Skip to contentSkip to conversation

package/erofs-utils: new package

PATCH New Gao Xiang 2 participants 9 messages Mar 16, 2020 – Mar 20, 2020 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Gao Xiang

author
#1 lore raw

PATCH v2 1/2 package/erofs-utils: new package

This patch adds EROFS userspace tool erofs-utils to buildroot, which can be used to generate EROFS images.

---

Changes since v1:
- use upper-case name EROFS, except all config items because it seems other filesystem names are all in low-case.

Hi,

EROFS filesystem [1] [2] has been included in linux 5.4 formally and it has been enabled as a module in openSUSE, Debian, Ubuntu and Fedora as well.

This patchset enables alternative EROFS support for buildroot and I think it will be useful for such embedded devices which need better dynamic performance with moderate compressed rootfs.

[1] https://static.sched.com/hosted_files/kccncosschn19chi/ce/EROFS%20file%20system_OSS2019_Final.pdf
[2] https://www.usenix.org/system/files/atc19-gao.pdf

Thanks,
Gao Xiang

 package/Config.in                             |  1 +
 package/Config.in.host                        |  1 +
 .../0001-erofs-utils-fix-configure.ac.patch   | 33 +++++++++++
 ...d-_LARGEFILE64_SOURCE-and-_GNU_SOURC.patch | 58 +++++++++++++++++++
 package/erofs-utils/Config.in                 | 16 +++++
 package/erofs-utils/Config.in.host            |  6 ++
 package/erofs-utils/erofs-utils.hash          |  3 +
 package/erofs-utils/erofs-utils.mk            | 22 +++++++
 8 files changed, 140 insertions(+)
 create mode 100644 package/erofs-utils/0001-erofs-utils-fix-configure.ac.patch
 create mode 100644 package/erofs-utils/0002-erofs-utils-avoid-_LARGEFILE64_SOURCE-and-_GNU_SOURC.patch
 create mode 100644 package/erofs-utils/Config.in
 create mode 100644 package/erofs-utils/Config.in.host
 create mode 100644 package/erofs-utils/erofs-utils.hash
 create mode 100644 package/erofs-utils/erofs-utils.mk
package/Config.in +1 -0
index 146fc1bbc3..3aeb32a5de 100644
@@ -196,6 +196,7 @@ menu "Filesystem and flash utilities"
 	source "package/e2fsprogs/Config.in"
 	source "package/e2tools/Config.in"
 	source "package/ecryptfs-utils/Config.in"
+	source "package/erofs-utils/Config.in"
 	source "package/exfat/Config.in"
 	source "package/exfat-utils/Config.in"
 	source "package/f2fs-tools/Config.in"
package/Config.in.host +1 -0
index dfea478868..64a88f7630 100644
@@ -18,6 +18,7 @@ menu "Host utilities"
 	source "package/dtc/Config.in.host"
 	source "package/e2fsprogs/Config.in.host"
 	source "package/e2tools/Config.in.host"
+	source "package/erofs-utils/Config.in.host"
 	source "package/eudev/Config.in.host"
 	source "package/f2fs-tools/Config.in.host"
 	source "package/faketime/Config.in.host"
