From patchwork Tue Jan 12 04:31:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 1424970 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=busybox.net Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DFHx64NKvz9sjB for ; Tue, 12 Jan 2021 15:42:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 86C2885F67; Tue, 12 Jan 2021 04:42:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OoXgnM5_U016; Tue, 12 Jan 2021 04:42:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 10AD885B80; Tue, 12 Jan 2021 04:42:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 2C4841BF352 for ; Tue, 12 Jan 2021 04:42:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 28AC085AC7 for ; Tue, 12 Jan 2021 04:42:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yg38IPpUBJ56 for ; Tue, 12 Jan 2021 04:42:05 +0000 (UTC) X-Greylist: delayed 00:10:01 by SQLgrey-1.7.6 Received: from sonic314-21.consmr.mail.gq1.yahoo.com (sonic314-21.consmr.mail.gq1.yahoo.com [98.137.69.84]) by hemlock.osuosl.org (Postfix) with ESMTPS id 196E985A46 for ; Tue, 12 Jan 2021 04:42:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1610426524; bh=PrrSau/+/pndjFeG6s+N4GK8eSsUg4OaZMahM/K8k20=; h=From:To:Cc:Subject:Date:References:From:Subject:Reply-To; b=eRLAzlwxrwZreMCkBhmuhMU21d1oy94CpOiOZ1S8T03POOXCg9O/lo5PCDvoXl7Sk2ewEJJHe4DQtmxiMXPlRMEQ4Urg+Qh9TE2I/nOD/Hs+fHfZTrqQnUdwRvqb8ALtIwNR3HH+Q/8B6/vl0bNgqr/Ho7TQX7oKwECGjc+AAk1qgAgcxQMFbi06aa3XaY5Zf9nJKf5KzTmevrn/8Luqr4DGg/cTHZR44N5jjlP9NXyXsuHtZPkJLTHgWw40GPAiMUYHMCejP7ppi/sFeYBmy7kOr7IKVct0nHD9Ir/Z6SwCpoxsx9IuVaM1mMAG/0gQbE8It4+yqJVpOrXYx8TlTg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1610426524; bh=y4Bgv3lq3EzGld6rxVfI3RCTH7jZIEsDmcSUiqUpvTt=; h=From:To:Subject:Date:From:Subject:Reply-To; b=CXLTj+/wS8ryoQC91pA5e0AV2Gllzz7IWfjCxvnQ0o0wMZApjWpv0PNE1b2YaOm8HgBDAhsDJxIdPJeWr6RO4GmtgLrgjRH+NrMfA4rV9RFN/dj1o7q00DVshECwm95BpiltOOd0X3iEo8n5uctgCP0qCtyBjBnyEX6WQH4GxHOC4NQNNBoLmmFiRoQa1JIyOCA651bPWs9Rg9T9/ptLFGfIuCowwtP6qNuIMQSVk4SJtJOTliNLNYH/M6LvyHlvzcQ9O0efoXhRXJbYsXFwKJ1fKucbLbuf5/jPnBEbR7B5CM+NVOJhsFxsTslCmrupdX6uVhcE443bXKkhW92W8A== X-YMail-OSG: z.jWQGYVM1mF1nDOK00Xf7cZp5rw8e8Mc5aHDI3fb_6LsKCbX3WdOIc7Fp.wgMv 4iy_M1Uvnu7wEOqU1QQf99OeK8EQAL_9siyE8MKOoC2H3iWFju35et0xgMwRna2jQjgkk41IYvkv iz3XlYnE1I4lGTVIKj6Op1htU2dTL2WNezjJ6oYw_8dWBRuBCHGJZVfbiEl87TzNiHJLnYhS69mw nCdxLE18wzxl_6xfidgB7GFWmidMeL7K2saXfMnrq6tqu5f7RkgkCZEafeWcZouZ7T.hMFGJwite D5sjAaJ_FH2Z09VrWK_FjxNRG5hg68LX101aYdoxtEC3pbwSzLFtyRkUUk4YFVUb7Dgs8I_IvQ4y UfNRLiOlW0KyPXsMfAoUiU2uUXXWON6HCKiC8yh3bDBHfXpCpvwOXyiaFDNQlSAIBbKTfmUSdMcD iF8TPr2ZgK8fDJz40PoIH4ekZT_7axgqgKI6oTYBokSHCQR_90gGwV04NbbUYKW7v4kHpvPMcOcT kIcDdS6KYlMFpYa1ddnY6d73v2wFirtgedXamF0FcTp4O3VJL6lBJEWeku1gzoTBH2cbi0PA5bL7 BM4GpRo5MLriBzFq2QuHF.1WhAPtlTzwZX5mQTvsCpy7YgYozNU.7grrv1vBEx5ecWeZ7a.cktk_ j9.2f6Tyn8WV4g6XlImy3d2WR7_6YAB0l45YDEpcF32bsaQfWMnFSK_S77NU6pk1SAteVkRf2kEw gAz_otgeSqEII0zg3DgEF1shY6bSgsKOGUZRgvm_HUYZCI.OhUBK_D_pVD3SynwFoeykqhvSZQUI I3Ud6HjMRI_9CO3lS6uuPVEVGkEgjC6NLqD0gcfpXtawXCzeZaQKDcE4JdKYvMn3Z1aR1jDFTl5_ 4g6mkebcGQBQLOSyWnmIb77Lsu8qLt4j94Wy3fuPs88Q9raX7DYMeYnNhoAXCnJsegfjRa9HRYck mlvLiVH4qcgwJ0bhWxvhpowNgvji2rnTuf2N5aYmra0uyRCmoUeY5mZBrjbev_cyT6ZtNtgs7r2_ j1eFHa7yRNsCxIvcCYdPi7rj6sys_PP9ImM1u6aPj8P2N_4OmDTBqMKaK4iXiZ0EChEIYPUnt9E6 T0BWm93SHQTKz4Lh3o96qfoLMLDXmPoPvpH0aHNVXnVbcQ7QGq3wLLtEUlMlOGH3eiWYVAMijdrk q95wRaaitmCG5V94Uo0poYbOHh8A4P8EhqwE3SqDlQyn2tjGDyMOXO_jZQMsG6oPLVO9by1lFTkb uhjHU7DC_InB95xP24J6Wth9WzR3SVW3HrQN5ckzKIlIK29bDa79.0mv39gpSRLdO4DgKoloxvq6 51sb8TyI0N_r62iBYzv5KRu16OV3Iq9QLFlRUZ.TU0FTWGrMYMpItHu7FG30kiRXMHcFQSnlhwE7 xLcILspjSPUAESmtyUeD8_5kkrkmeoNS85F1LZU_1MpWyh5kBta8jtTHS4dhOPgbmEiHnjnT5IWt wyVFH7W_qIdPAsas022kwL.o12KUNwzsKhX.QM7m2V_408iROdlBp6VeUdq2D235Xv7Y_BzgQfzf RXt7r5lHb2wlqLbDTj2Yn3BJe3bhvGa33v4TM0dBsuG1SAf1VsVl2BakXuScYeO48F9czh691lo4 NVanDNW89Uz_DXR6RhqAen5VsVRhlToBL1ibpsfglqJ9GQYUYCARrM9QSTHL303HxlW6mRfyM7lI 7OrQXnBrASYVaLoOTXDVQxWHdItud6yAQESb5hHXTiAWVJPa_5_6ue94dJHIWqRldepHIpWin7rJ 1mQ9X3tGOs171pyFH7dyLNTZ0zaSUWZHeggAnurb8ZIEwe29Be7HANNGlcj1pdWK3eJAS4Nwj3rO 01C0Kq3YuBc1IJ2_OZuK381r6Ej9fZP.Dy9S8Ym0tsDqoxhVT7H0KRRkDUprLUiGJU3ZEmkYiW6c LrfuNiEr3238Sih0aK8LDXFz_R3W9K3Kuso1C4TfOCpI9XlXt5d5y.FRa4yFRjaWXAKclOVPNOK5 svSK1uYQZBI91k69D3e5WioOvlxQE3Su.BJOQRBO70eyo4bvJ6PmGgDGHy0nIPkaLeBWEIXEgnyZ JYJ9rv8aZg9KNElfSO77uXBEhE5Fm4.2NzTxGvcejk9aSHK6oHeDaX4N_kKXs6IMb_RARCebZpnz z_d4LJm0wCXe4s_SC_jXDiXB7Zbvxo5R8QHrPcuelI.28I8S4.3SOo1vd1VvjP4Th6iUWEVoHnvv cfWZ.0rgQ9UkSbwpvH5PqeWzRq7kLGKDLCBH8N_6AtfZLyDxM9CYsA2qZwGtuWXoR2pRoaDHrgGy 7dXYYCperg1u6ubxp1nczo5x25g41ui0xCpepdGRCRt7Fy6M1gVbypJ9GCx0i4Fe6X7ZEGnyPCvr hZczDdpSCZduO_4bfYtofrZTtE2i4lHyXi7K2kr2DMVYO_i_wsdZql20nW96q9holhbzSwpo5W9U aiXTHud9qPRcLmYVm489YjmtXSo_fFXK4Gg4_.r_F4NmpG48NKBjzx1Hp_UVgi9OCUBa9calN98A QZuX0NKyQKKEv7G6DPEohfJKwp_06Dmp8SafhWGQ1ReEGLuLkWpPfxAL8W9itTUQCjW2NW0QhReR orxzL_1rFTSte.IgyVIPZGv033wjeNdOJDZ2i2r_CCuFgzx4CiqkbmO85hO0ZwZXobmLoGV5DR4Z rPbz3n.eQ28JeTMcpRQ-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.gq1.yahoo.com with HTTP; Tue, 12 Jan 2021 04:42:04 +0000 Received: by smtp424.mail.gq1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID b8af2e66f0bdc78a4b2d256b1c7e6596; Tue, 12 Jan 2021 04:32:00 +0000 (UTC) To: buildroot@buildroot.org Date: Tue, 12 Jan 2021 12:31:21 +0800 Message-Id: <20210112043121.6598-1-hsiangkao@aol.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 References: <20210112043121.6598-1-hsiangkao.ref@aol.com> Subject: [Buildroot] [PATCH] package/erofs-utils: bump version to 1.2.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Gao Xiang via buildroot Reply-To: Gao Xiang Cc: Gao Xiang , Gao Xiang , Fabrice Fontaine , "Yann E . MORIN" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - minor maintainence release mainly to address exist build issues; - remove the following patches since all have been upstreamed: 0001-erofs-utils-fix-multiple-definition-of-sbi.patch; 0002-erofs-utils-fuse-fix-linking-when-using-with-selinux.patch; 0003-erofs-utils-fuse-disable-backtrace-if-unsupported.patch. Signed-off-by: Gao Xiang --- ...utils-fix-multiple-definition-of-sbi.patch | 62 -------------- ...-fix-linking-when-using-with-selinux.patch | 33 -------- ...use-disable-backtrace-if-unsupported.patch | 82 ------------------- package/erofs-utils/erofs-utils.hash | 2 +- package/erofs-utils/erofs-utils.mk | 2 +- 5 files changed, 2 insertions(+), 179 deletions(-) delete mode 100644 package/erofs-utils/0001-erofs-utils-fix-multiple-definition-of-sbi.patch delete mode 100644 package/erofs-utils/0002-erofs-utils-fuse-fix-linking-when-using-with-selinux.patch delete mode 100644 package/erofs-utils/0003-erofs-utils-fuse-disable-backtrace-if-unsupported.patch diff --git a/package/erofs-utils/0001-erofs-utils-fix-multiple-definition-of-sbi.patch b/package/erofs-utils/0001-erofs-utils-fix-multiple-definition-of-sbi.patch deleted file mode 100644 index 374c9ab72db4..000000000000 --- a/package/erofs-utils/0001-erofs-utils-fix-multiple-definition-of-sbi.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6c938b755682629a26f85e5540f40c0d316130ed Mon Sep 17 00:00:00 2001 -From: Gao Xiang -Date: Tue, 8 Dec 2020 18:57:41 +0800 -Subject: erofs-utils: fix multiple definition of `sbi' - -As nl6720 reported [1], lib/inode.o (mkfs) and lib/super.o (erofsfuse) -could be compiled together by some options. Fix it now. - -[1] https://lore.kernel.org/r/10789285.Na0ui7I3VY@walnut - -Link: https://lore.kernel.org/r/20201208105741.9614-1-hsiangkao@aol.com -Fixes: 5e35b75ad499 ("erofs-utils: introduce fuse implementation") -Reported-by: nl6720 -Reviewed-by: Li Guifu -Signed-off-by: Gao Xiang ---- - lib/config.c | 1 + - lib/inode.c | 2 -- - lib/super.c | 2 -- - 3 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/lib/config.c b/lib/config.c -index 3155112..3ecd481 100644 ---- a/lib/config.c -+++ b/lib/config.c -@@ -11,6 +11,7 @@ - #include "erofs/internal.h" - - struct erofs_configure cfg; -+struct erofs_sb_info sbi; - - void erofs_init_configure(void) - { -diff --git a/lib/inode.c b/lib/inode.c -index 3d634fc..0c4839d 100644 ---- a/lib/inode.c -+++ b/lib/inode.c -@@ -22,8 +22,6 @@ - #include "erofs/xattr.h" - #include "erofs/exclude.h" - --struct erofs_sb_info sbi; -- - #define S_SHIFT 12 - static unsigned char erofs_ftype_by_mode[S_IFMT >> S_SHIFT] = { - [S_IFREG >> S_SHIFT] = EROFS_FT_REG_FILE, -diff --git a/lib/super.c b/lib/super.c -index 2d36692..025cefe 100644 ---- a/lib/super.c -+++ b/lib/super.c -@@ -11,8 +11,6 @@ - #include "erofs/io.h" - #include "erofs/print.h" - --struct erofs_sb_info sbi; -- - static bool check_layout_compatibility(struct erofs_sb_info *sbi, - struct erofs_super_block *dsb) - { --- -cgit 1.2.3-1.el7 - diff --git a/package/erofs-utils/0002-erofs-utils-fuse-fix-linking-when-using-with-selinux.patch b/package/erofs-utils/0002-erofs-utils-fuse-fix-linking-when-using-with-selinux.patch deleted file mode 100644 index bea3168b53da..000000000000 --- a/package/erofs-utils/0002-erofs-utils-fuse-fix-linking-when-using-with-selinux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f1f9659e98ea925a100e50332309955f5b2b4234 Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Thu, 10 Dec 2020 21:29:43 -0500 -Subject: erofs-utils: fuse: fix linking when using --with-selinux - -The libselinux functions selabel_open and selabel_close are called -by lib/config.c, so include libselinux in CFLAGS and LIBS to fix -building erofsfuse. - -Link: https://lore.kernel.org/r/87360dnkh4.fsf@gmail.com -Signed-off-by: David Michael -Reviewed-and-tested-by: Li Guifu -Signed-off-by: Gao Xiang ---- - fuse/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fuse/Makefile.am b/fuse/Makefile.am -index f14f6fd..e7757bc 100644 ---- a/fuse/Makefile.am -+++ b/fuse/Makefile.am -@@ -5,6 +5,6 @@ AUTOMAKE_OPTIONS = foreign - bin_PROGRAMS = erofsfuse - erofsfuse_SOURCES = dir.c main.c - erofsfuse_CFLAGS = -Wall -Werror -I$(top_srcdir)/include --erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} --erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} -+erofsfuse_CFLAGS += -DFUSE_USE_VERSION=26 ${libfuse_CFLAGS} ${libselinux_CFLAGS} -+erofsfuse_LDADD = $(top_builddir)/lib/liberofs.la ${libfuse_LIBS} ${liblz4_LIBS} ${libselinux_LIBS} - --- -cgit 1.2.3-1.el7 - diff --git a/package/erofs-utils/0003-erofs-utils-fuse-disable-backtrace-if-unsupported.patch b/package/erofs-utils/0003-erofs-utils-fuse-disable-backtrace-if-unsupported.patch deleted file mode 100644 index 4881df30c423..000000000000 --- a/package/erofs-utils/0003-erofs-utils-fuse-disable-backtrace-if-unsupported.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 833563ffd3126b6e85fc54402c6d68c29a30264c Mon Sep 17 00:00:00 2001 -From: Gao Xiang -Date: Thu, 17 Dec 2020 16:59:04 +0800 -Subject: [PATCH] erofs-utils: fuse: disable backtrace if unsupported - -backtrace is a GNU extension, enable it conditionally. - -Signed-off-by: Gao Xiang ---- - configure.ac | 3 ++- - fuse/main.c | 8 ++++++-- - 2 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d5fdfb8a3d17..28926c303c5c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -96,6 +96,7 @@ AC_ARG_VAR([LZ4_LIBS], [linker flags for lz4]) - # Checks for header files. - AC_CHECK_HEADERS(m4_flatten([ - dirent.h -+ execinfo.h - fcntl.h - getopt.h - inttypes.h -@@ -147,7 +148,7 @@ AC_CHECK_DECL(lseek64,[AC_DEFINE(HAVE_LSEEK64_PROTOTYPE, 1, - #include ]) - - # Checks for library functions. --AC_CHECK_FUNCS([fallocate gettimeofday memset realpath strdup strerror strrchr strtoull]) -+AC_CHECK_FUNCS([backtrace fallocate gettimeofday memset realpath strdup strerror strrchr strtoull]) - - # Configure libuuid - AS_IF([test "x$with_uuid" != "xno"], [ -diff --git a/fuse/main.c b/fuse/main.c -index 1e24efe110c2..c16291272e75 100644 ---- a/fuse/main.c -+++ b/fuse/main.c -@@ -6,7 +6,6 @@ - */ - #include - #include --#include - #include - #include - #include -@@ -168,6 +167,9 @@ static int optional_opt_func(void *data, const char *arg, int key, - return 1; - } - -+#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) -+#include -+ - static void signal_handle_sigsegv(int signal) - { - void *array[10]; -@@ -187,7 +189,7 @@ static void signal_handle_sigsegv(int signal) - erofs_dump("========================================\n"); - abort(); - } -- -+#endif - - int main(int argc, char *argv[]) - { -@@ -197,11 +199,13 @@ int main(int argc, char *argv[]) - erofs_init_configure(); - fprintf(stderr, "%s %s\n", basename(argv[0]), cfg.c_version); - -+#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) - if (signal(SIGSEGV, signal_handle_sigsegv) == SIG_ERR) { - fprintf(stderr, "failed to initialize signals\n"); - ret = -errno; - goto err; - } -+#endif - - /* parse options */ - ret = fuse_opt_parse(&args, &fusecfg, option_spec, optional_opt_func); --- -2.24.0 - diff --git a/package/erofs-utils/erofs-utils.hash b/package/erofs-utils/erofs-utils.hash index cd29ea96ff0a..0b0c7d14fba2 100644 --- a/package/erofs-utils/erofs-utils.hash +++ b/package/erofs-utils/erofs-utils.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 b3f65a6b6d8b1dc37694e083e01492041619100211757564adc851e327f1553c erofs-utils-1.2.tar.gz +sha256 6b2ea15c3b092bd9a3abd966f78bc01c6caacb94022643ff34cf69893ee04e84 erofs-utils-1.2.1.tar.gz sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING diff --git a/package/erofs-utils/erofs-utils.mk b/package/erofs-utils/erofs-utils.mk index d4e719470eda..5d547148b204 100644 --- a/package/erofs-utils/erofs-utils.mk +++ b/package/erofs-utils/erofs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -EROFS_UTILS_VERSION = 1.2 +EROFS_UTILS_VERSION = 1.2.1 EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot EROFS_UTILS_LICENSE = GPL-2.0+ EROFS_UTILS_LICENSE_FILES = COPYING