util-linux: Update for swapoff being a separate binary
PATCH 1/1 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.
--- meta/recipes-core/util-linux/util-linux.inc | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
From fe4bb20bbbff31ce1eb86afe8e81e8f0a3564877 Mon Sep 17 00:00:00 2001
From: Colin Walters <[email protected]>
Date: Mon, 29 Jul 2013 08:43:14 -0400
Subject: [PATCH] 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.
--- meta/recipes-core/util-linux/util-linux.inc | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
meta/recipes-core/util-linux/util-linux.inc +1 -4
@@ -116,7 +116,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"
@@ -141,9 +141,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 }
Signature · 1 line
1.7.1