* [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev
@ 2011-02-12 11:12 Martin Jansa
2011-02-12 11:12 ` [PATCH 2/2] eject: use u-a for /usr/bin/volname Martin Jansa
2011-02-12 12:16 ` [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev Koen Kooi
0 siblings, 2 replies; 4+ messages in thread
From: Martin Jansa @ 2011-02-12 11:12 UTC (permalink / raw)
To: openembedded-devel
* resolves conflict with latest busybox
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/util-linux-ng/util-linux-ng.inc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 579c8dc..51f25b2 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -6,7 +6,7 @@ DEPENDS_virtclass-native = "zlib-native lzo-native gettext-native"
inherit autotools gettext
-INC_PR = "r35"
+INC_PR = "r36"
# allows for a release candidate
RC ?= ""
@@ -126,8 +126,8 @@ do_install () {
'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
mkdir -p ${D}${base_bindir}
- sbinprogs="agetty blockdev ctrlaltdel cfdisk"
- sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw uuidd"
+ sbinprogs="agetty ctrlaltdel cfdisk"
+ sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid blockdev vigr vipw uuidd"
usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset cal script flock"
usrsbinprogs_a="readprofile"
binprogs_a="dmesg kill more umount mount login"
@@ -220,6 +220,7 @@ pkg_postinst_${PN} () {
update-alternatives --install ${base_bindir}/login login login.${PN} 100
update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100
update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100
+ update-alternatives --install ${base_sbindir}/blockdev blockdev blockdev.${PN} 100
update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 100
@@ -236,7 +237,7 @@ pkg_prerm_${PN} () {
test -x ${base_sbindir}/pivot_root.${PN} && \
update-alternatives --remove pivot_root pivot_root.${PN}
- for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login cal script flock uuidd; do
+ for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr blockdev chfn newgrp chsh login cal script flock uuidd; do
update-alternatives --remove $i $i.${PN}
done
}
--
1.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] eject: use u-a for /usr/bin/volname
2011-02-12 11:12 [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev Martin Jansa
@ 2011-02-12 11:12 ` Martin Jansa
2011-02-12 12:16 ` Koen Kooi
2011-02-12 12:16 ` [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev Koen Kooi
1 sibling, 1 reply; 4+ messages in thread
From: Martin Jansa @ 2011-02-12 11:12 UTC (permalink / raw)
To: openembedded-devel
* resolves conflict with latest busybox
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes/eject/eject_2.1.5.bb | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/recipes/eject/eject_2.1.5.bb b/recipes/eject/eject_2.1.5.bb
index 7c46432..06328dc 100644
--- a/recipes/eject/eject_2.1.5.bb
+++ b/recipes/eject/eject_2.1.5.bb
@@ -2,12 +2,22 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, ta
HOMEPAGE = "http://eject.sourceforge.net/"
LICENSE = "GPLv2"
-inherit autotools gettext
+PR = "r1"
-SRC_URI = "http://sources.openembedded.org/eject-2.1.5.tar.gz"
+inherit autotools gettext update-alternatives
-S = "${WORKDIR}/${PN}"
+ALTERNATIVE_NAME = "volname"
+ALTERNATIVE_LINK = "${bindir}/volname"
+ALTERNATIVE_PATH = "${bindir}/volname.${PN}"
+ALTERNATIVE_PRIORITY = "100"
+SRC_URI = "http://sources.openembedded.org/${P}.tar.gz"
SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"
+
+do_install_append() {
+ mv ${D}/${bindir}/volname ${D}/${bindir}/volname.${PN}
+}
+
+S = "${WORKDIR}/${PN}"
--
1.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev
2011-02-12 11:12 [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev Martin Jansa
2011-02-12 11:12 ` [PATCH 2/2] eject: use u-a for /usr/bin/volname Martin Jansa
@ 2011-02-12 12:16 ` Koen Kooi
1 sibling, 0 replies; 4+ messages in thread
From: Koen Kooi @ 2011-02-12 12:16 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12-02-11 12:12, Martin Jansa wrote:
> * resolves conflict with latest busybox
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@openembedded.org>
> ---
> recipes/util-linux-ng/util-linux-ng.inc | 9 +++++----
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
> index 579c8dc..51f25b2 100644
> --- a/recipes/util-linux-ng/util-linux-ng.inc
> +++ b/recipes/util-linux-ng/util-linux-ng.inc
> @@ -6,7 +6,7 @@ DEPENDS_virtclass-native = "zlib-native lzo-native gettext-native"
>
> inherit autotools gettext
>
> -INC_PR = "r35"
> +INC_PR = "r36"
>
> # allows for a release candidate
> RC ?= ""
> @@ -126,8 +126,8 @@ do_install () {
> 'LDFLAGS=${LDFLAGS}' 'DESTDIR=${D}' install
> mkdir -p ${D}${base_bindir}
>
> - sbinprogs="agetty blockdev ctrlaltdel cfdisk"
> - sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw uuidd"
> + sbinprogs="agetty ctrlaltdel cfdisk"
> + sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid blockdev vigr vipw uuidd"
> usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt reset cal script flock"
> usrsbinprogs_a="readprofile"
> binprogs_a="dmesg kill more umount mount login"
> @@ -220,6 +220,7 @@ pkg_postinst_${PN} () {
> update-alternatives --install ${base_bindir}/login login login.${PN} 100
> update-alternatives --install ${base_sbindir}/vipw vipw vipw.${PN} 100
> update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 100
> + update-alternatives --install ${base_sbindir}/blockdev blockdev blockdev.${PN} 100
> update-alternatives --install ${bindir}/setsid setsid setsid.${PN} 100
> update-alternatives --install ${bindir}/chrt chrt chrt.${PN} 100
> update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 100
> @@ -236,7 +237,7 @@ pkg_prerm_${PN} () {
> test -x ${base_sbindir}/pivot_root.${PN} && \
> update-alternatives --remove pivot_root pivot_root.${PN}
>
> - for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr chfn newgrp chsh login cal script flock uuidd; do
> + for i in dmesg kill more halt hwclock mkswap reboot shutdown sln mkfs.minix fsck.minix hexdump setsid chrt last logger mesg renice wall vipw vigr blockdev chfn newgrp chsh login cal script flock uuidd; do
> update-alternatives --remove $i $i.${PN}
> done
> }
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNVnosMkyGM64RGpERAuIHAJ4+/0uyMjYywzuLbklUmV84CR/sdgCdE2qa
pm+QYnyjZ4goWqbtexZTZwI=
=QNHh
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] eject: use u-a for /usr/bin/volname
2011-02-12 11:12 ` [PATCH 2/2] eject: use u-a for /usr/bin/volname Martin Jansa
@ 2011-02-12 12:16 ` Koen Kooi
0 siblings, 0 replies; 4+ messages in thread
From: Koen Kooi @ 2011-02-12 12:16 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 12-02-11 12:12, Martin Jansa wrote:
> * resolves conflict with latest busybox
>
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Koen Kooi <koen@openembedded.org>
> ---
> recipes/eject/eject_2.1.5.bb | 16 +++++++++++++---
> 1 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/recipes/eject/eject_2.1.5.bb b/recipes/eject/eject_2.1.5.bb
> index 7c46432..06328dc 100644
> --- a/recipes/eject/eject_2.1.5.bb
> +++ b/recipes/eject/eject_2.1.5.bb
> @@ -2,12 +2,22 @@ DESCRIPTION = "Eject allows removable media (typically a CD-ROM, floppy disk, ta
> HOMEPAGE = "http://eject.sourceforge.net/"
> LICENSE = "GPLv2"
>
> -inherit autotools gettext
> +PR = "r1"
>
> -SRC_URI = "http://sources.openembedded.org/eject-2.1.5.tar.gz"
> +inherit autotools gettext update-alternatives
>
> -S = "${WORKDIR}/${PN}"
> +ALTERNATIVE_NAME = "volname"
> +ALTERNATIVE_LINK = "${bindir}/volname"
> +ALTERNATIVE_PATH = "${bindir}/volname.${PN}"
> +ALTERNATIVE_PRIORITY = "100"
>
> +SRC_URI = "http://sources.openembedded.org/${P}.tar.gz"
>
> SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
> SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"
> +
> +do_install_append() {
> + mv ${D}/${bindir}/volname ${D}/${bindir}/volname.${PN}
> +}
> +
> +S = "${WORKDIR}/${PN}"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFNVno4MkyGM64RGpERAshlAJ4oAJzSTfXQVAqil/IFhAqz6zbomQCgsYA2
F1wpuukUUqbH7AfKomMU/uE=
=iZKg
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-02-12 12:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-12 11:12 [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev Martin Jansa
2011-02-12 11:12 ` [PATCH 2/2] eject: use u-a for /usr/bin/volname Martin Jansa
2011-02-12 12:16 ` Koen Kooi
2011-02-12 12:16 ` [PATCH 1/2] util-linux-ng: use u-a for /sbin/blockdev Koen Kooi
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.