Signed-off-by: Alexander Kanavin <[email protected]> --- ...parm-Remove-unused-linux-fs.h-header.patch | 32 ------------------- .../hdparm/{hdparm_9.64.bb => hdparm_9.65.bb} | 5 ++- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch rename meta/recipes-extended/hdparm/{hdparm_9.64.bb => hdparm_9.65.bb} (89%)
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 deleted file mode 100644 index dd88743d1e..0000000000 --- a/meta/recipes-extended/hdparm/hdparm/0001-hdparm-Remove-unused-linux-fs.h-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001 -From: Khem Raj <[email protected]> -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 <[email protected]> ---- - 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.65.bb similarity index 89% rename from meta/recipes-extended/hdparm/hdparm_9.64.bb rename to meta/recipes-extended/hdparm/hdparm_9.65.bb index eeb63a27e5..d5e6ab6065 100644 --- a/meta/recipes-extended/hdparm/hdparm_9.64.bb +++ b/meta/recipes-extended/hdparm/hdparm_9.65.bb @@ -24,10 +24,9 @@ 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" +SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b" EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#172210): https://lists.openembedded.org/g/openembedded-core/message/172210 Mute This Topic: https://lists.openembedded.org/mt/94612927/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
