diff options
| author | Andrei Gherzan <andrei@gherzan.ro> | 2012-09-17 13:49:58 +0300 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-09-18 07:44:13 -0700 |
| commit | 0ff32e8fb5463a23af9966afcb58eb00772af65b (patch) | |
| tree | edef9b1dcb4cc57419ebde5ffc65df6db4f142ac | |
| parent | 1773a98b68dd223b016fe408b022c2c5475669c2 (diff) | |
| download | openembedded-core-0ff32e8fb5463a23af9966afcb58eb00772af65b.tar.gz openembedded-core-0ff32e8fb5463a23af9966afcb58eb00772af65b.tar.bz2 openembedded-core-0ff32e8fb5463a23af9966afcb58eb00772af65b.zip | |
util-linux: Fix bloken swapoff symlink
There were 2 issues with this symlink.
1. Is was installed in base_bindidir but packaged in bindir. Fixed to
be packaged in base_bindir
2. The symlink swapoff was created to point to swapon. The problem is
that swapoff is an alternative so it would end up pointing to
swapoff.util-linux which was an inexistent file. The fix is to create
a symlink swapoff.util-linux to swapon.util-linux.
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.21.2.bb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 00e5d7cd4d..79e0608d36 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -46,7 +46,7 @@ FILES_util-linux-agetty = "${base_sbindir}/agetty" FILES_util-linux-fdisk = "${base_sbindir}/fdisk.${BPN}" FILES_util-linux-cfdisk = "${base_sbindir}/cfdisk" FILES_util-linux-sfdisk = "${sbindir}/sfdisk" -FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${sbindir}/swapoff.${BPN}" +FILES_util-linux-swaponoff = "${base_sbindir}/swapon.${BPN} ${base_sbindir}/swapoff.${BPN}" FILES_util-linux-losetup = "${base_sbindir}/losetup.${BPN}" FILES_util-linux-mount = "${base_bindir}/mount.${BPN}" FILES_util-linux-mcookie = "${bindir}/mcookie" @@ -121,7 +121,7 @@ do_install () { install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall - ln -sf swapon ${D}${base_sbindir}/swapoff + ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN} rm -f ${D}${sbindir}/swapoff } diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb index 0f5fdc6122..6ef31633dc 100644 --- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb @@ -1,5 +1,5 @@ MAJOR_VERSION = "2.21" -PR = "r1" +PR = "r2" require util-linux.inc # note that `lscpu' is under GPLv3+ |