From: Colin Walters Date: Mon, 29 Jul 2013 12:43:14 +0000 (-0400) Subject: util-linux: Update for swapoff being a separate binary X-Git-Tag: rev_ivi_2015_02_04~11626 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56a84ad8f32c7dc8a21b1f79e43f214014315036;p=scm%2Fbb%2Ftizen-distro.git 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 3d1198a..3c8c246 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 }