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

yum-native: Fix hacks.patch to handle architecture detection issues

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5396 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2008-10-02 21:28:14 +00:00
parent 537ff09c69
commit aea49588fa
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/packages/yum/files/hacks.patch
View File

@@ -5,10 +5,40 @@
yum/depsolve.py | 2 ++
4 files changed, 7 insertions(+), 1 deletion(-)
Index: yum-3.2.18/rpmUtils/arch.py
===================================================================
--- yum-3.2.18.orig/rpmUtils/arch.py 2008-06-17 14:05:42.000000000 +0100
+++ yum-3.2.18/rpmUtils/arch.py 2008-10-02 22:09:19.000000000 +0100
@@ -275,6 +275,12 @@
return arch
def getCanonArch(skipRpmPlatform = 0):
+ import os
+ if 'YUM_ARCH_FORCE' in os.environ:
+ return os.environ['YUM_ARCH_FORCE']
+
+ sys.exit(1)
+
if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
try:
f = open("/etc/rpm/platform", "r")
@@ -331,6 +338,12 @@
base arch is the arch before noarch in the arches dict if myarch is not
a key in the multilibArches."""
+ import os
+ if 'YUM_ARCH_FORCE' in os.environ:
+ return os.environ['YUM_ARCH_FORCE']
+
+ sys.exit(1)
+
if not myarch:
myarch = canonArch
Index: yum-3.2.18/rpmUtils/transaction.py
===================================================================
--- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100
+++ yum-3.2.18/rpmUtils/transaction.py 2008-09-03 17:55:27.000000000 +0100
+++ yum-3.2.18/rpmUtils/transaction.py 2008-10-02 17:09:57.000000000 +0100
@@ -43,6 +43,7 @@
'clean']
self.tsflags = []
@@ -20,7 +50,7 @@ Index: yum-3.2.18/rpmUtils/transaction.py
Index: yum-3.2.18/yum/constants.py
===================================================================
--- yum-3.2.18.orig/yum/constants.py 2008-07-21 16:56:54.000000000 +0100
+++ yum-3.2.18/yum/constants.py 2008-09-01 15:47:11.000000000 +0100
+++ yum-3.2.18/yum/constants.py 2008-10-02 17:09:57.000000000 +0100
@@ -17,7 +17,7 @@
"""
@@ -33,7 +63,7 @@ Index: yum-3.2.18/yum/constants.py
Index: yum-3.2.18/yum/depsolve.py
===================================================================
--- yum-3.2.18.orig/yum/depsolve.py 2008-08-06 17:05:16.000000000 +0100
+++ yum-3.2.18/yum/depsolve.py 2008-09-03 21:05:52.000000000 +0100
+++ yum-3.2.18/yum/depsolve.py 2008-10-02 17:09:57.000000000 +0100
@@ -141,9 +141,14 @@
else:
self.logger.critical(_('Invalid tsflag in config file: %s'), flag)

2
meta/packages/yum/yum-native_3.2.18.bb
View File

@@ -5,7 +5,7 @@ SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
file://paths.patch;patch=1 \
file://yum-install-recommends.py \
file://extract-postinst.awk"
PR = "r6"
PR = "r7"
DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"