summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/e2fsprogs
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs.inc10
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb56
2 files changed, 33 insertions, 33 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
index 2f113c5e8d..c80b93c802 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs.inc
@@ -4,11 +4,11 @@ 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-dumpe2fs = "GPLv2"
8LICENSE_e2fsprogs-e2fsck = "GPLv2" 8LICENSE:e2fsprogs-e2fsck = "GPLv2"
9LICENSE_e2fsprogs-mke2fs = "GPLv2" 9LICENSE:e2fsprogs-mke2fs = "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 \
13 file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \ 13 file://lib/ext2fs/ext2fs.h;beginline=1;endline=9;md5=596a8dedcb4e731c6b21c7a46fba6bef \
14 file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \ 14 file://lib/e2p/e2p.h;beginline=1;endline=7;md5=8a74ade8f9d65095d70ef2d4bf48e36a \
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb
index fc022f37de..d68d131e0a 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.2.bb
@@ -8,7 +8,7 @@ SRC_URI += "file://remove.ldconfig.call.patch \
8 file://0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch \ 8 file://0001-lib-ext2fs-unix_io.c-revert-parts-of-libext2fs-fix-p.patch \
9 " 9 "
10 10
11SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ 11SRC_URI:append:class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
12 file://quiet-debugfs.patch \ 12 file://quiet-debugfs.patch \
13" 13"
14 14
@@ -21,14 +21,14 @@ EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
21 --disable-libblkid --enable-verbose-makecmds \ 21 --disable-libblkid --enable-verbose-makecmds \
22 --with-crond-dir=no" 22 --with-crond-dir=no"
23 23
24EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" 24EXTRA_OECONF:darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
25 25
26PACKAGECONFIG ??= "" 26PACKAGECONFIG ??= ""
27PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse' 27PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse'
28 28
29# make locale rules sometimes fire, sometimes don't as git doesn't preserve 29# make locale rules sometimes fire, sometimes don't as git doesn't preserve
30# file mktime. Touch the files introducing non-determinism to the build 30# file mktime. Touch the files introducing non-determinism to the build
31do_compile_prepend (){ 31do_compile:prepend (){
32 find ${S}/po -type f -name "*.po" -exec touch {} + 32 find ${S}/po -type f -name "*.po" -exec touch {} +
33} 33}
34 34
@@ -68,57 +68,57 @@ e2fsprogs_conf_fixup () {
68 done 68 done
69} 69}
70 70
71do_install_append_class-native() { 71do_install:append:class-native() {
72 e2fsprogs_conf_fixup 72 e2fsprogs_conf_fixup
73} 73}
74 74
75do_install_append_class-nativesdk() { 75do_install:append:class-nativesdk() {
76 e2fsprogs_conf_fixup 76 e2fsprogs_conf_fixup
77} 77}
78 78
79do_install_append_class-target() { 79do_install:append:class-target() {
80 mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.e2fsprogs 80 mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.e2fsprogs
81 mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.e2fsprogs 81 mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.e2fsprogs
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 e2fsprogs-dumpe2fs" 85RDEPENDS:e2fsprogs = "e2fsprogs-badblocks e2fsprogs-dumpe2fs"
86RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" 86RRECOMMENDS:e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"
87 87
88PACKAGES =+ "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-e2scrub e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs" 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-dumpe2fs = "${base_sbindir}/dumpe2fs"
92FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" 92FILES:e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*"
93FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" 93FILES:e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
94FILES_e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*" 94FILES:e2fsprogs-e2scrub = "${base_sbindir}/e2scrub*"
95FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" 95FILES:e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
96FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label" 96FILES:e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label"
97FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" 97FILES:e2fsprogs-badblocks = "${base_sbindir}/badblocks"
98FILES_libcomerr = "${base_libdir}/libcom_err.so.*" 98FILES:libcomerr = "${base_libdir}/libcom_err.so.*"
99FILES_libss = "${base_libdir}/libss.so.*" 99FILES:libss = "${base_libdir}/libss.so.*"
100FILES_libe2p = "${base_libdir}/libe2p.so.*" 100FILES:libe2p = "${base_libdir}/libe2p.so.*"
101FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" 101FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
102FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" 102FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds"
103 103
104ALTERNATIVE_${PN} = "chattr" 104ALTERNATIVE:${PN} = "chattr"
105ALTERNATIVE_PRIORITY = "100" 105ALTERNATIVE_PRIORITY = "100"
106ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" 106ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
107ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" 107ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
108 108
109ALTERNATIVE_${PN}-doc = "fsck.8" 109ALTERNATIVE:${PN}-doc = "fsck.8"
110ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" 110ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
111 111
112ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2" 112ALTERNATIVE:${PN}-mke2fs = "mke2fs mkfs.ext2"
113ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs" 113ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs"
114ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2" 114ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
115 115
116ALTERNATIVE_${PN}-tune2fs = "tune2fs" 116ALTERNATIVE:${PN}-tune2fs = "tune2fs"
117ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs" 117ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
118 118
119RDEPENDS_e2fsprogs-e2scrub = "bash" 119RDEPENDS:e2fsprogs-e2scrub = "bash"
120RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed" 120RDEPENDS:${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
121RDEPENDS_${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs" 121RDEPENDS:${PN}-ptest += "e2fsprogs-badblocks e2fsprogs-dumpe2fs e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-resize2fs e2fsprogs-tune2fs"
122 122
123do_compile_ptest() { 123do_compile_ptest() {
124 oe_runmake -C ${B}/tests 124 oe_runmake -C ${B}/tests