diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-12-26 10:27:21 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-30 14:01:07 +0000 |
commit | 74d0f711732982b56feeab7191fc2c3be6d46179 (patch) | |
tree | 271945db7a91a15f09838745729facebd34dc570 /meta/recipes-devtools/rpm | |
parent | 5a0fd9a1c2ebb01380966a42e59cd3b7816c4a9d (diff) | |
download | poky-74d0f711732982b56feeab7191fc2c3be6d46179.tar.gz |
rpm: update 4.16.0 -> 4.16.1.2
(From OE-Core rev: bf2c7f82f07509424ce25ed5f64a03d7e4723fd1)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | 10 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch | 25 | ||||
-rw-r--r-- | meta/recipes-devtools/rpm/rpm_4.16.1.2.bb (renamed from meta/recipes-devtools/rpm/rpm_4.16.0.bb) | 3 |
3 files changed, 6 insertions, 32 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch index 30975faeaf..38d755205c 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 4fd37bc9d8d0777aa038777dd81a76b64f536efd Mon Sep 17 00:00:00 2001 | 1 | From 9bbe3f8564705aafcdcc5f2f033f9241a97f47c6 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 | 3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 |
4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for | 4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for |
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
14 | 3 files changed, 4 insertions(+), 4 deletions(-) | 14 | 3 files changed, 4 insertions(+), 4 deletions(-) |
15 | 15 | ||
16 | diff --git a/configure.ac b/configure.ac | 16 | diff --git a/configure.ac b/configure.ac |
17 | index 186e4aeec..5df252085 100644 | 17 | index 6c78568e4..76b1d40e4 100644 |
18 | --- a/configure.ac | 18 | --- a/configure.ac |
19 | +++ b/configure.ac | 19 | +++ b/configure.ac |
20 | @@ -944,7 +944,7 @@ else | 20 | @@ -966,7 +966,7 @@ else |
21 | usrprefix=$prefix | 21 | usrprefix=$prefix |
22 | fi | 22 | fi |
23 | 23 | ||
@@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644 | |||
40 | %_infodir %{_datadir}/info | 40 | %_infodir %{_datadir}/info |
41 | %_mandir %{_datadir}/man | 41 | %_mandir %{_datadir}/man |
42 | diff --git a/rpm.am b/rpm.am | 42 | diff --git a/rpm.am b/rpm.am |
43 | index b46c6b7da..02d5c7a0a 100644 | 43 | index cd40a16be..e6941e09f 100644 |
44 | --- a/rpm.am | 44 | --- a/rpm.am |
45 | +++ b/rpm.am | 45 | +++ b/rpm.am |
46 | @@ -1,10 +1,10 @@ | 46 | @@ -1,10 +1,10 @@ |
@@ -55,4 +55,4 @@ index b46c6b7da..02d5c7a0a 100644 | |||
55 | +rpmconfigdir = $(libdir)/rpm | 55 | +rpmconfigdir = $(libdir)/rpm |
56 | 56 | ||
57 | # Libtool version (current-revision-age) for all our libraries | 57 | # Libtool version (current-revision-age) for all our libraries |
58 | rpm_version_info = 10:0:1 | 58 | rpm_version_info = 10:2:1 |
diff --git a/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch b/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch deleted file mode 100644 index c7ae158f8d..0000000000 --- a/meta/recipes-devtools/rpm/files/0001-rpmdb.c-add-a-missing-include.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 9de15c7e1f4ca23a10edb9a3b657f06b2b13e841 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 20 Oct 2020 22:16:39 +0200 | ||
4 | Subject: [PATCH] rpmdb.c: add a missing include | ||
5 | |||
6 | This addressed build failures on non-glibc systems. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | lib/rpmdb.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/lib/rpmdb.c b/lib/rpmdb.c | ||
15 | index 4c101569f..73187630b 100644 | ||
16 | --- a/lib/rpmdb.c | ||
17 | +++ b/lib/rpmdb.c | ||
18 | @@ -8,6 +8,7 @@ | ||
19 | #include <utime.h> | ||
20 | #include <errno.h> | ||
21 | #include <dirent.h> | ||
22 | +#include <fcntl.h> | ||
23 | |||
24 | #ifndef DYING /* XXX already in "system.h" */ | ||
25 | #include <fnmatch.h> | ||
diff --git a/meta/recipes-devtools/rpm/rpm_4.16.0.bb b/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb index 4125f3f9d0..9195d66dd1 100644 --- a/meta/recipes-devtools/rpm/rpm_4.16.0.bb +++ b/meta/recipes-devtools/rpm/rpm_4.16.1.2.bb | |||
@@ -39,12 +39,11 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \ | |||
39 | file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ | 39 | file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \ |
40 | file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ | 40 | file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \ |
41 | file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ | 41 | file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \ |
42 | file://0001-rpmdb.c-add-a-missing-include.patch \ | ||
43 | file://0001-tools-Add-error.h-for-non-glibc-case.patch \ | 42 | file://0001-tools-Add-error.h-for-non-glibc-case.patch \ |
44 | " | 43 | " |
45 | 44 | ||
46 | PE = "1" | 45 | PE = "1" |
47 | SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0" | 46 | SRCREV = "278883a704ea36c97974d0f2d65d41abe78b0e2a" |
48 | 47 | ||
49 | S = "${WORKDIR}/git" | 48 | S = "${WORKDIR}/git" |
50 | 49 | ||