[PATCH 0/4] Misc fixes

[PATCH 0/4] Misc fixes

[Paul Eggleton]

Fixes for some minor issues I noticed recently.


The following changes since commit d3ab7005f0c899da9f9f132b22861bd5d4f952ba:

  tzdata: update to 2016b (2016-03-20 22:58:00 +0000)

are available in the git repository at:

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

Paul Eggleton (4):
  classes/packagegroup: fix dbg/dev/ptest complementary packages
  classes/packagegroup: drop complementary -ptest if ptest not in DISTRO_FEATURES
  classes/distutils*: don't hide logs when setup script fails
  site.conf.sample: fix reference to oe-git-proxy script

 meta/classes/distutils-tools.bbclass |  8 ++++----
 meta/classes/distutils.bbclass       |  8 ++++----
 meta/classes/distutils3.bbclass      |  8 ++++----
 meta/classes/packagegroup.bbclass    | 12 +++++++++---
 meta/conf/site.conf.sample           |  2 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

-- 
2.5.5

[PATCH 1/4] classes/packagegroup: fix dbg/dev/ptest complementary packages

[Paul Eggleton]

OE-Core commit 8981ed20234c42dc1f5cdef802ebe7214bd55238 (from 2013)
caused a regression where -dbg/-dev/-ptest packages weren't generated
for packagegroups because we weren't setting ALLOW_EMPTY for them.
Break out the code for adding complementary groups to its own
conditional so we can set ALLOW_EMPTY at the same time.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/packagegroup.bbclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 56cfead..92e0bbe 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -22,12 +22,15 @@ inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'al
 # Also mark all packages as ALLOW_EMPTY
 python () {
     packages = d.getVar('PACKAGES', True).split()
-    genpackages = []
     for pkg in packages:
         d.setVar("ALLOW_EMPTY_%s" % pkg, "1")
-        for postfix in ['-dbg', '-dev', '-ptest']:
-            genpackages.append(pkg+postfix)
     if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
+        # Add complementary packagegroups
+        genpackages = []
+        for pkg in packages:
+            for postfix in ['-dbg', '-dev', '-ptest']:
+                genpackages.append(pkg+postfix)
+                d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1")
         d.setVar('PACKAGES', ' '.join(packages+genpackages))
 }
 
-- 
2.5.5

[PATCH 2/4] classes/packagegroup: drop complementary -ptest if ptest not in DISTRO_FEATURES

[Paul Eggleton]

