Re: [leaf-devel] LEAF rebase/merge

Hi Erich, the best is to merge the new-initrd branch into the maint or master. In either case (merge or rebase) you need to resolve the conflicts. There are no other alternative. Yves > Le 14 janv. 2016 à 08:10, Erich Titl a écrit : > > Hi Yves > > KP has asked me to

[leaf-devel] Kernel patches in openembedded/yocto

Hi all, i'm working on a project that use openembedded/yocto project. It's really great to create a full linux distribution and boot images for any type of processor/architecture. Just for the informations this is how the configs and patches for the kernel are managed: There a directory that

Re: [leaf-devel] how to shrink a repository

Le 26 mars 2015 à 16:32, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Dienstag, 24. März 2015, 12:20:35 schrieb Yves Blusseau: Le 23 mars 2015 à 18:36, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hello Yves; Am Montag, 23. März 2015, 18:05:13 schrieb Yves

Re: [leaf-devel] LEAF upgrade / package repository

Sorry for my intrusion but why don't you use a git clone working dir for the document root of the http server. With that we can change the tree easily, we need only one branch that represent all the versions of the packages that can be download. Also with this the same file in different paths

Re: [leaf-devel] how to shrink a repository

Le 23 mars 2015 à 18:36, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hello Yves; Am Montag, 23. März 2015, 18:05:13 schrieb Yves Blusseau: Le 23 mars 2015 à 16:35, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi; Am Montag, 23. März 2015, 12:07:35 schrieb

Re: [leaf-devel] how to shrink a repository

Le 23 mars 2015 à 09:25, Erich Titl erich.t...@think.ch a écrit : Hi Yves Am 23.03.2015 um 08:56 schrieb Yves Blusseau: ... The feature is to clone a repository without downloading all the history (several GB) OK so you basically remove the history from a git repository

Re: [leaf-devel] how to shrink a repository

Le 23 mars 2015 à 01:11, Erich Titl erich.t...@think.ch a écrit : Hi Yves Am 18.03.2015 um 14:32 schrieb Yves Blusseau: Le 14 mars 2015 à 20:12, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; ... i have answer the question in the LEAF upgrade thread :D

Re: [leaf-devel] how to shrink a repository

Le 23 mars 2015 à 16:35, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi; Am Montag, 23. März 2015, 12:07:35 schrieb Yves Blusseau: Le 23 mars 2015 à 09:25, Erich Titl erich.t...@think.ch a écrit : Hi Yves Am 23.03.2015 um 08:56 schrieb Yves Blusseau

Re: [leaf-devel] LEAF Upgrade

Using git to store the packages and using branch to group the packages by version/architecture is really a good thing and it's not dependent to how and where the files are host. But using http to get the packages is a bad thing for me because is dependent of how the http server expose the

Re: [leaf-devel] how to shrink a repository

Le 14 mars 2015 à 20:12, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; you may have followed the threads about LEAF upgrade... Today we do have a package repository with for packages https://sourceforge.net/p/leaf/packages/ci/master/tree/ The summed packages

Re: [leaf-devel] LEAF Upgrade

Le 9 mars 2015 à 23:00, Erich Titl erich.t...@think.ch a écrit : Hi Yves please bear with me, I don't get it Am 09.03.2015 um 13:03 schrieb Yves Blusseau: .. An example using a local repository (it’s the same for a remote repository) # Create the repository cd /tmp git init

Re: [leaf-devel] LEAF Upgrade

Le 11 mars 2015 à 09:39, Erich Titl erich.t...@think.ch a écrit : Hi Yves Am 11.03.2015 um 08:56 schrieb Yves Blusseau: ... I guess with your tool we somehow duplicate a git repository to another filepath without actually duplicating the data and we should be able to point

Re: [leaf-devel] LEAF Upgrade

Hi all, just for your information, i have develop a script to store big binaries in git repository. With this we can have a full filesystem with all the versions like this: 4.1 ├── 4.1/i386 │ └── 4.1/i386/pkg2.lrp └── 4.1/x86_64 ├── 4.1/x86_64/pkg1.lrp └──

Re: [leaf-devel] Git rebasing

