[PATCH] util-linux-ng.inc, e2fsprogs.inc: Use update-alternatives for uuidd.

[PATCH] util-linux-ng.inc, e2fsprogs.inc: Use update-alternatives for uuidd.

[Graham Gower]

Util-linux-ng put uuidd in ${sbindir}, e2fsprogs put it in ${base_sbindir}.
This change puts both in ${base_sbindir}.

Fixes a conflict when DISTRO=micro.

| Collected errors:
|  * check_data_file_clashes: Package util-linux-ng wants to install file /mnt/oe/tmp/rootfs/native-sdk-image/sbin/uuidd
|       But that file is already provided by package  * e2fsprogs

Signed-off-by: Graham Gower <graham.gower@gmail.com>
---
 recipes/e2fsprogs/e2fsprogs.inc         |    5 ++++-
 recipes/util-linux-ng/util-linux-ng.inc |    7 ++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/recipes/e2fsprogs/e2fsprogs.inc b/recipes/e2fsprogs/e2fsprogs.inc
index 7697440..1366ce7 100644
--- a/recipes/e2fsprogs/e2fsprogs.inc
+++ b/recipes/e2fsprogs/e2fsprogs.inc
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz"
 
 S = "${WORKDIR}/e2fsprogs-${PV}"
 
-INC_PR = "r24"
+INC_PR = "r25"
 
 inherit autotools
 
@@ -39,6 +39,7 @@ do_install_append () {
 	rm ${D}${base_sbindir}/mkfs.ext2
 	rm ${D}${base_sbindir}/mkfs.ext3
 	rm ${D}${base_sbindir}/mkfs.ext4*
+	mv ${D}${base_sbindir}/uuidd ${D}${base_sbindir}/uuidd.${PN}
 
 	cd ${D}/${base_sbindir}
 	ln -sf ./e2fsck.${PN} fsck.ext2.${PN}
@@ -58,10 +59,12 @@ do_install_append () {
 
 pkg_postinst_e2fsprogs () {
 	update-alternatives --install ${base_bindir}/chattr chattr chattr.${PN} 100
+	update-alternatives --install ${base_sbindir}/uuidd uuidd uuidd.${PN} 10
 }
 
 pkg_prerm_e2fsprogs () {
 	update-alternatives --remove chattr chattr.${PN}
+	update-alternatives --remove uuidd uuidd.${PN}
 }
 
 
diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index 7455098..fbc92e4 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 ncurses-native lzo-native gettext-native
 
 inherit autotools gettext
 
-INC_PR = "r33"
+INC_PR = "r34"
 
 # allows for a release candidate
 RC ?= ""
@@ -124,7 +124,7 @@ do_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"
+        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid 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"
@@ -219,6 +219,7 @@ pkg_postinst_${PN} () {
 	update-alternatives --install ${base_sbindir}/vigr vigr vigr.${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
 	
 	# There seems to be problem, atleast on nslu2, with these, until they are
 	# fixed the busybox ones have higher priority
@@ -232,7 +233,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; 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 chfn newgrp chsh login cal script flock uuidd; do
 		update-alternatives --remove $i $i.${PN}
 	done
 }
-- 
1.7.1

Re: [PATCH] util-linux-ng.inc, e2fsprogs.inc: Use update-alternatives for uuidd.

[Stefan Schmidt]

Hello.

On Thu, 2010-12-02 at 12:36, Graham Gower wrote:
> Util-linux-ng put uuidd in ${sbindir}, e2fsprogs put it in ${base_sbindir}.
> This change puts both in ${base_sbindir}.
> 
> Fixes a conflict when DISTRO=micro.
> 
> | Collected errors:
> |  * check_data_file_clashes: Package util-linux-ng wants to install file /mnt/oe/tmp/rootfs/native-sdk-image/sbin/uuidd
> |       But that file is already provided by package  * e2fsprogs
> 
> Signed-off-by: Graham Gower <graham.gower@gmail.com>

I took all of your patches but the two automake and the one bind patch. Khem
reviewed and acked them all.

If I missed one please let me know. Patchwork is down right now and keeping the
overview is a bit of a hassle. :)

regards
Stefan Schmidt