From 9e0a3f641081b3a3eecd9877c460d7cb68717bf6 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 7 Dec 2021 14:06:59 +0100 Subject: [PATCH] erofs-utils: update 1.3 -> 1.4 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...0001-fsck-main.c-add-missing-include.patch | 26 +++++++++++++++++++ ...{erofs-utils_1.3.bb => erofs-utils_1.4.bb} | 6 +++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch rename meta/recipes-devtools/erofs-utils/{erofs-utils_1.3.bb => erofs-utils_1.4.bb} (79%) 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 new file mode 100644 index 0000000000..c3b3c0bd56 --- /dev/null +++ b/meta/recipes-devtools/erofs-utils/erofs-utils/0001-fsck-main.c-add-missing-include.patch @@ -0,0 +1,26 @@ +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.3.bb b/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb similarity index 79% rename from meta/recipes-devtools/erofs-utils/erofs-utils_1.3.bb rename to meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb index 77cce2fdaf..6ac8a37163 100644 --- a/meta/recipes-devtools/erofs-utils/erofs-utils_1.3.bb +++ b/meta/recipes-devtools/erofs-utils/erofs-utils_1.4.bb @@ -4,8 +4,10 @@ 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 = "2cd522105ea771ec30b269cd4c57e2265a4d6349" -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git;branch=master" +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+)+))" -- 2.40.1