On 09/25/2012 06:04 AM, Phil Blundell wrote:
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 <p...@pbcl.net>
---
meta/recipes-core/util-linux/util-linux.inc | 6 +++---
meta/recipes-core/util-linux/util-linux_2.21.2.bb | 6 +-----
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 b2a1552..d62d406 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 792730c..39e3609 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 = "r4"
+PR = "r5"
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
-}
Merged into OE-Core
Thanks
Sau!
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
