summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2019-08-08 11:45:13 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-12 16:23:57 +0100
commit9983b07fffd19082abded7c3f15cc77d306dd69c (patch)
treeb5674c575307f216aa2b24ad3bd48ecf741ca5c5 /meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
parent0928c098ac631ffefa7fd14013716a99c9c6657b (diff)
downloadpoky-9983b07fffd19082abded7c3f15cc77d306dd69c.tar.gz
e2fsprogs: 1.44.5 -> 1.45.3
Update e2fsprogs from 1.44.5 to 1.45.3: * rebase ptest.patch * remove 0001-create_inode-fix-copying-large-files.patch which merged by upstream * add new sub-package e2fsprogs-e2scrub and disable cron support (From OE-Core rev: e5f8c1facfc3507710d7111951fe075e01c58e4e) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb136
1 files changed, 0 insertions, 136 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
deleted file mode 100644
index 5cda89f59f..0000000000
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.44.5.bb
+++ /dev/null
@@ -1,136 +0,0 @@
1require e2fsprogs.inc
2
3SRC_URI += "file://remove.ldconfig.call.patch \
4 file://run-ptest \
5 file://ptest.patch \
6 file://mkdir_p.patch \
7 file://0001-misc-create_inode.c-set-dir-s-mode-correctly.patch \
8 file://0001-create_inode-fix-copying-large-files.patch \
9 "
10
11SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \
12 file://quiet-debugfs.patch \
13"
14
15SRCREV = "9a03c07e00f09a772245281d84a284c67e905148"
16UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$"
17
18EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \
19 --enable-elf-shlibs --disable-libuuid --disable-uuidd \
20 --disable-libblkid --enable-verbose-makecmds"
21
22EXTRA_OECONF_darwin = "--libdir=${base_libdir} --sbindir=${base_sbindir} --enable-bsd-shlibs"
23
24PACKAGECONFIG ??= ""
25PACKAGECONFIG[fuse] = '--enable-fuse2fs,--disable-fuse2fs,fuse'
26
27# make locale rules sometimes fire, sometimes don't as git doesn't preserve
28# file mktime. Touch the files introducing non-determinism to the build
29do_compile_prepend (){
30 find ${S}/po -type f -name "*.po" -exec touch {} +
31}
32
33do_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
63e2fsprogs_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
69do_install_append_class-native() {
70 e2fsprogs_conf_fixup
71}
72
73do_install_append_class-nativesdk() {
74 e2fsprogs_conf_fixup
75}
76
77do_install_append_class-target() {
78 mv ${D}${base_sbindir}/mke2fs ${D}${base_sbindir}/mke2fs.e2fsprogs
79 mv ${D}${base_sbindir}/mkfs.ext2 ${D}${base_sbindir}/mkfs.ext2.e2fsprogs
80 mv ${D}${base_sbindir}/tune2fs ${D}${base_sbindir}/tune2fs.e2fsprogs
81}
82
83RDEPENDS_e2fsprogs = "e2fsprogs-badblocks"
84RRECOMMENDS_e2fsprogs = "e2fsprogs-mke2fs e2fsprogs-e2fsck"
85
86PACKAGES =+ "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs"
87PACKAGES =+ "libcomerr libss libe2p libext2fs"
88
89FILES_e2fsprogs-resize2fs = "${base_sbindir}/resize2fs*"
90FILES_e2fsprogs-e2fsck = "${base_sbindir}/e2fsck ${base_sbindir}/fsck.ext*"
91FILES_e2fsprogs-mke2fs = "${base_sbindir}/mke2fs.e2fsprogs ${base_sbindir}/mkfs.ext* ${sysconfdir}/mke2fs.conf"
92FILES_e2fsprogs-tune2fs = "${base_sbindir}/tune2fs.e2fsprogs ${base_sbindir}/e2label"
93FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
94FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
95FILES_libss = "${base_libdir}/libss.so.*"
96FILES_libe2p = "${base_libdir}/libe2p.so.*"
97FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
98FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds"
99
100ALTERNATIVE_${PN} = "chattr"
101ALTERNATIVE_PRIORITY = "100"
102ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
103ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
104
105ALTERNATIVE_${PN}-doc = "fsck.8"
106ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8"
107
108ALTERNATIVE_${PN}-mke2fs = "mke2fs mkfs.ext2"
109ALTERNATIVE_LINK_NAME[mke2fs] = "${base_sbindir}/mke2fs"
110ALTERNATIVE_LINK_NAME[mkfs.ext2] = "${base_sbindir}/mkfs.ext2"
111
112ALTERNATIVE_${PN}-tune2fs = "tune2fs"
113ALTERNATIVE_LINK_NAME[tune2fs] = "${base_sbindir}/tune2fs"
114
115RDEPENDS_${PN}-ptest += "coreutils procps bash bzip2 diffutils perl sed"
116RDEPENDS_${PN}-ptest += "e2fsprogs-e2fsck e2fsprogs-mke2fs e2fsprogs-tune2fs e2fsprogs-badblocks e2fsprogs-resize2fs"
117
118do_compile_ptest() {
119 oe_runmake -C ${B}/tests
120}
121
122do_install_ptest() {
123 cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test
124 cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test
125 sed -e 's!../e2fsck/e2fsck!e2fsck!g' \
126 -e 's!../misc/tune2fs!tune2fs!g' -i ${D}${PTEST_PATH}/test/*/expect*
127 sed -e 's!../e2fsck/e2fsck!${base_sbindir}/e2fsck!g' -i ${D}${PTEST_PATH}/test/*/script
128
129 # Remove various files
130 find "${D}${PTEST_PATH}" -type f \
131 \( -name 'Makefile' -o -name 'Makefile.in' -o -name '*.o' -o -name '*.c' -o -name '*.h' \)\
132 -exec rm -f {} +
133
134 install -d ${D}${PTEST_PATH}/lib
135 install -m 0644 ${B}/lib/config.h ${D}${PTEST_PATH}/lib/
136}