From 9694ef314c858bc7be605f90964b92904958ac65 Mon Sep 17 00:00:00 2001 From: wangmy Date: Thu, 16 Jun 2022 09:35:54 +0800 Subject: erofs-utils: upgrade 1.4 -> 1.5 0001-fsck-main.c-add-missing-include.patch removed since it's included in 1.5. License-Update: license switch to GPL-2.0+ OR Apache-2.0 for better 3rd-party integration. Changelog: ========== * This release includes the following updates: - (fsck.erofs) support filesystem extraction (Igor Ostapenko); - support ztailpacking inline feature for compressed files (Yue Hu); - (dump.erofs) support listing directories; - more liberofs APIs (including iterate APIs) (me, Kelvin Zhang); - use mtime to allow more control over the timestamps (David Anderson); - switch to GPL-2.0+ OR Apache-2.0 dual license for liberofs; - various bugfixes and cleanups; (From OE-Core rev: bb87788832ad64079609e4f554e4d55a14f0aa94) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- .../0001-fsck-main.c-add-missing-include.patch | 26 --------------------- .../erofs-utils/erofs-utils_1.4.bb | 27 ---------------------- .../erofs-utils/erofs-utils_1.5.bb | 26 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch delete mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb create mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb (limited to 'meta/recipes-devtools/erofs-utils') diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch b/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch deleted file mode 100644 index c3b3c0bd56..0000000000 --- a/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 821778286843b8e88d0cd73a97d20b5a2fff8ea1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 6 Dec 2021 20:12:54 +0100 -Subject: [PATCH] fsck/main.c: add missing include - -Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR -definitions. - -Upstream-Status: Submitted [email to linux-erofs@lists.ozlabs.org,hsiangkao@linux.alibaba.com] -Signed-off-by: Alexander Kanavin ---- - fsck/main.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fsck/main.c b/fsck/main.c -index aefa881..ad48e35 100644 ---- a/fsck/main.c -+++ b/fsck/main.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - #include "erofs/print.h" - #include "erofs/io.h" - #include "erofs/decompress.h" diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb deleted file mode 100644 index e5e19e75b4..0000000000 --- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "Tools for erofs filesystems" -LICENSE = "GPL-2.0-or-later" -SECTION = "base" -LIC_FILES_CHKSUM = "file://COPYING;md5=94fa01670a2a8f2d3ab2de15004e0848" -HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" - -SRCREV = "ee97fe5fb77c737df0f77d92ab0d92edd3a11be6" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master \ - file://0001-fsck-main.c-add-missing-include.patch \ - " - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" - -S = "${WORKDIR}/git" - -DEPENDS = "util-linux-libuuid" - -inherit pkgconfig autotools - -PACKAGECONFIG ??= "lz4" -PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" - -EXTRA_OECONF = "${PACKAGECONFIG_CONFARGS} --disable-fuse" - -CFLAGS:append:powerpc64le = " -D__SANE_USERSPACE_TYPES__" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb new file mode 100644 index 0000000000..b9a97b3e53 --- /dev/null +++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb @@ -0,0 +1,26 @@ +SUMMARY = "Tools for erofs filesystems" +# liberofs also available under Apache 2.0 +LICENSE = "GPL-2.0-or-later" +SECTION = "base" +LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20" +HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" + +SRCREV = "a2821a66b42aee5430bccee82c280e38d1e9ab29" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P(\d+(\.\d+)+))" + +S = "${WORKDIR}/git" + +DEPENDS = "util-linux-libuuid" + +inherit pkgconfig autotools + +PACKAGECONFIG ??= "lz4" +PACKAGECONFIG[lz4] = "--enable-lz4,--disable-lz4,lz4" + +EXTRA_OECONF = "${PACKAGECONFIG_CONFARGS} --disable-fuse" + +CFLAGS:append:powerpc64le = " -D__SANE_USERSPACE_TYPES__" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf