On Tue, Sep 6, 2011 at 9:39 AM, Denis Carikli <[email protected]> wrote: > Signed-off-by: Denis Carikli <[email protected]> > --- > .../B921600.patch | 0 > .../busybox-appletlib-dependency.patch | 0 > .../busybox-udhcpc-no_deconfig.patch | 0 > .../{busybox-1.18.4 => busybox-1.18.5}/defconfig | 0 > .../get_header_tar.patch | 0 > .../run-parts.in.usr-bin.patch | 0 > .../udhcpc-fix-nfsroot.patch | 0 > .../udhcpscript.patch | 0 > .../{busybox_1.18.4.bb => busybox_1.18.5.bb} | 6 +++--- > 9 files changed, 3 insertions(+), 3 deletions(-) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/B921600.patch (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/busybox-appletlib-dependency.patch (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/busybox-udhcpc-no_deconfig.patch (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/defconfig (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/get_header_tar.patch (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/run-parts.in.usr-bin.patch (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/udhcpc-fix-nfsroot.patch (100%) > rename meta/recipes-core/busybox/{busybox-1.18.4 => > busybox-1.18.5}/udhcpscript.patch (100%) > rename meta/recipes-core/busybox/{busybox_1.18.4.bb => busybox_1.18.5.bb} > (85%)
While upgrading I've noticed few file conflicts Configuring busybox. ln: /sbin/blockdev: File exists ln: /usr/bin/flock: File exists ln: /usr/bin/time: File exists update-alternatives: Error: not linking //sbin/blockdev to ../bin/busybox since //sbin/blockdev exists and is not a link update-alternatives: Error: not linking //usr/bin/flock to ../../bin/busybox since //usr/bin/flock exists and is not a link update-alternatives: Error: not linking //usr/bin/time to ../../bin/busybox since //usr/bin/time exists and is not a link SHR root@gjama / $ opkg search /sbin/blockdev util-linux - 2.19.1-r4 SHR root@gjama / $ opkg search /usr/bin/flock util-linux - 2.19.1-r4 SHR root@gjama / $ opkg search /usr/bin/time time - 1.7-r0 So someone should update busybox's defconfig or teach util-linux and time to use u-a for this. Regards, > > diff --git a/meta/recipes-core/busybox/busybox-1.18.4/B921600.patch > b/meta/recipes-core/busybox/busybox-1.18.5/B921600.patch > similarity index 100% > rename from meta/recipes-core/busybox/busybox-1.18.4/B921600.patch > rename to meta/recipes-core/busybox/busybox-1.18.5/B921600.patch > diff --git > a/meta/recipes-core/busybox/busybox-1.18.4/busybox-appletlib-dependency.patch > b/meta/recipes-core/busybox/busybox-1.18.5/busybox-appletlib-dependency.patch > similarity index 100% > rename from > meta/recipes-core/busybox/busybox-1.18.4/busybox-appletlib-dependency.patch > rename to > meta/recipes-core/busybox/busybox-1.18.5/busybox-appletlib-dependency.patch > diff --git > a/meta/recipes-core/busybox/busybox-1.18.4/busybox-udhcpc-no_deconfig.patch > b/meta/recipes-core/busybox/busybox-1.18.5/busybox-udhcpc-no_deconfig.patch > similarity index 100% > rename from > meta/recipes-core/busybox/busybox-1.18.4/busybox-udhcpc-no_deconfig.patch > rename to > meta/recipes-core/busybox/busybox-1.18.5/busybox-udhcpc-no_deconfig.patch > diff --git a/meta/recipes-core/busybox/busybox-1.18.4/defconfig > b/meta/recipes-core/busybox/busybox-1.18.5/defconfig > similarity index 100% > rename from meta/recipes-core/busybox/busybox-1.18.4/defconfig > rename to meta/recipes-core/busybox/busybox-1.18.5/defconfig > diff --git a/meta/recipes-core/busybox/busybox-1.18.4/get_header_tar.patch > b/meta/recipes-core/busybox/busybox-1.18.5/get_header_tar.patch > similarity index 100% > rename from meta/recipes-core/busybox/busybox-1.18.4/get_header_tar.patch > rename to meta/recipes-core/busybox/busybox-1.18.5/get_header_tar.patch > diff --git > a/meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch > b/meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch > similarity index 100% > rename from > meta/recipes-core/busybox/busybox-1.18.4/run-parts.in.usr-bin.patch > rename to meta/recipes-core/busybox/busybox-1.18.5/run-parts.in.usr-bin.patch > diff --git > a/meta/recipes-core/busybox/busybox-1.18.4/udhcpc-fix-nfsroot.patch > b/meta/recipes-core/busybox/busybox-1.18.5/udhcpc-fix-nfsroot.patch > similarity index 100% > rename from meta/recipes-core/busybox/busybox-1.18.4/udhcpc-fix-nfsroot.patch > rename to meta/recipes-core/busybox/busybox-1.18.5/udhcpc-fix-nfsroot.patch > diff --git a/meta/recipes-core/busybox/busybox-1.18.4/udhcpscript.patch > b/meta/recipes-core/busybox/busybox-1.18.5/udhcpscript.patch > similarity index 100% > rename from meta/recipes-core/busybox/busybox-1.18.4/udhcpscript.patch > rename to meta/recipes-core/busybox/busybox-1.18.5/udhcpscript.patch > diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb > b/meta/recipes-core/busybox/busybox_1.18.5.bb > similarity index 85% > rename from meta/recipes-core/busybox/busybox_1.18.4.bb > rename to meta/recipes-core/busybox/busybox_1.18.5.bb > index b2053ee..c0dc1d4 100644 > --- a/meta/recipes-core/busybox/busybox_1.18.4.bb > +++ b/meta/recipes-core/busybox/busybox_1.18.5.bb > @@ -1,5 +1,5 @@ > require busybox.inc > -PR = "r9" > +PR = "r0" > > SRC_URI = > "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ > file://udhcpscript.patch \ > @@ -25,7 +25,7 @@ SRC_URI = > "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ > file://umount.busybox \ > file://defconfig" > > -SRC_URI[tarball.md5sum] = "b03c5b46ced732679e525a920a1a62f5" > -SRC_URI[tarball.sha256sum] = > "4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa" > +SRC_URI[tarball.md5sum] = "96dd43cc7cee4017a6bf31b7da82a1f5" > +SRC_URI[tarball.sha256sum] = > "10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0" > > EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX} > SKIP_STRIP=y" > -- > 1.7.4.1 > > > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core > _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
