diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-10-27 22:15:54 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-29 16:28:35 +0100 |
| commit | 5e21fcd82923d3733e004049d8974eeafc4c1724 (patch) | |
| tree | cf42641a104216bf61622d01ad2fef05969e2ad7 | |
| parent | a78ada8639ea71e48f785a20719f5dc151778341 (diff) | |
| download | poky-5e21fcd82923d3733e004049d8974eeafc4c1724.tar.gz | |
hdparm: update 9.64 -> 9.65
(From OE-Core rev: 438083e2ec628b563130bda5005ea10fd685d5b7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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.65.bb (renamed from meta/recipes-extended/hdparm/hdparm_9.64.bb) | 5 |
2 files changed, 2 insertions, 35 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 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 @@ | |||
| 1 | From c8fc52968f9e97d29ccf6deb348ec02627d74235 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 29 Jul 2022 13:00:40 -0700 | ||
| 4 | Subject: [PATCH] hdparm: Remove unused linux/fs.h header | ||
| 5 | |||
| 6 | this helps fixing builds with glibc 2.36 where mount.h conflits now with | ||
| 7 | kernel mount.h which is included indirectly by linux/fs.h see [1] for | ||
| 8 | details | ||
| 9 | |||
| 10 | [1] https://sourceware.org/glibc/wiki/Release/2.36 | ||
| 11 | |||
| 12 | Upstream-Status: Submitted [https://sourceforge.net/p/hdparm/patches/52/] | ||
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 14 | --- | ||
| 15 | hdparm.c | 1 - | ||
| 16 | 1 file changed, 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/hdparm.c b/hdparm.c | ||
| 19 | index fa21e2f..901bdd8 100644 | ||
| 20 | --- a/hdparm.c | ||
| 21 | +++ b/hdparm.c | ||
| 22 | @@ -25,7 +25,6 @@ | ||
| 23 | #include <sys/mman.h> | ||
| 24 | #include <sys/user.h> | ||
| 25 | #include <linux/types.h> | ||
| 26 | -#include <linux/fs.h> | ||
| 27 | #include <linux/major.h> | ||
| 28 | #include <endian.h> | ||
| 29 | #include <asm/byteorder.h> | ||
| 30 | -- | ||
| 31 | 2.37.1 | ||
| 32 | |||
diff --git a/meta/recipes-extended/hdparm/hdparm_9.64.bb b/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" | |||
| 24 | 24 | ||
| 25 | SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ | 25 | SRC_URI = "${SOURCEFORGE_MIRROR}/hdparm/${BP}.tar.gz \ |
| 26 | file://wiper.sh-fix-stat-path.patch \ | 26 | file://wiper.sh-fix-stat-path.patch \ |
| 27 | file://0001-hdparm-Remove-unused-linux-fs.h-header.patch \ | 27 | " |
| 28 | " | ||
| 29 | 28 | ||
| 30 | SRC_URI[sha256sum] = "315b956951c3fea027287de204381534217c0bd0f37b4935877fe2db0cab859a" | 29 | SRC_URI[sha256sum] = "d14929f910d060932e717e9382425d47c2e7144235a53713d55a94f7de535a4b" |
| 31 | 30 | ||
| 32 | EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' | 31 | EXTRA_OEMAKE = 'STRIP="echo" LDFLAGS="${LDFLAGS}"' |
| 33 | 32 | ||