Hi Yves Hi Erich, I have a question regarding my commit branch which I sync to the repository. I would like to rebase this branch to tag 5.1.3 to be able to work with this release. I read about rebase --onto, but to me this does not make sense, since I did not branch off a tag, but

Re: [leaf-devel] LEAF Upgrade

Hi all, just for your information, i have develop a script to store big binaries in git repository. With this we can have a full filesystem with all the versions like this: 4.1 ├── 4.1/i386 │ └── 4.1/i386/pkg2.lrp └── 4.1/x86_64 ├── 4.1/x86_64/pkg1.lrp └── 4.1/x86_64/pkg3.lrp 5.1.2

Re: [leaf-devel] LEAF Upgrade

You may have a look into leaf.zetam.org I worked with Yves recently to provide a new and working Packages page there, no further decisions made about mocing webpages permamently - any input will be welcome. With the exception of kernels and lwp Packages, Packages are downloadable

Re: [leaf-devel] wpasupplicant

Le 8 janv. 2015 à 11:53, Erich Titl erich.t...@think.ch a écrit : Am 08.01.2015 um 10:57 schrieb Yves Blusseau: Le 8 janv. 2015 à 09:53, Erich Titl erich.t...@think.ch a écrit : Salut Yves Am 08.01.2015 um 08:46 schrieb Yves Blusseau: One more thing, was is the branch ‘config

Re: [leaf-devel] wpasupplicant

Hello all, and happy new year. Cherry picking is not a good solution. If you want to commit only some changes from one branch to another you can use git add -p for example to select the portion of « code » you want to add. You can alse use rebase -i to create specific commits in a branch and

Re: [leaf-devel] wpasupplicant

One more thing, was is the branch ‘config’ for ? If it’s a feature branch it need to be more descriptive. If it’s a branch that is own by someone else it’s better to name it name-branch. Regards, Yves -- Dive into the

[leaf-devel] Wifi 802ac card

Hi all, i'm looking for a 802ac wifi card in mini pcie format that was compatible with our leaf kernel. Do you have see something that works ? Regards, Yves -- Dive into the World of Parallel Programming! The Go

Re: [leaf-devel] commits for 5.1.3

Yes thanks a lot david for the documentation you havec made in the wiki. Regards, Yves Le 27 déc. 2014 à 00:24, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi David - nice to see you! If you want to see your commits in 5.13, and I bet you will, you have to commit to the maint

Re: [leaf-devel] GIT

mega@leafbuilder:~/leaf/devel/bering-uclibc$ git pull Password: remote: Counting objects: 84, done. remote: Compressing objects: 100% (55/55), done. remote: Total 55 (delta 34), reused 0 (delta 0) Unpacking objects: 100% (55/55), done. Von ssh://git.code.sf.net/p/leaf/bering-uclibc

Re: [leaf-devel] [leaf:bering-uclibc] [2bdcfd] - Jorge Contreras: Backup symlinks, empty dirs and other improvements

Le 4 nov. 2014 à 00:26, Erich Titl erich.t...@think.ch a écrit : HI Jorge Am 03.11.2014 um 21:50 schrieb cpu memhd: Hey Erich, Your expand path properly handles the './', and also, another thing I discovered is that with my modified expandpath, it will not always get rid of

Re: [leaf-devel] [leaf:bering-uclibc] [2bdcfd] - Jorge Contreras: Backup symlinks, empty dirs and other improvements

Le 5 nov. 2014 à 10:56, Erich Titl erich.t...@think.ch a écrit : HI Yves Am 05.11.2014 um 09:48 schrieb Yves Blusseau: Le 4 nov. 2014 à 00:26, Erich Titl erich.t...@think.ch a écrit : ... Hi all, i don’t know if it can help you but i have write some functions to retrieve

Re: [leaf-devel] uboot disturbs the build process

Le 15 oct. 2014 à 22:25, Erich Titl erich.t...@think.ch a écrit : Hi KP on 15.10.2014 20:07, kp kirchdoerfer wrote: Hi Erich; ... I'm pretty shure you can merge, without forcing others to follow your pathes - otherwise git would be a desaster. Igitt Igitt :-) Pls show us

[leaf-devel] A great project

