mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpm: change arch scoring items

Browse Source 
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).

[YOCTO #3864]

(From OE-Core rev: 9263a2192ccf8ca513cbf7f2f88473e267e6b945)

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Bogdan Marinescu
2013-04-24 11:48:50 +03:00
committed by Richard Purdie
parent 3e79775a82
commit f2f835632c
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
meta/recipes-devtools/rpm/rpm/rpm-platform-file-fix.patch Normal file
View File

@@ -0,0 +1,28 @@
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]
diff --git a/lib/rpmrc.c b/lib/rpmrc.c
index e676601..9140bbe 100644
--- a/lib/rpmrc.c
+++ b/lib/rpmrc.c
@@ -510,6 +510,7 @@ static rpmRC rpmPlatform(const char * platform)
#endif
}
+#if !defined(RPM_VENDOR_POKY) /* Skip the explicit-platform */
#if defined(RPM_VENDOR_OPENPKG) /* explicit-platform */
/* do not use vendor and GNU attribution */
p = rpmExpand("%{_host_cpu}-%{_host_os}", NULL);
@@ -520,7 +521,8 @@ static rpmRC rpmPlatform(const char * platform)
#endif
xx = mireAppend(RPMMIRE_STRCMP, 0, p, NULL, &mi_re, &mi_nre);
p = _free(p);
-
+#endif
+
init_platform++;
}
rc = (init_platform ? RPMRC_OK : RPMRC_FAIL);

3
meta/recipes-devtools/rpm/rpm_5.4.9.bb
View File

@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "libpcre attr acl popt ossp-uuid file bison-native"
PR = "r62"
PR = "r63"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -86,6 +86,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.9-0.20120508.src.rpm;ex
file://rpm-platform2.patch \
file://rpm-remove-sykcparse-decl.patch \
file://debugedit-segv.patch \
file://rpm-platform-file-fix.patch \
"
# Uncomment the following line to enable platform score debugging