package/erofs-utils/0001-erofs-utils-fix-configure.ac.patch new file +33 -0
new file mode 100644
index 0000000000..7ced565995
@@ -0,0 +1,33 @@
+From eefd95b37e1042992cb07bec1ac3f6dbe199d8f0 Mon Sep 17 00:00:00 2001
+From: Haruue Icymoon <[email protected]>
+Date: Fri, 22 Nov 2019 16:58:59 +0800
+Subject: [PATCH] erofs-utils: fix configure.ac
+
+./configure will fail when --with-lz4-libdir is not set, since
+$with_lz4_libdir will be an empty string and generate an empty -L
+into LDFLAGS. This patch fixes it.
+
+Link: https://lore.kernel.org/r/20191122085859.GA2414688 at usamimi.host.haruue.net
+Signed-off-by: Haruue Icymoon <[email protected]>
+Fixes: d51c2d043773 ("erofs-utils: introduce lz4/lz4hc compression algorithm")
+Signed-off-by: Gao Xiang <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f925358..870dfb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -174,7 +174,7 @@ if test "x$enable_lz4" = "xyes"; then
+ 
+   if test "x${have_lz4h}" = "xyes" ; then
+     saved_LDFLAGS=${LDFLAGS}
+-    LDFLAGS="-L$with_lz4_libdir ${LDFLAGS}"
++    test -z "${with_lz4_libdir}" || LDFLAGS="-L$with_lz4_libdir ${LDFLAGS}"
+     AC_CHECK_LIB(lz4, LZ4_compress_destSize, [
+       have_lz4="yes"
+       have_lz4hc="yes"
+-- 
+2.20.1
+
package/erofs-utils/0002-erofs-utils-avoid-_LARGEFILE64_SOURCE-and-_GNU_SOURC.patch new file +58 -0

58 lines not on this page · raw message

package/erofs-utils/Config.in new file +16 -0
new file mode 100644
index 0000000000..75bcbdaae2
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_EROFS_UTILS
+	bool "erofs-utils"
+	help
+	  Userspace utilities for EROFS filesystem
+
+	  https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
+
+if BR2_PACKAGE_EROFS_UTILS
+
+config BR2_PACKAGE_EROFS_UTILS_LZ4
+	bool "lz4 support"
+	select BR2_PACKAGE_LZ4
+	help
+	  Support LZ4 compression algorithm
+
+endif
package/erofs-utils/Config.in.host new file +6 -0
new file mode 100644
index 0000000000..31ea6eb2ea
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_EROFS_UTILS
+	bool "host erofs-utils"
+	help
+	  Userspace utilities for EROFS filesystem
+
+	  https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
package/erofs-utils/erofs-utils.hash new file +3 -0
new file mode 100644
index 0000000000..45d4883a01
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 508ee818dc6a02cf986647e37cb991b76f7b3e7ea303ffc9e980772de68f3b10  erofs-utils-1.0.tar.gz
+sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713  COPYING
package/erofs-utils/erofs-utils.mk new file +22 -0
new file mode 100644
index 0000000000..3f28547e8e
@@ -0,0 +1,22 @@
+################################################################################
+#
+# erofs-utils
+#
+################################################################################
+
+EROFS_UTILS_VERSION = 1.0
+EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot
+EROFS_UTILS_AUTORECONF = YES
+EROFS_UTILS_LICENSE = GPL-2.0+
+EROFS_UTILS_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y)
+EROFS_UTILS_DEPENDENCIES += lz4
+else
+EROFS_UTILS_CONF_OPTS += --disable-lz4
+endif
+
+HOST_EROFS_UTILS_DEPENDENCIES = host-lz4
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 1 line
2.20.1
author
#2 lore raw

PATCH v2 2/2 fs/erofs: add support for creating EROFS rootfs image

This patch makes possible to create rootfs image using EROFS filesystem.

---
 fs/Config.in       |  1 +
 fs/erofs/Config.in | 24 ++++++++++++++++++++++++
 fs/erofs/erofs.mk  | 17 +++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 fs/erofs/Config.in
 create mode 100644 fs/erofs/erofs.mk
fs/Config.in +1 -0
index 527051ef54..37a2aa21f8 100644
@@ -5,6 +5,7 @@ source "fs/btrfs/Config.in"
 source "fs/cloop/Config.in"
 source "fs/cpio/Config.in"
 source "fs/cramfs/Config.in"
+source "fs/erofs/Config.in"
 source "fs/ext2/Config.in"
 source "fs/f2fs/Config.in"
 source "fs/initramfs/Config.in"
fs/erofs/Config.in new file +24 -0
new file mode 100644
index 0000000000..dad2498a15
@@ -0,0 +1,24 @@
+config BR2_TARGET_ROOTFS_EROFS
+	bool "erofs root filesystem"
+	select BR2_PACKAGE_HOST_EROFS_UTILS
+	help
+	  Build a EROFS root filesystem. If you enable this option,
+	  you probably want to enable the erofs-utils package too.
+
+if BR2_TARGET_ROOTFS_EROFS
+
+choice
+	prompt "Compression algorithm"
+	default BR2_TARGET_ROOTFS_EROFS_LZ4HC
+	help
+	  Select the primary compression algorithm to use when
+	  generating EROFS filesystem image.
+
+config BR2_TARGET_ROOTFS_EROFS_NONE
+	bool "none"
+
+config BR2_TARGET_ROOTFS_EROFS_LZ4HC
+	bool "lz4hc"
+
+endchoice
+endif # BR2_TARGET_ROOTFS_EROFS
fs/erofs/erofs.mk new file +17 -0
new file mode 100644
index 0000000000..58559d4833
@@ -0,0 +1,17 @@
+################################################################################
+#
+# Build the EROFS root filesystem image
+#
+################################################################################
+
+ROOTFS_EROFS_DEPENDENCIES = host-erofs-utils
+
+ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y)
+ROOTFS_EROFS_ARGS += -zlz4hc
+endif
+
+define ROOTFS_EROFS_CMD
+	$(HOST_DIR)/bin/mkfs.erofs $(ROOTFS_EROFS_ARGS) $@ $(TARGET_DIR)
+endef
+
+$(eval $(rootfs))
Signature · 1 line
2.20.1
#3 lore raw

