Misc fixes for OE-Core

Some typo corrections and minor bug fixes.

The following changes since commit e44ed8c18e395b9c055aefee113b90708e8a8a2f:

build-appliance-image: Update to jethro head revision (2015-11-03 14:02:57 +0000)

are available in the git repository at:

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

Paul Eggleton (6):
meta/conf/layer.conf: fix typo
meta: Fix typos in Upstream-Status labels
gitignore: fix overzealous exclusion conf/distro/include: drop old recipes from include files classes/buildhistory: split package history values only once classes/distrodata: split SRC_URI properly before determining type

 .gitignore                                         |  2 +-
 meta/classes/buildhistory.bbclass                  |  2 +-
 meta/classes/distrodata.bbclass                    |  4 +-
 meta/conf/distro/include/as-needed.inc             |  3 --
 meta/conf/distro/include/distro_alias.inc          | 58 ----------------------
 meta/conf/layer.conf                               |  2 +-
 .../openssl/crypto_use_bigint_in_x86-64_perl.patch |  2 +-
 .../autogen/autogen/redirect-output-dir.patch      |  2 +-
 ...oring-is-success-if-not-sound-card-device.patch |  2 +-
 9 files changed, 8 insertions(+), 69 deletions(-)

2.1.0

This was excluding any subdirectory anywhere in the tree named build*, rather than just at the root - thus anything in meta/recipes-devtools/build-compare had to be forcibly added. Change the line so that it only operates at the root of the repo.

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index e80a2fd..d8f2259 100644
@@ -2,7 +2,7 @@ bitbake
 *.pyc
 *.pyo
 /*.patch
-build*/
+/build*/
 pyshtables.py
 pstage/
 scripts/oe-git-proxy-socks

2.1.0

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

index 9773632..2ecba0f 100644
@@ -16,7 +16,7 @@ BBLAYERS_LAYERINDEX_NAME_core = "openembedded-core"
 # Set a variable to get to the top of the metadata location
 COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}'
 
-# opkg-utils is for update-altnernatives :(
+# opkg-utils is for update-alternatives :(
 SIGGEN_EXCLUDERECIPES_ABISAFE += " \
   sysvinit-inittab \
   shadow-securetty \

2.1.0

We need these to be consistent so they are possible to programmatically read.

---
 .../openssl/openssl/crypto_use_bigint_in_x86-64_perl.patch              | 2 +-
 meta/recipes-devtools/autogen/autogen/redirect-output-dir.patch         | 2 +-
 .../alsa-utils/assume-storing-is-success-if-not-sound-card-device.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

index c397af2..af3989f 100644
@@ -1,4 +1,4 @@
-Upsteram Status: Backport
+Upstream-Status: Backport
 
 When building on x32 systems where the default type is 32bit, make sure
 we can transparently represent 64bit integers.  Otherwise we end up with

index de126ed..fc5a71b 100644
@@ -1,6 +1,6 @@
 [PATCH] redirect the dir of mklibsrc-log.tx
 
-Upstream-Statue: Pending
+Upstream-Status: Pending
 
 redirect mklibsrc-log.tx to builddir, not /tmp; otherwise mklibsrc-log.tx
 maybe unable to be written if other users is building autogen at the same time.

index f67283d..5309c4e 100644
@@ -1,6 +1,6 @@
 [PATCH] assume storing is success if not sound card device
 
-Upstream-Statue: Pending
+Upstream-Status: Pending
 
 Systemd will report failure when run alsa-*, if the machine has not the
 sound card. To void this annoyed message, alsa-restore/alsa-state ignore

2.1.0

These recipes have been removed (some a very long time ago, pre-dating OE-Core).

---
 meta/conf/distro/include/as-needed.inc    |  3 --
 meta/conf/distro/include/distro_alias.inc | 58 -------------------------------
 2 files changed, 61 deletions(-)

index 4f249fd..114d377 100644
@@ -6,11 +6,8 @@ ASNEEDED_pn-console-tools = ""
 ASNEEDED_pn-distcc = ""
 ASNEEDED_pn-openobex = ""
 ASNEEDED_pn-icu = ""
-ASNEEDED_pn-xserver-kdrive-xomap = ""
-ASNEEDED_pn-minimo = ""
 ASNEEDED_pn-pciutils = ""
 ASNEEDED_pn-puzzles = ""
-ASNEEDED_pn-dialer = ""
 ASNEEDED_pn-pulseaudio = ""
 ASNEEDED_pn-rpm = ""
 

2.1.0

We don't actually use values we read in here that are likely to contain = characters but we might as well split the value properly in case we do in future.

---
 meta/classes/buildhistory.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 4db0441..a8653f9 100644
@@ -80,7 +80,7 @@ python buildhistory_emit_pkghistory() {
         pkginfo = PackageInfo(pkg)
         with open(histfile, "r") as f:
             for line in f:
-                lns = line.split('=')
+                lns = line.split('=', 1)
                 name = lns[0].strip()
                 value = lns[1].strip(" \t\r\n").strip('"')
                 if name == "PE":

2.1.0

We weren't splitting SRC_URI values containing multiple URIs here; this didn't cause any errors except when a trailing ; was left on a URI, in which case the next URI was considered part of the parameter, which didn't contain a = and therefore was considered invalid.

We only care about the first URI in SRC_URI in this context (since that's the upstream URI by convention) so split it as we should and take the first item.

Fixes [YOCTO #8645].

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

index 5a4c1b6..44c06e1 100644
@@ -271,9 +271,9 @@ python do_checkpkg() {
         from bb.fetch2 import FetchError, NoMethodError, decodeurl
 
         """first check whether a uri is provided"""
-        src_uri = d.getVar('SRC_URI', True)
+        src_uri = (d.getVar('SRC_URI', True) or '').split()
         if src_uri:
-            uri_type, _, _, _, _, _ = decodeurl(src_uri)
+            uri_type, _, _, _, _, _ = decodeurl(src_uri[0])
         else:
             uri_type = "none"
 

2.1.0