[PATCH 19.07 2/2] make_ext4fs: Update to version 2020-01-05

Adrian Schmutzler freifunk at adrianschmutzler.de
Thu Jul 23 06:29:56 EDT 2020


From: Hauke Mehrtens <hauke at hauke-m.de>

5c201be Add LDFLAGS when building libsparse.a
ec17045 make_ext4fs: fix build on musl systems

Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
(cherry picked from commit 271d0c825ba5821160e4a516497796fa342c2eff)
---
 tools/make-ext4fs/Makefile                      |  6 +++---
 tools/make-ext4fs/patches/100-add-ldflags.patch | 11 -----------
 2 files changed, 3 insertions(+), 14 deletions(-)
 delete mode 100644 tools/make-ext4fs/patches/100-add-ldflags.patch

diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile
index 03db1917fc..77031cdce3 100644
--- a/tools/make-ext4fs/Makefile
+++ b/tools/make-ext4fs/Makefile
@@ -11,9 +11,9 @@ PKG_NAME:=make-ext4fs
 
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/make_ext4fs.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2017-05-29
-PKG_SOURCE_VERSION:=eebda1d55d9701ace2700d7ae461697fadf52d1f
-PKG_MIRROR_HASH:=c52e14101d7de89292a0c8b30506839aca3164603a20f8e491e42103083b9d8c
+PKG_SOURCE_DATE:=2020-01-05
+PKG_SOURCE_VERSION:=5c201be7d72aff735da27e17c29852e0cefe3e52
+PKG_MIRROR_HASH:=a9b74b7b95acc84a5a5c33d6acf493faad8f161caca3180734d9bd383c9d823f
 
 include $(INCLUDE_DIR)/host-build.mk
 
diff --git a/tools/make-ext4fs/patches/100-add-ldflags.patch b/tools/make-ext4fs/patches/100-add-ldflags.patch
deleted file mode 100644
index d9ce47bb80..0000000000
--- a/tools/make-ext4fs/patches/100-add-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,7 @@ OBJ := \
- 	$(CC) $(CFLAGS) -c -o $@ $^
- 
- make_ext4fs: $(OBJ) libsparse/libsparse.a
--	$(CC) -o $@ $^ $(ZLIB)
-+	$(CC) $(LDFLAGS)-o $@ $^ $(ZLIB)
- 
- libsparse/libsparse.a:
- 	$(MAKE) -C libsparse/ libsparse.a
-- 
2.20.1




More information about the openwrt-devel mailing list