PATCH v2 2/2 fs/erofs: add support for creating EROFS rootfs image

Gao, All,

On 2020-03-16 09:58 +0800, Gao Xiang spake thusly:

Quoted 5 lines

This patch makes possible to create rootfs image using EROFS filesystem.

---

[--SNIP--]

fs/erofs/Config.in line 6

Quoted 12 lines
fs/erofs/Config.in new file +6 -0
new file mode 100644
index 0000000000..dad2498a15
@@ -0,0 +1,24 @@
+config BR2_TARGET_ROOTFS_EROFS
+	bool "erofs root filesystem"
+	select BR2_PACKAGE_HOST_EROFS_UTILS
+	help
+	  Build a EROFS root filesystem. If you enable this option,
+	  you probably want to enable the erofs-utils package too.

Since erofs is a read-only filesystem, and since erofs-utils only provide an mkfs tool, I don't see how erofs-utils would be useful on the target. So I've dropped that part from the help text.

Quoted 4 lines
fs/erofs/Config.in new file +4 -0
+if BR2_TARGET_ROOTFS_EROFS
+
+choice
+	prompt "Compression algorithm"

fs/erofs/Config.in line 21

Quoted 10 lines
fs/erofs/Config.in new file +10 -0
+	default BR2_TARGET_ROOTFS_EROFS_LZ4HC
+	help
+	  Select the primary compression algorithm to use when
+	  generating EROFS filesystem image.
+
+config BR2_TARGET_ROOTFS_EROFS_NONE
+	bool "none"
+
+config BR2_TARGET_ROOTFS_EROFS_LZ4HC
+	bool "lz4hc"

Do you envision adding other compression schemes? As far as I can see, the erofs-utils as well as the linux driver only ever supports lz4 (and I think you are well aware of that ;-) ).

I know the other filesystems (squashfs, jffs2...) have a choice about the compression method, but for those ther are two or more such possibilities, so it makes sense they have a choice. For erofs, not so much.

As such, I have dropped the choice altogether, and just kept the single boolean to enable compression.

Applied to master with the above changes. Thanks!

Regards,
Yann E. MORIN.

