summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb12
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb
index 837224cc72..f4855bc430 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.43.bb
@@ -52,6 +52,10 @@ do_install () {
52 mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs 52 mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs
53 53
54 install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ 54 install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/
55
56 # Clean host path (build directory) in compile_et, mk_cmds
57 sed -i -e "s,\(ET_DIR=.*\)${S}/lib/et\(.*\),\1${datadir}/et\2,g" ${D}${bindir}/compile_et
58 sed -i -e "s,\(SS_DIR=.*\)${S}/lib/ss\(.*\),\1${datadir}/ss\2,g" ${D}${bindir}/mk_cmds
55} 59}
56 60
57# Need to find the right mke2fs.conf file 61# Need to find the right mke2fs.conf file
@@ -61,12 +65,6 @@ e2fsprogs_conf_fixup () {
61 done 65 done
62} 66}
63 67
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
70do_install_append_class-native() { 68do_install_append_class-native() {
71 e2fsprogs_conf_fixup 69 e2fsprogs_conf_fixup
72} 70}
@@ -90,7 +88,7 @@ FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
90FILES_libss = "${base_libdir}/libss.so.*" 88FILES_libss = "${base_libdir}/libss.so.*"
91FILES_libe2p = "${base_libdir}/libe2p.so.*" 89FILES_libe2p = "${base_libdir}/libe2p.so.*"
92FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" 90FILES_libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*"
93FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so" 91FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds"
94 92
95ALTERNATIVE_${PN} = "chattr" 93ALTERNATIVE_${PN} = "chattr"
96ALTERNATIVE_PRIORITY = "100" 94ALTERNATIVE_PRIORITY = "100"