summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/erofs-utils
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-06-16 09:35:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-17 17:57:44 +0100
commit9694ef314c858bc7be605f90964b92904958ac65 (patch)
treef18ef025913da7e422dc3d51b67fea53ecfd045c /meta/recipes-devtools/erofs-utils
parent72706c7aab1927475d8dda084ba5c8765a0cfe19 (diff)
downloadpoky-9694ef314c858bc7be605f90964b92904958ac65.tar.gz
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 <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/erofs-utils')
-rw-r--r--meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch26
-rw-r--r--meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb (renamed from meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb)9
2 files changed, 4 insertions, 31 deletions
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 @@
1From 821778286843b8e88d0cd73a97d20b5a2fff8ea1 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 6 Dec 2021 20:12:54 +0100
4Subject: [PATCH] fsck/main.c: add missing include
5
6Otherwise musl C library builds fail with missing S_IFMT/S_IFDIR
7definitions.
8
9Upstream-Status: Submitted [email to linux-erofs@lists.ozlabs.org,hsiangkao@linux.alibaba.com]
10Signed-off-by: Alexander Kanavin <alex@linutronix.de>
11---
12 fsck/main.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/fsck/main.c b/fsck/main.c
16index aefa881..ad48e35 100644
17--- a/fsck/main.c
18+++ b/fsck/main.c
19@@ -6,6 +6,7 @@
20 #include <stdlib.h>
21 #include <getopt.h>
22 #include <time.h>
23+#include <sys/stat.h>
24 #include "erofs/print.h"
25 #include "erofs/io.h"
26 #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.5.bb
index e5e19e75b4..b9a97b3e53 100644
--- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb
+++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.5.bb
@@ -1,13 +1,12 @@
1SUMMARY = "Tools for erofs filesystems" 1SUMMARY = "Tools for erofs filesystems"
2# liberofs also available under Apache 2.0
2LICENSE = "GPL-2.0-or-later" 3LICENSE = "GPL-2.0-or-later"
3SECTION = "base" 4SECTION = "base"
4LIC_FILES_CHKSUM = "file://COPYING;md5=94fa01670a2a8f2d3ab2de15004e0848" 5LIC_FILES_CHKSUM = "file://COPYING;md5=73001d804ea1e3d84365f652242cca20"
5HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README" 6HOMEPAGE = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/README"
6 7
7SRCREV = "ee97fe5fb77c737df0f77d92ab0d92edd3a11be6" 8SRCREV = "a2821a66b42aee5430bccee82c280e38d1e9ab29"
8SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master \ 9SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master"
9 file://0001-fsck-main.c-add-missing-include.patch \
10 "
11 10
12UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))" 11UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))"
13 12