[PATCH] build_patches: backport make-ext4fs updates

[Johannes Kimmel]

These patches are needed to be able to build openwrt on systems running
musl libc.

Signed-off-by: Johannes Kimmel <fff at bareminimum.eu>
---
 ...-update-to-HEAD-of-2017-05-29-eebda1.patch | 39 ++++++++++++++
 ..._ext4fs-Update-to-version-2020-01-05.patch | 52 +++++++++++++++++++
 2 files changed, 91 insertions(+)
 create mode 100644 build_patches/openwrt/0015-make-ext4fs-update-to-HEAD-of-2017-05-29-eebda1.patch
 create mode 100644 build_patches/openwrt/0016-make_ext4fs-Update-to-version-2020-01-05.patch

diff --git a/build_patches/openwrt/0015-make-ext4fs-update-to-HEAD-of-2017-05-29-eebda1.patch b/build_patches/openwrt/0015-make-ext4fs-update-to-HEAD-of-2017-05-29-eebda1.patch
new file mode 100644
index 0000000..531737f
--- /dev/null
+++ b/build_patches/openwrt/0015-make-ext4fs-update-to-HEAD-of-2017-05-29-eebda1.patch
@@ -0,0 +1,39 @@
+From ac2f341036c18acee2b4f69e819cffeaacc2e824 Mon Sep 17 00:00:00 2001
+From: Christian Lamparter <chunkeey at gmail.com>
+Date: Sun, 18 Aug 2019 02:37:51 +0200
+Subject: [PATCH 15/16] make-ext4fs: update to HEAD of 2017-05-29 - eebda1
+
+Update make-ext4fs to commit eebda1d55d9701ace2700d7ae461697fadf52d1f
+
+git log --pretty=oneline --abbrev-commit 484903e4..eebda1d5
+
+eebda1d make_ext4: Add strict prototypes.
+bb9cf91 make_ext4fs: Remove off64_t in favor of standard off_t
+
+Created with the help of the make-package-update-commit.sh script.
+
+Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
+---
+ tools/make-ext4fs/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile
+index f67ab6e5b5..03db1917fc 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:=2016-08-14
+-PKG_SOURCE_VERSION:=484903e4332be6c317f531b008cb2a841a18c506
+-PKG_MIRROR_HASH:=d7ccd5e426b1d15331ff000a37dc15161f6eef594453e970fd584fcde5a25075
++PKG_SOURCE_DATE:=2017-05-29
++PKG_SOURCE_VERSION:=eebda1d55d9701ace2700d7ae461697fadf52d1f
++PKG_MIRROR_HASH:=c52e14101d7de89292a0c8b30506839aca3164603a20f8e491e42103083b9d8c
+ 
+ include $(INCLUDE_DIR)/host-build.mk
+ 
+-- 
+2.27.0
+
diff --git a/build_patches/openwrt/0016-make_ext4fs-Update-to-version-2020-01-05.patch b/build_patches/openwrt/0016-make_ext4fs-Update-to-version-2020-01-05.patch
new file mode 100644
index 0000000..a31dcc8
--- /dev/null
+++ b/build_patches/openwrt/0016-make_ext4fs-Update-to-version-2020-01-05.patch
@@ -0,0 +1,52 @@
+From 271d0c825ba5821160e4a516497796fa342c2eff Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke at hauke-m.de>
+Date: Sun, 5 Jan 2020 19:40:37 +0100
+Subject: [PATCH 16/16] make_ext4fs: Update to version 2020-01-05
+
+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>
+---
+ 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.27.0
+
-- 
2.27.0