Quoted 32 lines
fs/erofs/Config.in new file +2 -0
+endchoice
+endif # BR2_TARGET_ROOTFS_EROFS
fs/erofs/erofs.mk new file +17 -0
new file mode 100644
index 0000000000..58559d4833
@@ -0,0 +1,17 @@
+################################################################################
+#
+# Build the EROFS root filesystem image
+#
+################################################################################
+
+ROOTFS_EROFS_DEPENDENCIES = host-erofs-utils
+
+ifeq ($(BR2_TARGET_ROOTFS_EROFS_LZ4HC),y)
+ROOTFS_EROFS_ARGS += -zlz4hc
+endif
+
+define ROOTFS_EROFS_CMD
+	$(HOST_DIR)/bin/mkfs.erofs $(ROOTFS_EROFS_ARGS) $@ $(TARGET_DIR)
+endef
+
+$(eval $(rootfs))
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#4 lore raw

PATCH v2 2/2 fs/erofs: add support for creating EROFS rootfs image

Hi Yann,

Quoted 9 lines · Yann E. MORIN

Gao, All,

On 2020-03-16 09:58 +0800, Gao Xiang spake thusly:

Quoted 5 lines

This patch makes possible to create rootfs image using EROFS filesystem.

---

[--SNIP--]

Quoted 16 lines

fs/erofs/Config.in line 6

Quoted 12 lines
fs/erofs/Config.in new file +6 -0
new file mode 100644
index 0000000000..dad2498a15
@@ -0,0 +1,24 @@
+config BR2_TARGET_ROOTFS_EROFS
+	bool "erofs root filesystem"
+	select BR2_PACKAGE_HOST_EROFS_UTILS
+	help
+	  Build a EROFS root filesystem. If you enable this option,
+	  you probably want to enable the erofs-utils package too.

Since erofs is a read-only filesystem, and since erofs-utils only provide an mkfs tool, I don't see how erofs-utils would be useful on the target. So I've dropped that part from the help text.

Currently I agree with you. So that's fine. :)

Quoted 11 lines
Quoted 11 lines
fs/erofs/Config.in new file +10 -0
+if BR2_TARGET_ROOTFS_EROFS
+
+choice
+	prompt "Compression algorithm"
+	default BR2_TARGET_ROOTFS_EROFS_LZ4HC
+	help
+	  Select the primary compression algorithm to use when
+	  generating EROFS filesystem image.
+
+config BR2_TARGET_ROOTFS_EROFS_NONE
Quoted 8 lines

fs/erofs/Config.in line 21

Quoted 4 lines
fs/erofs/Config.in new file +4 -0
+	bool "none"
+
+config BR2_TARGET_ROOTFS_EROFS_LZ4HC
+	bool "lz4hc"

Do you envision adding other compression schemes? As far as I can see, the erofs-utils as well as the linux driver only ever supports lz4 (and I think you are well aware of that ;-) ).

I have been still working on support LZMA algorithm (a lot of work to achieve LZMA fixed-sized output compression) in my spare time.

Quoted 8 lines

I know the other filesystems (squashfs, jffs2...) have a choice about the compression method, but for those ther are two or more such possibilities, so it makes sense they have a choice. For erofs, not so much.

As such, I have dropped the choice altogether, and just kept the single boolean to enable compression.

Currently, I'm fine with that as well. After LZMA algorithm is ready upstream, I could submit another patch then.

Quoted 2 lines

Applied to master with the above changes. Thanks!

Thank you very much!

Thanks,
Gao Xiang

Quoted 4 lines

Regards,
Yann E. MORIN.

#5 lore raw

PATCH v2 2/2 fs/erofs: add support for creating EROFS rootfs image

Gao, All,

On 2020-03-20 15:13 +0800, Gao Xiang spake thusly:

Quoted 1 line · Yann E. MORIN

[--SNIP--]

Quoted 8 lines
Quoted 6 lines

I know the other filesystems (squashfs, jffs2...) have a choice about the compression method, but for those ther are two or more such possibilities, so it makes sense they have a choice. For erofs, not so much.
As such, I have dropped the choice altogether, and just kept the single boolean to enable compression.

Currently, I'm fine with that as well. After LZMA algorithm is ready upstream, I could submit another patch then.

Yes, the choice can then be reinstated, and that would even not break existing configurations.

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#6 lore raw

PATCH v2 1/2 package/erofs-utils: new package

In reply to Gao Xiang

Gao, All,

On 2020-03-16 09:58 +0800, Gao Xiang spake thusly:

Quoted 4 lines

This patch adds EROFS userspace tool erofs-utils to buildroot, which can be used to generate EROFS images.

Applied to master, with the following fixes:

- add explicit --enable-lz4
- explain why autoreconf
- add DEVELOPPER entry

Thanks!

Regards,
Yann E. MORIN.

Quoted 244 lines

---

Changes since v1:
- use upper-case name EROFS, except all config items because it seems other filesystem names are all in low-case.

Hi,

EROFS filesystem [1] [2] has been included in linux 5.4 formally and it has been enabled as a module in openSUSE, Debian, Ubuntu and Fedora as well.

This patchset enables alternative EROFS support for buildroot and I think it will be useful for such embedded devices which need better dynamic performance with moderate compressed rootfs.

[1] https://static.sched.com/hosted_files/kccncosschn19chi/ce/EROFS%20file%20system_OSS2019_Final.pdf
[2] https://www.usenix.org/system/files/atc19-gao.pdf

Thanks,
Gao Xiang

 package/Config.in                             |  1 +
 package/Config.in.host                        |  1 +
 .../0001-erofs-utils-fix-configure.ac.patch   | 33 +++++++++++
 ...d-_LARGEFILE64_SOURCE-and-_GNU_SOURC.patch | 58 +++++++++++++++++++
 package/erofs-utils/Config.in                 | 16 +++++
 package/erofs-utils/Config.in.host            |  6 ++
 package/erofs-utils/erofs-utils.hash          |  3 +
 package/erofs-utils/erofs-utils.mk            | 22 +++++++
 8 files changed, 140 insertions(+)
 create mode 100644 package/erofs-utils/0001-erofs-utils-fix-configure.ac.patch
 create mode 100644 package/erofs-utils/0002-erofs-utils-avoid-_LARGEFILE64_SOURCE-and-_GNU_SOURC.patch
 create mode 100644 package/erofs-utils/Config.in
 create mode 100644 package/erofs-utils/Config.in.host
 create mode 100644 package/erofs-utils/erofs-utils.hash
 create mode 100644 package/erofs-utils/erofs-utils.mk
package/Config.in +1 -0
index 146fc1bbc3..3aeb32a5de 100644
@@ -196,6 +196,7 @@ menu "Filesystem and flash utilities"
 	source "package/e2fsprogs/Config.in"
 	source "package/e2tools/Config.in"
 	source "package/ecryptfs-utils/Config.in"
+	source "package/erofs-utils/Config.in"
 	source "package/exfat/Config.in"
 	source "package/exfat-utils/Config.in"
 	source "package/f2fs-tools/Config.in"
package/Config.in.host +1 -0
index dfea478868..64a88f7630 100644
@@ -18,6 +18,7 @@ menu "Host utilities"
 	source "package/dtc/Config.in.host"
 	source "package/e2fsprogs/Config.in.host"
 	source "package/e2tools/Config.in.host"
+	source "package/erofs-utils/Config.in.host"
 	source "package/eudev/Config.in.host"
 	source "package/f2fs-tools/Config.in.host"
 	source "package/faketime/Config.in.host"
package/erofs-utils/0001-erofs-utils-fix-configure.ac.patch new file +33 -0
new file mode 100644
index 0000000000..7ced565995
@@ -0,0 +1,33 @@
+From eefd95b37e1042992cb07bec1ac3f6dbe199d8f0 Mon Sep 17 00:00:00 2001
+From: Haruue Icymoon <[email protected]>
+Date: Fri, 22 Nov 2019 16:58:59 +0800
+Subject: [PATCH] erofs-utils: fix configure.ac
+
+./configure will fail when --with-lz4-libdir is not set, since
+$with_lz4_libdir will be an empty string and generate an empty -L
+into LDFLAGS. This patch fixes it.
+
+Link: https://lore.kernel.org/r/20191122085859.GA2414688 at usamimi.host.haruue.net
+Signed-off-by: Haruue Icymoon <[email protected]>
+Fixes: d51c2d043773 ("erofs-utils: introduce lz4/lz4hc compression algorithm")
+Signed-off-by: Gao Xiang <[email protected]>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index f925358..870dfb9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -174,7 +174,7 @@ if test "x$enable_lz4" = "xyes"; then
+ 
+   if test "x${have_lz4h}" = "xyes" ; then
+     saved_LDFLAGS=${LDFLAGS}
+-    LDFLAGS="-L$with_lz4_libdir ${LDFLAGS}"
++    test -z "${with_lz4_libdir}" || LDFLAGS="-L$with_lz4_libdir ${LDFLAGS}"
+     AC_CHECK_LIB(lz4, LZ4_compress_destSize, [
+       have_lz4="yes"
+       have_lz4hc="yes"
+-- 
+2.20.1
+
package/erofs-utils/0002-erofs-utils-avoid-_LARGEFILE64_SOURCE-and-_GNU_SOURC.patch new file +58 -0
new file mode 100644
index 0000000000..0b6ecab71b
@@ -0,0 +1,58 @@
+From 41d6c984699f30c11e8c92550239bbe5a3e5ada1 Mon Sep 17 00:00:00 2001
+From: Gao Xiang <[email protected]>
+Date: Sat, 14 Mar 2020 17:05:37 +0800
+Subject: [PATCH] erofs-utils: avoid _LARGEFILE64_SOURCE and _GNU_SOURCE
+ redefinition
+
+This patch can be used to resolve the following build errors:
+
+compress.c:10: error: "_LARGEFILE64_SOURCE" redefined [-Werror]
+ #define _LARGEFILE64_SOURCE
+
+<command-line>: note: this is the location of the previous definition
+
+io.c:9: error: "_LARGEFILE64_SOURCE" redefined [-Werror]
+ #define _LARGEFILE64_SOURCE
+
+<command-line>: note: this is the location of the previous definition
+
+Signed-off-by: Gao Xiang <[email protected]>
+---
+ lib/compress.c | 2 ++
+ lib/io.c       | 4 ++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/lib/compress.c b/lib/compress.c
+index 8337487..b14ff17 100644
+--- a/lib/compress.c
++++ b/lib/compress.c
+@@ -7,7 +7,9 @@
+  * Created by Miao Xie <[email protected]>
+  * with heavy changes by Gao Xiang <[email protected]>
+  */
++#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
++#endif
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+diff --git a/lib/io.c b/lib/io.c
+index 52f9424..5b998d8 100644
+--- a/lib/io.c
++++ b/lib/io.c
+@@ -6,8 +6,12 @@
+  *             http://www.huawei.com/
+  * Created by Li Guifu <[email protected]>
+  */
++#ifndef _LARGEFILE64_SOURCE
+ #define _LARGEFILE64_SOURCE
++#endif
++#ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
++#endif
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include "erofs/io.h"
+-- 
+2.20.1
+
package/erofs-utils/Config.in new file +16 -0
new file mode 100644
index 0000000000..75bcbdaae2
@@ -0,0 +1,16 @@
+config BR2_PACKAGE_EROFS_UTILS
+	bool "erofs-utils"
+	help
+	  Userspace utilities for EROFS filesystem
+
+	  https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
+
+if BR2_PACKAGE_EROFS_UTILS
+
+config BR2_PACKAGE_EROFS_UTILS_LZ4
+	bool "lz4 support"
+	select BR2_PACKAGE_LZ4
+	help
+	  Support LZ4 compression algorithm
+
+endif
package/erofs-utils/Config.in.host new file +6 -0
new file mode 100644
index 0000000000..31ea6eb2ea
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HOST_EROFS_UTILS
+	bool "host erofs-utils"
+	help
+	  Userspace utilities for EROFS filesystem
+
+	  https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git
package/erofs-utils/erofs-utils.hash new file +3 -0
new file mode 100644
index 0000000000..45d4883a01
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 508ee818dc6a02cf986647e37cb991b76f7b3e7ea303ffc9e980772de68f3b10  erofs-utils-1.0.tar.gz
+sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713  COPYING
package/erofs-utils/erofs-utils.mk new file +22 -0
new file mode 100644
index 0000000000..3f28547e8e
@@ -0,0 +1,22 @@
+################################################################################
+#
+# erofs-utils
+#
+################################################################################
+
+EROFS_UTILS_VERSION = 1.0
+EROFS_UTILS_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot
+EROFS_UTILS_AUTORECONF = YES
+EROFS_UTILS_LICENSE = GPL-2.0+
+EROFS_UTILS_LICENSE_FILES = COPYING
+
+ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y)
+EROFS_UTILS_DEPENDENCIES += lz4
+else
+EROFS_UTILS_CONF_OPTS += --disable-lz4
+endif
+
+HOST_EROFS_UTILS_DEPENDENCIES = host-lz4
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#7 lore raw

PATCH v2 1/2 package/erofs-utils: new package

Hi Yann,

Quoted 8 lines · Yann E. MORIN

Gao, All,

On 2020-03-16 09:58 +0800, Gao Xiang spake thusly:

Quoted 4 lines

This patch adds EROFS userspace tool erofs-utils to buildroot, which can be used to generate EROFS images.

Quoted 7 lines

Applied to master, with the following fixes:

- add explicit --enable-lz4
- explain why autoreconf
- add DEVELOPPER entry

Thanks!

Thanks for taking time & your help on this patch, it looks good to me. :)

