* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/erofs-utils/files/, sys-fs/erofs-utils/
@ 2020-12-11 4:48 Denis Reva
0 siblings, 0 replies; 2+ messages in thread
From: Denis Reva @ 2020-12-11 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 828be86ca51385916354962961fb259450aaaafa
Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Fri Dec 11 04:48:20 2020 +0000
Commit: Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Fri Dec 11 04:48:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=828be86c
sys-fs/erofs-utils: bumped up to 1.2+9999 version
Thank David Michael for ebuild:
https://bugs.gentoo.org/701284
Version 1.2 with patch now supports -fno-common
Live ebuild (message from D.Michael):
This updates the live ebuild with the new features. It doesn't need
the patch from 1.2, since that's in the experimental branch.
It actually does need the sed call to fix selinux+fuse at
the moment, since that is not addressed upstream. I dropped it
here anyway assuming it will be fixed relatively soon.
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
sys-fs/erofs-utils/Manifest | 1 +
sys-fs/erofs-utils/erofs-utils-1.2.ebuild | 45 ++++++++++++++++
sys-fs/erofs-utils/erofs-utils-9999.ebuild | 38 ++++++++++++++
.../files/erofs-utils-1.2-no-common.patch | 61 ++++++++++++++++++++++
sys-fs/erofs-utils/metadata.xml | 1 +
5 files changed, 146 insertions(+)
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 3bf92e0b..4b9d3aab 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1 +1,2 @@
DIST erofs-utils-1.1.tar.gz 46133 BLAKE2B 24a2f16059e39bd65203f4a28721b8aad70599d6201ead02c291234de631bd3def1c403fa8b50b6dce4af3eea2768b912c4f56ad20c3c26db3853ba3174775ac SHA512 f300b536f0ba91a05a7eb3dc9a9ec402c98966ad7c0e1f2f664a650caaffce6c4433722374418c6d03e69ce2e74785e55f9bcc45e6717a8bc67e5352e450806b
+DIST erofs-utils-1.2.tar.gz 60991 BLAKE2B 08b9bea397f52d158a40f095811853315a3b553618f380d1ece012c813d708c2331b2a445bb59c4b86d81edab33c834e37aeb0aeeb9acb157b7aebed309cb591 SHA512 167311beb2d4722436051956076d670f6a54da72e1690d19d43e0c46dd972f9f61427b4792b469813a6a4ff2e3c445646cf063d37b4ee2b52f88eb14e7bf2713
diff --git a/sys-fs/erofs-utils/erofs-utils-1.2.ebuild b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
new file mode 100644
index 00000000..62a2d24c
--- /dev/null
+++ b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Userspace tools for EROFS images"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+SRC_URI="${HOMEPAGE}/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="fuse lz4 selinux +uuid"
+
+RDEPEND="
+ fuse? ( sys-fs/fuse:0 )
+ lz4? ( >=app-arch/lz4-1.9 )
+ selinux? ( sys-libs/libselinux )
+ uuid? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-no-common.patch"
+)
+
+src_prepare() {
+ default
+ use fuse && use selinux && sed -i \
+ -e 's/.*CFLAGS}.*/& ${libselinux_CFLAGS}/' \
+ -e 's/.*LIBS}.*/& ${libselinux_LIBS}/' \
+ fuse/Makefile.am
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable fuse) \
+ $(use_enable lz4) \
+ $(use_with selinux) \
+ $(use_with uuid)
+}
diff --git a/sys-fs/erofs-utils/erofs-utils-9999.ebuild b/sys-fs/erofs-utils/erofs-utils-9999.ebuild
new file mode 100644
index 00000000..1b9df411
--- /dev/null
+++ b/sys-fs/erofs-utils/erofs-utils-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools git-r3
+
+DESCRIPTION="Userspace tools for EROFS images"
+HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
+EGIT_BRANCH="experimental"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS=""
+IUSE="fuse lz4 selinux +uuid"
+
+RDEPEND="
+ fuse? ( sys-fs/fuse:0 )
+ lz4? ( >=app-arch/lz4-1.9 )
+ selinux? ( sys-libs/libselinux )
+ uuid? ( sys-apps/util-linux )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable fuse) \
+ $(use_enable lz4) \
+ $(use_with selinux) \
+ $(use_with uuid)
+}
diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
new file mode 100644
index 00000000..689e485d
--- /dev/null
+++ b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
@@ -0,0 +1,61 @@
+From ac0d13efa1fe673e677343cda4795d820500da6b Mon Sep 17 00:00:00 2001
+From: Gao Xiang <hsiangkao@aol.com>
+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 <nl6720@gmail.com>
+Signed-off-by: Gao Xiang <hsiangkao@aol.com>
+---
+ 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/sys-fs/erofs-utils/metadata.xml b/sys-fs/erofs-utils/metadata.xml
index e4bdaaa4..277295be 100644
--- a/sys-fs/erofs-utils/metadata.xml
+++ b/sys-fs/erofs-utils/metadata.xml
@@ -32,5 +32,6 @@
</longdescription>
<use>
<flag name="uuid">Allow interaction with libuuid in sys-apps/util-linux. It's recommended turn on</flag>
+ <flag name="fuse">Enable support for Filesystem in Userspace via sys-fs/fuse</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/erofs-utils/files/, sys-fs/erofs-utils/
@ 2021-04-25 17:05 Denis Reva
0 siblings, 0 replies; 2+ messages in thread
From: Denis Reva @ 2021-04-25 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 0dbc2a5b649d09b30324b7c8718ef7613e344947
Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Sun Apr 25 17:04:43 2021 +0000
Commit: Denis Reva <denis7774 <AT> gmail <DOT> com>
CommitDate: Sun Apr 25 17:04:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0dbc2a5b
sys-fs/erofs-utils: remove obsoleted versions
Attempt to fix
https://bugs.gentoo.org/781623
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
sys-fs/erofs-utils/Manifest | 2 -
sys-fs/erofs-utils/erofs-utils-1.1.ebuild | 33 ------------
sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild | 7 ++-
sys-fs/erofs-utils/erofs-utils-1.2.ebuild | 45 ----------------
.../files/erofs-utils-1.2-no-common.patch | 61 ----------------------
.../files/erofs-utils-1.2.1-no-Werror.patch | 13 +++++
6 files changed, 19 insertions(+), 142 deletions(-)
diff --git a/sys-fs/erofs-utils/Manifest b/sys-fs/erofs-utils/Manifest
index 99547f2a2..1ce3db33d 100644
--- a/sys-fs/erofs-utils/Manifest
+++ b/sys-fs/erofs-utils/Manifest
@@ -1,3 +1 @@
-DIST erofs-utils-1.1.tar.gz 46133 BLAKE2B 24a2f16059e39bd65203f4a28721b8aad70599d6201ead02c291234de631bd3def1c403fa8b50b6dce4af3eea2768b912c4f56ad20c3c26db3853ba3174775ac SHA512 f300b536f0ba91a05a7eb3dc9a9ec402c98966ad7c0e1f2f664a650caaffce6c4433722374418c6d03e69ce2e74785e55f9bcc45e6717a8bc67e5352e450806b
DIST erofs-utils-1.2.1.tar.gz 61218 BLAKE2B 787d3c549020bf44d750ef1af8878c452683579ff545ed0a6b03a24fb5e5f559dad8dd1d00664598b7d42ec6f9d69800b087d0dcb0de147b51696b416903d712 SHA512 1b0fae6f1d7a5ee01f65e71e389c474d596be8800087beb063bfbda471c54d76f9d3f08da645cecb613b637044ff3f6b19d3c8647425261cec1646c87ad57802
-DIST erofs-utils-1.2.tar.gz 60991 BLAKE2B 08b9bea397f52d158a40f095811853315a3b553618f380d1ece012c813d708c2331b2a445bb59c4b86d81edab33c834e37aeb0aeeb9acb157b7aebed309cb591 SHA512 167311beb2d4722436051956076d670f6a54da72e1690d19d43e0c46dd972f9f61427b4792b469813a6a4ff2e3c445646cf063d37b4ee2b52f88eb14e7bf2713
diff --git a/sys-fs/erofs-utils/erofs-utils-1.1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.1.ebuild
deleted file mode 100644
index 5f029f22a..000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS images"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="lz4 +uuid"
-
-RDEPEND="
- lz4? ( >=app-arch/lz4-1.9 )
- uuid? ( sys-apps/util-linux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable lz4) \
- $(use_with uuid)
-}
diff --git a/sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild b/sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild
index 8441f7d88..678098001 100644
--- a/sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild
+++ b/sys-fs/erofs-utils/erofs-utils-1.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools
+inherit autotools flag-o-matic
DESCRIPTION="Userspace tools for EROFS images"
HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
@@ -23,12 +23,17 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ ${FILESDIR}/erofs-utils-1.2.1-no-Werror.patch
+)
+
src_prepare() {
default
eautoreconf
}
src_configure() {
+ append-flags "-Wno-error"
econf \
$(use_enable fuse) \
$(use_enable lz4) \
diff --git a/sys-fs/erofs-utils/erofs-utils-1.2.ebuild b/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
deleted file mode 100644
index 96d5cb85b..000000000
--- a/sys-fs/erofs-utils/erofs-utils-1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Userspace tools for EROFS images"
-HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="fuse lz4 selinux +uuid"
-
-RDEPEND="
- fuse? ( sys-fs/fuse:0 )
- lz4? ( >=app-arch/lz4-1.9 )
- selinux? ( sys-libs/libselinux )
- uuid? ( sys-apps/util-linux )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-no-common.patch"
-)
-
-src_prepare() {
- default
- use fuse && use selinux && sed -i \
- -e 's/.*CFLAGS}.*/& ${libselinux_CFLAGS}/' \
- -e 's/.*LIBS}.*/& ${libselinux_LIBS}/' \
- fuse/Makefile.am
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable fuse) \
- $(use_enable lz4) \
- $(use_with selinux) \
- $(use_with uuid)
-}
diff --git a/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch b/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
deleted file mode 100644
index 689e485d7..000000000
--- a/sys-fs/erofs-utils/files/erofs-utils-1.2-no-common.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ac0d13efa1fe673e677343cda4795d820500da6b Mon Sep 17 00:00:00 2001
-From: Gao Xiang <hsiangkao@aol.com>
-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 <nl6720@gmail.com>
-Signed-off-by: Gao Xiang <hsiangkao@aol.com>
----
- 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/sys-fs/erofs-utils/files/erofs-utils-1.2.1-no-Werror.patch b/sys-fs/erofs-utils/files/erofs-utils-1.2.1-no-Werror.patch
new file mode 100644
index 000000000..90b004501
--- /dev/null
+++ b/sys-fs/erofs-utils/files/erofs-utils-1.2.1-no-Werror.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 28926c3..6be002b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,7 +11,7 @@ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR(config)
+-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
++AM_INIT_AUTOMAKE([foreign -Wall])
+
+ # Checks for programs.
+ AM_PROG_AR
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-25 17:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-25 17:05 [gentoo-commits] repo/proj/guru:dev commit in: sys-fs/erofs-utils/files/, sys-fs/erofs-utils/ Denis Reva
-- strict thread matches above, loose matches on Subject: below --
2020-12-11 4:48 Denis Reva
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox