diff options
author | Qing He <qing.he@intel.com> | 2011-03-10 18:28:55 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-14 21:08:32 +0000 |
commit | 023c43b98cab9037ea01b7030e08b692aea54707 (patch) | |
tree | 669080cdf30f86a9d083879d4fe50362acb3559c /meta/recipes-extended/sat-solver/sat-solver | |
parent | 7da9f27c376bbe54baef564b32c165a2a6e860f9 (diff) | |
download | poky-023c43b98cab9037ea01b7030e08b692aea54707.tar.gz |
sat-solver: add machine arch support
(From OE-Core rev: ca758fa404fa447689ff205ee3b4b76bd3f1068a)
Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/sat-solver/sat-solver')
-rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/builtin-arch.patch | 28 | ||||
-rw-r--r-- | meta/recipes-extended/sat-solver/sat-solver/no-builtin-arch.patch | 29 |
2 files changed, 57 insertions, 0 deletions
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 @@ | |||
1 | This patch adds the ${MACHINE_ARCH} and ${PACKAGE_ARCH} to | ||
2 | sat-solver available archs, see do_archpatch in .bb for more | ||
3 | details, this is the version for ${BASE_PACKAGE_ARCH} already | ||
4 | recognized in sat-sovler. | ||
5 | |||
6 | Signed-off-by: Qing He <qing.he@intel.com> | ||
7 | |||
8 | diff --git a/src/poolarch.c b/src/poolarch.c | ||
9 | index 34a14a3..660959b 100644 | ||
10 | --- a/src/poolarch.c | ||
11 | +++ b/src/poolarch.c | ||
12 | @@ -21,6 +21,7 @@ | ||
13 | #include "util.h" | ||
14 | |||
15 | const char *archpolicies[] = { | ||
16 | + "@MACHINE_ARCH@", "@MACHINE_ARCH@:@PKG_ARCH_TAIL@", | ||
17 | "x86_64", "x86_64:i686:i586:i486:i386", | ||
18 | "i686", "i686:i586:i486:i386", | ||
19 | "i586", "i586:i486:i386", | ||
20 | @@ -72,7 +74,7 @@ pool_setarch(Pool *pool, const char *arch) | ||
21 | return; | ||
22 | } | ||
23 | #ifndef DEBIAN_SEMANTICS | ||
24 | - id = ARCH_NOARCH; | ||
25 | + id = ARCH_ALL; | ||
26 | #else | ||
27 | id = ARCH_ALL; | ||
28 | #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 @@ | |||
1 | This patch adds the ${MACHINE_ARCH} and ${PACKAGE_ARCH} to | ||
2 | sat-solver available archs, see do_archpatch in .bb for more | ||
3 | details, this is the version for ${BASE_PACKAGE_ARCH} not | ||
4 | recognized in sat-sovler. | ||
5 | |||
6 | Signed-off-by: Qing He <qing.he@intel.com> | ||
7 | |||
8 | diff --git a/src/poolarch.c b/src/poolarch.c | ||
9 | index 34a14a3..36367ba 100644 | ||
10 | --- a/src/poolarch.c | ||
11 | +++ b/src/poolarch.c | ||
12 | @@ -21,6 +21,8 @@ | ||
13 | #include "util.h" | ||
14 | |||
15 | const char *archpolicies[] = { | ||
16 | + "@MACHINE_ARCH@", "@MACHINE_ARCH@:@PKG_ARCH@", | ||
17 | + "@PKG_ARCH@", "@PKG_ARCH@", | ||
18 | "x86_64", "x86_64:i686:i586:i486:i386", | ||
19 | "i686", "i686:i586:i486:i386", | ||
20 | "i586", "i586:i486:i386", | ||
21 | @@ -72,7 +74,7 @@ pool_setarch(Pool *pool, const char *arch) | ||
22 | return; | ||
23 | } | ||
24 | #ifndef DEBIAN_SEMANTICS | ||
25 | - id = ARCH_NOARCH; | ||
26 | + id = ARCH_ALL; | ||
27 | #else | ||
28 | id = ARCH_ALL; | ||
29 | #endif | ||