summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-01-13 17:37:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:03 +0000
commit8c3276ecea38d4d67c22e6db49060b2d4b457278 (patch)
treea08abeadef1a30dff799b50755a33a4faf8ab33c /meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
parentb248e55c0c39a4d45adc0690f2eefb332ab233f5 (diff)
downloadpoky-8c3276ecea38d4d67c22e6db49060b2d4b457278.tar.gz
e2fsprogs: 1.42.9 -> 1.43 (master)
Upgrade to 1.43 (master) to make "mke2fs -d" support xattr, so that the layer which requires xattr such as meta-selinux can populate images easily. * Remove the following patches since they are alredy in the source. 0001-e2fsprogs-fix-cross-compilation-problem.patch 0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch 0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch 0002-misc-create_inode.c-copy-files-recursively.patch 0003-misc-create_inode.c-create-special-file.patch 0004-misc-create_inode.c-create-symlink.patch 0005-misc-create_inode.c-copy-regular-file.patch 0006-misc-create_inode.c-create-directory.patch 0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch 0008-mke2fs.c-add-an-option-d-root-directory.patch 0009-misc-create_inode.c-handle-hardlinks.patch 0010-debugfs-use-the-functions-in-misc-create_inode.c.patch 0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch 0012-Fix-musl-build-failures.patch CVE-2015-0247.patch copy-in-create-hardlinks-with-the-correct-directory-.patch fix-icache.patch misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch * Remove cache_inode.patch since it is not needed any more * Updated mkdir.patch and ptest.patch * Add --enable-libblkid to EXTRA_OECONF since libblkid is not created by default. * Time of core-image-sato-sdk do_rootfs: - Before upgrade real 3m18.508s user 7m42.088s sys 1m1.984s - After upgrade real 3m21.552s user 7m38.496s sys 1m0.644s The are nearly the same * The "fsck -f" shows the image is OK, and also can boot. [YOCTO #8622] (From OE-Core rev: a1f235ad736d322bb50eb4a4293b6b2f4e5200aa) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb117
1 files changed, 0 insertions, 117 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
deleted file mode 100644
index ce7d2e8628..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb
+++ /dev/null
@@ -1,117 +0,0 @@
1require e2fsprogs.inc
2
3RECIPE_NO_UPDATE_REASON = "Updating backported patches to 1.42.13 is too much pain. Let's wait until 1.43 is released."
4
5SRC_URI += "file://acinclude.m4 \
6 file://remove.ldconfig.call.patch \
7 file://fix-icache.patch \
8 file://quiet-debugfs.patch \
9 file://0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch \
10 file://0002-misc-create_inode.c-copy-files-recursively.patch \
11 file://0003-misc-create_inode.c-create-special-file.patch \
12 file://0004-misc-create_inode.c-create-symlink.patch \
13 file://0005-misc-create_inode.c-copy-regular-file.patch \
14 file://0006-misc-create_inode.c-create-directory.patch \
15 file://0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch \
16 file://0008-mke2fs.c-add-an-option-d-root-directory.patch \
17 file://0009-misc-create_inode.c-handle-hardlinks.patch \
18 file://0010-debugfs-use-the-functions-in-misc-create_inode.c.patch \
19 file://0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch \
20 file://0012-Fix-musl-build-failures.patch \
21 file://0001-e2fsprogs-fix-cross-compilation-problem.patch \
22 file://misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch \
23 file://cache_inode.patch \
24 file://CVE-2015-0247.patch \
25 file://0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch \
26 file://copy-in-create-hardlinks-with-the-correct-directory-.patch \
27"
28
29SRC_URI[md5sum] = "3f8e41e63b432ba114b33f58674563f7"
30SRC_URI[sha256sum] = "2f92ac06e92fa00f2ada3ee67dad012d74d685537527ad1241d82f2d041f2802"
31
32EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-elf-shlibs --disable-libuuid --disable-uuidd --enable-verbose-makecmds"
33EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
34
35do_configure_prepend () {
36 cp ${WORKDIR}/acinclude.m4 ${S}/
37}
38
39do_install () {
40 oe_runmake 'DESTDIR=${D}' install
41 oe_runmake 'DESTDIR=${D}' install-libs
42 # We use blkid from util-linux now so remove from here
43 rm -f ${D}${base_libdir}/libblkid*
44 rm -rf ${D}${includedir}/blkid
45 rm -f ${D}${base_libdir}/pkgconfig/blkid.pc
46 rm -f ${D}${base_sbindir}/blkid
47 rm -f ${D}${base_sbindir}/fsck
48 rm -f ${D}${base_sbindir}/findfs
49
50 # e2initrd_helper and the pkgconfig files belong in libdir
51 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
52 install -d ${D}${libdir}
53 mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir}
54 mv ${D}${base_libdir}/pkgconfig ${D}${libdir}
55 fi
56
57 oe_multilib_header ext2fs/ext2_types.h
58 install -d ${D}${base_bindir}
59 mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
60
61 install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
62}
63
64do_install_append_class-target() {
65 # Clean host path in compile_et, mk_cmds
66 sed -i -e "s,ET_DIR=\"${S}/lib/et\",ET_DIR=\"${datadir}/et\",g" ${D}${bindir}/compile_et
67 sed -i -e "s,SS_DIR=\"${S}/lib/ss\",SS_DIR=\"${datadir}/ss\",g" ${D}${bindir}/mk_cmds
68}
69
70RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
71RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"
72
73PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs"
74PACKAGES =+ "libcomerr libss libe2p libext2fs"
75
76FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*"
77FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
78FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
79FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs ${base_sbindir}/e2label"
80FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
81FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
82FILES_libss = "${base_libdir}/libss.so.*"
83FILES_libe2p = "${base_libdir}/libe2p.so.*"
84FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
85FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
86
87BBCLASSEXTEND = "native nativesdk"
88
89inherit update-alternatives
90
91ALTERNATIVE_${PN} = "chattr"
92ALTERNATIVE_PRIORITY = "100"
93ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
94ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
95
96ALTERNATIVE_${PN}-doc = "libblkid.3 blkid.8 findfs.8 fsck.8"
97ALTERNATIVE_LINK_NAME[libblkid.3] = "${mandir}/man3/libblkid.3"
98ALTERNATIVE_LINK_NAME[blkid.8] = "${mandir}/man8/blkid.8"
99ALTERNATIVE_LINK_NAME[findfs.8] = "${mandir}/man8/findfs.8"
100ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
101
102inherit ptest
103SRC_URI += "file://run-ptest"
104SRC_URI += "file://ptest.patch"
105
106RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps"
107#RDEPENDS_${PN}-ptest += "expect"
108
109do_compile_ptest() {
110 oe_runmake -C ${B}/tests
111}
112
113do_install_ptest() {
114 cp -a ${B}/tests ${D}${PTEST_PATH}/test
115 cp -a ${S}/tests/* ${D}${PTEST_PATH}/test
116 sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
117}