From: Yves B. <blu...@ze...> - 2012-12-29 19:34:49
|
Le 29 déc. 2012 à 00:45, KP Kirchdoerfer <ka...@us...> 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; >>> >>> while trying to rebuild from git master I saw that accel-ppp fails due >>> to missing files. >>> >>> Andrew committed on 7 Nov changes and new files for accel-ppp, but they >>> seem to have been lost in the meantime >>> >>> "Summary of changes: >>> repo/accel-ppp/accel-ppp.conf | 2 +- >>> repo/accel-ppp/add_rpath.patch | 23 ++++++++++ >>> repo/accel-ppp/buildtool.cfg | 18 +++++++- >>> repo/accel-ppp/buildtool.mk | 2 + >>> repo/accel-ppp/cli_fixes.patch | 95 >>> ++++++++++++++++++++++++++++++++++++++++ >>> 5 files changed, 137 insertions(+), 3 deletions(-) >>> create mode 100644 repo/accel-ppp/add_rpath.patch >>> create mode 100644 repo/accel-ppp/cli_fixes.patch" >>> >>> How can we fix that, how can that happen and how can we be shure that >>> other commits are not affected? > > I got it, a later commit with a new upstream version removed the files > from repository - that's what I#ve looked for. So everything is ok with > git, and wrong with accel-ppp's buildtool.cfg(?) Hi all, if you want to see what was done by who and when for a specific directory use for example the git log command with the --name-status option: $ git log --name-status repo/accel-ppp commit 059fa994c633e661792fe36c680ed12a784c34af Author: Andrew Denisenko <nit...@us...> Date: Fri Dec 14 14:22:42 2012 accel-ppp: update to upstream version D repo/accel-ppp/accel-ppp-1.7.2.tar.bz2 A repo/accel-ppp/accel-ppp-1.7.3.tar.bz2 D repo/accel-ppp/add_rpath.patch M repo/accel-ppp/buildtool.cfg M repo/accel-ppp/buildtool.mk D repo/accel-ppp/cli_fixes.patch commit 1d99c2d2d5e4675d873bd86e3e0c0d2a8a4d0798 Author: Andrew Denisenko <nit...@us...> Date: Wed Nov 7 09:51:01 2012 accel-ppp: more patches from upstream A repo/accel-ppp/add_rpath.patch M repo/accel-ppp/buildtool.cfg M repo/accel-ppp/buildtool.mk A repo/accel-ppp/cli_fixes.patch commit 114deb09c8da140a7d1da79d233a4b96cfbb9f36 Author: Andrew Denisenko <nit...@us...> Date: Wed Nov 7 09:46:53 2012 Revert "accel-ppp: move libs to /usr/lib" This reverts commit ababdc8466c0444b9efd745a7e8e66f6dff394c7. Upstream added lib/accel-ppp to RPATH M repo/accel-ppp/accel-ppp.conf M repo/accel-ppp/buildtool.cfg commit ababdc8466c0444b9efd745a7e8e66f6dff394c7 Author: Andrew Denisenko <nit...@us...> Date: Fri Nov 2 17:59:16 2012 accel-ppp: move libs to /usr/lib uClibc doesn't search dependent libs in /usr/lib/accel-ppp if loaded lib is dependent from other libs. M repo/accel-ppp/accel-ppp.conf M repo/accel-ppp/buildtool.cfg commit e894e6f5c92b2abbb0adee1d4d434cc61f48b431 Author: Andrew Denisenko <nit...@us...> Date: Fri Nov 2 17:22:32 2012 accel-ppp: revision up M repo/accel-ppp/buildtool.cfg Status are: D for delete, A for add and M for modified. Regards, Yves |