diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2022-07-29 13:11:49 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-02 11:29:57 +0100 |
| commit | 799074e1912147b94cf876a9652cbbd9c5e35ad2 (patch) | |
| tree | 1464f069f98cfd107ac5323aed3848c0e532b1f8 /meta/recipes-extended | |
| parent | ca1fef4cb33b5f218cd0206002e8776d2f68b12d (diff) | |
| download | openembedded-core-contrib-799074e1912147b94cf876a9652cbbd9c5e35ad2.tar.gz | |
hdparm: Fix build with glibc 2.36
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Diffstat (limited to 'meta/recipes-extended')
| -rw-r--r-- | meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch | 32 | ||||
| -rw-r--r-- | meta/recipes-extended/hdparm/hdparm_9.64.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch b/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch new file mode 100644 index 0000000000..dd88743d1e --- /dev/null +++ b/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch @@ -0,0 +1,32 @@ +From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 29 Jul 2022 13:00:40 -0700 +Subject: [PATCH] hdparm: Remove unused linux/fs.h header + +this helps fixing builds with glibc 2.36 where mount.h conflits now with +kernel mount.h which is included indirectly by linux/fs.h see [1] for +details + +[1] https://sourceware.org/glibc/wiki/Release/2.36 + +Upstream-Status: Submitted [https://sourceforge.net/p/hdparm/patches/52/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + hdparm.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/hdparm.c b/hdparm.c +index fa21e2f..901bdd8 100644 +--- a/hdparm.c ++++ b/hdparm.c +@@ -25,7 +25,6 @@ + #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> +-- +2.37.1 + diff --git a/meta/recipes-extended/hdparm/hdparm_9.64.bb b/meta/recipes-extended/hdparm/hdparm_9.64.bb index 558dd53f8f..eeb63a27e5 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.64.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.64.bb @@ -24,6 +24,7 @@ RDEPENDS:wiper = "bash gawk coreutils" SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ file://wiper.sh-fix-stat-path.patch \ + file://0001-hdparm-Remove-unused-linux-fs.h-header.patch \ " SRC_URI[sha256sum] = "315b956951c3fea027287de204381534217c0bd0f37b4935877fe2db0cab859a" |