mirror of
https://git.yoctoproject.org/poky
synced 2026-03-17 20:59:42 +01:00
yum: do not hardcode arm architecture - rootfs_rpm provide arch info
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5392 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
@@ -5,27 +5,6 @@
|
||||
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-09-01 15:47:11.000000000 +0100
|
||||
@@ -275,6 +275,7 @@
|
||||
return arch
|
||||
|
||||
def getCanonArch(skipRpmPlatform = 0):
|
||||
+ return "arm"
|
||||
if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK):
|
||||
try:
|
||||
f = open("/etc/rpm/platform", "r")
|
||||
@@ -331,6 +332,8 @@
|
||||
base arch is the arch before noarch in the arches dict if myarch is not
|
||||
a key in the multilibArches."""
|
||||
|
||||
+ return "arm"
|
||||
+
|
||||
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
|
||||
|
||||
@@ -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 = "r5"
|
||||
PR = "r6"
|
||||
|
||||
DEPENDS = "rpm-native python-native python-iniparse-native python-urlgrabber-native yum-metadata-parser-native libxml2-native"
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
HOMEPAGE = "http://linux.duke.edu/projects/yum/"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://linux.duke.edu/projects/yum/download/3.2/yum-${PV}.tar.gz \
|
||||
file://hacks.patch;patch=1 \
|
||||
|
||||
Reference in New Issue
Block a user