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>
This commit is contained in:
Alexander Kanavin
2020-12-26 10:27:21 +01:00
committed by Richard Purdie
parent 5a0fd9a1c2
commit 74d0f71173
3 changed files with 6 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
From 4fd37bc9d8d0777aa038777dd81a76b64f536efd Mon Sep 17 00:00:00 2001
From 9bbe3f8564705aafcdcc5f2f033f9241a97f47c6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Mon, 27 Feb 2017 09:43:30 +0200
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>
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 186e4aeec..5df252085 100644
index 6c78568e4..76b1d40e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -944,7 +944,7 @@ else
@@ -966,7 +966,7 @@ else
usrprefix=$prefix
fi
@@ -40,7 +40,7 @@ index 35c8cf9df..9d8b2825c 100644
%_infodir %{_datadir}/info
%_mandir %{_datadir}/man
diff --git a/rpm.am b/rpm.am
index b46c6b7da..02d5c7a0a 100644
index cd40a16be..e6941e09f 100644
--- a/rpm.am
+++ b/rpm.am
@@ -1,10 +1,10 @@
@@ -55,4 +55,4 @@ index b46c6b7da..02d5c7a0a 100644
+rpmconfigdir = $(libdir)/rpm
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 10:0:1
rpm_version_info = 10:2:1

View File

@@ -1,25 +0,0 @@
From 9de15c7e1f4ca23a10edb9a3b657f06b2b13e841 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 20 Oct 2020 22:16:39 +0200
Subject: [PATCH] rpmdb.c: add a missing include
This addressed build failures on non-glibc systems.
Upstream-Status: Backport
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
lib/rpmdb.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/rpmdb.c b/lib/rpmdb.c
index 4c101569f..73187630b 100644
--- a/lib/rpmdb.c
+++ b/lib/rpmdb.c
@@ -8,6 +8,7 @@
#include <utime.h>
#include <errno.h>
#include <dirent.h>
+#include <fcntl.h>
#ifndef DYING /* XXX already in "system.h" */
#include <fnmatch.h>

View File

@@ -39,12 +39,11 @@ SRC_URI = "git://github.com/rpm-software-management/rpm;branch=rpm-4.16.x \
file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \
file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \
file://0001-lib-transaction.c-fix-file-conflicts-for-MIPS64-N32.patch \
file://0001-rpmdb.c-add-a-missing-include.patch \
file://0001-tools-Add-error.h-for-non-glibc-case.patch \
"
PE = "1"
SRCREV = "cd7f9303ef1070f027493cad7d00bc66935af2a0"
SRCREV = "278883a704ea36c97974d0f2d65d41abe78b0e2a"
S = "${WORKDIR}/git"