diff options
| author | Qing He <qing.he@intel.com> | 2011-01-21 17:54:22 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2011-01-24 14:09:12 -0800 |
| commit | 8ee25e24622ac5eb9d204dfbf12a2e79fdac20c8 (patch) | |
| tree | 48a44f260317aa7d23e631bb0882ad5bf9a65e56 /meta/recipes-core | |
| parent | 036e4a920fe1dd97c521eb44dcb50bf3df29e43b (diff) | |
| download | openembedded-core-8ee25e24622ac5eb9d204dfbf12a2e79fdac20c8.tar.gz openembedded-core-8ee25e24622ac5eb9d204dfbf12a2e79fdac20c8.tar.bz2 openembedded-core-8ee25e24622ac5eb9d204dfbf12a2e79fdac20c8.zip | |
util-linux: fix dangling symlinks
shutdown and swapon should be in $base_sbindir instead of $sbindir
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-core')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 18 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.17.2.bb | 2 |
2 files changed, 14 insertions, 6 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 931a627b56..42881093fd 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -149,11 +149,19 @@ do_install () { install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall - ln -sf ${sbindir}/swapon ${D}${sbindir}/swapoff.${PN} - ln -sf ${sbindir}/shutdown ${D}${sbindir}/reboot.${PN} - ln -sf ${sbindir}/shutdown ${D}${sbindir}/halt.${PN} - ln -sf ${sbindir}/shutdown ${D}${sbindir}/fastboot - ln -sf ${sbindir}/shutdown ${D}${sbindir}/fasthalt + # note ${PN} in swapon.${PN}, swapon is an alternative link that is + # not guaranteed to provide multiple functions, similar for shutdown + ln -sf swapon.${PN} ${D}${base_sbindir}/swapoff.${PN} + ln -sf shutdown.${PN} ${D}${base_sbindir}/reboot.${PN} + ln -sf shutdown.${PN} ${D}${base_sbindir}/halt.${PN} + ln -sf shutdown.${PN} ${D}${base_sbindir}/fastboot + ln -sf shutdown.${PN} ${D}${base_sbindir}/fasthalt + + rm -f ${D}${sbindir}/halt + rm -f ${D}${sbindir}/reboot + rm -f ${D}${sbindir}/fastboot + rm -f ${D}${sbindir}/fasthalt + rm -f ${D}${sbindir}/swapoff } pkg_postinst_${PN} () { diff --git a/meta/recipes-core/util-linux/util-linux_2.17.2.bb b/meta/recipes-core/util-linux/util-linux_2.17.2.bb index 662bde0dfc..d0b1b41ed4 100644 --- a/meta/recipes-core/util-linux/util-linux_2.17.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.17.2.bb @@ -1,6 +1,6 @@ MAJOR_VERSION = "2.17" require util-linux.inc -PR = "r2" +PR = "r3" SRC_URI += "file://uclibc-compile.patch \ file://util-linux-ng-replace-siginterrupt.patch" |