Hi all, if you don't know Yocto (https://www.yoctoproject.org/about) it's a great project to build custom Linux-based systems for embedded products that already support a lot of BSP (Board Support Package : specific board packages). Perhaps we can take a lot of informations to build custom

Re: [leaf-devel] A great project

Le 23 août 2014 à 12:39, Yves Blusseau bluss...@users.sourceforge.net a écrit : Hi all, if you don't know Yocto (https://www.yoctoproject.org/about) it's a great project to build custom Linux-based systems for embedded products that already support a lot of BSP (Board Support Package

Re: [leaf-devel] annex pb after updating distro

Le 17 août 2014 à 15:49, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; I've tried to get into annex etc again today. As you may have seen I have updated my build host to ubuntu 14.04 and it seems something has changed, which breaks annex. Running annex status

[leaf-devel] Git Repository without binaries

Hi all, i have clone our leaf repository to github without any binaries in it. So the repository has a size of 7MB. You can checkout it with: git clone g...@github.com:LEAF-Bering-uClibc/bering-uclibc.git The purpose of this repository is to check and test the tools that is use to manage this

Re: [leaf-devel] Git Repository without binaries

Le 10 août 2014 à 11:55, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; Am Sonntag, 10. August 2014, 10:21:08 schrieb Yves Blusseau: Hi all, i have clone our leaf repository to github without any binaries in it. So the repository has a size of 7MB. You can checkout

Re: [leaf-devel] moving git branches

Le 10 août 2014 à 12:02, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; Hi all; I remember I failed last time, so I'd like to ask you to do the job :) As you may have seen I've added the final 5.1 images to the SF FRS. Now that we do have a new major stable release

Re: [leaf-devel] Misused of next branch

Le 5 août 2014 à 17:13, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Mittwoch, 30. Juli 2014, 23:47:16 schrieb Yves Blusseau: Le 30 juil. 2014 à 17:48, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Dienstag, 29. Juli 2014, 18:17:56 schrieb Yves Blusseau: Hi all

Re: [leaf-devel] Master not fully merge with maint

Le 2 août 2014 à 19:02, Yves Blusseau bluss...@zetam.org a écrit : Hi all, it's seems that commits from maint has not be fully merge into master: Performing inexact rename detection: 100% (14352/14352), done. Auto-merging repo/linux/buildtool.cfg CONFLICT (content): Merge conflict

[leaf-devel] Another router

Hi all, i have found this router: http://www.ubnt.com/edgemax/edgerouter-lite * http://www.smallnetbuilder.com/lanwan/lanwan-reviews/32012-first-look-ubiquiti-edgerouter-lite It's seems we can put a freebsd or linux on it: - http://rtfm.net/FreeBSD/ERL/ -

Re: [leaf-devel] Another router

platforms with 32M RAM). Rest of flash will remain as JFFS2 r/w filesystem for configs/packages/modules. 03.08.2014 13:18, Yves Blusseau ?: Hi all, i have found this router: http://www.ubnt.com/edgemax/edgerouter-lite * http://www.smallnetbuilder.com/lanwan/lanwan-reviews/32012-first

Re: [leaf-devel] buildpacket in branch maint

Le 1 août 2014 à 17:11, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; can you pls check your latest commit of buildpackert.pl in branch maint. I ran buildall and generated images, butthey fail to start with a kernel panic (no init found) - replacing builpacket.pl

Re: [leaf-devel] buildpacket in branch maint

Le 2 août 2014 à 16:14, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Samstag, 2. August 2014, 15:12:46 schrieb Yves Blusseau: Le 1 août 2014 à 17:11, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; can you pls check your latest commit of buildpackert.pl

[leaf-devel] Master not fully merge with maint

Hi all, it's seems that commits from maint has not be fully merge into master: Performing inexact rename detection: 100% (14352/14352), done. Auto-merging repo/linux/buildtool.cfg CONFLICT (content): Merge conflict in repo/linux/buildtool.cfg CONFLICT (rename/delete):

[leaf-devel] Git cleanup

