mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-26 19:39:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

sat-solver: fix arch=all packages

Browse Source 
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>
This commit is contained in:
Qing He
2011-04-13 16:59:22 +08:00
committed by Saul Wold
parent c36361ed5a
commit b8765d4efb
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch → meta/recipes-extended/sat-solver/sat-solver/sat-solver_core.patch
View File

@@ -1,3 +1,5 @@
Upstream-Status: Inappropriate [distribution]
Fix "arch" integration with Poky.
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.
Disable the built-in archpolicies structure, and replace it with one
we generate in the recipe.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Also add poky semantics option in CMake.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Qing He <qing.he@intel.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 443281e..4456a87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,6 +45,11 @@ MESSAGE(STATUS "Building for Debian")
ADD_DEFINITIONS( -DDEBIAN -DDEBIAN_SEMANTICS)
ENDIF ( DEBIAN )
+IF ( OE_CORE )
+MESSAGE(STATUS "Building for OE core")
+ADD_DEFINITIONS( -DOE_CORE -DOE_CORE_SEMANTICS)
+ENDIF ( OE_CORE )
+
IF ( MULTI_SEMANTICS )
MESSAGE(STATUS "Enabling multi dist support")
ADD_DEFINITIONS( -DMULTI_SEMANTICS)
diff --git a/src/knownid.h b/src/knownid.h
index 7757ae0..4b8bee7 100644
--- a/src/knownid.h
@@ -27,7 +48,7 @@ index 55c8677..3356ff8 100644
}
/* we allow changes to/from noarch */
+#ifdef POKY_SEMANTICS
+#ifdef OE_CORE_SEMANTICS
+ if (a1 == a2 ||
+ a1 == ARCH_NOARCH || a2 == ARCH_NOARCH ||
+ a1 == ARCH_ANY || a2 == ARCH_ANY ||
@@ -86,7 +107,7 @@ index 34a14a3..2d7cd70 100644
- 0
-};
+/* Provide the const char *archpolicies structure */
+#include "poky-arch.h"
+#include "core-arch.h"
void
pool_setarch(Pool *pool, const char *arch)
@@ -97,7 +118,7 @@ index 34a14a3..2d7cd70 100644
-#ifndef DEBIAN_SEMANTICS
- id = ARCH_NOARCH;
-#else
+#if defined(DEBIAN_SEMANTICS) || defined(POKY_SEMANTICS)
+#if defined(DEBIAN_SEMANTICS) || defined(OE_CORE_SEMANTICS)
id = ARCH_ALL;
+#else
+ id = ARCH_NOARCH;

16
meta/recipes-extended/sat-solver/sat-solver_git.bb
View File

@@ -7,19 +7,19 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
DEPENDS = "libcheck rpm zlib expat db"
PV = "0.0-git${SRCPV}"
PR = "r8"
PR = "r9"
SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
file://sat-solver_rpm5.patch \
file://sat-solver_obsolete.patch \
file://cmake.patch \
file://db5.patch \
file://sat-solver_poky.patch \
file://sat-solver_core.patch \
"
S = "${WORKDIR}/git"
EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DOE_CORE=OE_CORE"
inherit cmake pkgconfig
@@ -38,18 +38,18 @@ do_archgen () {
INSTALL_PLATFORM_ARCHS="$each_arch $INSTALL_PLATFORM_ARCHS"
done
echo "/* Automatically generated by the sat-solver recipe */" > src/poky-arch.h
echo "const char *archpolicies[] = {" >> src/poky-arch.h
echo "/* Automatically generated by the sat-solver recipe */" > src/core-arch.h
echo "const char *archpolicies[] = {" >> src/core-arch.h
set -- $INSTALL_PLATFORM_ARCHS
save_IFS=$IFS
IFS=:
while [ $# -gt 0 ]; do echo " \"$1\", "\""$*"\", >> src/poky-arch.h ; shift; done
while [ $# -gt 0 ]; do echo " \"$1\", "\""$*"\", >> src/core-arch.h ; shift; done
IFS=$save_IFS
echo " 0" >> src/poky-arch.h
echo "};" >> src/poky-arch.h
echo " 0" >> src/core-arch.h
echo "};" >> src/core-arch.h
}
addtask archgen before do_configure after do_patch