Skip to contentSkip to conversation

Various fixes, mostly for WARNING messages

PATCH In review Richard Purdie 4 participants 22 messages Feb 23, 2012 – Mar 1, 2012

lore
Share & tools
lore
#0 lore raw

cover Various fixes, mostly for WARNING messages

These patches mainly fix various warning issues reported by the build but there are a couple of other improvements/fixes thrown in.

The following changes since commit a578fbce14b6f3391f28d59f287160e04590fa77:

netbase: remove redundant assignments (2012-02-22 22:11:27 +0000)

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

This repository is based against Poky, not OE-Core.

Richard Purdie (16):
eglibc: Fix package warning
rpm: Fix LICENSE field
libusb1: Address unpackaged files warning
libusb-compat: Address unpackaged files warning
readline: Add a patch to remove the redundant rpath linker option
libgcrypt: Fix unpackaged file warning
dbus: Fix unpackaged files warning
e2fsprogs: Fix unpackaged file warning
cracklib: Fix unpackaged files warning by disabling autodetected
python
glib-2.0: Fix unpackaged files warning
dbus-glib: Correctly package bash completion pieces to avoid QA
warning
package.bbclass: Remove empty directories created as part of srcdebug
handling
insane.bbclass: Only depend on desktop-file-utils-native when we need
it
autotools.bbclass: Make builds deterministic
gthumb: Resolve staticdev QA warnings
sstatesig.py: Add handling for machine specific module depenedencies

 meta/classes/autotools.bbclass                     |    2 +
 meta/classes/insane.bbclass                        |    8 +++++-
 meta/classes/package.bbclass                       |   13 +++++++++-
 meta/lib/oe/sstatesig.py                           |   26 +++++++++++++++----
 meta/recipes-core/dbus/dbus-glib.inc               |    4 ++-
 meta/recipes-core/dbus/dbus-glib_0.92.bb           |    2 +-
 meta/recipes-core/dbus/dbus.inc                    |    3 ++
 meta/recipes-core/eglibc/eglibc-package.inc        |    1 +
 meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb      |    5 +++-
 meta/recipes-core/readline/files/norpath.patch     |   21 ++++++++++++++++
 meta/recipes-core/readline/readline.inc            |    1 +
 meta/recipes-core/readline/readline_6.2.bb         |    2 +-
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb  |    4 +-
 meta/recipes-devtools/rpm/rpm_5.4.0.bb             |    4 +-
 meta/recipes-extended/cracklib/cracklib_2.8.18.bb  |    4 ++-
 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb         |    6 ++++-
 meta/recipes-support/libgcrypt/libgcrypt.inc       |    3 ++
 meta/recipes-support/libusb/libusb-compat_0.1.3.bb |    4 +-
 meta/recipes-support/libusb/libusb1_1.0.8.bb       |    4 +-
 19 files changed, 95 insertions(+), 22 deletions(-)
 create mode 100644 meta/recipes-core/readline/files/norpath.patch
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/16 eglibc: Fix package warning

WARNING: For recipe eglibc, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib/locale

---
 meta/recipes-core/eglibc/eglibc-package.inc |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-core/eglibc/eglibc-package.inc +1 -0
index 2a1d939..d898717 100644
@@ -104,5 +104,6 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
 
 eglibc_package_preprocess () {
 	rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
+	rm -rf ${PKGD}/${libdir}/locale
 }
 
Signature · 1 line
1.7.5.4
#2 lore raw

PATCH 2/16 rpm: Fix LICENSE field

This addresses the warning:

WARNING: rpm: No generic license file exists for: LGPL in any provider
WARNING: rpm: No generic license file exists for: 2.1 in any provider

---
 meta/recipes-devtools/rpm/rpm_5.4.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/rpm/rpm_5.4.0.bb +2 -2
index 2c26d9a..6be490f 100644
@@ -39,13 +39,13 @@ DESCRIPTION_perl-modules-rpm-dev = "Development items such as man pages for use
 language bindings."
 
 HOMEPAGE = "http://rpm5.org/"
-LICENSE = "LGPL 2.1"
+LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = "file-native"
-PR = "r30"
+PR = "r31"
 
 # 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...
Signature · 1 line
1.7.5.4
#3 lore raw

