Backports for fido

The following changes since commit 9f339f516ab03d598fae0e536b3a420ea4d8ee1a:

bash: Disable custom memory allocator (2015-11-20 15:46:27 +0000)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib jansa/fido-backports
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/fido-backports

Martin Jansa (2):
texinfo: don't create dependency on INHERIT variable linux-dtb.inc: drop unused DTB_NAME variable from do_install

Mike Crowe (1):
allarch: Force TARGET_*FLAGS variable values

Richard Purdie (2):
layer.conf: Add several allarch dependency exclusions layer.conf: Add missing dependency for allarch package
initramfs-framework

 meta/classes/allarch.bbclass                 |  4 ++++
 meta/conf/layer.conf                         | 11 +++++++++++
 meta/recipes-extended/texinfo/texinfo_5.2.bb |  2 +-
 meta/recipes-kernel/linux/linux-dtb.inc      |  1 -
 4 files changed, 16 insertions(+), 2 deletions(-)

2.6.3

From: Richard Purdie <[email protected]>

These are dependencies that our allarch packages have in OE-Core that cause those allarch packages to rebuild every time MACHINE changes.

With these changes, OE-Core allarch packages all have a common sstate signatures and no longer rebuild.

(From OE-Core rev: 63bff90fa4fb4a95e8c79f9f8e5dd90ae1dfc69d)

---
 meta/conf/layer.conf | 10 ++++++++++
 1 file changed, 10 insertions(+)

index 573579a..4880371 100644
@@ -45,5 +45,15 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   gcc-cross-${TARGET_ARCH}->musl \
   gcc-cross-${TARGET_ARCH}->uclibc \
   gcc-cross-${TARGET_ARCH}->linux-libc-headers \
+  ppp-dialin->ppp \
+  resolvconf->bash \
+  docbook-xsl-stylesheets->perl \
+  initramfs-framework->busybox \
+  initramfs-framework->systemd \
+  liberation-fonts->fontconfig \
+  gnome-icon-theme->librsvg \
+  font-alias->font-util \
+  weston-init->weston \
+  weston-init->kbd \
 "
 

2.6.3

From: Richard Purdie <[email protected]>

Similiarly to the other previous changes, add a missing allarch package dependency for initramfs-framework on udev.

---
 meta/conf/layer.conf | 1 +
 1 file changed, 1 insertion(+)

index 4880371..77168ed 100644
@@ -50,6 +50,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   docbook-xsl-stylesheets->perl \
   initramfs-framework->busybox \
   initramfs-framework->systemd \
+  initramfs-framework->udev \
   liberation-fonts->fontconfig \
   gnome-icon-theme->librsvg \
   font-alias->font-util \

2.6.3

From: Mike Crowe <[email protected]>

TARGET_CPPFLAGS, TARGET_CFLAGS, TARGET_CPPFLAGS and TARGET_LDFLAGS may differ between MACHINEs. Since they are exported they affect task hashes even if unused which leads to multiple variants of allarch packages existing in sstate and bouncing in the sysroot when switching between MACHINEs.

allarch packages shouldn't be using these variables anyway, so let's ensure they have a fixed value in order to avoid this problem.

(Compare with 05a70ac30b37cab0952f1b9df501993a9dec70da and 14f4d016fef9d660da1e7e91aec4a0e807de59ab.)

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

