Skip to contentSkip to conversation

util-linux-ng: fix readprofile update-alternatives vs busybox

PATCH In review Eric Bénard 3 participants 3 messages Sep 9, 2010 – Sep 10, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util-linux-ng: fix readprofile update-alternatives vs busybox

* util-linux-ng installs readprofile in /sbin, busybox installs it in /usr/sbin which tiggers the following log when configuring the package :
Configuring util-linux-ng-readprofile.
update-alternatives: Error: cannot register alternative readprofile to /sbin/readprofile since it is already registered to /usr/sbin/readprofile Collected errors:
* pkg_run_script: postinst script returned status 1.
* opkg_configure: util-linux-ng-readprofile.postinst returned 1.

* the fix is to have util-linux-ng install readprofile in /usr/sbin

* this patch fix http://bugs.openembedded.org/show_bug.cgi?id=5474 as suggested by Tom Rini

---
 recipes/util-linux-ng/util-linux-ng.inc |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
recipes/util-linux-ng/util-linux-ng.inc +11 -4
index cbdf68d..ca0790e 100644
@@ -8,7 +8,7 @@ inherit autotools gettext
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r27"
+INC_PR = "r28"
 
 # allows for a release candidate
 RC ?= ""
@@ -51,7 +51,7 @@ FILES_util-linux-ng-losetup = "${base_sbindir}/losetup.${PN}"
 FILES_util-linux-ng-mount = "${base_bindir}/mount.${PN} ${sysconfdir}/default/mountall"
 FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}"
 # Moved to ${base_sbindir} by do_install:
-FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}"
+FILES_util-linux-ng-readprofile = "${sbindir}/readprofile.${PN}"
 FILES_util-linux-ng-fsck = "${base_sbindir}/fsck.${PN}"
 FILES_util-linux-ng-blkid = "${base_sbindir}/blkid.${PN}"
 FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"
@@ -124,8 +124,9 @@ 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 readprofile fsck blkid vigr vipw"
+        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw"
         usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
+        usrsbinprogs_a="readprofile"
         binprogs_a="dmesg kill more umount mount login reset"
 
         if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -152,6 +153,12 @@ do_install () {
                 fi
         done
 
+        for p in $usrsbinprogs_a; do
+                if [ -f "${D}${sbindir}/$p" ]; then
+                        mv "${D}${sbindir}/$p" "${D}${sbindir}/$p.${PN}"
+                fi
+        done
+
         for p in $binprogs_a; do
                 if [ -f "${D}${base_bindir}/$p" ]; then
                         mv "${D}${base_bindir}/$p" "${D}${base_bindir}/$p.${PN}"
@@ -271,7 +278,7 @@ pkg_prerm_util-linux-ng-swaponoff () {
 }
 
 pkg_postinst_util-linux-ng-readprofile() {
-    update-alternatives --install ${base_sbindir}/readprofile readprofile readprofile.${PN} 100
+    update-alternatives --install ${sbindir}/readprofile readprofile readprofile.${PN} 100
 }
 
 pkg_prerm_util-linux-ng-readprofile () {
Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 10 lines · Eric Bénard

* util-linux-ng installs readprofile in /sbin, busybox installs it in /usr/sbin which tiggers the following log when configuring the package :
Configuring util-linux-ng-readprofile.
update-alternatives: Error: cannot register alternative readprofile to /sbin/readprofile since it is already registered to /usr/sbin/readprofile Collected errors:
* pkg_run_script: postinst script returned status 1.
* opkg_configure: util-linux-ng-readprofile.postinst returned 1.

Quoted 6 lines

* the fix is to have util-linux-ng install readprofile in /usr/sbin

* this patch fix http://bugs.openembedded.org/show_bug.cgi?id=5474 as suggested by Tom Rini

Quoted 59 lines
---
 recipes/util-linux-ng/util-linux-ng.inc |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)
recipes/util-linux-ng/util-linux-ng.inc +11 -4
index cbdf68d..ca0790e 100644
@@ -8,7 +8,7 @@ inherit autotools gettext
 
 DEFAULT_PREFERENCE = "-1"
 
-INC_PR = "r27"
+INC_PR = "r28"
 
 # allows for a release candidate
 RC ?= ""
@@ -51,7 +51,7 @@ FILES_util-linux-ng-losetup = "${base_sbindir}/losetup.${PN}"
 FILES_util-linux-ng-mount = "${base_bindir}/mount.${PN} ${sysconfdir}/default/mountall"
 FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}"
 # Moved to ${base_sbindir} by do_install:
-FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}"
+FILES_util-linux-ng-readprofile = "${sbindir}/readprofile.${PN}"
 FILES_util-linux-ng-fsck = "${base_sbindir}/fsck.${PN}"
 FILES_util-linux-ng-blkid = "${base_sbindir}/blkid.${PN}"
 FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"
@@ -124,8 +124,9 @@ 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 readprofile fsck blkid vigr vipw"
+        sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw"
         usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
+        usrsbinprogs_a="readprofile"
         binprogs_a="dmesg kill more umount mount login reset"
 
         if [ "${base_sbindir}" != "${sbindir}" ]; then
