diff options
author | Qing He <qing.he@intel.com> | 2011-04-13 16:59:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-28 10:44:19 +0100 |
commit | 181d5f550d06aaf76ba20666664895355ba6ccea (patch) | |
tree | 589621778221ef12ab240d157a3a7a155c6ec3d0 /meta/recipes-extended/sat-solver/sat-solver | |
parent | 927d33c170f062c0a59d2a321679d5fe22e80a97 (diff) | |
download | poky-181d5f550d06aaf76ba20666664895355ba6ccea.tar.gz |
sat-solver: fix arch=all packages
add a new options to set noarch archs as all so platform independent
packages can be recognized and installed.
fixes [YOCTO #993]
(From OE-Core rev: bd0798120559a8aca726db8e962bbbafb80c2a54)
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/sat-solver_core.patch (renamed from meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch) | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch index b762bac854..11bf5b0182 100644 --- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch +++ b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch | |||
@@ -1,3 +1,5 @@ | |||
1 | Upstream-Status: Inappropriate [distribution] | ||
2 | |||
1 | Fix "arch" integration with Poky. | 3 | Fix "arch" integration with Poky. |
2 | 4 | ||
3 | Add a missing "any" architecture type and update the semantics to use it. | 5 | Add a missing "any" architecture type and update the semantics to use it. |
@@ -5,8 +7,27 @@ Add a missing "any" architecture type and update the semantics to use it. | |||
5 | Disable the built-in archpolicies structure, and replace it with one | 7 | Disable the built-in archpolicies structure, and replace it with one |
6 | we generate in the recipe. | 8 | we generate in the recipe. |
7 | 9 | ||
10 | Also add poky semantics option in CMake. | ||
11 | |||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
13 | Signed-off-by: Qing He <qing.he@intel.com> | ||
9 | 14 | ||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 443281e..4456a87 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian") | ||
20 | ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS) | ||
21 | ENDIF ( DEBIAN ) | ||
22 | |||
23 | +IF ( OE_CORE ) | ||
24 | +MESSAGE(STATUS "Building for OE core") | ||
25 | +ADD_DEFINITIONS( -DOE_CORE -DOE_CORE_SEMANTICS) | ||
26 | +ENDIF ( OE_CORE ) | ||
27 | + | ||
28 | IF ( MULTI_SEMANTICS ) | ||
29 | MESSAGE(STATUS "Enabling multi dist support") | ||
30 | ADD_DEFINITIONS( -DMULTI_SEMANTICS) | ||
10 | diff --git a/src/knownid.h b/src/knownid.h | 31 | diff --git a/src/knownid.h b/src/knownid.h |
11 | index 7757ae0..4b8bee7 100644 | 32 | index 7757ae0..4b8bee7 100644 |
12 | --- a/src/knownid.h | 33 | --- a/src/knownid.h |
@@ -27,7 +48,7 @@ index 55c8677..3356ff8 100644 | |||
27 | } | 48 | } |
28 | 49 | ||
29 | /* we allow changes to/from noarch */ | 50 | /* we allow changes to/from noarch */ |
30 | +#ifdef POKY_SEMANTICS | 51 | +#ifdef OE_CORE_SEMANTICS |
31 | + if (a1 == a2 || | 52 | + if (a1 == a2 || |
32 | + a1 == ARCH_NOARCH || a2 == ARCH_NOARCH || | 53 | + a1 == ARCH_NOARCH || a2 == ARCH_NOARCH || |
33 | + a1 == ARCH_ANY || a2 == ARCH_ANY || | 54 | + a1 == ARCH_ANY || a2 == ARCH_ANY || |
@@ -86,7 +107,7 @@ index 34a14a3..2d7cd70 100644 | |||
86 | - 0 | 107 | - 0 |
87 | -}; | 108 | -}; |
88 | +/* Provide the const char *archpolicies structure */ | 109 | +/* Provide the const char *archpolicies structure */ |
89 | +#include "poky-arch.h" | 110 | +#include "core-arch.h" |
90 | 111 | ||
91 | void | 112 | void |
92 | pool_setarch(Pool *pool, const char *arch) | 113 | pool_setarch(Pool *pool, const char *arch) |
@@ -97,7 +118,7 @@ index 34a14a3..2d7cd70 100644 | |||
97 | -#ifndef DEBIAN_SEMANTICS | 118 | -#ifndef DEBIAN_SEMANTICS |
98 | - id = ARCH_NOARCH; | 119 | - id = ARCH_NOARCH; |
99 | -#else | 120 | -#else |
100 | +#if defined(DEBIAN_SEMANTICS) || defined(POKY_SEMANTICS) | 121 | +#if defined(DEBIAN_SEMANTICS) || defined(OE_CORE_SEMANTICS) |
101 | id = ARCH_ALL; | 122 | id = ARCH_ALL; |
102 | +#else | 123 | +#else |
103 | + id = ARCH_NOARCH; | 124 | + id = ARCH_NOARCH; |