index 4bc9927..6f63f9d 100644
@@ -27,6 +27,10 @@ python () {
         d.setVar("PACKAGE_EXTRA_ARCHS", "")
         d.setVar("SDK_ARCH", "none")
         d.setVar("SDK_CC_ARCH", "none")
+        d.setVar("TARGET_CPPFLAGS", "none")
+        d.setVar("TARGET_CFLAGS", "none")
+        d.setVar("TARGET_CXXFLAGS", "none")
+        d.setVar("TARGET_LDFLAGS", "none")
 
         # Avoid this being unnecessarily different due to nuances of
         # the target machine that aren't important for "all" arch

2.6.3

* we don't want the do_package signature depending on INHERIT variable
* e.g. just adding the own-mirrors causes texinfo to rebuild:

  # bitbake-diffsigs BUILD/sstate-diff/*/*/texinfo/*do_package.sig*
  basehash changed from 015df2fd8e396cc1e15622dbac843301 to 9f1d06c4f238c70a99ccb6d8da348b6a
  Variable INHERIT value changed from
  ' rm_work blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'
  to
  ' rm_work own-mirrors blacklist blacklist report-error ${PACKAGE_CLASSES} ${USER_CLASSES} ${INHERIT_DISTRO} ${INHERIT_BLACKLIST} sanity'

---
 meta/recipes-extended/texinfo/texinfo_5.2.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 8dbcaa1..c9ac182 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 PROVIDES_append_class-native = " texinfo-replacement-native"
 
 def compress_pkg(d):
-    if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
+    if bb.data.inherits_class('compress_doc', d):
          compress = d.getVar("DOC_COMPRESS", True)
          if compress == "gz":
              return "gzip"

2.6.3

Joshua,

why this one didn't make it to your fido update?

Martin 'JaMa' Jansa     jabber: [email protected]

(For the benefit of the list and with apologies to Martin for the spam)

Apologies, that wasn't an intentional omission. I've pushed it to my joshuagl/fido-next branch and will include it in the next merge request (hopefully today).

Regards,

Joshua

* this is causing do_install to depend on KERNEL_IMAGE_BASE_NAME which in some cases contains something like BUILD_NUMBER from CI, that caused do_install to be reexecuted every single time, which is very sad to be caused by unused variable.
* jethro and newer don't need this change, because it's also fixed in commit 86b3f29f93e3f87903668ea317c6bd97be4cdf62
Author: Marek Vasut <[email protected]>
Date: Thu May 14 14:31:11 2015 +0200
Subject: kernel: Build DTBs early

---
 meta/recipes-kernel/linux/linux-dtb.inc | 1 -
 1 file changed, 1 deletion(-)

index 6b8f1a5..4779be2 100644
@@ -13,7 +13,6 @@ do_install_append() {
 				DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'`
 			fi
 			DTB_BASE_NAME=`basename ${DTB} .dtb`
-			DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
 			DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
 			DTB_PATH="${B}/arch/${ARCH}/boot/dts/${DTB}"
 			oe_runmake ${DTB}

2.6.3

From: Martin Jansa <[email protected]>

* my previous thumb related commit:
commit 3e760031f91fb87c3e2f62b77a117eb41164f259
Author: Martin Jansa <[email protected]>
Date: Wed Feb 18 15:40:35 2015 +0100

feature-arm-thumb.inc: respect ARM_INSTRUCTION_SET when adding thumb suffix

unfortunately removed conditional on "thumb" in TUNE_FEATURES, when setting ARMPKGSFX_THUMB

* in case we have MACHINE without "thumb" in TUNE_FEATURES and distro setting ARM_INSTRUCTION_SET to "thumb" we end with:
ARM_INSTRUCTION_SET="thumb"
ARM_THUMB_OPT="thumb"
ARM_M_OPT="thumb"

# TUNE_CCARGS correctly not adding -mthumb
TUNE_CCARGS=" -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon"

  # but ARMPKGSFX_THUMB and TUNE_PKGARCH including "t2":
  ARMPKGSFX_THUMB="t2"
  TUNE_PKGARCH="armv7at2-vfp-neon"

  # causing following error:
  Error, the PACKAGE_ARCHS variable does not contain TUNE_PKGARCH (armv7at2-vfp-neon).

---
 meta/conf/machine/include/arm/feature-arm-thumb.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 9746c7b..5632171 100644
@@ -33,7 +33,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ' -m${ARM_M_OPT}'
 OVERRIDES .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', ':thumb', '', d)}"
 
 # Add suffix from ARM_THUMB_SUFFIX only if after all this we still set ARM_M_OPT to thumb
-ARMPKGSFX_THUMB .= "${@ d.getVar('ARM_THUMB_SUFFIX', True) if d.getVar('ARM_M_OPT', True) == 'thumb' else ''}"
+ARMPKGSFX_THUMB .= "${@bb.utils.contains('TUNE_FEATURES', 'thumb', '${ARM_THUMB_SUFFIX}', '', d) if d.getVar('ARM_M_OPT', True) == 'thumb' else ''}"
 
 # Whether to compile with code to allow interworking between the two
 # instruction sets. This allows thumb code to be executed on a primarily

2.6.3

Thanks, I've merged these 5 and the 6th that followed to my fido-next branch, I hope to test it on the autobuilder tomorrow.

http://cgit.openembedded.org/openembedded-core-contrib/log/?h=joshuagl/fido-next

Regards,

Joshua

PING

Martin 'JaMa' Jansa     jabber: [email protected]