aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/util-linux
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2012-09-25 14:04:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 15:01:15 +0100
commit19dd830ff8a1b87499b9a51599265dd436214708 (patch)
treed9cb387bbb1e5fe7f554e54c27e2a2b38cf88cbd /meta/recipes-core/util-linux
parent9880a5261ca509c69efbafa27cddd9b2b8ca08f0 (diff)
downloadopenembedded-core-contrib-19dd830ff8a1b87499b9a51599265dd436214708.tar.gz
openembedded-core-contrib-19dd830ff8a1b87499b9a51599265dd436214708.tar.bz2
openembedded-core-contrib-19dd830ff8a1b87499b9a51599265dd436214708.zip
util-linux: Don't package chkdupexe
The chkdupexe utility is fairly worthless and drags perl in as a build dependency of the whole util-linux recipe. If anybody actually wants to use this script then we should package it separately, but for the time being let's just delete it. Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/util-linux')
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc6
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.21.2.bb6
2 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index 2c5267f086e..a5e5b12014f 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -31,7 +31,7 @@ PACKAGES =+ "util-linux-agetty util-linux-fdisk util-linux-cfdisk util-linux-sfd
util-linux-mount util-linux-readprofile util-linux-libblkid \
util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
- util-linux-chkdupexe util-linux-mkfs util-linux-mcookie"
+ util-linux-mkfs util-linux-mcookie"
EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
--disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -63,7 +63,6 @@ FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid
FILES_util-linux-lscpu = "${bindir}/lscpu"
FILES_util-linux-fsck = "${base_sbindir}/fsck*"
-FILES_util-linux-chkdupexe = "${bindir}/chkdupexe"
FILES_util-linux-mkfs = "${sbindir}/mkfs"
# Util-linux' blkid replaces the e2fsprogs one
@@ -72,7 +71,6 @@ RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
-RDEPENDS_${PN}-chkdupexe = "perl"
RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
RRECOMMENDS_${PN}_virtclass-native = ""
@@ -125,6 +123,8 @@ do_install () {
ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN}
rm -f ${D}${sbindir}/swapoff
+
+ rm -f ${D}${bindir}/chkdupexe
}
inherit update-alternatives
diff --git a/meta/recipes-core/util-linux/util-linux_2.21.2.bb b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
index e8f00fcb5ed..9a52200f74a 100644
--- a/meta/recipes-core/util-linux/util-linux_2.21.2.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.2.bb
@@ -1,5 +1,5 @@
MAJOR_VERSION = "2.21"
-PR = "r3"
+PR = "r4"
require util-linux.inc
# note that `lscpu' is under GPLv3+
@@ -40,7 +40,3 @@ addtask remove_lscpu before do_configure after do_patch
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
-
-do_install_append () {
- sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe
-}