PATCH 3/16 libusb1: Address unpackaged files warning

In reply to Richard Purdie

WARNING: For recipe libusb1, the following files/directories were installed but not shipped in any package:
WARNING: /lib/libusb-1.0.la

---
 meta/recipes-support/libusb/libusb1_1.0.8.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/libusb/libusb1_1.0.8.bb +2 -2
index e45a9d9..b8fa790 100644
@@ -6,7 +6,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"
 
@@ -27,4 +27,4 @@ do_install_append() {
 
 FILES_${PN} += "${base_libdir}/*.so.*"
 
-FILES_${PN}-dev += "${base_libdir}/*.so"
+FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
Signature · 1 line
1.7.5.4
#4 lore raw

Re: [PATCH 03/16] libusb1: Address unpackaged files warning

Quoted 22 lines · Richard Purdie

WARNING: For recipe libusb1, the following files/directories were installed but not shipped in any package:
WARNING: /lib/libusb-1.0.la

---
 meta/recipes-support/libusb/libusb1_1.0.8.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/libusb/libusb1_1.0.8.bb +1 -1
index e45a9d9..b8fa790 100644
@@ -6,7 +6,7 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24"
 
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2"
 

meta/recipes-support/libusb/libusb1_1.0.8.bb do_install_append() { · line 30

Quoted 5 lines
meta/recipes-support/libusb/libusb1_1.0.8.bb +1 -1
@@ -27,4 +27,4 @@ do_install_append() {
 
 FILES_${PN} += "${base_libdir}/*.so.*"
 
-FILES_${PN}-dev += "${base_libdir}/*.so"
+FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"

why not just delete it. We have been living without it anyway

#5 lore raw

PATCH 4/16 libusb-compat: Address unpackaged files warning

In reply to Richard Purdie

WARNING: For recipe libusb-compat, the following files/directories were installed but not shipped in any package:
WARNING: /lib/libusb.la

---
 meta/recipes-support/libusb/libusb-compat_0.1.3.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-support/libusb/libusb-compat_0.1.3.bb +2 -2
index 1595a29..43da5af 100644
@@ -15,7 +15,7 @@ DEPENDS = "libusb1"
 PROVIDES = "libusb"
 
 PE = "1"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-${PV}.tar.bz2 \
            file://0.1.0-beta1-gcc3.4-fix.patch"
@@ -34,4 +34,4 @@ do_install_append() {
 	fi
 }
 
-FILES_${PN}-dev += "${base_libdir}/*.so"
+FILES_${PN}-dev += "${base_libdir}/*.so ${base_libdir}/*.la"
Signature · 1 line
1.7.5.4
#6 lore raw

Re: [PATCH 04/16] libusb-compat: Address unpackaged files warning

Quoted 2 lines · Richard Purdie

WARNING: For recipe libusb-compat, the following files/directories were installed but not shipped in any package:
WARNING:   /lib/libusb.la

Why not drop it?

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
#7 lore raw

Re: [PATCH 04/16] libusb-compat: Address unpackaged files warning

Quoted 6 lines · Otavio Salvador
Quoted 2 lines · Richard Purdie

WARNING: For recipe libusb-compat, the following files/directories were installed but not shipped in any package:
WARNING: /lib/libusb.la

Why not drop it?

I want to be consistent. We currently package the .la files. We've also recently witnessed what can happen when they're removed...

Cheers,

Richard

#8 lore raw

PATCH 5/16 readline: Add a patch to remove the redundant rpath linker option

In reply to Richard Purdie

This resolves the QA warnings:

WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libhistory.so.6.2 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libreadline.so.6.2 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libreadline.so.6 contains probably-redundant RPATH /usr/lib
WARNING: QA Issue: readline: /work/x86_64-poky-linux/readline-6.2-r0/packages-split/readline/usr/lib/libhistory.so.6 contains probably-redundant RPATH /usr/lib

---
 meta/recipes-core/readline/files/norpath.patch |   21 +++++++++++++++++++++
 meta/recipes-core/readline/readline.inc        |    1 +
 meta/recipes-core/readline/readline_6.2.bb     |    2 +-
 3 files changed, 23 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/readline/files/norpath.patch
meta/recipes-core/readline/files/norpath.patch new file +21 -0
new file mode 100644
index 0000000..5d71582
@@ -0,0 +1,21 @@
+This support script ends up hardcoding unnecessary rpaths into the libraries. We
+will search $libdir automatically so this is just wastes space. There may be some
+cases this is necessary but our use cases aren't one of them.
+
+Upstream-Status: Inappropriate
+
+RP 2012/2/23
+
+Index: readline-6.2/support/shobj-conf
+===================================================================
+--- readline-6.2.orig/support/shobj-conf	2012-02-23 11:06:37.193179379 +0000
++++ readline-6.2/support/shobj-conf	2012-02-23 11:06:50.049178918 +0000
+@@ -114,7 +114,7 @@
+ 	SHOBJ_LD='${CC}'
+ 	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
+ 
+-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
++	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
+ 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
+ 	;;
+ 
meta/recipes-core/readline/readline.inc +1 -0
index 743d8b3..2e9c6b1 100644
@@ -12,6 +12,7 @@ DEPENDS += "ncurses"
 
 SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz \
            file://configure-fix.patch \
+           file://norpath.patch \
            file://acinclude.m4"
 
 S = "${WORKDIR}/${BPN}-${PV}"
meta/recipes-core/readline/readline_6.2.bb +1 -1
index 5e32bb5..e6f330d 100644
@@ -1,6 +1,6 @@
 require readline.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI[md5sum] = "67948acb2ca081f23359d0256e9a271c"
 SRC_URI[sha256sum] = "79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381"
Signature · 1 line
1.7.5.4
#9 lore raw

PATCH 6/16 libgcrypt: Fix unpackaged file warning

In reply to Richard Purdie

WARNING: For recipe libgcrypt, the following files/directories were installed but not shipped in any package:
WARNING: /usr/sbin

---
 meta/recipes-support/libgcrypt/libgcrypt.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-support/libgcrypt/libgcrypt.inc +3 -0
index 088cd34..a890188 100644
@@ -21,6 +21,9 @@ EXTRA_OECONF = "--without-pth --disable-asm --with-capabilities"
 do_install_append() {
 	install -d ${D}/${libdir}/pkgconfig
 	install -m 0644 ${S}/src/libgcrypt.pc ${D}/${libdir}/pkgconfig/
+	
+	# Remove empty sbin directory since we don't build the daemon that would install there
+	rmdir ${D}${sbindir}
 }
 
 ARM_INSTRUCTION_SET = "arm"
Signature · 1 line
1.7.5.4
#10 lore raw

PATCH 7/16 dbus: Fix unpackaged files warning

In reply to Richard Purdie

WARNING: For recipe dbus, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib/dbus-1.0/test

---
 meta/recipes-core/dbus/dbus.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-core/dbus/dbus.inc +3 -0
index 2a25256..1306450 100644
@@ -94,6 +94,9 @@ do_install() {
 	# disable dbus-1 sysv script on systemd installs
 	# nearly all distros call the initscript plain 'dbus', but OE-core is different
 	ln -sf /dev/null ${D}/${base_libdir}/systemd/system/dbus-1.service
+	
+	# We don't build tests, don't need the empty directory
+	rmdir ${D}${libdir}/${BPN}*/test/
 }
 
 do_install_virtclass-native() {
Signature · 1 line
1.7.5.4
#11 lore raw

PATCH 9/16 cracklib: Fix unpackaged files warning by disabling autodetected python

In reply to Richard Purdie
WARNING: For recipe cracklib, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/lib/python2.7
WARNING:   /usr/lib/python2.7/site-packages
---
 meta/recipes-extended/cracklib/cracklib_2.8.18.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-extended/cracklib/cracklib_2.8.18.bb +3 -1
index 31f808d..ad8fd5b 100644
@@ -5,7 +5,9 @@ LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
 
 DEPENDS = "zlib"
-PR ="r3"
+PR ="r4"
+
+EXTRA_OECONF = "--without-python"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/cracklib/cracklib-${PV}.tar.gz"
 
Signature · 1 line
1.7.5.4
#12 lore raw

PATCH 10/16 glib-2.0: Fix unpackaged files warning

In reply to Richard Purdie
WARNING: For recipe glib-2.0, the following files/directories were installed but not shipped in any package:
WARNING:   /usr/lib/gio
WARNING:   /usr/lib/gio/modules
---
 meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.30.2.bb +4 -1
index 111f9a4..e2170bc 100644
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r4"
+PR = "r5"
 PE = "1"
 
 DEPENDS += "libffi python-argparse-native zlib"
@@ -35,6 +35,9 @@ do_install_append() {
   # remove some unpackaged files
   rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
   rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
+  # and empty dirs
+  rmdir ${D}${libdir}/gio/modules/
+  rmdir ${D}${libdir}/gio/
 }
 
 PACKAGES += "${PN}-codegen"
Signature · 1 line
1.7.5.4
#13 lore raw

PATCH 12/16 package.bbclass: Remove empty directories created as part of srcdebug handling

In reply to Richard Purdie

We can create directories like /usr/src/debug as part of the debug file manipulations. If these are going to end up empty, remove them to avoid QA warnings like:

WARNING: For recipe task-core-x11, the following files/directories were installed but not shipped in any package:
WARNING:   /usr
WARNING:   /usr/src
WARNING:   /usr/src/debug
WARNING: For recipe task-core-console, the following files/directories were installed but not shipped in any package:
WARNING:   /usr
WARNING:   /usr/src
WARNING:   /usr/src/debug
---
 meta/classes/package.bbclass |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)
meta/classes/package.bbclass +12 -1
index f6d6e1a..b579e50 100644
@@ -251,7 +251,13 @@ def splitfile2(debugsrcdir, d):
     sourcefile = bb.data.expand("${WORKDIR}/debugsources.list", d)
 
     if debugsrcdir:
-       bb.mkdirhier("%s%s" % (dvar, debugsrcdir))
+       nosuchdir = []
+       basepath = dvar
+       for p in debugsrcdir.split("/"):
+           basepath = basepath + "/" + p
+           if not os.path.exists(basepath):
+               nosuchdir.append(basepath)
+       bb.mkdirhier(basepath)
 
        processdebugsrc =  "LC_ALL=C ; sort -z -u '%s' | egrep -v -z '(<internal>|<built-in>)$' | "
        # We need to ignore files that are not actually ours
@@ -268,6 +274,11 @@ def splitfile2(debugsrcdir, d):
               #bb.note("rmdir -p %s" % dir)
               os.system("rmdir -p %s 2>/dev/null" % dir)
 
+       # Also remove debugsrcdir if its empty
+       for p in nosuchdir[::-1]:
+           if not os.listdir(p):
+               os.rmdir(p)
+
 def runstrip(file, elftype, d):
     # Function to strip a single file, called from split_and_strip_files below
     # A working 'file' (one which works on the target architecture)
Signature · 1 line
1.7.5.4
#14 lore raw

PATCH 14/16 autotools.bbclass: Make builds deterministic

In reply to Richard Purdie

We need to ensure any aclocal-copy directory is removed before we s earch for .m4 files, else the locations .m4 files are found from can vary depending on whether its the first or second time we run configure.

Clearing any existing aclocal-copy directory before we start resolves this issue and makes builds deterministic again.

---
 meta/classes/autotools.bbclass |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta/classes/autotools.bbclass +2 -0
index 5d74333..4db021b 100644
@@ -102,6 +102,8 @@ autotools_do_configure() {
 		if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
 			olddir=`pwd`
 			cd ${S}
+			# Remove any previous copy of the m4 macros
+			rm -rf ${B}/aclocal-copy/
 			if [ x"${acpaths}" = xdefault ]; then
 				acpaths=
 				for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
Signature · 1 line
1.7.5.4
#15 lore raw

PATCH 15/16 gthumb: Resolve staticdev QA warnings

In reply to Richard Purdie

Since the .a files are pretty useless in the case of plugin modules, lets just remove them. This resolves the warnings:

WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libslideshow.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libimporter.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libimage_viewer.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libchange_date.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libedit_metadata.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libgstreamer_tools.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libphoto_importer.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libimage_rotation.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libfile_viewer.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libpixbuf_savers.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libexport_tools.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libconvert_format.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/librename_series.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libfile_tools.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libwebalbums.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libcatalogs.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libresize_images.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libimage_print.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libdesktop_background.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libred_eye_removal.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libcomments.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libfile_manager.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libjpeg_utils.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libgstreamer_utils.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/liblist_tools.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libbookmarks.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libsearch.a'
WARNING: QA Issue: non -staticdev package contains static .a library: gthumb path '/work/x86_64-poky-linux/gthumb-2.12.4-r1/packages-split/gthumb/usr/lib/gthumb/extensions/libraw_files.a'

---
 meta/recipes-gnome/gthumb/gthumb_2.12.4.bb |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/recipes-gnome/gthumb/gthumb_2.12.4.bb +5 -1
index 19a6b31..5c87dc1 100644
@@ -4,7 +4,7 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base"
 
-PR = "r1"
+PR = "r2"
 
 EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter"
 
@@ -15,3 +15,7 @@ FILES_${PN}-dbg += "${libdir}/gthumb/modules/.debug/ ${libdir}/gthumb/extensions
 
 SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f"
 SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d"
+
+do_install_append () {
+	rm ${D}${libdir}/${BPN}/extensions/*.a
+}
Signature · 1 line
1.7.5.4
#16 lore raw

PATCH 16/16 sstatesig.py: Add handling for machine specific module depenedencies

In reply to Richard Purdie

Adding dependencies on machine specific recipes from generic packages causes a rebuild of the generic package per machine if using signatures for the stamp files which is unacceptable.

We need to declare that RRECOMMENDS on kernel-module-* are safe and that we shouldn't care about these machine specific dependencies from a stamp perspective. This change adds code which does this.

It depends on a change in bitbake to expose the dataCache object which can be used to make the calculations we need to allow this to work correctly.

---
 meta/lib/oe/sstatesig.py |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
meta/lib/oe/sstatesig.py +20 -6
index ee7cbad..5a64882 100644
@@ -1,6 +1,6 @@
 import bb.siggen
 
-def sstate_rundepfilter(fn, recipename, task, dep, depname):
+def sstate_rundepfilter(fn, recipename, task, dep, depname, dataCache):
     # Return True if we should keep the dependency, False to drop it
     def isNative(x):
         return x.endswith("-native")
@@ -8,13 +8,16 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
         return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate")
     def isNativeSDK(x):
         return x.endswith("-nativesdk")
+    def isKernel(fn):
+        inherits = " ".join(dataCache.inherits[fn])
+        return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1
 
     # Always include our own inter-task dependencies
     if recipename == depname:
         return True
 
     # Quilt (patch application) changing isn't likely to affect anything
-    if depname == "quilt-native":
+    if depname == "quilt-native" and recipename != "quilt-native":
         return False
     # Don't change native/cross/nativesdk recipe dependencies any further
     if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename):
@@ -30,6 +33,17 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
     if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'base-files']:
         return False
 
+    # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum
+    # if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum
+    # is machine specific.
+    # Therefore if we're not a kernel or a module recipe (inheriting the kernel classes)
+    # and we reccomend a kernel-module, we exclude the dependency.
+    depfn = dep.rsplit(".", 1)[0]
+    if dataCache and isKernel(depfn) and not isKernel(fn):
+        for pkg in dataCache.runrecs[fn]:
+            if " ".join(dataCache.runrecs[fn][pkg]).find("kernel-module-") != -1:
+                return False
+
     # Default to keep dependencies
     return True
 
@@ -37,15 +51,15 @@ class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic):
     name = "OEBasic"
     def init_rundepcheck(self, data):
         pass
-    def rundep_check(self, fn, recipename, task, dep, depname):
-        return sstate_rundepfilter(fn, recipename, task, dep, depname)
+    def rundep_check(self, fn, recipename, task, dep, depname, dataCache = None):
+        return sstate_rundepfilter(fn, recipename, task, dep, depname, dataCache)
 
 class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
     name = "OEBasicHash"
     def init_rundepcheck(self, data):
         pass
-    def rundep_check(self, fn, recipename, task, dep, depname):
-        return sstate_rundepfilter(fn, recipename, task, dep, depname)
+    def rundep_check(self, fn, recipename, task, dep, depname, dataCache = None):
+        return sstate_rundepfilter(fn, recipename, task, dep, depname, dataCache)
 
 # Insert these classes into siggen's namespace so it can see and select them
 bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic
Signature · 1 line
1.7.5.4
Acked-by on v1 16/16
#17 lore raw

Re: [PATCH 16/16] sstatesig.py: Add handling for machine specific module depenedencies

Quoted 8 lines · Richard Purdie

Adding dependencies on machine specific recipes from generic packages causes a rebuild of the generic package per machine if using signatures for the stamp files which is unacceptable.

We need to declare that RRECOMMENDS on kernel-module-* are safe and that we shouldn't care about these machine specific dependencies from a stamp perspective. This change adds code which does this.

Quoted 5 lines

It depends on a change in bitbake to expose the dataCache object which can be used to make the calculations we need to allow this to work correctly.

Improves qemux86-64copy build times significantly :)

Quoted 80 lines
---
 meta/lib/oe/sstatesig.py |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)
meta/lib/oe/sstatesig.py +20 -6
index ee7cbad..5a64882 100644
@@ -1,6 +1,6 @@
 import bb.siggen
 
-def sstate_rundepfilter(fn, recipename, task, dep, depname):
+def sstate_rundepfilter(fn, recipename, task, dep, depname, dataCache):
     # Return True if we should keep the dependency, False to drop it
     def isNative(x):
         return x.endswith("-native")
@@ -8,13 +8,16 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
         return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate")
     def isNativeSDK(x):
         return x.endswith("-nativesdk")
+    def isKernel(fn):
+        inherits = " ".join(dataCache.inherits[fn])
+        return inherits.find("module-base.bbclass") != -1 or inherits.find("linux-kernel-base.bbclass") != -1
 
     # Always include our own inter-task dependencies
     if recipename == depname:
         return True
 
     # Quilt (patch application) changing isn't likely to affect anything
-    if depname == "quilt-native":
+    if depname == "quilt-native" and recipename != "quilt-native":
         return False
     # Don't change native/cross/nativesdk recipe dependencies any further
     if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename):
@@ -30,6 +33,17 @@ def sstate_rundepfilter(fn, recipename, task, dep, depname):
     if depname in ['sysvinit-inittab', 'shadow-securetty', 'opkg-config-base', 'netbase', 'formfactor', 'xserver-xf86-config', 'pointercal', 'base-files']:
         return False
 
+    # Kernel modules are well namespaced. We don't want to depend on the kernel's checksum
+    # if we're just doing an RRECOMMENDS_xxx = "kernel-module-*", not least because the checksum
+    # is machine specific.
+    # Therefore if we're not a kernel or a module recipe (inheriting the kernel classes)
+    # and we reccomend a kernel-module, we exclude the dependency.
+    depfn = dep.rsplit(".", 1)[0]
+    if dataCache and isKernel(depfn) and not isKernel(fn):
+        for pkg in dataCache.runrecs[fn]:
+            if " ".join(dataCache.runrecs[fn][pkg]).find("kernel-module-") != -1:
+                return False
+
     # Default to keep dependencies
     return True
 
@@ -37,15 +51,15 @@ class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic):
     name = "OEBasic"
     def init_rundepcheck(self, data):
         pass
-    def rundep_check(self, fn, recipename, task, dep, depname):
-        return sstate_rundepfilter(fn, recipename, task, dep, depname)
+    def rundep_check(self, fn, recipename, task, dep, depname, dataCache = None):
+        return sstate_rundepfilter(fn, recipename, task, dep, depname, dataCache)
 
 class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
     name = "OEBasicHash"
     def init_rundepcheck(self, data):
         pass
-    def rundep_check(self, fn, recipename, task, dep, depname):
-        return sstate_rundepfilter(fn, recipename, task, dep, depname)
+    def rundep_check(self, fn, recipename, task, dep, depname, dataCache = None):
+        return sstate_rundepfilter(fn, recipename, task, dep, depname, dataCache)
 
 # Insert these classes into siggen's namespace so it can see and select them
 bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic
Signature · 7 lines
1.7.5.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#18 lore raw

PATCH 8/16 e2fsprogs: Fix unpackaged file warning

In reply to Richard Purdie

WARNING: For recipe e2fsprogs, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib/e2initrd_helper

---
 meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb +2 -2
index 2289211..793393e 100644
@@ -1,6 +1,6 @@
 require e2fsprogs.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://fallocate.patch \
             file://acinclude.m4"
@@ -54,7 +54,7 @@ FILES_e2fsprogs-badblocks = "${base_sbindir}/badblocks"
 FILES_libcomerr = "${base_libdir}/libcom_err.so.*"
 FILES_libss = "${base_libdir}/libss.so.*"
 FILES_libe2p = "${base_libdir}/libe2p.so.*"
-FILES_libext2fs = "${base_libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
+FILES_libext2fs = "${libdir}/e2initrd_helper ${libdir}/libext2fs.so.*"
 FILES_${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
1.7.5.4
#19 lore raw

PATCH 11/16 dbus-glib: Correctly package bash completion pieces to avoid QA warning

WARNING: For recipe dbus-glib, the following files/directories were installed but not shipped in any package:
WARNING:   /etc
WARNING:   /etc/bash_completion.d
WARNING:   /etc/bash_completion.d/dbus-bash-completion.sh
WARNING:   /usr/libexec/dbus-bash-completion-helper
---
 meta/recipes-core/dbus/dbus-glib.inc     |    4 +++-
 meta/recipes-core/dbus/dbus-glib_0.92.bb |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
meta/recipes-core/dbus/dbus-glib.inc +3 -1
index 80f68c8..da2845a 100644
@@ -19,8 +19,10 @@ EXTRA_OECONF = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-in
                 --with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"
 EXTRA_OECONF_virtclass-native = "--with-introspect-xml=${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml"
 
+PACKAGES += "${PN}-bash-completion"
+
 FILES_${PN} = "${libdir}/lib*${SOLIBS}"
-FILES_${PN}-bash_completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \
+FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d/dbus-bash-completion.sh \
    ${libexecdir}/dbus-bash-completion-helper"
 FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
 FILES_${PN}-dev += "${bindir}/dbus-binding-tool"
meta/recipes-core/dbus/dbus-glib_0.92.bb +1 -1
index c7266d4..988625b 100644
@@ -1,6 +1,6 @@
 require dbus-glib.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "b595b36890c4f9f8f5d5dec131c495f8"
 SRC_URI[sha256sum] = "5a7fd4cf937cdcb7f2eed61341b70ee0f2607450a50db381618598adf60dd40e"
Signature · 1 line
1.7.5.4
#20 lore raw

PATCH 13/16 insane.bbclass: Only depend on desktop-file-utils-native when we need it

In reply to Richard Purdie

There is no point in depending on desktop-file-utils if we're not going to use it. This patch makes the dependency conditional upon the desktop tests being enabled.

---
 meta/classes/insane.bbclass |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
meta/classes/insane.bbclass +7 -1
index ead6ec1..7a84465 100644
@@ -23,7 +23,7 @@
 # The package.bbclass can help us here.
 #
 inherit package
-PACKAGE_DEPENDS += "pax-utils-native desktop-file-utils-native ${QADEPENDS}"
+PACKAGE_DEPENDS += "pax-utils-native ${QADEPENDS}"
 PACKAGEFUNCS += " do_package_qa "
 
 # unsafe-references-in-binaries requires prelink-rtld from
@@ -722,3 +722,9 @@ do_populate_sysroot[postfuncs] += "do_qa_staging "
 # have it in DEPENDS and for correct LIC_FILES_CHKSUM
 #addtask qa_configure after do_configure before do_compile
 do_configure[postfuncs] += "do_qa_configure "
+
+python () {
+    tests = d.getVar('WARN_QA', True) + " " + d.getVar('ERROR_QA', True)
+    if tests.find("desktop") != -1:
+        d.appendVar("PACKAGE_DEPENDS", "desktop-file-utils-native")
+}
Signature · 1 line
1.7.5.4
#21 lore raw
In reply to Richard Purdie
Quoted 2 lines · Richard Purdie

These patches mainly fix various warning issues reported by the build but there are a couple of other improvements/fixes thrown in.

From looking on the patches seems fine except I'd remove the .la files instead of adding it on -dev. I didn't build-test it as it is based on Poky.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
E-mail: [email protected]  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br