Patchwork [1/2] sat-solver: fix arch=all packages

login
register
mail settings
Submitter Qing He
Date April 13, 2011, 9:26 a.m.
Message ID <e97fe275402062a86c56f70560b9660786d07db7.1302686656.git.qing.he@intel.com>
Download mbox | patch
Permalink /patch/2201/
State New, archived
Headers show

Comments

Qing He - April 13, 2011, 9:26 a.m.
From: Qing He <qing.he@intel.com>

add a new options to set noarch archs as all so platform independent
packages can be recognized and installed.

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../sat-solver/sat-solver/sat-solver_poky.patch    |   19 +++++++++++++++++++
 meta/recipes-extended/sat-solver/sat-solver_git.bb |    4 ++--
 2 files changed, 21 insertions(+), 2 deletions(-)
Khem Raj - April 13, 2011, 3:38 p.m.
On Wed, Apr 13, 2011 at 2:26 AM, Qing He <qing.he@intel.com> wrote:
> From: Qing He <qing.he@intel.com>
>
> add a new options to set noarch archs as all so platform independent
> packages can be recognized and installed.
>

I think this patch does not belong to oe-core as it seems distro specific

> Signed-off-by: Qing He <qing.he@intel.com>
> ---
>  .../sat-solver/sat-solver/sat-solver_poky.patch    |   19 +++++++++++++++++++
>  meta/recipes-extended/sat-solver/sat-solver_git.bb |    4 ++--
>  2 files changed, 21 insertions(+), 2 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_poky.patch
> index b762bac..e055545 100644
> --- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch
> +++ b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch
> @@ -5,8 +5,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.
>
> +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 ( POKY )
> ++MESSAGE(STATUS "Building for Poky")
> ++ADD_DEFINITIONS( -DPOKY -DPOKY_SEMANTICS)
> ++ENDIF ( POKY )
> ++
> + 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
> diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
> index a693776..0d5a5e6 100644
> --- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
> +++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
> @@ -7,7 +7,7 @@ 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 \
> @@ -19,7 +19,7 @@ SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
>
>  S = "${WORKDIR}/git"
>
> -EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
> +EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DPOKY=POKY"
>
>  inherit cmake pkgconfig
>
> --
> 1.7.0
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Qing He - April 14, 2011, 3:20 a.m.
On Wed, 2011-04-13 at 23:38 +0800, Khem Raj wrote:
> On Wed, Apr 13, 2011 at 2:26 AM, Qing He <qing.he@intel.com> wrote:
> > From: Qing He <qing.he@intel.com>
> >
> > add a new options to set noarch archs as all so platform independent
> > packages can be recognized and installed.
> >
> 
> I think this patch does not belong to oe-core as it seems distro specific

Ah, you're right. Thank you to point out.

Thanks,
Qing

Patch

diff --git a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch
index b762bac..e055545 100644
--- a/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch
+++ b/meta/recipes-extended/sat-solver/sat-solver/sat-solver_poky.patch
@@ -5,8 +5,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.
 
+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 ( POKY )
++MESSAGE(STATUS "Building for Poky")
++ADD_DEFINITIONS( -DPOKY -DPOKY_SEMANTICS)
++ENDIF ( POKY )
++
+ 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
diff --git a/meta/recipes-extended/sat-solver/sat-solver_git.bb b/meta/recipes-extended/sat-solver/sat-solver_git.bb
index a693776..0d5a5e6 100644
--- a/meta/recipes-extended/sat-solver/sat-solver_git.bb
+++ b/meta/recipes-extended/sat-solver/sat-solver_git.bb
@@ -7,7 +7,7 @@  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 \
@@ -19,7 +19,7 @@  SRC_URI = "git://gitorious.org/opensuse/sat-solver.git;protocol=git \
 
 S = "${WORKDIR}/git"
 
-EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5"
+EXTRA_OECMAKE += "-DLIB=lib -DRPM5=RPM5 -DPOKY=POKY"
 
 inherit cmake pkgconfig