Small RPM package fix

PATCH Applied Mark Hatle 2 participants 3 messages Jul 6, 2012 – Jul 9, 2012

lore

Share & tools

lore

Mark Hatle

author

2012-07-06 20:07 UTC #0 lore raw

cover Small RPM package fix

A couple of minor RPM fixes that affect non-default configurations.

The following changes since commit 8f16811a8d51982a8b3d70e6087aef4a41926840:

bootimg: Use STAGING_KERNEL_DIR (2012-07-06 09:38:17 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc

Mark Hatle (1):
rpm: Fix PACKAGECONFIG dependencies

 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Signature · 1 line

1.7.3.4

Mark Hatle

author

2012-07-06 20:07 UTC #1 lore raw

PATCH 1/1 rpm: Fix PACKAGECONFIG dependencies

neon requires expat to be built first

lua similarly requires expat if enabled

selinux package name should be "libselinux" (from meta-selinux).

Signed-off-by Mark Hatle <[email protected]>

---
 meta/recipes-devtools/rpm/rpm_5.4.9.bb |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

meta/recipes-devtools/rpm/rpm_5.4.9.bb +4 -4

index 8e892a8..6ef1aae 100644
@@ -43,7 +43,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "libpcre attr acl popt ossp-uuid file"
-PR = "r44"
+PR = "r45"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...

@@ -129,13 +129,13 @@ PACKAGECONFIG[libelf] = "--with-libelf,--without-libelf,elfutils,"
 
 WITH_SELINUX = "--with-selinux --with-sepol --with-semanage"
 WITHOUT_SELINUX = "--without-selinux --without-sepol --without-semanage"
-PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},selinux,"
+PACKAGECONFIG[selinux] = "${WITH_SELINUX},${WITHOUT_SELINUX},libselinux,"
 
 WITH_NEON = "--with-neon --with-libproxy --with-expat --without-gssapi"
 WITHOUT_NEON = "--without-neon --without-libproxy --without-expat --without-gssapi"
-PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon,"
+PACKAGECONFIG[neon] = "${WITH_NEON},${WITHOUT_NEON},neon expat,"
 
-PACKAGECONFIG[lua] = "--with-lua,--without-lua,"
+PACKAGECONFIG[lua] = "--with-lua,--without-lua,expat,"
 PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl,"
 
 PACAKGECONFIG[augeas] = "--with-augeas,--without-augeas,augeas,"

Signature · 1 line

1.7.3.4

Saul Wold

Applied

2012-07-09 16:43 UTC #2 lore raw

In reply to Mark Hatle

Quoted 10 lines · Mark Hatle

A couple of minor RPM fixes that affect non-default configurations.
The following changes since commit 8f16811a8d51982a8b3d70e6087aef4a41926840:
   bootimg: Use STAGING_KERNEL_DIR (2012-07-06 09:38:17 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/misc

Quoted 6 lines

Mark Hatle (1):
rpm: Fix PACKAGECONFIG dependencies
  meta/recipes-devtools/rpm/rpm_5.4.9.bb |    8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)

Merged into OE-Core

Thanks
Sau!