diff options
Diffstat (limited to 'poky/meta/recipes-extended/hdparm')
| -rw-r--r-- | poky/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch | 32 | ||||
| -rw-r--r-- | poky/meta/recipes-extended/hdparm/hdparm_9.64.bb (renamed from poky/meta/recipes-extended/hdparm/hdparm_9.63.bb) | 3 |
2 files changed, 34 insertions, 1 deletions
diff --git a/poky/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch b/poky/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch new file mode 100644 index 0000000000..dd88743d1e --- /dev/null +++ b/poky/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/poky/meta/recipes-extended/hdparm/hdparm_9.63.bb b/poky/meta/recipes-extended/hdparm/hdparm_9.64.bb index 7900a310a3..eeb63a27e5 100644 --- a/poky/meta/recipes-extended/hdparm/hdparm_9.63.bb +++ b/poky/meta/recipes-extended/hdparm/hdparm_9.64.bb @@ -24,9 +24,10 @@ 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] = "70785deaebba5877a89c123568b41dee990da55fc51420f13f609a1072899691" +SRC_URI[sha256sum] = "315b956951c3fea027287de204381534217c0bd0f37b4935877fe2db0cab859a" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' |