merge of '35442223e2d33755090d92a33d52bde6f6e207a1'

     and '7050fca057f88bff7fa417c61f8dd6b9596a36ad'

3 files changed, 35 insertions, 35 deletions

diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index 82a2d53312..e59d194aeb 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -94,10 +94,6 @@ python do_package_deb () {
     if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
         os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
 
-    if packages == []:
-        bb.debug(1, "No packages; nothing to do")
-        return
-
     packages = bb.data.getVar('PACKAGES', d, 1)
     for pkg in packages.split():
         localdata = bb.data.createCopy(d)
diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass
index 97de5e2774..917fadd750 100644
--- a/classes/rm_work.bbclass
+++ b/classes/rm_work.bbclass
@@ -6,6 +6,10 @@
 # INHERIT += "rm_work"
 #
 
+# Use the completion scheulder by default when rm_work is active
+# to try and reduce disk usage
+BB_SCHEDULER ?= "completion"
+
 RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}"
 BB_DEFAULT_TASK = "rm_work_all"
 
diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass
index a3b67b5798..701777bbcc 100644
--- a/classes/siteinfo.bbclass
+++ b/classes/siteinfo.bbclass
@@ -21,40 +21,40 @@ def get_siteinfo_list(d):
        target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1)
 
        targetinfo = {\
-               "armeb-linux":             "endian-big bit-32 common-glibc arm-common",\
-               "armeb-linux-gnueabi":     "endian-big bit-32 common-glibc arm-common armeb-linux",\
-               "armeb-linux-uclibc":      "endian-big bit-32 common-uclibc arm-common",\
-               "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\
+               "armeb-linux":             "endian-big bit-32 common-linux common-glibc arm-common",\
+               "armeb-linux-gnueabi":     "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\
+               "armeb-linux-uclibc":      "endian-big bit-32 common-linux common-uclibc arm-common",\
+               "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\
                "arm-darwin":              "endian-little bit-32 common-darwin",\
-               "arm-linux":               "endian-little bit-32 common-glibc arm-common",\
-               "arm-linux-gnueabi":       "endian-little bit-32 common-glibc arm-common arm-linux",\
-               "arm-linux-uclibc":        "endian-little bit-32 common-uclibc arm-common",\
-               "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\
-               "avr32-linux":             "endian-big bit-32 common-glibc avr32-common",\ 
-               "avr32-linux-uclibc":      "endian-big bit-32 common-uclibc avr32-common",\
+               "arm-linux":               "endian-little bit-32 common-linux common-glibc arm-common",\
+               "arm-linux-gnueabi":       "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\
+               "arm-linux-uclibc":        "endian-little bit-32 common-linux common-uclibc arm-common",\
+               "arm-linux-uclibcgnueabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\
+               "avr32-linux":             "endian-big bit-32 common-linux common-glibc avr32-common",\ 
+               "avr32-linux-uclibc":      "endian-big bit-32 common-linux common-uclibc avr32-common",\
                "bfin-uclinux-uclibc":       "endian-little bit-32 common-uclibc bfin-common",\
-               "i386-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i486-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i586-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i686-linux":              "endian-little bit-32 common-glibc ix86-common",\
-               "i386-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "i486-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "i586-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "i686-linux-uclibc":       "endian-little bit-32 common-uclibc ix86-common",\
-               "mipsel-linux":            "endian-little bit-32 common-glibc",\
-               "mipsel-linux-uclibc":     "endian-little bit-32 common-uclibc",\
-               "mips-linux":              "endian-big bit-32 common-glibc",\
-               "mips-linux-uclibc":       "endian-big bit-32 common-uclibc",\
+               "i386-linux":              "endian-little bit-32 common-linux common-glibc ix86-common",\
+               "i486-linux":              "endian-little bit-32 common-linux common-glibc ix86-common",\
+               "i586-linux":              "endian-little bit-32 common-linux common-glibc ix86-common",\
+               "i686-linux":              "endian-little bit-32 common-linux common-glibc ix86-common",\
+               "i386-linux-uclibc":       "endian-little bit-32 common-linux common-uclibc ix86-common",\
+               "i486-linux-uclibc":       "endian-little bit-32 common-linux common-uclibc ix86-common",\
+               "i586-linux-uclibc":       "endian-little bit-32 common-linux common-uclibc ix86-common",\
+               "i686-linux-uclibc":       "endian-little bit-32 common-linux common-uclibc ix86-common",\
+               "mipsel-linux":            "endian-little bit-32 common-linux common-glibc",\
+               "mipsel-linux-uclibc":     "endian-little bit-32 common-linux common-uclibc",\
+               "mips-linux":              "endian-big bit-32 common-linux common-glibc",\
+               "mips-linux-uclibc":       "endian-big bit-32 common-linux common-uclibc",\
                "powerpc-darwin":          "endian-big bit-32 common-darwin",\
-               "ppc-linux":               "endian-big bit-32 common-glibc powerpc-common",\ 
-	       "powerpc-linux":           "endian-big bit-32 common-glibc powerpc-common",\
-               "powerpc-linux-uclibc":    "endian-big bit-32 common-uclibc powerpc-common",\
-               "sh3-linux":               "endian-little bit-32 common-glibc sh-common",\
-               "sh4-linux":               "endian-little bit-32 common-glibc sh-common",\
-               "sh4-linux-uclibc":        "endian-little bit-32 common-uclibc sh-common",\
-               "sparc-linux":             "endian-big bit-32 common-glibc",\
-               "x86_64-linux":            "endian-little bit-64 common-glibc",\
-               "x86_64-linux-uclibc":     "endian-little bit-64 common-uclibc"}
+               "ppc-linux":               "endian-big bit-32 common-linux common-glibc powerpc-common",\ 
+	       "powerpc-linux":           "endian-big bit-32 common-linux common-glibc powerpc-common",\
+               "powerpc-linux-uclibc":    "endian-big bit-32 common-linux common-uclibc powerpc-common",\
+               "sh3-linux":               "endian-little bit-32 common-linux common-glibc sh-common",\
+               "sh4-linux":               "endian-little bit-32 common-linux common-glibc sh-common",\
+               "sh4-linux-uclibc":        "endian-little bit-32 common-linux common-uclibc sh-common",\
+               "sparc-linux":             "endian-big bit-32 common-linux common-glibc",\
+               "x86_64-linux":            "endian-little bit-64 common-linux common-glibc",\
+               "x86_64-linux-uclibc":     "endian-little bit-64 common-linux common-uclibc"}
        if target in targetinfo:
                info = targetinfo[target].split()
                info.append(target)