summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndré Draszik <git@andred.net>2019-12-12 21:41:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-16 23:25:49 +0000
commit1d09005509c46f6d26bba9c046a43e848acd4d17 (patch)
tree4c765b37c54894dd6fc425d98346101bfe7849bd /meta
parent151da8bf9805a87d558f64f7d07066e5be7bba6f (diff)
downloadpoky-1d09005509c46f6d26bba9c046a43e848acd4d17.tar.gz
e2fsprogs: split dumpe2fs into its own package
This is a mere 24KB (on 32bit arm), avoiding to pull in all of the remainder +300KB in small initramfs images when not needed. Add this new package to RDEPENDS of e2fsprogs so as to not break existing users. Also, remove a stale reference to the non-existent e2fsprogs-fsck package which was removed in 2012 from here in commit 98b1b9f047ef ("e2fsprogs: Drop fsck binary"), commit 93d647172786 in poky, and sort some of the lists alphabetically. (From OE-Core rev: 19dd3453da39066564d899d561e4814822dcbd18) Signed-off-by: André Draszik <git@andred.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc2
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb7
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index a54a11c354..009f5ed807 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -4,9 +4,9 @@ fixing, configuring , and debugging ext2 filesystems."
4HOMEPAGE = "http://e2fsprogs.sourceforge.net/" 4HOMEPAGE = "http://e2fsprogs.sourceforge.net/"
5 5
6LICENSE = "GPLv2 & LGPLv2 & BSD & MIT" 6LICENSE = "GPLv2 & LGPLv2 & BSD & MIT"
7LICENSE_e2fsprogs-dumpe2fs = "GPLv2"
7LICENSE_e2fsprogs-e2fsck = "GPLv2" 8LICENSE_e2fsprogs-e2fsck = "GPLv2"
8LICENSE_e2fsprogs-mke2fs = "GPLv2" 9LICENSE_e2fsprogs-mke2fs = "GPLv2"
9LICENSE_e2fsprogs-fsck = "GPLv2"
10LICENSE_e2fsprogs-tune2fs = "GPLv2" 10LICENSE_e2fsprogs-tune2fs = "GPLv2"
11LICENSE_e2fsprogs-badblocks = "GPLv2" 11LICENSE_e2fsprogs-badblocks = "GPLv2"
12LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \ 12LIC_FILES_CHKSUM = "file://NOTICE;md5=d50be0580c0b0a7fbc7a4830bbe6c12b \
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
index ab44c28f2a..6e69eea21c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb
@@ -82,12 +82,13 @@ do_install_append_class-target() {
82 mv ${D}${base_sbindir}/tune2fs ${D}${base_sbindir}/tune2fs.e2fsprogs 82 mv ${D}${base_sbindir}/tune2fs ${D}${base_sbindir}/tune2fs.e2fsprogs
83} 83}
84 84
85RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" 85RDEPENDS_e2fsprogs = "e2fsprogs-badblocks e2fsprogs-dumpe2fs"
86RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" 86RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"
87 87
88PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-e2scrub e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" 88PACKAGES =+ "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-e2scrub e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs"
89PACKAGES =+ "libcomerr libss libe2p libext2fs" 89PACKAGES =+ "libcomerr libss libe2p libext2fs"
90 90
91FILES_e2fsprogs-dumpe2fs = "${base_sbindir}/dumpe2fs"
91FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" 92FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*"
92FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 93FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
93FILES_e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*" 94FILES_e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*"
@@ -117,7 +118,7 @@ ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
117 118
118RDEPENDS_e2fsprogs-e2scrub = "bash" 119RDEPENDS_e2fsprogs-e2scrub = "bash"
119RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed" 120RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
120RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" 121RDEPENDS_${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs"
121 122
122do_compile_ptest() { 123do_compile_ptest() {
123 oe_runmake -C ${B}/tests 124 oe_runmake -C ${B}/tests