summaryrefslogtreecommitdiffstats
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:02:29 +0100
commit7d408d37814604ea2de428b60f40998736ca4e97 (patch)
tree9d1a92b7a03cb1d8bd78639d6c04cc63ca383bbc
parent0c7ef5214d3edbd1c31cd1eedfc0ca2bea5770d4 (diff)
downloadpoky-7d408d37814604ea2de428b60f40998736ca4e97.tar.gz
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. (From OE-Core rev: 19dd830ff8a1b87499b9a51599265dd436214708) Signed-off-by: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 2c5267f086..a5e5b12014 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
31 util-linux-mount util-linux-readprofile util-linux-libblkid \ 31 util-linux-mount util-linux-readprofile util-linux-libblkid \
32 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \ 32 util-linux-libblkid-dev util-linux-libuuid util-linux-libuuid-dev \
33 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \ 33 util-linux-uuidgen util-linux-lscpu util-linux-fsck util-linux-blkid \
34 util-linux-chkdupexe util-linux-mkfs util-linux-mcookie" 34 util-linux-mkfs util-linux-mcookie"
35 35
36EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \ 36EXTRA_OECONF = "--libdir=${base_libdir} --disable-use-tty-group \
37 --disable-makeinstall-chown --enable-elvtune --enable-init \ 37 --disable-makeinstall-chown --enable-elvtune --enable-init \
@@ -63,7 +63,6 @@ FILES_util-linux-libuuid-dev = "${base_libdir}/libuuid.so ${base_libdir}/libuuid
63FILES_util-linux-lscpu = "${bindir}/lscpu" 63FILES_util-linux-lscpu = "${bindir}/lscpu"
64 64
65FILES_util-linux-fsck = "${base_sbindir}/fsck*" 65FILES_util-linux-fsck = "${base_sbindir}/fsck*"
66FILES_util-linux-chkdupexe = "${bindir}/chkdupexe"
67FILES_util-linux-mkfs = "${sbindir}/mkfs" 66FILES_util-linux-mkfs = "${sbindir}/mkfs"
68 67
69# Util-linux' blkid replaces the e2fsprogs one 68# Util-linux' blkid replaces the e2fsprogs one
@@ -72,7 +71,6 @@ RCONFLICTS_util-linux-blkid = "e2fsprogs-blkid"
72RREPLACES_util-linux-blkid = "e2fsprogs-blkid" 71RREPLACES_util-linux-blkid = "e2fsprogs-blkid"
73 72
74RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup" 73RDEPENDS_${PN} = "util-linux-umount util-linux-swaponoff util-linux-losetup"
75RDEPENDS_${PN}-chkdupexe = "perl"
76RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs " 74RRECOMMENDS_${PN} = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-mount util-linux-readprofile util-linux-mkfs "
77 75
78RRECOMMENDS_${PN}_virtclass-native = "" 76RRECOMMENDS_${PN}_virtclass-native = ""
@@ -125,6 +123,8 @@ do_install () {
125 123
126 ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN} 124 ln -sf swapon.${BPN} ${D}${base_sbindir}/swapoff.${BPN}
127 rm -f ${D}${sbindir}/swapoff 125 rm -f ${D}${sbindir}/swapoff
126
127 rm -f ${D}${bindir}/chkdupexe
128} 128}
129 129
130inherit update-alternatives 130inherit 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 e8f00fcb5e..9a52200f74 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 @@
1MAJOR_VERSION = "2.21" 1MAJOR_VERSION = "2.21"
2PR = "r3" 2PR = "r4"
3require util-linux.inc 3require util-linux.inc
4 4
5# note that `lscpu' is under GPLv3+ 5# note that `lscpu' is under GPLv3+
@@ -40,7 +40,3 @@ addtask remove_lscpu before do_configure after do_patch
40 40
41CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as" 41CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
42EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group" 42EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
43
44do_install_append () {
45 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/chkdupexe
46}