If ptest isn't in DISTRO_FEATURES, there won't be any -ptest packages
and thus no need for the -ptest package for the packagegroup either.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/packagegroup.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 92e0bbe..d56248f 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -27,8 +27,11 @@ python () {
     if d.getVar('PACKAGEGROUP_DISABLE_COMPLEMENTARY', True) != '1':
         # Add complementary packagegroups
         genpackages = []
+        complementary_types = ['-dbg', '-dev']
+        if bb.utils.contains('DISTRO_FEATURES', 'ptest', True, False, d):
+            complementary_types.append('-ptest')
         for pkg in packages:
-            for postfix in ['-dbg', '-dev', '-ptest']:
+            for postfix in complementary_types:
                 genpackages.append(pkg+postfix)
                 d.setVar("ALLOW_EMPTY_%s" % pkg+postfix, "1")
         d.setVar('PACKAGES', ' '.join(packages+genpackages))
-- 
2.5.5

[PATCH 3/4] classes/distutils*: don't hide logs when setup script fails

[Paul Eggleton]

We need to see the output of the setup script in the error message
because what we are having bbfatal print here doesn't completely
describe what went wrong, thus we should use bbfatal_log here and not
bbfatal.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/distutils-tools.bbclass | 8 ++++----
 meta/classes/distutils.bbclass       | 8 ++++----
 meta/classes/distutils3.bbclass      | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta/classes/distutils-tools.bbclass b/meta/classes/distutils-tools.bbclass
index f43450e..8d9b3f7 100644
--- a/meta/classes/distutils-tools.bbclass
+++ b/meta/classes/distutils-tools.bbclass
@@ -10,14 +10,14 @@ distutils_do_compile() {
          STAGING_LIBDIR=${STAGING_LIBDIR} \
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
-         bbfatal "${PYTHON_PN} setup.py build_ext execution failed."
+         bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed."
 }
 
 distutils_stage_headers() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install_headers execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
 }
 
 distutils_stage_all() {
@@ -27,7 +27,7 @@ distutils_stage_all() {
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install (stage) execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
 }
 
 distutils_do_install() {
@@ -39,7 +39,7 @@ distutils_do_install() {
         PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install execution failed."
 
         echo "Step 3 of ${PN} Install ..."
         # support filenames with *spaces*
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index cd06713..da48a2e 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -12,14 +12,14 @@ distutils_do_compile() {
          STAGING_LIBDIR=${STAGING_LIBDIR} \
          BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
          ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py build ${DISTUTILS_BUILD_ARGS} || \
-         bbfatal "${PYTHON_PN} setup.py build execution failed."
+         bbfatal_log "${PYTHON_PN} setup.py build execution failed."
 }
 
 distutils_stage_headers() {
         install -d ${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR}
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install_headers execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
 }
 
 distutils_stage_all() {
@@ -29,7 +29,7 @@ distutils_stage_all() {
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install (stage) execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
 }
 
 distutils_do_install() {
@@ -39,7 +39,7 @@ distutils_do_install() {
         PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install execution failed."
 
         # support filenames with *spaces*
         # only modify file if it contains path  and recompile it
diff --git a/meta/classes/distutils3.bbclass b/meta/classes/distutils3.bbclass
index 443bf3a..4f6ca44 100644
--- a/meta/classes/distutils3.bbclass
+++ b/meta/classes/distutils3.bbclass
@@ -19,7 +19,7 @@ distutils3_do_compile() {
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py \
         build ${DISTUTILS_BUILD_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py build_ext execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py build_ext execution failed."
 }
 distutils3_do_compile[vardepsexclude] = "MACHINE"
 
@@ -32,7 +32,7 @@ distutils3_stage_headers() {
         fi
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install_headers ${DISTUTILS_STAGE_HEADERS_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install_headers execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install_headers execution failed."
 }
 distutils3_stage_headers[vardepsexclude] = "MACHINE"
 
@@ -48,7 +48,7 @@ distutils3_stage_all() {
         PYTHONPATH=${STAGING_DIR_HOST}${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install ${DISTUTILS_STAGE_ALL_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install (stage) execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install (stage) execution failed."
 }
 distutils3_stage_all[vardepsexclude] = "MACHINE"
 
@@ -64,7 +64,7 @@ distutils3_do_install() {
         PYTHONPATH=${D}${PYTHON_SITEPACKAGES_DIR} \
         BUILD_SYS=${BUILD_SYS} HOST_SYS=${SYS} \
         ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} setup.py install --install-lib=${D}/${PYTHON_SITEPACKAGES_DIR} ${DISTUTILS_INSTALL_ARGS} || \
-        bbfatal "${PYTHON_PN} setup.py install execution failed."
+        bbfatal_log "${PYTHON_PN} setup.py install execution failed."
 
         # support filenames with *spaces*
         find ${D} -name "*.py" -exec grep -q ${D} {} \; -exec sed -i -e s:${D}::g {} \;
-- 
2.5.5

[PATCH 4/4] site.conf.sample: fix reference to oe-git-proxy script

[Paul Eggleton]

The name of the script is oe-git-proxy, not oe-git-proxy.sh.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/conf/site.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/site.conf.sample b/meta/conf/site.conf.sample
index c551e8f..6cfefc5 100644
--- a/meta/conf/site.conf.sample
+++ b/meta/conf/site.conf.sample
@@ -17,7 +17,7 @@ SCONF_VERSION = "1"
 #
 
 # To use git with a proxy, you must use an external git proxy command, such as
-# the one provided by scripts/oe-git-proxy.sh. To use this script, copy it to
+# the one provided by scripts/oe-git-proxy. To use this script, copy it to
 # your PATH and uncomment the following:
 #GIT_PROXY_COMMAND ?= "oe-git-proxy"
 #ALL_PROXY ?= "socks://socks.example.com:1080"
-- 
2.5.5

[PATCH 0/4] misc fixes

[Khem Raj]

Fix install collisions between go-native and go-bootstrap-native
Fix ltp for musl
Other fixes are found by clang but are generic

The following changes since commit b5a595a4be09756b88e91f3353e3b221b165ab44:

  binutils: disable gold on mingw (2017-03-20 15:17:48 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib kraj/pu
  http://cgit.openembedded.org/openembedded-core-contrib/log/?h=kraj/pu

Khem Raj (4):
  ltp: Fix __sighandler_t for mips
  openssl: Fix build with clang
  acpitests: Point Makefile CC to use OE synthesized CC
  go-native: Install bootstrap binaries with 1.4 suffix

 ...build-with-clang-using-external-assembler.patch | 49 ++++++++++++++++++++++
 .../recipes-connectivity/openssl/openssl_1.0.2k.bb |  5 ++-
 meta/recipes-devtools/go/go-native.inc             | 12 +++---
 meta/recipes-extended/acpica/acpitests_20140828.bb |  2 +-
 ...n.h-Use-sighandler_t-instead-of-__sighand.patch | 31 +++++++-------
 5 files changed, 76 insertions(+), 23 deletions(-)
 create mode 100644 meta/recipes-connectivity/openssl/openssl/0001-Fix-build-with-clang-using-external-assembler.patch

-- 
2.12.0

[PATCH 0/4] Misc Fixes

[Saul Wold]

Fix up build time with PACKAGECONFIG for perl in openssl, found some non-overridable
PACKAGECONFIGs so fix them and clean up util-linux-dev issue

Sau!

Saul Wold (4):
  harfbuzz: Allow PACKAGECONFIG to be overridden
  beecrypt: Allow PACKAGECONFIG to be overridden
  openssl: use PACKAGECONFIG to disable perl bits
  util-linux: remove non PN based -dev packages

 meta/recipes-connectivity/openssl/openssl.inc     | 16 +++++++++++-----
 meta/recipes-core/util-linux/util-linux.inc       | 10 ++++------
 meta/recipes-graphics/harfbuzz/harfbuzz_0.9.25.bb |  2 +-
 meta/recipes-support/beecrypt/beecrypt_4.2.1.bb   |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

-- 
1.8.3.1

[PATCH 0/4] Misc Fixes

[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-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(-)

-- 
1.7.6.5

Re: [PATCH 0/4] Misc Fixes

[Richard Purdie]

On Wed, 2012-01-25 at 11:29 -0800, Saul Wold wrote:
> 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

Merged to master, thanks. I took v2 of the pm-utils fix though.

Cheers,

Richard