From: Martin Jansa <martin.jansa@gmail.com>
To: Patches and discussions about the oe-core layer
<openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH v2] busybox: update to 1.8.5
Date: Thu, 8 Sep 2011 15:18:30 +0200 [thread overview]
Message-ID: <CA+chaQdR=p6C++xpewOvbc+F04kEu6RpnWBeQrunLyDa7oOnLw@mail.gmail.com> (raw)
In-Reply-To: <1315294779-3295-1-git-send-email-denis@eukrea.com>
On Tue, Sep 6, 2011 at 9:39 AM, Denis Carikli <denis@eukrea.com> wrote:
> Signed-off-by: Denis Carikli <denis@eukrea.com>
> ---
> .../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
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
prev parent reply other threads:[~2011-09-08 13:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-06 7:33 [PATCH] busybox: update to 1.8.5 Signed-off-by: Denis Carikli <denis@eukrea.com> Denis Carikli
2011-09-06 7:39 ` [PATCH v2] busybox: update to 1.8.5 Denis Carikli
2011-09-08 3:45 ` Saul Wold
2011-09-08 13:18 ` Martin Jansa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+chaQdR=p6C++xpewOvbc+F04kEu6RpnWBeQrunLyDa7oOnLw@mail.gmail.com' \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.