mirror of
https://git.yoctoproject.org/poky
synced 2026-03-19 13:49:41 +01:00
rpm: A number of the patches have been submitted upstream
Note the upstream submission in the patches. (From OE-Core rev: 9672f7620a365d29afca81d357d1d4d5fcedb3ed) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mark Hatle
committed by
Richard Purdie
Richard Purdie
parent
6833c5d77b
commit
8ea55ba895
@@ -1,6 +1,6 @@
|
||||
[PATCH] define EM_AARCH64
|
||||
|
||||
Upstream-Status: pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
EM_AARCH64 maybe not be defined due to old version elf.h, and lead to
|
||||
that debugedit can not work on aarch64 elf object files, since there is
|
||||
|
||||
@@ -4,7 +4,7 @@ Date: Tue, 11 Nov 2014 16:28:22 +0800
|
||||
Subject: [PATCH] using poptParseArgvString to parse the
|
||||
_gpg_check_password_cmd
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Both __gpg_check_password_cmd and __gpg_sign_cmd include "%{_gpg_name}", but
|
||||
strace shows that gpg_name has a quote when run _gpg_check_password,
|
||||
|
||||
@@ -11,7 +11,7 @@ Note: in all other places a backup copy was used, just not buildid processing.
|
||||
Also the process (...) function was modified to verify the data is not
|
||||
NULL as well. This is an extra check and is not strictly necessary.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ Before the above operations, invoke elf_begin/elf_update/elf_end
|
||||
with ELF_C_RDWR and ELF_F_LAYOUT set to enlarge the above file, it
|
||||
could make sure the file is safe for the following elf operations.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
tools/debugedit.c | 25 +++++++++++++++++++++++++
|
||||
|
||||
@@ -5,7 +5,7 @@ Using rpmdb.h w/o including errno.h may result in a warning.
|
||||
Using rpmtag.h w/o also adding stdint.h will result in numerous failures
|
||||
about unknown types on modern compilers.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Qing He <qing.he@intel.com>
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
@@ -14,7 +14,7 @@ install-exec-am. It also removed the dependency in install-data-hook on
|
||||
install-pkgbinPROGRAMS. This means install-pkgbinPROGRAMS will only be run once
|
||||
so there whould be any file contention.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Morgan Little <morgan.little@windriver.com>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ We want to see the RPMSENSE_SCRIPT values for use with SMART. We also
|
||||
want to see the MISSINGOK value so we can avoid recommended packages causing
|
||||
failures.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ Provide an alternative. This alternative function is based on code from:
|
||||
|
||||
Code is under an Apache 2.0 License.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ This patch changes the list of supported items to:
|
||||
<arch>-<vendor>-<os>
|
||||
<arch>-<vendor>-<os>-<extension>
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Occasionally the cp -p fails with a non-zero return code. This will cause
|
||||
the system abort the build.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Fix an issue where parseEmbedded is not defined, but is still used.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ configure.ac: Check if the current compiler supports the transactions
|
||||
Some distributions appear to have compilers that are built without support
|
||||
for transactions, even though they are GCC 4.7 or newer.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ are found. We need to fix the caller to check the return code too.
|
||||
|
||||
RP 2014/6/10
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Index: rpm-5.4.14/lib/fsm.c
|
||||
===================================================================
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
rpm - rpmio/keccak.c: make SSE/MMX dependent upon gcc config
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ This caused the system to only permit a binary comparison - "new preferred" or
|
||||
else comparison the system will now perform a 'last-in-wins' resolution when
|
||||
"neither is preferred".
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
@@ -2,7 +2,7 @@ During installation, the libtool relink attempts to link to -lrpm...
|
||||
The problem is that it hasn't been installed yet! So small change causes
|
||||
the libtool to instead use the build version.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ appears to be invalid. Instead of relying solely on the platform comparison
|
||||
we also want to generate a perceived platform based on the valid rpm contents
|
||||
of arch and os.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Fix errors when building with sasl2 disabled
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
lib/order.c: Make the dependency loop messages into debug msgs
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ rpmpsmStage function(rpmVerifyScript->rpmpsmScriptStage->rpmpsmStage) and occur
|
||||
fault because of null point(rpmtsGetRdb(ts) == NULL and rpmtsGetRdb(ts)->db_txn).
|
||||
So we open rpmdb to avoid bad input when find headerIsEntry true.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
|
||||
Index: rpm-5.4.14/lib/verify.c
|
||||
|
||||
@@ -2,7 +2,7 @@ Add the ability to query the packageorigin
|
||||
|
||||
Written by jbj at rpm5.org
|
||||
|
||||
Upstream-Status: Inappropriate [not author]
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ Patch taken from http://git.pld-linux.org/?p=packages/rpm.git;a=commitdiff;h=105
|
||||
|
||||
RP 2014/6/10
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Index: rpm-5.4.14/build/files.c
|
||||
===================================================================
|
||||
|
||||
@@ -2,7 +2,7 @@ Don't add the first line of /etc/rpm/platform to the list of patterns
|
||||
to match when computing an arch score, use it just for getting
|
||||
information about the platform (cpu/vendor/os). Fixes #3864.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Index: rpm-5.4.14/lib/rpmrc.c
|
||||
===================================================================
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Fix up platform and related sysinfo file loading.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
This ensures that RPM knows the compatible set of package types at all times.
|
||||
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
Fix up platform and related sysinfo file loading (part 2).
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
We need to ensure that we set the _gnu flag somehow. We do this by reading
|
||||
from the platform file, and setting a new _platform_gnu and related vars.
|
||||
|
||||
@@ -11,6 +9,8 @@ values. The macros file uses the configure time defaults in _platform_...
|
||||
versions have not been defined. This preserves existing behavior, but
|
||||
ensures reasonable defaults are always available.
|
||||
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
Index: rpm-5.4.14/lib/rpmrc.c
|
||||
|
||||
@@ -2,7 +2,7 @@ Fix an issue where the PACKAGEORIGIN is not properly stored.
|
||||
|
||||
Restore the rpmtsCallback fdSetOpen call and related code.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ tag. Without this, any custom tag extensions will be returned in a format
|
||||
that the tagNumFromPyObject and related functions like hdr_subscript will
|
||||
failed to process. Usually the failure is error: expected a string or integer
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ lib/rpmts.c: Ensure that we check both providename and filepaths
|
||||
When looking up a missing dependencies, such as /bin/sh, we need to lookup
|
||||
in both the providename and filepaths DB, not just the filepaths DB.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ getent: ELF 32-bit MSB executable, MIPS, N32 MIPS64 [snip]
|
||||
|
||||
And "rpm -qp --filecolor" was wrong (it was 1, but should be 4).
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Fix a typo in the rpmio Makefile.am
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ when the generating process is executed on different architectures.
|
||||
|
||||
This patch resolves it by taking the byte order that host uses.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Ming Liu <ming.liu@windriver.com>
|
||||
---
|
||||
|
||||
@@ -5,7 +5,7 @@ special 'filenames' item is value. This adds a similar patch to the
|
||||
_tagType to return the proper type, otherwise it comes back as a simple
|
||||
RPM_STRING_ARRAY_TYPE which limits the response to the first element.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
Source: None
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
Author: Khem Raj <raj.khem@gmail.com>
|
||||
Date: 2011-03-03
|
||||
Description:
|
||||
|
||||
@@ -5,7 +5,7 @@ This uses an existing configure check.
|
||||
This is needed for uclibc since it does not have the above function
|
||||
implemented.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Define the x* wrappers for uclibc as well
|
||||
|
||||
Upstream-Status: Pending
|
||||
Upstream-Status: Submitted [RPM5 maintainer]
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user