[oe-commits] [Bug 5474] busybox and util-linux-ng register alternative `readprofile' to different paths

[bugzilla-daemon at git.openembedded.org]

http://bugs.openembedded.org/show_bug.cgi?id=5474





--- Comment #3 from Korey Lu <koreylu at gmail.com>  2010-09-11 09:15:32 ---
(In reply to comment #2)
> (In reply to comment #1)
> > It looks like busybox is in the wrong here.  Would you care to take this up
> > with upstream?  It's a matter of modifying include/applets.h and my quick
> > poking suggests this shouldn't be needed before /usr can be mounted so
> > /usr/sbin should be fine.
> 
> OK, I misunderstood the original posting.  The correct location is /usr/sbin.

OK, here I have a patch against util-linux-ng.inc, it packages readprofile in
the correct location.

diff --git a/recipes/util-linux-ng/util-linux-ng.inc
b/recipes/util-linux-ng/util-linux-ng.inc
index cbdf68d..19d0eb4 100644
--- a/recipes/util-linux-ng/util-linux-ng.inc
+++ b/recipes/util-linux-ng/util-linux-ng.inc
@@ -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,7 +124,8 @@ 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"
+        usrsbinprogs_a="readprofile"
         usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice wall
setsid chrt"
         binprogs_a="dmesg kill more umount mount login reset"

@@ -158,6 +159,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 $sbinprogs_a; do
                 if [ -f "${D}${base_sbindir}/$p" ]; then
                         mv "${D}${base_sbindir}/$p"
"${D}${base_sbindir}/$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 () {

-- 
Configure bugmail: http://bugs.openembedded.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.