Misc Fixes
cover Misc Fixes
Richard,
This set address a build issue, and fixes a couple of bugs, I split the staticdev QA test into 2 part for the libgcc change.
Thanks
Sau!
The following changes since commit 746e8ffa66850bf9050cd6baf94eb76c492eb535:
uclibc-git: Update to latest RC (2012-01-25 14:33:52 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Marc Ferland (1):
pm-utils: Add grep to RDEPENDS to avoid command failures.
Saul Wold (3):
default-providers: add kbd as PREFERRED_PROVIDER for console-tools insane.bbclass: Add test for static .a libraries in non-staticdev
packages
libgcc: Add INSANE_SKIP of staticdev for libgcc-dev and libgcov-dev
meta/classes/insane.bbclass | 15 ++++++++++++++- meta/conf/distro/include/default-providers.inc | 2 +- meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 4 +++- meta/recipes-devtools/gcc/libgcc_4.6.bb | 3 +++ 4 files changed, 21 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.6.5
PATCH 1/4 pm-utils: Add grep to RDEPENDS to avoid command failures.
From: Marc Ferland <[email protected]>
This is needed because the pm-utils functions uses the "-x" option of grep which is not supported by the busybox grep.
[YOCTO #1887]
--- meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +3 -1
@@ -6,12 +6,14 @@ LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147" -PR = "r0" +PR = "r1" SRC_URI = "http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz" inherit pkgconfig autotools +RDEPENDS = "grep" + FILES_${PN}-dbg += "${libdir}/pm-utils/bin/.debug \ ${datadir}/doc/pm-utils/README.debugging"
Signature · 1 line
1.7.6.5
Re: [PATCH 1/4] pm-utils: Add grep to RDEPENDS to avoid command failures.
Quoted 1 line · Saul Wold
+RDEPENDS = "grep"
Don't you get a QA error for that?
p.
Re: [PATCH 1/4] pm-utils: Add grep to RDEPENDS to avoid command failures.
Quoted 5 lines · Phil Blundell
Quoted 1 line · Saul Wold
+RDEPENDS = "grep"
Don't you get a QA error for that?
I didn't see any QA warnings when building with yocto (edison branch). I'll resend the patch with some corrections.
Here's bitbake output on my machine (with RDEPENDS = "grep"):
NOTE: Resolving any missing task queue dependencies
NOTE: Preparing runqueue
NOTE: Executing SetScene Tasks
NOTE: Executing RunQueue Tasks
NOTE: Running task 630 of 703 (ID: 4, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_fetch)
NOTE: package pm-utils-1.4.1-r1: task do_fetch: Started
NOTE: package pm-utils-1.4.1-r1: task do_fetch: Succeeded
NOTE: Running task 693 of 703 (ID: 0, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_unpack)
NOTE: package pm-utils-1.4.1-r1: task do_unpack: Started
NOTE: package pm-utils-1.4.1-r1: task do_unpack: Succeeded
NOTE: Running task 694 of 703 (ID: 1, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_patch)
NOTE: package pm-utils-1.4.1-r1: task do_patch: Started
NOTE: package pm-utils-1.4.1-r1: task do_patch: Succeeded
NOTE: Running task 695 of 703 (ID: 6, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_configure)
NOTE: Running task 696 of 703 (ID: 10, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_populate_lic)
NOTE: package pm-utils-1.4.1-r1: task do_configure: Started
NOTE: package pm-utils-1.4.1-r1: task do_populate_lic: Started
NOTE: package pm-utils-1.4.1-r1: task do_populate_lic: Succeeded
NOTE: package pm-utils-1.4.1-r1: task do_configure: Succeeded
NOTE: Running task 697 of 703 (ID: 7, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_compile)
NOTE: package pm-utils-1.4.1-r1: task do_compile: Started
NOTE: package pm-utils-1.4.1-r1: task do_compile: Succeeded
NOTE: Running task 698 of 703 (ID: 2, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_install)
NOTE: package pm-utils-1.4.1-r1: task do_install: Started
NOTE: package pm-utils-1.4.1-r1: task do_install: Succeeded
NOTE: Running task 699 of 703 (ID: 9, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_package)
NOTE: Running task 700 of 703 (ID: 3, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_populate_sysroot)
NOTE: package pm-utils-1.4.1-r1: task do_populate_sysroot: Started
NOTE: package pm-utils-1.4.1-r1: task do_package: Started
NOTE: package pm-utils-1.4.1-r1: task do_populate_sysroot: Succeeded
NOTE: package pm-utils-1.4.1-r1: task do_package: Succeeded
NOTE: Running task 701 of 703 (ID: 11, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_package_write_rpm)
NOTE: package pm-utils-1.4.1-r1: task do_package_write_rpm: Started
NOTE: package pm-utils-1.4.1-r1: task do_package_write_rpm: Succeeded
NOTE: Running noexec task 702 of 703 (ID: 8, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_package_write)
NOTE: Running noexec task 703 of 703 (ID: 5, /home/marc/yocto/poky/meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb, do_build)
NOTE: Tasks Summary: Attempted 703 tasks of which 691 didn't need to be
rerun and 0 failed.
Marc
Re: [PATCH 1/4] pm-utils: Add grep to RDEPENDS to avoid command failures.
Quoted 5 lines · Marc Ferland
Quoted 3 lines · Phil Blundell
Quoted 1 line · Saul Wold
+RDEPENDS = "grep"
Quoted 7 lines
Quoted 2 lines
Don't you get a QA error for that?
I didn't see any QA warnings when building with yocto (edison branch). I'll resend the patch with some corrections.
Here's bitbake output on my machine (with RDEPENDS = "grep"):
Ah, hm. Does yocto not use recipe_sanity by default?
p.
Re: [PATCH 1/4] pm-utils: Add grep to RDEPENDS to avoid command failures.
In reply to Saul WoldOp 25 jan. 2012 om 20:29 heeft Saul Wold <[email protected]> het volgende geschreven:
Quoted 26 lines
From: Marc Ferland <[email protected]>
This is needed because the pm-utils functions uses the "-x" option of grep which is not supported by the busybox grep.
[YOCTO #1887]
Written-by Marc Ferland <[email protected]>Signed-off-by Saul Wold <[email protected]>---
meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb | 4 +++-1 files changed, 3 insertions(+), 1 deletions(-)meta/recipes-bsp/pm-utils/pm-utils_1.4.1.bb +1
-1@@ -6,12 +6,14 @@ LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/pm-pmu.c;beginline=1;endline=22;md5=3c1ddbc54e735fb4a0386e14c78a3147" -PR = "r0" +PR = "r1"
SRC_URI= "http://pm-utils.freedesktop.org/releases/pm-utils-${PV}.tar.gz"
Quoted 3 lines
inherit pkgconfig autotools
+RDEPENDS = "grep"
RDEPENDS_${PN} = "grep"
Quoted 12 lines
+
FILES_${PN}-dbg += "${libdir}/pm-utils/bin/.debug \ ${datadir}/doc/pm-utils/README.debugging"Signature · 7 lines
1.7.6.5 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
PATCH 2/4 default-providers: add kbd as PREFERRED_PROVIDER for console-tools
In reply to Saul Woldkbd is used a primary provider for console-tools
--- meta/conf/distro/include/default-providers.inc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/default-providers.inc +1 -1
@@ -32,4 +32,4 @@ PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_opkg-native ?= "opkg-native" PREFERRED_PROVIDER_opkg-nativesdk ?= "opkg-nativesdk" - +PREFERRED_PROVIDER_console-tools ?= "kbd"
Signature · 1 line
1.7.6.5
PATCH 3/4 insane.bbclass: Add test for static .a libraries in non-staticdev packages
In reply to Saul WoldThis check verifies that non staticdev and non pic packages do not have static libraries in them. There are a few exceptions for the libgcc-dev and libgcov-dev packages which are whitelisted, also the *_nonshared.a need to be part of their respective -dev packages.
This is currently a warning to work out any other issues in the upper layers but will be moved to ERROR at somepoint in the future.
[YOCTO #663]
--- meta/classes/insane.bbclass | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-)
meta/classes/insane.bbclass +14 -1
@@ -109,7 +109,7 @@ def package_qa_get_machine_dict(): # Currently not being used by default "desktop" -WARN_QA ?= "ldflags useless-rpaths rpaths unsafe-references-in-binaries unsafe-references-in-scripts" +WARN_QA ?= "ldflags useless-rpaths rpaths unsafe-references-in-binaries unsafe-references-in-scripts staticdev" ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms" def package_qa_clean_path(path,d):
@@ -192,6 +192,19 @@ def package_qa_check_dev(path, name, d, elf, messages): messages.append("non -dev/-dbg/-nativesdk package contains symlink .so: %s path '%s'" % \ (name, package_qa_clean_path(path,d))) +QAPATHTEST[staticdev] = "package_qa_check_staticdev" +def package_qa_check_staticdev(path, name, d, elf, messages): + """ + Check for ".a" library in non-staticdev packages + There are a number of exceptions to this rule, -pic packages can contain + static libraries, the _nonshared.a belong with their -dev packages and + libgcc.a, libgcov.a will be skipped in their packages + """ + + if not name.endswith("-pic") and not name.endswith("-staticdev") and path.endswith(".a") and not path.endswith("_nonshared.a"): + messages.append("non -staticdev package contains static .a library: %s path '%s'" % \ + (name, package_qa_clean_path(path,d))) + QAPATHTEST[debug-files] = "package_qa_check_dbg" def package_qa_check_dbg(path, name, d, elf, messages): """
Signature · 1 line
1.7.6.5
PATCH 4/4 libgcc: Add INSANE_SKIP of staticdev for libgcc-dev and libgcov-dev
In reply to Saul WoldSkip the staticdev QA test since the static archives belong with the -dev.
--- meta/recipes-devtools/gcc/libgcc_4.6.bb | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
meta/recipes-devtools/gcc/libgcc_4.6.bb +3 -0
@@ -48,3 +48,6 @@ do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package" BBCLASSEXTEND = "nativesdk" +INSANE_SKIP_libgcc-dev = "staticdev" +INSANE_SKIP_libgcov-dev = "staticdev" +
Signature · 1 line
1.7.6.5
Richard Purdie
AppliedQuoted 18 lines · Saul Wold
Richard,
This set address a build issue, and fixes a couple of bugs, I split the staticdev QA test into 2 part for the libgcc change.
Thanks
Sau!The following changes since commit
746e8ffa66850bf9050cd6baf94eb76c492eb535:uclibc-git: Update to latest RC (2012-01-25 14:33:52 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contribsgw/fix
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix
Quoted 8 lines
Marc Ferland (1):
pm-utils: Add grep to RDEPENDS to avoid command failures.Saul Wold (3):
default-providers: add kbd asPREFERRED_PROVIDERfor console-tools insane.bbclass: Add test for static .a libraries in non-staticdev
packages
libgcc: AddINSANE_SKIPof staticdev for libgcc-dev and libgcov-dev
Merged to master, thanks. I took v2 of the pm-utils fix though.
Cheers,
Richard