Misc fixes

PATCH New Paul Eggleton 1 participant 5 messages Mar 21, 2016

lore

Share & tools

lore

Paul Eggleton

author

2016-03-21 05:11 UTC #0 lore raw

cover Misc fixes

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

Signature · 1 line

2.5.5

Paul Eggleton

author

2016-03-21 05:11 UTC #1 lore raw

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

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 <[email protected]>

---
 meta/classes/packagegroup.bbclass | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

meta/classes/packagegroup.bbclass +6 -3

index 56cfead..92e0bbe 100644
@@ -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))
 }

Signature · 1 line

2.5.5

Paul Eggleton

author

2016-03-21 05:11 UTC #2 lore raw

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

In reply to 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 <[email protected]>

---
 meta/classes/packagegroup.bbclass | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

meta/classes/packagegroup.bbclass +4 -1

index 92e0bbe..d56248f 100644
@@ -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))

Signature · 1 line

2.5.5

Paul Eggleton

author

2016-03-21 05:11 UTC #3 lore raw

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

In reply to 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 <[email protected]>

---
 meta/classes/distutils-tools.bbclass | 8 ++++----
 meta/classes/distutils.bbclass       | 8 ++++----
 meta/classes/distutils3.bbclass      | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

meta/classes/distutils-tools.bbclass +4 -4

index f43450e..8d9b3f7 100644
@@ -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*

meta/classes/distutils.bbclass +4 -4

index cd06713..da48a2e 100644
@@ -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

meta/classes/distutils3.bbclass +4 -4

index 443bf3a..4f6ca44 100644
@@ -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 {} \;

Signature · 1 line

2.5.5

Paul Eggleton

author

2016-03-21 05:11 UTC #4 lore raw

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

In reply to Paul Eggleton

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

Signed-off-by Paul Eggleton <[email protected]>

---
 meta/conf/site.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/conf/site.conf.sample +1 -1

index c551e8f..6cfefc5 100644
@@ -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"

Signature · 1 line

2.5.5