Skip to contentSkip to conversation

Warning fixes and related cleanups

PATCH In review Paul Eggleton 1 participant 6 messages Dec 4, 2013 – Dec 5, 2013

lore
Share & tools
lore
#0 lore raw

cover Warning fixes and related cleanups

The following changes since commit 64f0a0bc408d8e32d5e795aeb9fffee0539f5e22:

ptest: ensure do_install_ptest_base task runs in fakeroot context (2013-12-03 17:35:34 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib paule/fixes2
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/fixes2

Paul Eggleton (4):
gpgme: remove pth handling
openssh: remove unrecognised configure option
libarchive: add e2fsprogs to DEPENDS
libarchive: add SUMMARY and fix HOMEPAGE

 meta/recipes-connectivity/openssh/openssh_6.4p1.bb   |  3 +--
 meta/recipes-extended/libarchive/libarchive_2.8.5.bb |  5 ++++-
 meta/recipes-support/gpgme/gpgme_1.4.3.bb            | 10 +++-------
 3 files changed, 8 insertions(+), 10 deletions(-)
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/4 gpgme: remove pth handling

pth support was removed from gpgpme in 1.3.2 according to the upstream changelog, so drop all mention of it from the recipe.

Fixes the configure warning:
WARNING: QA Issue: gpgme: configure was passed unrecognised options: --without-pth-test --with-pth

---
 meta/recipes-support/gpgme/gpgme_1.4.3.bb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
meta/recipes-support/gpgme/gpgme_1.4.3.bb +3 -7
index aacd923..78182c0 100644
@@ -15,16 +15,12 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
 SRC_URI[md5sum] = "334e524cffa8af4e2f43ae8afe585672"
 SRC_URI[sha256sum] = "2d1cc12411753752d9c5b9037e6fd3fd363517af720154768cc7b46b60120496"
 
-DEPENDS = "libgpg-error libassuan ${PTH}"
-PTH_libc-uclibc = "npth"
-PTH = "pth"
+DEPENDS = "libgpg-error libassuan"
 
-EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
-                --with-gpg=${bindir}/gpg --without-gpgsm"
+EXTRA_OECONF = "--with-gpg=${bindir}/gpg --without-gpgsm"
 
 inherit autotools binconfig
 
-PACKAGES =+ "${PN}-pth ${PN}-pthread"
-FILES_${PN}-pth = "${libdir}/libgpgme-pth.so.*"
+PACKAGES =+ "${PN}-pthread"
 FILES_${PN}-pthread = "${libdir}/libgpgme-pthread.so.*"
 FILES_${PN}-dev += "${datadir}/common-lisp/source/gpgme/*"
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH 2/4 openssh: remove unrecognised configure option

In reply to Paul Eggleton

ssh-rand-helper was removed in OpenSSH 6.0 according to the upstream changelog, so the configure option to enable/disable it was removed.

Fixes the following warning:
WARNING: QA Issue: openssh: configure was passed unrecognised options: --with-rand-helper

---
 meta/recipes-connectivity/openssh/openssh_6.4p1.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
meta/recipes-connectivity/openssh/openssh_6.4p1.bb +1 -2
index 859fdd6..b48c14b 100644
@@ -55,8 +55,7 @@ inherit autotools
 CFLAGS += "-D__FILE_OFFSET_BITS=64"
 export LD = "${CC}"
 
-EXTRA_OECONF = "--with-rand-helper=no \
-                ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
+EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
                 --without-zlib-version-check \
                 --with-privsep-path=/var/run/sshd \
                 --sysconfdir=${sysconfdir}/ssh \
Signature · 1 line
1.8.1.2
#5 lore raw

PATCH 4/4 libarchive: add SUMMARY and fix HOMEPAGE

In reply to Paul Eggleton
---
 meta/recipes-extended/libarchive/libarchive_2.8.5.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-extended/libarchive/libarchive_2.8.5.bb +2 -1
index d3fb09e..76df23b 100644
@@ -1,5 +1,6 @@
+SUMMARY = "Support for reading various archive formats"
 DESCRIPTION = "C library and command-line tools for reading and writing tar, cpio, zip, ISO, and other archive formats"
-HOMEPAGE = "http://code.google.com/p/libarchive/"
+HOMEPAGE = "http://www.libarchive.org/"
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4255e2e6f0349a4ac8fbd68459296e46"
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH 3/4 libarchive: add e2fsprogs to DEPENDS

In reply to Paul Eggleton

libarchive's configure script looks for ext2fs/ext2_fs.h in order to use some defines for file attributes support if present (but doesn't link to any additional libraries.) There is no configure option to disable this, and if e2fsprogs is rebuilding between do_configure and do_compile you can currently get a failure. Since we normally only build this recipe for the target, and this functionality should really be supported on all linux systems, just add the dependency as most normal Linux distros seem to.

---
 meta/recipes-extended/libarchive/libarchive_2.8.5.bb | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-extended/libarchive/libarchive_2.8.5.bb +2 -0
index 11c2f7d..d3fb09e 100644
@@ -4,6 +4,8 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4255e2e6f0349a4ac8fbd68459296e46"
 
+DEPENDS = "e2fsprogs"
+
 PACKAGECONFIG ?= "libxml2 zlib bz2"
 
 PACKAGECONFIG_append_class-target = "\
Signature · 1 line
1.8.1.2
#4 lore raw

Re: [PATCH 3/4] libarchive: add e2fsprogs to DEPENDS

Quoted 8 lines · On Wednesday 04 December 2013 16:40:28 Paul Eggleton wrote:

libarchive's configure script looks for ext2fs/ext2_fs.h in order to use some defines for file attributes support if present (but doesn't link to any additional libraries.) There is no configure option to disable this, and if e2fsprogs is rebuilding between do_configure and do_compile you can currently get a failure. Since we normally only build this recipe for the target, and this functionality should really be supported on all linux systems, just add the dependency as most normal Linux distros seem to.

Actually this has problems building for nativesdk since there is no nativesdk- e2fsprogs; scratch this while I figure out a better solution.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre