Skip to contentSkip to conversation

fix lighttpd pciutils and apt

PATCH New Robert Yang 1 participant 4 messages Sep 7, 2016

lore
Share & tools
lore
#0 lore raw

cover fix lighttpd pciutils and apt

The following changes since commit 55bb6816aca39bfa25d4f7e2158a57a5f0ac1cca:

oeqa.buildperf: correct globalres time format (2016-09-06 10:24:00 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/3fixes

Robert Yang (3):
lighttpd: without-memcache -> without-memcached
apt: add PACKAGECONFIG for lz4
pciutils: fix PACKAGECONFIG

 meta/recipes-bsp/pciutils/pciutils_3.5.1.bb       | 6 +++---
 meta/recipes-devtools/apt/apt_1.2.12.bb           | 1 +
 meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
Signature · 1 line
2.9.0
#1 lore raw

PATCH 1/3 lighttpd: without-memcache -> without-memcached

Fixed:
WARNING: QA Issue: lighttpd: configure was passed unrecognised options: --without-memcache [unknown-configure-option]

---
 meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-extended/lighttpd/lighttpd_1.4.41.bb +1 -1
index bba90cf..1a3f323 100644
@@ -36,7 +36,7 @@ EXTRA_OECONF = " \
              --without-bzip2 \
              --without-ldap \
              --without-lua \
-             --without-memcache \
+             --without-memcached \
              --with-pcre \
              --without-webdav-props \
              --without-webdav-locks \
Signature · 1 line
2.9.0
#2 lore raw

PATCH 2/3 apt: add PACKAGECONFIG for lz4

In reply to Robert Yang

Fixed:
apt-1.2.12: apt rdepends on lz4, but it isn't a build dependency, missing lz4 in DEPENDS or PACKAGECONFIG? [build-deps]

---
 meta/recipes-devtools/apt/apt_1.2.12.bb | 1 +
 1 file changed, 1 insertion(+)
meta/recipes-devtools/apt/apt_1.2.12.bb +1 -0
index 85c0d56..ae0bce9 100644
@@ -7,6 +7,7 @@ require apt-package.inc
 PACKAGECONFIG ??= "lzma"
 PACKAGECONFIG[lzma] = "ac_cv_lib_lzma_lzma_easy_encoder=yes,ac_cv_lib_lzma_lzma_easy_encoder=no,xz"
 PACKAGECONFIG[bz2] = "ac_cv_lib_bz2_BZ2_bzopen=yes,ac_cv_lib_bz2_BZ2_bzopen=no,bzip2"
+PACKAGECONFIG[lz4] = "ac_cv_lib_lz4_LZ4F_createCompressionContext=yes,ac_cv_lib_lz4_LZ4F_createCompressionContext=no,lz4"
 
 FILES_${PN} += "${bindir}/apt-key"
 apt-manpages += "doc/apt-key.8"
Signature · 1 line
2.9.0
#3 lore raw

PATCH 3/3 pciutils: fix PACKAGECONFIG

In reply to Robert Yang

The PACKAGECONFIG's value doens't go into EXTRA_OECONF, but PACKAGECONFIG_CONFARGS.

Fixed:
pciutils-3.5.1: libpci rdepends on libudev, but it isn't a build dependency, missing eudev in DEPENDS or PACKAGECONFIG? [build-deps] pciutils-3.5.1: pciutils rdepends on libudev, but it isn't a build dependency, missing eudev in DEPENDS or PACKAGECONFIG? [build-deps]

---
 meta/recipes-bsp/pciutils/pciutils_3.5.1.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-bsp/pciutils/pciutils_3.5.1.bb +3 -3
index a84efd9..d32b119 100644
@@ -27,9 +27,9 @@ PCI_CONF_FLAG = "ZLIB=yes DNS=yes SHARED=yes"
 do_configure () {
 	(
 	  cd lib && \
-	  # EXTRA_OECONF for this recipe could only possibly contain 'HWDB=yes/no', so we put it
-	  # before ./configure
-	  ${PCI_CONF_FLAG} ${EXTRA_OECONF} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH}
+	  # PACKAGECONFIG_CONFARGS for this recipe could only possibly contain 'HWDB=yes/no',
+	  # so we put it before ./configure
+	  ${PCI_CONF_FLAG} ${PACKAGECONFIG_CONFARGS} ./configure ${PV} ${datadir} ${TARGET_OS} ${TARGET_ARCH}
 	)
 }
 
Signature · 1 line
2.9.0