@@ -152,6 +153,12 @@ do_install () {
                 fi
         done
 
+        for p in $usrsbinprogs_a; do
+                if [ -f "${D}${sbindir}/$p" ]; then
+                        mv "${D}${sbindir}/$p" "${D}${sbindir}/$p.${PN}"
+                fi
+        done
+
         for p in $binprogs_a; do
                 if [ -f "${D}${base_bindir}/$p" ]; then
                         mv "${D}${base_bindir}/$p" "${D}${base_bindir}/$p.${PN}"
@@ -271,7 +278,7 @@ pkg_prerm_util-linux-ng-swaponoff () {
 }
 
 pkg_postinst_util-linux-ng-readprofile() {
-    update-alternatives --install ${base_sbindir}/readprofile readprofile readprofile.${PN} 100
+    update-alternatives --install ${sbindir}/readprofile readprofile readprofile.${PN} 100
 }
 
 pkg_prerm_util-linux-ng-readprofile () {
Signature · 2 lines
Tom Rini
Mentor Graphics Corporation
Tested-by
#2 lore raw
Quoted 11 lines · Tom Rini
Quoted 10 lines · Eric Bénard

* util-linux-ng installs readprofile in /sbin, busybox installs it in /usr/sbin which tiggers the following log when configuring the package :
Configuring util-linux-ng-readprofile.
update-alternatives: Error: cannot register alternative readprofile to /sbin/readprofile since it is already registered to /usr/sbin/readprofile Collected errors:
* pkg_run_script: postinst script returned status 1.
* opkg_configure: util-linux-ng-readprofile.postinst returned 1.

Quoted 8 lines
Quoted 6 lines

* the fix is to have util-linux-ng install readprofile in /usr/sbin

* this patch fix http://bugs.openembedded.org/show_bug.cgi?id=5474 as suggested by Tom Rini

Quoted 70 lines
Quoted 68 lines

---
recipes/util-linux-ng/util-linux-ng.inc | 15 +++++++++++----

1 files changed, 11 insertions(+), 4 deletions(-)
recipes/util-linux-ng/util-linux-ng.inc +0 -0
index cbdf68d..ca0790e 100644
@@ -8,7 +8,7 @@ inherit autotools gettext
 

DEFAULT_PREFERENCE = "-1"

recipes/util-linux-ng/util-linux-ng.inc +1 -1
-INC_PR = "r27"
+INC_PR = "r28"
# allows for a release candidate
RC ?= ""
recipes/util-linux-ng/util-linux-ng.inc +0 -0
@@ -51,7 +51,7 @@ FILES_util-linux-ng-losetup =

"${base_sbindir}/losetup.${PN}" FILES_util-linux-ng-mount = "${base_bindir}/mount.${PN} ${sysconfdir}/default/mountall" FILES_util-linux-ng-umount = "${base_bindir}/umount.${PN}" # Moved to ${base_sbindir} by do_install:

recipes/util-linux-ng/util-linux-ng.inc +1 -1
-FILES_util-linux-ng-readprofile = "${base_sbindir}/readprofile.${PN}"
+FILES_util-linux-ng-readprofile = "${sbindir}/readprofile.${PN}"

FILES_util-linux-ng-fsck = "${base_sbindir}/fsck.${PN}" FILES_util-linux-ng-blkid = "${base_sbindir}/blkid.${PN}" FILES_${PN}-mountall = "${sysconfdir}/default/mountall.${PN}"

recipes/util-linux-ng/util-linux-ng.inc +0 -0
@@ -124,8 +124,9 @@ 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 readprofile fsck blkid vigr vipw"
+ sbinprogs_a="pivot_root hwclock mkswap shutdown mkfs.minix fsck.minix losetup swapon fdisk fsck blkid vigr vipw" usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall setsid chrt"
+ usrsbinprogs_a="readprofile"
binprogs_a="dmesg kill more umount mount login reset"

if [ "${base_sbindir}" != "${sbindir}" ]; then

recipes/util-linux-ng/util-linux-ng.inc +0 -0
@@ -152,6 +153,12 @@ do_install () {

fi
done

+ for p in $usrsbinprogs_a; do
+ if [ -f "${D}${sbindir}/$p" ]; then
+ mv "${D}${sbindir}/$p" "${D}${sbindir}/$p.${PN}"
+ fi
+ done
+
for p in $binprogs_a; do
if [ -f "${D}${base_bindir}/$p" ]; then
mv "${D}${base_bindir}/$p" "${D}${base_bindir}/$p.${PN}"

recipes/util-linux-ng/util-linux-ng.inc +0 -1
@@ -271,7 +278,7 @@ pkg_prerm_util-linux-ng-swaponoff () {
 }
 
 pkg_postinst_util-linux-ng-readprofile() {
- update-alternatives --install ${base_sbindir}/readprofile

readprofile readprofile.${PN} 100
+ update-alternatives --install ${sbindir}/readprofile readprofile readprofile.${PN} 100
}

pkg_prerm_util-linux-ng-readprofile () {