summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2013-07-29 08:43:14 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-07-31 06:59:58 +0100
commit55770c09b978a7df28aeab8638f2d34797e819f6 (patch)
tree57696f72c23ec0124348306ad3b6be7f706d1de9 /meta/recipes-core
parent82ac6aaa29e00944eaf70c586d70be1019b699d9 (diff)
downloadpoky-55770c09b978a7df28aeab8638f2d34797e819f6.tar.gz
util-linux: Update for swapoff being a separate binary
In older versions of util-linux, swapon and swapoff were the same binary, and it did runtime detection. But since v2.22 which is util-linux commit 6cf8d46ceefe9a7, they are separate binaries. This patch is necessary to make the util-linux version of swapoff work at all - currently in OE swapoff = swapon, which is clearly broken =) Probably most OE consumers use the busybox swapoff and hence this has gone unnoticed. (From OE-Core rev: 4a15433f12c616f06192a4cda209da29395ceb93) Signed-off-by: Colin Walters <walters@verbum.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 3d1198ad1d..3c8c246974 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -122,7 +122,7 @@ do_install () {
122 mkdir -p ${D}${base_bindir} 122 mkdir -p ${D}${base_bindir}
123 123
124 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" 124 sbinprogs="agetty ctrlaltdel cfdisk vipw vigr"
125 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev" 125 sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev"
126 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" 126 usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt"
127 binprogs_a="dmesg kill more umount mount login reset" 127 binprogs_a="dmesg kill more umount mount login reset"
128 128
@@ -147,9 +147,6 @@ do_install () {
147 install -d ${D}${sysconfdir}/default/ 147 install -d ${D}${sysconfdir}/default/
148 echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall 148 echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall
149 149
150 ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN}
151 rm -f ${D}${sbindir}/swapoff
152
153 rm -f ${D}${bindir}/chkdupexe 150 rm -f ${D}${bindir}/chkdupexe
154} 151}
155 152