And if possible, could you also kindly consider [PATCH v2 2/2]?

I have been verified this series by booting up generated rootfs images with no unexpected behavior, kindly let me know if something else needed.

Thanks,
Gao Xiang

#8 lore raw

PATCH v2 1/2 package/erofs-utils: new package

Gao, All,

On 2020-03-19 21:25 +0800, Gao Xiang spake thusly:

Quoted 11 lines · Yann E. MORIN
Quoted 10 lines

Gao, All,

On 2020-03-16 09:58 +0800, Gao Xiang spake thusly:

Quoted 4 lines

This patch adds EROFS userspace tool erofs-utils to buildroot, which can be used to generate EROFS images.

Applied to master, with the following fixes:

Quoted 8 lines
Quoted 5 lines

- add explicit --enable-lz4
- explain why autoreconf
- add DEVELOPPER entry

Thanks!

Thanks for taking time & your help on this patch, it looks good to me. :)

No problem, thanks for the patch.

Quoted 1 line

And if possible, could you also kindly consider [PATCH v2 2/2]?

I just ran out of time yesterday to look at it. I'ts still on my tablets to handle it.

One thing that would be nice, is to have a runtime test for it, like we have for the other filesystems:
support/testing/tests/fs/

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author
#9 lore raw

PATCH v2 1/2 package/erofs-utils: new package

Quoted 23 lines · Yann E. MORIN

Gao, All,

On 2020-03-19 21:25 +0800, Gao Xiang spake thusly:

Quoted 11 lines · Yann E. MORIN
Quoted 10 lines

Gao, All,

On 2020-03-16 09:58 +0800, Gao Xiang spake thusly:

Quoted 4 lines

This patch adds EROFS userspace tool erofs-utils to buildroot, which can be used to generate EROFS images.

Applied to master, with the following fixes:

Quoted 8 lines
Quoted 5 lines

- add explicit --enable-lz4
- explain why autoreconf
- add DEVELOPPER entry

Thanks!

Thanks for taking time & your help on this patch, it looks good to me. :)

Quoted 6 lines

No problem, thanks for the patch.

Quoted 1 line

And if possible, could you also kindly consider [PATCH v2 2/2]?

I just ran out of time yesterday to look at it. I'ts still on my tablets to handle it.

That's fine :)

Quoted 4 lines

One thing that would be nice, is to have a runtime test for it, like we have for the other filesystems:
support/testing/tests/fs/

Okay, I will try to write some script later in my free time.

Thanks,
Gao Xiang

Quoted 15 lines

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot