diff options
| author |   Colin Walters <walters@verbum.org> | 2013-07-29 08:43:14 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-31 06:56:27 +0100 |
| commit | 4a15433f12c616f06192a4cda209da29395ceb93 (patch) | |
| tree | bc47dce4ef3dc956c901e68a74ec70bc690d90d1 /meta/recipes-core/util-linux/util-linux.inc | |
| parent | 4ca0af699b5b4b3cf95b3e76482651949fd922ac (diff) | |
| download | openembedded-core-4a15433f12c616f06192a4cda209da29395ceb93.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.
Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core/util-linux/util-linux.inc')
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 5 |
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 () { mkdir -p ${D}${base_bindir} sbinprogs="agetty ctrlaltdel cfdisk vipw vigr" - sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon fdisk readprofile fsck blkid blockdev" + sbinprogs_a="pivot_root hwclock mkswap mkfs.minix fsck.minix losetup swapon swapoff fdisk readprofile fsck blkid blockdev" usrbinprogs_a="chfn chsh hexdump last logger mesg newgrp renice utmpdump wall setsid chrt flock getopt" binprogs_a="dmesg kill more umount mount login reset" @@ -147,9 +147,6 @@ do_install () { install -d ${D}${sysconfdir}/default/ echo 'MOUNTALL="-t nonfs,nosmbfs,noncpfs"' > ${D}${sysconfdir}/default/mountall - ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN} - rm -f ${D}${sbindir}/swapoff - rm -f ${D}${bindir}/chkdupexe } |