[oe] [PATCH 26/70] yum: do not hardcode arm architecture - rootfs_rpm provide arch info (from Poky)

[Khem Raj]

On Wednesday 04 March 2009 07:52:41 Marcin Juszkiewicz wrote:
> From: Marcin Juszkiewicz <hrw at openedhand.com>
>
> git-svn-id: https://svn.o-hand.com/repos/poky@5392
> 311d38ba-8fff-0310-9ca6-ca027cbcb966 ---
>  packages/yum/files/hacks.patch    |   21 ---------------------
>  packages/yum/yum-native_3.2.18.bb |    2 +-
>  packages/yum/yum_3.2.18.bb        |    1 +
>  3 files changed, 2 insertions(+), 22 deletions(-)
>
> diff --git a/packages/yum/files/hacks.patch
> b/packages/yum/files/hacks.patch index d0232ec..ac8445f 100644
> --- a/packages/yum/files/hacks.patch
> +++ b/packages/yum/files/hacks.patch
> @@ -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 diff --git a/packages/yum/yum-native_3.2.18.bb
> b/packages/yum/yum-native_3.2.18.bb index 60dafe3..679f8e9 100644
> --- a/packages/yum/yum-native_3.2.18.bb
> +++ b/packages/yum/yum-native_3.2.18.bb
> @@ -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"
>
> diff --git a/packages/yum/yum_3.2.18.bb b/packages/yum/yum_3.2.18.bb
> index 67e9ad7..7d34097 100644
> --- a/packages/yum/yum_3.2.18.bb
> +++ b/packages/yum/yum_3.2.18.bb
> @@ -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 \

ah this invalidates my comment to patch 18/70
-- 
Khem Raj
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20090310/e14c1cdf/attachment-0002.sig>