diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-02 20:44:17 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-10-02 20:44:17 +0000 |
| commit | 8a49dd28cc68e419990395c7d4f5846617e91356 (patch) | |
| tree | d43abf243dd81fef8f1ce56be3ee9bad7ba1b43c /meta/packages/yum/files/hacks.patch | |
| parent | e5e21ca415095c805370a42daa0d3ddb3bd84da0 (diff) | |
| download | poky-8a49dd28cc68e419990395c7d4f5846617e91356.tar.gz | |
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
Diffstat (limited to 'meta/packages/yum/files/hacks.patch')
| -rw-r--r-- | meta/packages/yum/files/hacks.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/meta/packages/yum/files/hacks.patch b/meta/packages/yum/files/hacks.patch index d0232ec9be..ac8445f7ac 100644 --- a/meta/packages/yum/files/hacks.patch +++ b/meta/packages/yum/files/hacks.patch | |||
| @@ -5,27 +5,6 @@ | |||
| 5 | yum/depsolve.py | 2 ++ | 5 | yum/depsolve.py | 2 ++ |
| 6 | 4 files changed, 7 insertions(+), 1 deletion(-) | 6 | 4 files changed, 7 insertions(+), 1 deletion(-) |
| 7 | 7 | ||
| 8 | Index: yum-3.2.18/rpmUtils/arch.py | ||
| 9 | =================================================================== | ||
| 10 | --- yum-3.2.18.orig/rpmUtils/arch.py 2008-06-17 14:05:42.000000000 +0100 | ||
| 11 | +++ yum-3.2.18/rpmUtils/arch.py 2008-09-01 15:47:11.000000000 +0100 | ||
| 12 | @@ -275,6 +275,7 @@ | ||
| 13 | return arch | ||
| 14 | |||
| 15 | def getCanonArch(skipRpmPlatform = 0): | ||
| 16 | + return "arm" | ||
| 17 | if not skipRpmPlatform and os.access("/etc/rpm/platform", os.R_OK): | ||
| 18 | try: | ||
| 19 | f = open("/etc/rpm/platform", "r") | ||
| 20 | @@ -331,6 +332,8 @@ | ||
| 21 | base arch is the arch before noarch in the arches dict if myarch is not | ||
| 22 | a key in the multilibArches.""" | ||
| 23 | |||
| 24 | + return "arm" | ||
| 25 | + | ||
| 26 | if not myarch: | ||
| 27 | myarch = canonArch | ||
| 28 | |||
| 29 | Index: yum-3.2.18/rpmUtils/transaction.py | 8 | Index: yum-3.2.18/rpmUtils/transaction.py |
| 30 | =================================================================== | 9 | =================================================================== |
| 31 | --- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100 | 10 | --- yum-3.2.18.orig/rpmUtils/transaction.py 2008-06-17 14:05:42.000000000 +0100 |
