From 023c43b98cab9037ea01b7030e08b692aea54707 Mon Sep 17 00:00:00 2001 From: Qing He Date: Thu, 10 Mar 2011 18:28:55 +0800 Subject: sat-solver: add machine arch support (From OE-Core rev: ca758fa404fa447689ff205ee3b4b76bd3f1068a) Signed-off-by: Qing He Signed-off-by: Richard Purdie --- .../sat-solver/sat-solver/builtin-arch.patch | 28 +++++++++++++++++++++ .../sat-solver/sat-solver/no-builtin-arch.patch | 29 ++++++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-extended/sat-solver/sat-solver/builtin-arch.patch create mode 100644 meta/recipes-extended/sat-solver/sat-solver/no-builtin-arch.patch (limited to 'meta/recipes-extended/sat-solver/sat-solver') diff --git a/meta/recipes-extended/sat-solver/sat-solver/builtin-arch.patch b/meta/recipes-extended/sat-solver/sat-solver/builtin-arch.patch new file mode 100644 index 0000000000..c228c36e49 --- /dev/null +++ b/meta/recipes-extended/sat-solver/sat-solver/builtin-arch.patch @@ -0,0 +1,28 @@ +This patch adds the ${MACHINE_ARCH} and ${PACKAGE_ARCH} to +sat-solver available archs, see do_archpatch in .bb for more +details, this is the version for ${BASE_PACKAGE_ARCH} already +recognized in sat-sovler. + +Signed-off-by: Qing He + +diff --git a/src/poolarch.c b/src/poolarch.c +index 34a14a3..660959b 100644 +--- a/src/poolarch.c ++++ b/src/poolarch.c +@@ -21,6 +21,7 @@ + #include "util.h" + + const char *archpolicies[] = { ++ "@MACHINE_ARCH@", "@MACHINE_ARCH@:@PKG_ARCH_TAIL@", + "x86_64", "x86_64:i686:i586:i486:i386", + "i686", "i686:i586:i486:i386", + "i586", "i586:i486:i386", +@@ -72,7 +74,7 @@ pool_setarch(Pool *pool, const char *arch) + return; + } + #ifndef DEBIAN_SEMANTICS +- id = ARCH_NOARCH; ++ id = ARCH_ALL; + #else + id = ARCH_ALL; + #endif diff --git a/meta/recipes-extended/sat-solver/sat-solver/no-builtin-arch.patch b/meta/recipes-extended/sat-solver/sat-solver/no-builtin-arch.patch new file mode 100644 index 0000000000..225fbfe159 --- /dev/null +++ b/meta/recipes-extended/sat-solver/sat-solver/no-builtin-arch.patch @@ -0,0 +1,29 @@ +This patch adds the ${MACHINE_ARCH} and ${PACKAGE_ARCH} to +sat-solver available archs, see do_archpatch in .bb for more +details, this is the version for ${BASE_PACKAGE_ARCH} not +recognized in sat-sovler. + +Signed-off-by: Qing He + +diff --git a/src/poolarch.c b/src/poolarch.c +index 34a14a3..36367ba 100644 +--- a/src/poolarch.c ++++ b/src/poolarch.c +@@ -21,6 +21,8 @@ + #include "util.h" + + const char *archpolicies[] = { ++ "@MACHINE_ARCH@", "@MACHINE_ARCH@:@PKG_ARCH@", ++ "@PKG_ARCH@", "@PKG_ARCH@", + "x86_64", "x86_64:i686:i586:i486:i386", + "i686", "i686:i586:i486:i386", + "i586", "i586:i486:i386", +@@ -72,7 +74,7 @@ pool_setarch(Pool *pool, const char *arch) + return; + } + #ifndef DEBIAN_SEMANTICS +- id = ARCH_NOARCH; ++ id = ARCH_ALL; + #else + id = ARCH_ALL; + #endif -- cgit v1.2.3-54-g00ecf