From 1ff3a3a1e5d7ccc179143fa6a7a999e8418fae0d Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Tue, 28 Oct 2008 15:55:46 +0000 Subject: [PATCH] - Add "arm" architectures. --- package/libsatsolver.changes | 5 +++++ src/poolarch.c | 31 +++++++++++++++++++------------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 48214fc..73b9136 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Oct 28 16:55:03 CET 2008 - ma@suse.de + +- Add 'arm' architectures. + +------------------------------------------------------------------- Mon Oct 27 10:54:36 CET 2008 - kkaempf@suse.de - Improve error detection and reporting when parsing 'content' file diff --git a/src/poolarch.c b/src/poolarch.c index 7f4fa97..7a08617 100644 --- a/src/poolarch.c +++ b/src/poolarch.c @@ -7,7 +7,7 @@ /* * poolarch.c - * + * * create architecture policies */ @@ -21,16 +21,23 @@ #include "util.h" const char *archpolicies[] = { - "x86_64", "x86_64:i686:i586:i486:i386", - "i686", "i686:i586:i486:i386", - "i586", "i586:i486:i386", - "i486", "i486:i386", - "i386", "i386", - "s390x", "s390x:s390", - "s390", "s390", - "ia64", "ia64:i686:i586:i486:i386", - "ppc64", "ppc64:ppc", - "ppc", "ppc", + "x86_64", "x86_64:i686:i586:i486:i386", + "i686", "i686:i586:i486:i386", + "i586", "i586:i486:i386", + "i486", "i486:i386", + "i386", "i386", + "s390x", "s390x:s390", + "s390", "s390", + "ia64", "ia64:i686:i586:i486:i386", + "ppc64", "ppc64:ppc", + "ppc", "ppc", + "armv6l", "armv6l:armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l", + "armv5tejl", "armv5tejl:armv5tel:armv5l:armv4tl:armv4l:armv3l", + "armv5tel", "armv5tel:armv5l:armv4tl:armv4l:armv3l", + "armv5l", "armv5l:armv4tl:armv4l:armv3l", + "armv4tl", "armv4tl:armv4l:armv3l", + "armv4l", "armv4l:armv3l", + "armv3l", "armv3l", 0 }; @@ -45,7 +52,7 @@ pool_setarch(Pool *pool, const char *arch) int i; Id *id2arch; Id id, lastarch; - + pool->id2arch = sat_free(pool->id2arch); if (!arch) { -- 2.7.4