sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Colin Walters 2013-07-29 08:43:14 -04:00 committed by Richard Purdie
parent 82ac6aaa29
commit 55770c09b9
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/recipes-core/util-linux/util-linux.inc
View File

@ -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
}