Hi all, are you ok to remove old prelease tags like: v4.2.1-beta1, v5.0-alpha, v5.0.2-rc3, …. ? keeping only stable release tags. Regards, Yves -- Infragistics Professional Build stunning WinForms apps today! Reboot

Re: [leaf-devel] Misused of next branch

Le 30 juil. 2014 à 17:48, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Dienstag, 29. Juli 2014, 18:17:56 schrieb Yves Blusseau: Hi all, i think you are misusing the next branch. The next branch is not use to be the next branch for the next release. As the git workflow guide

[leaf-devel] Misused of next branch

Hi all, i think you are misusing the next branch. The next branch is not use to be the next branch for the next release. As the git workflow guide said (http://goo.gl/BOzkap) the next branch is intended as a testing branch for topics being tested for stability for master. So the next branch is

Re: [leaf-devel] Misused of next branch

Le 29 juil. 2014 à 20:21, Erich Titl erich.t...@think.ch a écrit : Hi Yves at 29.07.2014 18:17, Yves Blusseau wrote: Hi all, i think you are misusing the next branch. The next branch is not use to be the next branch for the next release. As the git workflow guide said (http://goo.gl

Re: [leaf-devel] Misused of next branch

Le 29 juil. 2014 à 21:35, Andrew ni...@seti.kr.ua a écrit : Fixed. I've cherry-picked significant commits into kernel-3.14, and forced next branch to point at current master branch. For all, you need to do `git reset --hard origin/next` on next branch, if it is in your local repo.

[leaf-devel] new leaf-storage repository

Hi all, i have create a new repository (leaf-storage) to test a new tool that i’m currently working on that store big/binaries files on a remote repository. This repository will never contain any commits or trees, only blobs. So it’s normal you don’t see anything with the gib web interface.

Re: [leaf-devel] Git - Submodules

Le 22 juil. 2014 à 11:47, Per Sjoholm tas...@users.sourceforge.net a écrit : Can git submodules be of help in reducing size http://git-scm.com/book/en/Git-Tools-Submodules Github also has feutures . No as each git repositories contain all the history. Regards, Yves

[leaf-devel] git_archive_download tool

Hi all, i have create a small tool to download file(s) or directory directly from sourceforge repository by using git-archive command. It is at least 3x faster to download with git-archive than using the http transport. I have put the tools currently on a personal branch

Re: [leaf-devel] Git - Submodules

Le 22 juil. 2014 à 14:08, Mike Noyes mhno...@users.sourceforge.net a écrit : On 07/22/2014 04:41 AM, Yves Blusseau wrote: Le 22 juil. 2014 à 11:47, Per Sjoholm tas...@users.sourceforge.net a écrit : Can git submodules be of help in reducing size http://git-scm.com/book/en/Git-Tools

Re: [leaf-devel] Reducing the size of the Bering-uClibc repository

Le 20 juil. 2014 à 21:42, Andrew ni...@seti.kr.ua a écrit : 20.07.2014 21:12, Yves Blusseau ?: Le 20 juil. 2014 à 19:39, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Sonntag, 20. Juli 2014, 19:22:18 schrieb Yves Blusseau: Le 20 juil. 2014 à 19:04, kp kirchdoerfer kap

Re: [leaf-devel] Reducing the size of the Bering-uClibc repository

Le 21 juil. 2014 à 09:51, Andrew ni...@seti.kr.ua a écrit : 21.07.2014 09:48, Yves Blusseau пишет: Le 20 juil. 2014 à 21:42, Andrew ni...@seti.kr.ua a écrit : 20.07.2014 21:12, Yves Blusseau ?: Le 20 juil. 2014 à 19:39, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am

Re: [leaf-devel] Reducing the size of the Bering-uClibc repository

Le 21 juil. 2014 à 11:17, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Gents; Am Montag, 21. Juli 2014, 10:22:55 schrieb Yves Blusseau: Le 21 juil. 2014 à 09:51, Andrew ni...@seti.kr.ua a écrit : 21.07.2014 09:48, Yves Blusseau пишет: Le 20 juil. 2014 à 21:42, Andrew ni

Re: [leaf-devel] Reducing the size of the Bering-uClibc repository

Le 21 juil. 2014 à 19:14, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Montag, 21. Juli 2014, 13:36:51 schrieb Yves Blusseau: Le 21 juil. 2014 à 11:17, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Gents; Am Montag, 21. Juli 2014, 10:22:55 schrieb Yves Blusseau

Re: [leaf-devel] Reducing the size of the Bering-uClibc repository

Le 20 juil. 2014 à 19:04, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Sonntag, 20. Juli 2014, 18:40:15 schrieb Yves Blusseau: Le 20 juil. 2014 à 18:22, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; Am Sonntag, 20. Juli 2014, 18:09:00 schrieb Yves Blusseau

[leaf-devel] Wiki migration

Hi all, Thanks to KP who give me the dump of the old wikimedia. The export is online at this url: http://bering-uclibc.zetam.org Regards, Yves -- ___ leaf-devel mailing list

Re: [leaf-devel] Wiki migration

Le 13 juil. 2014 à 17:12, Yves Blusseau bluss...@users.sourceforge.net a écrit : Hi all, Thanks to KP who give me the dump of the old wikimedia. The export is online at this url: http://bering-uclibc.zetam.org I miss to told you that the wiki have the SyntaxHighlight_GeSHi extension

Re: [leaf-devel] Wiki migration

More informations about the migration: I was using the same database as before, so your login, password and rights are the same as the wiki on SF. So Mike as the rights (as before) to change the users rights of other users. Actually, the wiki is closed so no new user can register a new account

[leaf-devel] nut package

Hi all, is it normal that the nut package have specific group 84 ? Owner Files = 0:84 Directories = 0:84 /Owner Regards, Yves -- ___

Re: [leaf-devel] Elvis package

Le 10 juil. 2014 à 01:35, Erich Titl erich.t...@think.ch a écrit : at 08.07.2014 09:06, Yves Blusseau wrote: Before 4.x we had a pretty usable vi, with probably all the bugs one can think of. The busybox stuff may be nice but is typically just a meager replacement for the REAL thing. I am

Re: [leaf-devel] LEAF pages/wiki/trac

Le 8 juil. 2014 à 20:01, Mike Noyes mhno...@users.sourceforge.net a écrit : On another subject, I nominate Yves for promotion to project admin. Thoughts? Thanks. Regards, Yves -- Open source business process

Re: [leaf-devel] Elvis package

Before 4.x we had a pretty usable vi, with probably all the bugs one can think of. The busybox stuff may be nice but is typically just a meager replacement for the REAL thing. I am under the impression that for the sake of new platforms and kernel features we are loosing some of the

[leaf-devel] Elvis package

Hi all, elvis-tiny (1.4-22) binary segfault on my platform for big file. Ex if i try to open /var/log/kern.log (62ko) and do 2 x CTRL-F it segfault I have compiled a 1.4-23 version, it's a little better but segfault also. It is known that elvis-tiny have a lot of bug. I have compiled also an

Re: [leaf-devel] Elvis package

Le 6 juil. 2014 à 14:39, Yves Blusseau bluss...@zetam.org a écrit : AFAIK unfortunately busybox-vi is not just a replacement, one needs to build it with a proper toolchain, and replace initrd… Can you explain ? We can choose now which editor to use with the Platform_Editor buildtool

Re: [leaf-devel] Elvis package

Le 6 juil. 2014 à 15:12, kp kirchdoerfer kap...@users.sourceforge.net a écrit : Am Sonntag, 6. Juli 2014, 15:02:54 schrieb Yves Blusseau: Le 6 juil. 2014 à 14:39, Yves Blusseau bluss...@zetam.org a écrit : AFAIK unfortunately busybox-vi is not just a replacement, one needs to build

Re: [leaf-devel] Elvis package

Le 6 juil. 2014 à 19:48, l...@davidmbrooke.co.uk a écrit : My vote would be: - Include the busybox vi for all images by default - Continue to package elvis-tiny for users who like the compromise of size and functionality - Add a better vi clone for people who want full functionality

[leaf-devel] Error with pert utility

Hi all, i use pef top -a command to see how my system is running. It works well the first time i launch it but when i try to relaunch it i have this error: ~ # perf top -a Error: The sys_perf_event_open() syscall returned with 22 (Invalid argument) for event (cycles). /bin/dmesg may provide

Re: [leaf-devel] LEAF pages/wiki/trac

Le 29 juin 2014 à 18:28, Yves Blusseau bluss...@zetam.org a écrit : Mike, your help and insights are appreciated, and I guess none of us will, or would have complained (maybe a little bit as usual :)), if you move on to based on your experience about hosting issues for LEAF. As you

Re: [leaf-devel] Can't expand variable $uClibc_loader_link

Le 2 juil. 2014 à 06:34, Yves Blusseau bluss...@users.sourceforge.net a écrit : Hi all, i'm trying to create a new initrd.lrp package but the buildpacket.pl return the error: sudo ./buildpacket.pl --package=initrd Error: can't expand variable $uClibc_loader_link Where this variable

Re: [leaf-devel] wpa-supplicant on bering 5.01

Le 11 févr. 2014 à 21:24, Erich Titl erich.t...@think.ch a écrit : Hi Erich, you can stash your changes. After that fetch the branch master from the repo and rebase your work on it: git stash git pull git stash pop Did that, now tons of conflicts arose, at least it did not abort.

Re: [leaf-devel] wpa-supplicant on bering 5.01

Le 12 févr. 2014 à 10:02, Erich Titl erich.t...@think.ch a écrit : Looking at the files I see that my changes have disappered, rather unfortunate, but not that bad. I still remember what I did. I was of the opinion this should never happen. Changes doesn’t disapperred, they are in your

Re: [leaf-devel] wpa-supplicant on bering 5.01

Le 12 févr. 2014 à 11:33, Erich Titl erich.t...@think.ch a écrit : Hi Yves on 12.02.2014 09:41, Yves Blusseau wrote: Le 11 févr. 2014 à 21:24, Erich Titl erich.t...@think.ch a écrit : ... Don ’t know how you have so much conflict. I _believe_ I know the reason. For some

Re: [leaf-devel] Git workflow questions

Le 7 févr. 2014 à 22:09, David M Brooke l...@davidmbrooke.co.uk a écrit : Hi leaf-devel, Hi David ! What I did was: - Created a new local branch (called trac#93) based on maint - Committed the code change against that new branch - Merged the bugfix branch back into « maint (with

Re: [leaf-devel] Git workflow questions

Le 10 févr. 2014 à 21:00, David M Brooke l...@davidmbrooke.co.uk a écrit : I also have a new Package (vnstat) which I'd like to add. That's not a bug-fix, so should I create my feature branch off master rather than maint? Fork off the new feature branch from maint if you want to add the

Re: [leaf-devel] wpa-supplicant on bering 5.01

Le 11 févr. 2014 à 16:07, Erich Titl erich.t...@think.ch a écrit : Hi Folks it looks like wpa-supplicant is out of date on 5.01 (possibly later too) I have successfully built the latest wpasupplicant on my (slightly invalid) buildenv and would like to contribute it. Questions - How

Re: [leaf-devel] start with branch renaming/moving

Le 6 janv. 2014 à 19:09, KP Kirchdörfer kap...@users.sourceforge.net a écrit : Locally I do have maint-4.x, how to proceed? btw: how can we fix the wrong rename/move of maint to maint-4.x? Yes easy :D remove local and remote branches with the commands: git checkout master git branch -d

Re: [leaf-devel] start with branch renaming/moving

Hi kp, no « renaming » branch is not the right thing to do. Also removing integration branches on the repository is not a good idea :D It seems there a problem has my local maint branch is now not « attach » to a remote maint branch (do you remove or change the maint branch) ? In any case we

Re: [leaf-devel] start with branch renaming/moving

Le 6 janv. 2014 à 11:07, Erich Titl erich.t...@think.ch a écrit : Hi Yves Hi Erich All this sounds fine for the central repository, would you mind to elaborate this for the distributed (workspace) repositories? What is the canonical way distribute the new repository structure? I don’t

Re: [leaf-devel] start with branch renaming/moving

Le 6 janv. 2014 à 16:33, Erich Titl erich.t...@think.ch a écrit : If the central repository gets changed structurally, what needs to be done to the peripheral copies, are they just magically modified? If we only fast-forward central repository branches nothing specific things is needed to

Re: [leaf-devel] start with branch renaming/moving

Le 6 janv. 2014 à 17:31, KP Kirchdörfer kap...@users.sourceforge.net a écrit : Hi Yves; I knew I made something wrong :) Because of that I started only with the old maint branch, which I hoped wouldn’t be that harmful, and didn't touch anything else. It hard to break (not recoverable)

Re: [leaf-devel] git branches

Le 28 juil. 2013 à 19:28, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Yes, sounds easier and more towards how we do releases. I'm keen to tag versions when doing a new release, so that won't be a problem. A question, possibly asked before, how do we keep branches like next in

Re: [leaf-devel] git branches

Le 27 juil. 2013 à 20:08, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Am 27.07.2013 19:31, schrieb Yves Blusseau: Le 27 juil. 2013 à 11:11, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Well, seems a problem is that we have developed two different concepts

Re: [leaf-devel] git branches

Le 27 juil. 2013 à 00:44, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : My understanding is that we also don't release 5.0.0.x, or something else - 5.0.1 is the maintenance version for 5.0. The changes are mostly package updates but no big changes. NO, maint is for old version

Re: [leaf-devel] git branches

Le 24 juil. 2013 à 19:22, Erich Titl erich.t...@think.ch a écrit : Hi KP on 24.07.2013 19:11, KP Kirchdoerfer wrote: Hi all; hi Yves; now that 5.0 has gone stable and even a first beta of 5.0.1 is out, I think it's about time to move master branch to maint. What would be the old

Re: [leaf-devel] LEAF for raspberry pi

Le 7 avr. 2013 à 12:33, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Someting might went wrong when rebasing, I had to hard reset my local repository to origin/rpi, cause pull and reabse gave resulted in errors. Yes because rebase is bad for branch already committed. Rebase

Re: [leaf-devel] LEAF for raspberry pi

Le 7 avr. 2013 à 15:55, Andrew ni...@seti.kr.ua a écrit : If we'll merge this branch into master in future - is it OK to merge master into rpi branch? Yes you can. But if the rip branch is a topic branch it's perhaps better to do a rebase like you do. Yves

Re: [leaf-devel] git branches

$git cherry -v master origin/buc5-x86_64-toolchain + c99432cb0297ef5c4d84aa3ece351414d29a2d49 Add x86_64-net6501-linux-uclibc toolchain Are we okay to merge it ? If it works..., I can't test. Does it mean we need to create another image? Yes it works, i have a net501 board. The

Re: [leaf-devel] git branches

Le 31 mars 2013 à 23:06, Erich Titl erich.t...@think.ch a écrit : Am 31.03.2013 20:41, schrieb KP Kirchdoerfer: Hi all; I just looked into the branches we have: git branch -r origin/buc5-x86_64-toolchain origin/maint origin/maint-4.0 origin/maint-4.2 origin/master

Re: [leaf-devel] merging maint into master

Le 14 janv. 2013 à 17:26, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Yves; can you pls merge maint to master so we do have the openvpn update in master? Yes done. I followed the path you described earlier, but I'm not happy with it in that case. The preferred way

Re: [leaf-devel] testing kernel 3.4.24

Le 07/01/2013 22:53, Erich Titl a écrit : Hi Gents Am 07.01.2013 13:06, schrieb Yves Blusseau: ... Branches 4.x are in maintainer mode. So no update of the kernel or uClibc will be done. You must be kidding. So you say that a release is in maintenance mode before there is even a running

Re: [leaf-devel] X64_32 init problem

Le 30 déc. 2012 à 17:32, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Hi all; there is a problem that X86_64 runs into an error: [0.220661] Kernel panic - not syncing: No init found. Try passing init= option to kernel. See Linux Documentation/init.txt for guidance. [

Re: [leaf-devel] possible git pb with accel-ppp

Le 29 déc. 2012 à 00:45, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Am 28.12.2012 22:07, schrieb Andrew: Hi. Ok I'll look on it. A lot of patches are now unneeded (they are from git upstream, and are merged into 1.7.3). Thanks. 28.12.2012 16:30, KP Kirchdoerfer ?: Hi;

Re: [leaf-devel] proposing a timeframe and features for 5.0-alpha2

Le 26 déc. 2012 à 00:01, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Hi; sorry for the delay - I started the discussion and then went offline :( Am 21.12.2012 10:21, schrieb Yves Blusseau: Le 19 déc. 2012 à 17:46, KP Kirchdoerfer kap...@users.sourceforge.net a écrit

Re: [leaf-devel] proposing a timeframe and features for 5.0-alpha2

Le 19 déc. 2012 à 17:46, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Hi Gents; I'd like to make a proposal for the timeframe and features of the second alpha version of 5.0. First of all, I think it should still be an alpha version - so neither the kernel nor the uClibc are

Re: [leaf-devel] Don't forget to change your git configuration

Le 19 déc. 2012 à 10:36, KP Kirchdoerfer kap...@users.sourceforge.net a écrit : Am 17.12.2012 14:58, schrieb Mike Noyes: On 12/17/2012 03:17 AM, Yves Blusseau wrote: Hi all, i see some commits that has been done in the old git repository: $ git cherry -v origin/master old/master

[leaf-devel] Don't forget to change your git configuration

Hi all, i see some commits that has been done in the old git repository: $ git cherry -v origin/master old/master + 7127babead986725fc128e9acc7b1c5a08fa44d8 kernel update to 3.2.35 + b3b98c475e6392a92951c3b29445d3db86c9a7f6 add verification with gpgv I have merge the changes in the new git

Re: [leaf-devel] update ---- Discussion... Wifi on BuC 4.3.1 moved to leaf-devel

Le 12/12/2012 22:11, Erich Titl a écrit : Am 11.12.2012 08:29, schrieb Yves Blusseau: Le 10 déc. 2012 à 11:28, Erich Titlerich.t...@think.ch a écrit : Hi Yves on 10.12.2012 10:30, Yves Blusseau wrote: Hi all, i have repush the patch from Erich because it's add a merge commit. Please

Re: [leaf-devel] update ---- Discussion... Wifi on BuC 4.3.1 moved to leaf-devel

Le 10 déc. 2012 à 11:28, Erich Titl erich.t...@think.ch a écrit : Hi Yves on 10.12.2012 10:30, Yves Blusseau wrote: Hi all, i have repush the patch from Erich because it's add a merge commit. Please try to rebase your local topic branch from the remote one before doing the merge

Re: [leaf-devel] update ---- Discussion... Wifi on BuC 4.3.1 moved to leaf-devel

Hi all, i have repush the patch from Erich because it's add a merge commit. Please try to rebase your local topic branch from the remote one before doing the merge. To be sure use the git merge --ff-only command. Regards, Yves smime.p7s Description: S/MIME cryptographic signature

Re: [leaf-devel] update ---- Discussion... Wifi on BuC 4.3.1 moved to leaf-devel

Le 6 déc. 2012 à 19:13, Erich Titl erich.t...@think.ch a écrit : Ah by the way, I deleted my master branch, what needs to be done to pull it again? Hi Erich, you can use the tips to have multiple work tree with one repository:

Re: [leaf-devel] buildpacket.pl doesn't create package/arch directory

Le 2 nov. 2012 à 13:34, Andrew a écrit : Hi all. I noticed subj. When package directory is missed, buildpacket.pl fails. Fixed. Yves -- LogMeIn Central: Instant, anywhere, Remote PC access and management. Stay in

Re: [leaf-devel] buildtool failure when using include

Le 3 nov. 2012 à 11:45, KP Kirchdoerfer a écrit : Hi; buildtool fails, when the ?include statement tries to load the same file twice or more. Can't include file '/opt/buildtool-master/source/i486-unknown-linux-uclibc/ppp/common.cfg' from file

Re: [leaf-devel] 5.x alpha

Le 30/10/2012 17:36, KP Kirchdoerfer a écrit : There has been proposals to update the current 3.2.x kernel. I voted to stay with the 3.2 kernel, which is well tested, Andrew voted for a 3.4 kernel, Yves asked for a more recent one, but also pointed out a few weeks, that the 3.4 kernel is also

  1   2   >