From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 15 Aug 2022 17:17:46 +0000 (+0000)
Subject: hdparm: Fix build with glibc 2.36
X-Git-Tag: v2.27-core171~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fac5f144bb6fca3058ecfdf98b183e76c499c795;p=ipfire-2.x.git

hdparm: Fix build with glibc 2.36

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/hdparm b/lfs/hdparm
index 704317a6a8..8d3f6d1cf3 100644
--- a/lfs/hdparm
+++ b/lfs/hdparm
@@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hdparm-9.64-fix-glibc-headers.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/src/patches/hdparm-9.64-fix-glibc-headers.patch b/src/patches/hdparm-9.64-fix-glibc-headers.patch
new file mode 100644
index 0000000000..7589c861e9
--- /dev/null
+++ b/src/patches/hdparm-9.64-fix-glibc-headers.patch
@@ -0,0 +1,11 @@
+--- hdparm-9.64/hdparm.c
++++ hdparm-9.64/hdparm.c
+@@ -24,9 +24,6 @@
+ #include <sys/mount.h>
+ #include <sys/mman.h>
+ #include <sys/user.h>
+-#include <linux/types.h>
+-#include <linux/fs.h>
+-#include <linux/major.h>
+ #include <endian.h>
+ #include <asm/byteorder.h>