package/erofs-utils: new package
This patch adds EROFS userspace tool erofs-utils to buildroot, which can be used to generate EROFS images. Signed-off-by: Gao Xiang <hsiangkao@aol.com> [yann.morin.1998@free.fr: - add explicit --enable-lz4 - explain why autoreconf - add DEVELOPPER entry ] Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
parent
d81b4433de
commit
359a334e91
|
@ -980,6 +980,9 @@ F: package/qt5/qt5webengine/
|
|||
F: package/qt5/qt5webkit/
|
||||
F: package/qt5/qt5webkit-examples/
|
||||
|
||||
N: Gao Xiang <hsiangkao@aol.com>
|
||||
F: package/erofs-utils/
|
||||
|
||||
N: Gary Bisson <bisson.gary@gmail.com>
|
||||
F: board/boundarydevices/
|
||||
F: configs/nitrogen*
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
33
package/erofs-utils/0001-erofs-utils-fix-configure.ac.patch
Normal file
33
package/erofs-utils/0001-erofs-utils-fix-configure.ac.patch
Normal file
|
@ -0,0 +1,33 @@
|
|||
From eefd95b37e1042992cb07bec1ac3f6dbe199d8f0 Mon Sep 17 00:00:00 2001
|
||||
From: Haruue Icymoon <i@haruue.moe>
|
||||
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@usamimi.host.haruue.net
|
||||
Signed-off-by: Haruue Icymoon <i@haruue.moe>
|
||||
Fixes: d51c2d043773 ("erofs-utils: introduce lz4/lz4hc compression algorithm")
|
||||
Signed-off-by: Gao Xiang <gaoxiang25@huawei.com>
|
||||
---
|
||||
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
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
From 41d6c984699f30c11e8c92550239bbe5a3e5ada1 Mon Sep 17 00:00:00 2001
|
||||
From: Gao Xiang <gaoxiang25@huawei.com>
|
||||
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 <gaoxiang25@huawei.com>
|
||||
---
|
||||
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 <miaoxie@huawei.com>
|
||||
* with heavy changes by Gao Xiang <gaoxiang25@huawei.com>
|
||||
*/
|
||||
+#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 <bluce.liguifu@huawei.com>
|
||||
*/
|
||||
+#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
|
||||
|
16
package/erofs-utils/Config.in
Normal file
16
package/erofs-utils/Config.in
Normal file
|
@ -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
|
6
package/erofs-utils/Config.in.host
Normal file
6
package/erofs-utils/Config.in.host
Normal file
|
@ -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
|
3
package/erofs-utils/erofs-utils.hash
Normal file
3
package/erofs-utils/erofs-utils.hash
Normal file
|
@ -0,0 +1,3 @@
|
|||
# Locally computed
|
||||
sha256 508ee818dc6a02cf986647e37cb991b76f7b3e7ea303ffc9e980772de68f3b10 erofs-utils-1.0.tar.gz
|
||||
sha256 feee3b3157dcdf78d4f50edefbd5dd7adf8b6d52c11bfaaa746a85a373256713 COPYING
|
27
package/erofs-utils/erofs-utils.mk
Normal file
27
package/erofs-utils/erofs-utils.mk
Normal file
|
@ -0,0 +1,27 @@
|
|||
################################################################################
|
||||
#
|
||||
# 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_LICENSE = GPL-2.0+
|
||||
EROFS_UTILS_LICENSE_FILES = COPYING
|
||||
|
||||
# From a git tree: no generated autotools files
|
||||
# Also: 0001-erofs-utils-fix-configure.ac.patch
|
||||
EROFS_UTILS_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EROFS_UTILS_LZ4),y)
|
||||
EROFS_UTILS_DEPENDENCIES += lz4
|
||||
EROFS_UTILS_CONF_OPTS += --enable-lz4
|
||||
else
|
||||
EROFS_UTILS_CONF_OPTS += --disable-lz4
|
||||
endif
|
||||
|
||||
HOST_EROFS_UTILS_DEPENDENCIES = host-lz4
|
||||
HOST_EROFS_UTILS_CONF_OPTS += --enable-lz4
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
Loading…
Reference in a new issue