From 0a2b230d5c1f7897d6c643c282731880a9726ba3 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Sun, 29 Sep 2024 07:06:16 +0800 Subject: e2tools: upgrade 0.1.0 -> 0.1.2 ChangeLog: https://github.com/e2tools/e2tools/releases/tag/v0.1.2 Signed-off-by: Yi Zhao Signed-off-by: Khem Raj --- .../recipes-utils/e2tools/e2tools_0.1.2.bb | 46 ++++++++++++++++++++ .../recipes-utils/e2tools/e2tools_git.bb | 49 ---------------------- ...0001-Disable-portability-warning-as-error.patch | 34 --------------- 3 files changed, 46 insertions(+), 83 deletions(-) create mode 100644 meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb delete mode 100644 meta-filesystems/recipes-utils/e2tools/e2tools_git.bb delete mode 100644 meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb new file mode 100644 index 0000000000..d7e654babe --- /dev/null +++ b/meta-filesystems/recipes-utils/e2tools/e2tools_0.1.2.bb @@ -0,0 +1,46 @@ +SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem." +DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \ +and manipulate files in an ext2/ext3 filesystem. These utilities access a \ +filesystem directly using the ext2fs library. Can also be used on a Linux \ +machine to read/write to disk images or floppies without having to mount \ +them or have root access." +HOMEPAGE = "https://github.com/e2tools/e2tools" +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += "coreutils e2fsprogs" + +SRC_URI = " \ + git://github.com/e2tools/e2tools;protocol=https;branch=master \ + file://run-ptest \ +" + +SRCREV = "46da6c398e70635a296245851fcedbc56c35e824" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig ptest + +# Otherwise these tools will be detected from build host and +# assumptions will go wrong, Fun of cross compiling +EXTRA_OECONF += "\ + ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \ + ac_cv_path_CHMOD=${base_bindir}/chmod \ + ac_cv_path_DD=${base_bindir}/dd \ + ac_cv_path_GREP=${base_bindir}/grep \ + " + +do_install_ptest() { + rm -rf "${D}${PTEST_PATH}/*" + cp -r ../build "${D}${PTEST_PATH}" + cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build" + cp -r "${S}" "${D}${PTEST_PATH}" + rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \ + ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache + sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status +} + +RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" + +BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb deleted file mode 100644 index 459c7058e1..0000000000 --- a/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Set of GPL'ed utilities to ext2/ext3 filesystem." -DESCRIPTION = "e2tools is a simple set of GPL'ed utilities to read, write, \ -and manipulate files in an ext2/ext3 filesystem. These utilities access a \ -filesystem directly using the ext2fs library. Can also be used on a Linux \ -machine to read/write to disk images or floppies without having to mount \ -them or have root access." -HOMEPAGE = "https://github.com/e2tools/e2tools" -SECTION = "base" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += "coreutils e2fsprogs" - -PV = "0.1.0+git" - -SRC_URI = " \ - git://github.com/e2tools/e2tools;protocol=https;branch=master \ - file://0001-Disable-portability-warning-as-error.patch \ - file://run-ptest \ -" - -SRCREV = "fd092754a6b65c3a769f74f888668c066f09c36d" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig ptest - -# Otherwise these tools will be detected from build host and -# assumptions will go wrong, Fun of cross compiling -EXTRA_OECONF += "\ - ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \ - ac_cv_path_CHMOD=${base_bindir}/chmod \ - ac_cv_path_DD=${base_bindir}/dd \ - ac_cv_path_GREP=${base_bindir}/grep \ - " - -do_install_ptest() { - rm -rf "${D}${PTEST_PATH}/*" - cp -r ../build "${D}${PTEST_PATH}" - cp -r "${S}/build-aux" "${D}${PTEST_PATH}/build" - cp -r "${S}" "${D}${PTEST_PATH}" - rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \ - ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache - sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status -} - -RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" - -BBCLASSEXTEND = "native" diff --git a/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch b/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch deleted file mode 100644 index dec793f373..0000000000 --- a/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e0aaedea30483bf5b9bb085e12fff79144fa1174 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 29 Aug 2024 11:12:57 -0700 -Subject: [PATCH] Disable portability warning as error - -With latest automake 1.17 its warning about escape hash -mark [1] and since configure.ac uses -werror to call automake -this becomes an error and reconfigure fails. - -escape hash mark is non-portable as discussed here [2] - -Fow now let it be a warning, it should be fixed in a portable way - -[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7610 -[2] https://lists.gnu.org/archive/html/automake/2011-08/msg00023.html - -Upstream-Status: Submitted [https://github.com/e2tools/e2tools/pull/31] -Signed-off-by: Khem Raj ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index dd32c4d..9f37591 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([ - -Wall - -Werror -+-Wno-portability - 1.9.6 - foreign - subdir-objects -- cgit v1.2.3-54-g00ecf