diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2017-11-14 01:58:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-21 13:06:12 +0000 |
commit | 6dfc03cf472069215e8bad0274a9048e0a183d1d (patch) | |
tree | e735e66b28d9fc1d1cbb1b923213ce64f84fa2d2 /meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb | |
parent | a9be3c445a047bc6fadf65b0d0f874c86c593e5d (diff) | |
download | poky-6dfc03cf472069215e8bad0274a9048e0a183d1d.tar.gz |
e2fsprogs: 1.43.5 -> 1.43.7
Remove reproducible-doc.patch which is already in the source.
(From OE-Core rev: c76d6f22e72399cab4d2652a7431a390907e1ba2)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb | 117 |
1 files changed, 0 insertions, 117 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb deleted file mode 100644 index 00093cc20c..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.5.bb +++ /dev/null | |||
@@ -1,117 +0,0 @@ | |||
1 | require e2fsprogs.inc | ||
2 | |||
3 | SRC_URI += "file://acinclude.m4 \ | ||
4 | file://remove.ldconfig.call.patch \ | ||
5 | file://quiet-debugfs.patch \ | ||
6 | file://run-ptest \ | ||
7 | file://ptest.patch \ | ||
8 | file://mkdir.patch \ | ||
9 | file://Revert-mke2fs-enable-the-metadata_csum-and-64bit-fea.patch \ | ||
10 | file://mkdir_p.patch \ | ||
11 | file://reproducible-doc.patch \ | ||
12 | file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch" | ||
16 | |||
17 | SRCREV = "2a13c84b513aa094d1cda727e92d35a89dd777da" | ||
18 | UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" | ||
19 | |||
20 | EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ | ||
21 | --enable-elf-shlibs --disable-libuuid --disable-uuidd \ | ||
22 | --disable-libblkid --enable-verbose-makecmds" | ||
23 | |||
24 | EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs" | ||
25 | |||
26 | PACKAGECONFIG ??= "" | ||
27 | PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse' | ||
28 | |||
29 | do_configure_prepend () { | ||
30 | cp ${WORKDIR}/acinclude.m4 ${S}/ | ||
31 | } | ||
32 | |||
33 | do_install () { | ||
34 | oe_runmake 'DESTDIR=${D}' install | ||
35 | oe_runmake 'DESTDIR=${D}' install-libs | ||
36 | # We use blkid from util-linux now so remove from here | ||
37 | rm -f ${D}${base_libdir}/libblkid* | ||
38 | rm -rf ${D}${includedir}/blkid | ||
39 | rm -f ${D}${base_libdir}/pkgconfig/blkid.pc | ||
40 | rm -f ${D}${base_sbindir}/blkid | ||
41 | rm -f ${D}${base_sbindir}/fsck | ||
42 | rm -f ${D}${base_sbindir}/findfs | ||
43 | |||
44 | # e2initrd_helper and the pkgconfig files belong in libdir | ||
45 | if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then | ||
46 | install -d ${D}${libdir} | ||
47 | mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} | ||
48 | mv ${D}${base_libdir}/pkgconfig ${D}${libdir} | ||
49 | fi | ||
50 | |||
51 | oe_multilib_header ext2fs/ext2_types.h | ||
52 | install -d ${D}${base_bindir} | ||
53 | mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs | ||
54 | |||
55 | install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ | ||
56 | |||
57 | # Clean host path (build directory) in compile_et, mk_cmds | ||
58 | sed -i -e "s,\(ET_DIR=.*\)${S}/lib/et\(.*\),\1${datadir}/et\2,g" ${D}${bindir}/compile_et | ||
59 | sed -i -e "s,\(SS_DIR=.*\)${S}/lib/ss\(.*\),\1${datadir}/ss\2,g" ${D}${bindir}/mk_cmds | ||
60 | } | ||
61 | |||
62 | # Need to find the right mke2fs.conf file | ||
63 | e2fsprogs_conf_fixup () { | ||
64 | for i in mke2fs mkfs.ext2 mkfs.ext3 mkfs.ext4; do | ||
65 | create_wrapper ${D}${base_sbindir}/$i MKE2FS_CONFIG=${sysconfdir}/mke2fs.conf | ||
66 | done | ||
67 | } | ||
68 | |||
69 | do_install_append_class-native() { | ||
70 | e2fsprogs_conf_fixup | ||
71 | } | ||
72 | |||
73 | do_install_append_class-nativesdk() { | ||
74 | e2fsprogs_conf_fixup | ||
75 | } | ||
76 | |||
77 | RDEPENDS_e2fsprogs = "e2fsprogs-badblocks" | ||
78 | RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck" | ||
79 | |||
80 | PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs" | ||
81 | PACKAGES =+ "libcomerr libss libe2p libext2fs" | ||
82 | |||
83 | FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*" | ||
84 | FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*" | ||
85 | FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf" | ||
86 | FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label" | ||
87 | FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks" | ||
88 | FILES_libcomerr = "${base_libdir}/libcom_err.so.*" | ||
89 | FILES_libss = "${base_libdir}/libss.so.*" | ||
90 | FILES_libe2p = "${base_libdir}/libe2p.so.*" | ||
91 | FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" | ||
92 | FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" | ||
93 | |||
94 | ALTERNATIVE_${PN} = "chattr" | ||
95 | ALTERNATIVE_PRIORITY = "100" | ||
96 | ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" | ||
97 | ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" | ||
98 | |||
99 | ALTERNATIVE_${PN}-doc = "fsck.8" | ||
100 | ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" | ||
101 | |||
102 | RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps bash" | ||
103 | |||
104 | do_compile_ptest() { | ||
105 | oe_runmake -C ${B}/tests | ||
106 | } | ||
107 | |||
108 | do_install_ptest() { | ||
109 | cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test | ||
110 | cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test | ||
111 | sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect* | ||
112 | |||
113 | # Remove various files | ||
114 | find "${D}${PTEST_PATH}" -type f \ | ||
115 | \( -name 'Makefile' -o -name 'Makefile.in' -o -name '*.o' -o -name '*.c' -o -name '*.h' \)\ | ||
116 | -exec rm -f {} + | ||
117 | } | ||