[Patch 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication

[Patch 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication

[Zubair Lutfullah Kakakhel]

Hi,

This patch series adds a few MACHINEOVERRIDES options in arch-mips
to reduce duplicate configurations in various recipes.

Further info in 
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10404

Regards,
ZubairLK

Zubair Lutfullah Kakakhel (13):
  arch-mips: Add MACHINEOVERRIDES variables to reduce duplication
  bitbake.conf: Reduce duplication in MIPS variants
  fts: Reduce duplication in MIPS variants.
  glibc: Reduce duplication in MIPS variants
  packagegroup: Reduce duplication in MIPS variants.
  gcc-runtime: Reduce duplication in MIPS variants.
  gdb: Reduce duplication in MIPS variants.
  mmc-utils: Reduce duplication in MIPS variants.
  valgrind: Reduce duplication in MIPS variants.
  ghostscript: Reduce duplication in MIPS variants.
  ltp: Reduce duplication in MIPS variants.
  mdadm: Reduce duplication in MIPS variants.
  webkit: Reduce duplication in MIPS variants.

 meta/conf/bitbake.conf                                  | 11 +----------
 meta/conf/machine/include/mips/arch-mips.inc            |  7 +++++++
 meta/recipes-core/fts/fts.bb                            |  5 +----
 meta/recipes-core/glibc/glibc-ld.inc                    | 17 ++---------------
 .../recipes-core/packagegroups/packagegroup-core-sdk.bb |  5 +----
 .../packagegroups/packagegroup-core-tools-profile.bb    | 10 ++--------
 meta/recipes-devtools/gcc/gcc-runtime.inc               |  9 +--------
 meta/recipes-devtools/gdb/gdb-common.inc                |  7 +------
 meta/recipes-devtools/mmc/mmc-utils_git.bb              |  6 ++++--
 meta/recipes-devtools/valgrind/valgrind_3.12.0.bb       |  3 +--
 meta/recipes-extended/ghostscript/ghostscript_9.19.bb   |  4 ++--
 meta/recipes-extended/ltp/ltp_20160126.bb               |  3 ++-
 meta/recipes-extended/mdadm/mdadm_3.4.bb                |  6 ++++--
 meta/recipes-sato/webkit/webkitgtk_2.14.1.bb            |  3 +--
 14 files changed, 30 insertions(+), 66 deletions(-)

-- 
2.10.2

[Patch 01/13] arch-mips: Add MACHINEOVERRIDES variables to reduce duplication

[Zubair Lutfullah Kakakhel]

In some cases, each MIPS variant in a recipe requires a duplicate
line. Even if the passed flag is the same.

Add global MACHINEOVERRIDES variables for the following
 * mipsarch		: All MIPS
 * mipsarchr6		: All MIPS R6
 * mipsarcho32{el}	: All MIPS o32
 * mipsarchn32{el}	: All MIPS n32
 * mipsarchn64{el}	: All MIPS n64

This is intended to reduce duplications in recipes

[YOCTO #10404]

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/conf/machine/include/mips/arch-mips.inc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
index 6069ca1..5b42841 100644
--- a/meta/conf/machine/include/mips/arch-mips.inc
+++ b/meta/conf/machine/include/mips/arch-mips.inc
@@ -50,6 +50,13 @@ MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32',
 TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}"
 TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
 
+# Various Global Machine Overrides
+MACHINEOVERRIDES =. "mipsarch:"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'r6', 'mipsarchr6:', '' ,d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'mipsarchn32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'o32', 'mipsarcho32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
+MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarch64${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
+
 # Base tunes
 AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf"
 TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard"
-- 
2.10.2

[Patch 02/13] bitbake.conf: Reduce duplication in MIPS variants

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/conf/bitbake.conf | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9f445bb..1472e8f 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -533,16 +533,7 @@ BUILDSDK_LDFLAGS = "-Wl,-O1"
 
 LINKER_HASH_STYLE ??= "gnu"
 # mips does not support GNU hash style therefore we override
-LINKER_HASH_STYLE_mips = "sysv"
-LINKER_HASH_STYLE_mipsel = "sysv"
-LINKER_HASH_STYLE_mips64 = "sysv"
-LINKER_HASH_STYLE_mips64el = "sysv"
-LINKER_HASH_STYLE_mips64n32 = "sysv"
-LINKER_HASH_STYLE_mips64eln32 = "sysv"
-LINKER_HASH_STYLE_mipsisa32r6 = "sysv"
-LINKER_HASH_STYLE_mipsisa32r6el = "sysv"
-LINKER_HASH_STYLE_mipsisa64r6 = "sysv"
-LINKER_HASH_STYLE_mipsisa64r6el = "sysv"
+LINKER_HASH_STYLE_mipsarch = "sysv"
 
 TARGET_LINK_HASH_STYLE ?= "${@['-Wl,--hash-style=gnu',''][d.getVar('LINKER_HASH_STYLE', True) != 'gnu']}"
 
-- 
2.10.2

[Patch 03/13] fts: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-core/fts/fts.bb | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/meta/recipes-core/fts/fts.bb b/meta/recipes-core/fts/fts.bb
index 9d8230f..de9297e 100644
--- a/meta/recipes-core/fts/fts.bb
+++ b/meta/recipes-core/fts/fts.bb
@@ -22,10 +22,7 @@ S = "${WORKDIR}/${BPN}"
 
 do_configure[noexec] = "1"
 
-HASHSTYLE_mips = "sysv"
-HASHSTYLE_mipsel = "sysv"
-HASHSTYLE_mips64 = "sysv"
-HASHSTYLE_mips64el = "sysv"
+HASHSTYLE_mipsarch = "sysv"
 HASHSTYLE = "gnu"
 
 VER = "0"
-- 
2.10.2

[Patch 04/13] glibc: Reduce duplication in MIPS variants

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-core/glibc/glibc-ld.inc | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/meta/recipes-core/glibc/glibc-ld.inc b/meta/recipes-core/glibc/glibc-ld.inc
index b982368..e2e2474 100644
--- a/meta/recipes-core/glibc/glibc-ld.inc
+++ b/meta/recipes-core/glibc/glibc-ld.inc
@@ -7,21 +7,8 @@ def ld_append_if_tune_exists(d, infos, dict):
 
 def glibc_dl_info(d):
     ld_info_all = {
-        "mips": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mipsisa32r6": ["ld-linux-mipsn8.so.1", "FLAG_ELF_LIBC6"],
-        "mipsisa32r6el": ["ld-linux-mipsn8.so.1", "FLAG_ELF_LIBC6"],
-        "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
-        "mipsisa64r6": ["ld-linux-mipsn8.so.1", "FLAG_ELF_LIBC6"],
-        "mipsisa64r6el": ["ld-linux-mipsn8.so.1", "FLAG_ELF_LIBC6"],
+        "mipsarch": ["ld.so.1", "FLAG_ELF_LIBC6"],
+        "mipsarchr6": ["ld-linux-mipsn8.so.1", "FLAG_ELF_LIBC6"],
         "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"],
         "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
         "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"],
-- 
2.10.2

[Patch 05/13] packagegroup: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-core/packagegroups/packagegroup-core-sdk.bb       |  5 +----
 .../packagegroups/packagegroup-core-tools-profile.bb           | 10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index aceba78..327cd8e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -28,10 +28,7 @@ RDEPENDS_packagegroup-core-sdk = "\
 
 SANITIZERS = "libasan-dev libubsan-dev"
 SANITIZERS_aarch64 = ""
-SANITIZERS_mips = ""
-SANITIZERS_mipsel = ""
-SANITIZERS_mips64 = ""
-SANITIZERS_mips64n32 = ""
+SANITIZERS_mipsarch = ""
 SANITIZERS_nios2 = ""
 SANITIZERS_powerpc64 = ""
 SANITIZERS_sparc = ""
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index dd98445..31ad82b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -36,10 +36,7 @@ PERF_libc-musl = ""
 SYSTEMTAP = "systemtap"
 SYSTEMTAP_libc-uclibc = ""
 SYSTEMTAP_libc-musl = ""
-SYSTEMTAP_mips = ""
-SYSTEMTAP_mipsel = ""
-SYSTEMTAP_mips64 = ""
-SYSTEMTAP_mips64n32 = ""
+SYSTEMTAP_mipsarch = ""
 SYSTEMTAP_nios2 = ""
 SYSTEMTAP_aarch64 = ""
 
@@ -65,10 +62,7 @@ BABELTRACE = "babeltrace"
 VALGRIND = "valgrind"
 VALGRIND_libc-uclibc = ""
 VALGRIND_libc-musl = ""
-VALGRIND_mips = ""
-VALGRIND_mipsel = ""
-VALGRIND_mips64 = ""
-VALGRIND_mips64n32 = ""
+VALGRIND_mipsarch = ""
 VALGRIND_nios2 = ""
 VALGRIND_armv4 = ""
 VALGRIND_armv5 = ""
-- 
2.10.2

[Patch 06/13] gcc-runtime: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-devtools/gcc/gcc-runtime.inc | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/gcc/gcc-runtime.inc b/meta/recipes-devtools/gcc/gcc-runtime.inc
index 15252f1..d56f82a 100644
--- a/meta/recipes-devtools/gcc/gcc-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-runtime.inc
@@ -17,14 +17,7 @@ EXTRA_OECONF_PATHS = "\
 EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
 
 RUNTIMELIBITM = "libitm"
-RUNTIMELIBITM_mips = ""
-RUNTIMELIBITM_mipsel = ""
-RUNTIMELIBITM_mips64 = ""
-RUNTIMELIBITM_mips64el = ""
-RUNTIMELIBITM_mipsisa32r6 = ""
-RUNTIMELIBITM_mipsisa32r6el = ""
-RUNTIMELIBITM_mipsisa64r6 = ""
-RUNTIMELIBITM_mipsisa64r6el = ""
+RUNTIMELIBITM_mipsarch = ""
 RUNTIMELIBITM_nios2 = ""
 RUNTIMELIBITM_microblaze = ""
 
-- 
2.10.2

[Patch 07/13] gdb: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-devtools/gdb/gdb-common.inc | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 33a5ce9..5b8087c 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -6,12 +6,7 @@ DEPENDS = "expat zlib ncurses virtual/libiconv ${LTTNGUST}"
 LTTNGUST = "lttng-ust"
 LTTNGUST_aarch64 = ""
 LTTNGUST_libc-uclibc = ""
-LTTNGUST_mips = ""
-LTTNGUST_mipsel = ""
-LTTNGUST_mips64 = ""
-LTTNGUST_mips64el = ""
-LTTNGUST_mips64n32 = ""
-LTTNGUST_mips64eln32 = ""
+LTTNGUST_mipsarch = ""
 LTTNGUST_sh4 = ""
 LTTNGUST_libc-musl = ""
 
-- 
2.10.2

[Patch 08/13] mmc-utils: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-devtools/mmc/mmc-utils_git.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/mmc/mmc-utils_git.bb b/meta/recipes-devtools/mmc/mmc-utils_git.bb
index 2cba860..9732609 100644
--- a/meta/recipes-devtools/mmc/mmc-utils_git.bb
+++ b/meta/recipes-devtools/mmc/mmc-utils_git.bb
@@ -13,8 +13,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git;branc
 S = "${WORKDIR}/git"
 
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
-CFLAGS_append_mips64 = " -D__SANE_USERSPACE_TYPES__"
-CFLAGS_append_mips64n32 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS_append_mipsarchn64el = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS_append_mipsarchn32 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS_append_mipsarchn32el = " -D__SANE_USERSPACE_TYPES__"
 
 do_install() {
     install -d ${D}${bindir}
-- 
2.10.2

[Patch 09/13] valgrind: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-devtools/valgrind/valgrind_3.12.0.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
index a113880..2474bbc 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.12.0.bb
@@ -37,8 +37,7 @@ COMPATIBLE_HOST_armv5 = 'null'
 COMPATIBLE_HOST_armv6 = 'null'
 
 # valgrind doesn't like mips soft float
-COMPATIBLE_HOST_mips = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}"
-COMPATIBLE_HOST_mipsel = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}"
+COMPATIBLE_HOST_mipsarch = "${@bb.utils.contains("TARGET_FPU", "soft", "null", ".*-linux", d)}"
 
 inherit autotools ptest
 
-- 
2.10.2

[Patch 10/13] ghostscript: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-extended/ghostscript/ghostscript_9.19.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
index fe2016b..52f6fe3 100644
--- a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
+++ b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
@@ -46,8 +46,8 @@ EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
                 --with-cups-datadir=${datadir}/cups \
                 "
 
-EXTRA_OECONF_append_mips = " --with-large_color_index=0"
-EXTRA_OECONF_append_mipsel = " --with-large_color_index=0"
+EXTRA_OECONF_append_mipsarcho32 = " --with-large_color_index=0"
+EXTRA_OECONF_append_mipsarcho32el = " --with-large_color_index=0"
 
 # Explicity disable libtiff, fontconfig,
 # freetype, cups for ghostscript-native
-- 
2.10.2

[Patch 11/13] ltp: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-extended/ltp/ltp_20160126.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/ltp/ltp_20160126.bb b/meta/recipes-extended/ltp/ltp_20160126.bb
index 7631e0e..41670a5 100644
--- a/meta/recipes-extended/ltp/ltp_20160126.bb
+++ b/meta/recipes-extended/ltp/ltp_20160126.bb
@@ -23,7 +23,8 @@ DEPENDS = "attr libaio libcap acl openssl zip-native"
 DEPENDS_append_libc-musl = " fts "
 EXTRA_OEMAKE_append_libc-musl = " LIBC=musl "
 CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__"
-CFLAGS_append_mips64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS_append_mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
+CFLAGS_append_mipsarchn64el = " -D__SANE_USERSPACE_TYPES__"
 SRCREV = "fce797676b14f50406718e7ef640b50da66c9b36"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
-- 
2.10.2

[Patch 12/13] mdadm: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-extended/mdadm/mdadm_3.4.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-extended/mdadm/mdadm_3.4.bb b/meta/recipes-extended/mdadm/mdadm_3.4.bb
index 261054e..ee792e1 100644
--- a/meta/recipes-extended/mdadm/mdadm_3.4.bb
+++ b/meta/recipes-extended/mdadm/mdadm_3.4.bb
@@ -34,8 +34,10 @@ EXTRA_OEMAKE = 'CHECK_RUN_DIR=0 CXFLAGS="${CFLAGS}"'
 # to u64 == long in userspace. Define __SANE_USERSPACE_TYPES__ to get
 # int-ll64.h included
 CFLAGS_append_powerpc64 = ' -D__SANE_USERSPACE_TYPES__'
-CFLAGS_append_mips64 = ' -D__SANE_USERSPACE_TYPES__'
-CFLAGS_append_mips64n32 = ' -D__SANE_USERSPACE_TYPES__'
+CFLAGS_append_mipsarchn64 = ' -D__SANE_USERSPACE_TYPES__'
+CFLAGS_append_mipsarchn64el = ' -D__SANE_USERSPACE_TYPES__'
+CFLAGS_append_mipsarchn32 = ' -D__SANE_USERSPACE_TYPES__'
+CFLAGS_append_mipsarchn32el = ' -D__SANE_USERSPACE_TYPES__'
 
 do_compile() {
 	oe_runmake SYSROOT="${STAGING_DIR_TARGET}"
-- 
2.10.2

[Patch 13/13] webkit: Reduce duplication in MIPS variants.

[Zubair Lutfullah Kakakhel]

Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
variable is defined

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
---
 meta/recipes-sato/webkit/webkitgtk_2.14.1.bb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
index a2586de..a67ff0a 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.14.1.bb
@@ -82,8 +82,7 @@ EXTRA_OECMAKE_append_mips64 = " -DUSE_LD_GOLD=OFF "
 EXTRA_OECMAKE_append_toolchain-clang = " -DUSE_LD_GOLD=OFF "
 
 # JIT not supported on MIPS either
-EXTRA_OECMAKE_append_mips = " -DENABLE_JIT=OFF "
-EXTRA_OECMAKE_append_mips64 = " -DENABLE_JIT=OFF "
+EXTRA_OECMAKE_append_mipsarch = " -DENABLE_JIT=OFF "
 
 SECURITY_CFLAGS_remove_aarch64 = "-fpie"
 SECURITY_CFLAGS_append_aarch64 = " -fPIE"
-- 
2.10.2

Re: [Patch 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication

[Mark Hatle]

I've looked over the set, it all looks reasonable to me.

Acked-by: Mark Hatle <mark.hatle@windriver.com>

--Mark

On 11/7/16 9:01 AM, Zubair Lutfullah Kakakhel wrote:
> Hi,
> 
> This patch series adds a few MACHINEOVERRIDES options in arch-mips
> to reduce duplicate configurations in various recipes.
> 
> Further info in 
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10404
> 
> Regards,
> ZubairLK
> 
> Zubair Lutfullah Kakakhel (13):
>   arch-mips: Add MACHINEOVERRIDES variables to reduce duplication
>   bitbake.conf: Reduce duplication in MIPS variants
>   fts: Reduce duplication in MIPS variants.
>   glibc: Reduce duplication in MIPS variants
>   packagegroup: Reduce duplication in MIPS variants.
>   gcc-runtime: Reduce duplication in MIPS variants.
>   gdb: Reduce duplication in MIPS variants.
>   mmc-utils: Reduce duplication in MIPS variants.
>   valgrind: Reduce duplication in MIPS variants.
>   ghostscript: Reduce duplication in MIPS variants.
>   ltp: Reduce duplication in MIPS variants.
>   mdadm: Reduce duplication in MIPS variants.
>   webkit: Reduce duplication in MIPS variants.
> 
>  meta/conf/bitbake.conf                                  | 11 +----------
>  meta/conf/machine/include/mips/arch-mips.inc            |  7 +++++++
>  meta/recipes-core/fts/fts.bb                            |  5 +----
>  meta/recipes-core/glibc/glibc-ld.inc                    | 17 ++---------------
>  .../recipes-core/packagegroups/packagegroup-core-sdk.bb |  5 +----
>  .../packagegroups/packagegroup-core-tools-profile.bb    | 10 ++--------
>  meta/recipes-devtools/gcc/gcc-runtime.inc               |  9 +--------
>  meta/recipes-devtools/gdb/gdb-common.inc                |  7 +------
>  meta/recipes-devtools/mmc/mmc-utils_git.bb              |  6 ++++--
>  meta/recipes-devtools/valgrind/valgrind_3.12.0.bb       |  3 +--
>  meta/recipes-extended/ghostscript/ghostscript_9.19.bb   |  4 ++--
>  meta/recipes-extended/ltp/ltp_20160126.bb               |  3 ++-
>  meta/recipes-extended/mdadm/mdadm_3.4.bb                |  6 ++++--
>  meta/recipes-sato/webkit/webkitgtk_2.14.1.bb            |  3 +--
>  14 files changed, 30 insertions(+), 66 deletions(-)
> 

Re: [Patch 01/13] arch-mips: Add MACHINEOVERRIDES variables to reduce duplication

[Khem Raj]

On 11/7/16 7:01 AM, Zubair Lutfullah Kakakhel wrote:
> In some cases, each MIPS variant in a recipe requires a duplicate
> line. Even if the passed flag is the same.
> 
> Add global MACHINEOVERRIDES variables for the following
>  * mipsarch		: All MIPS
>  * mipsarchr6		: All MIPS R6
>  * mipsarcho32{el}	: All MIPS o32
>  * mipsarchn32{el}	: All MIPS n32
>  * mipsarchn64{el}	: All MIPS n64
> 
> This is intended to reduce duplications in recipes
> 
> [YOCTO #10404]
> 
> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
> ---
>  meta/conf/machine/include/mips/arch-mips.inc | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
> index 6069ca1..5b42841 100644
> --- a/meta/conf/machine/include/mips/arch-mips.inc
> +++ b/meta/conf/machine/include/mips/arch-mips.inc
> @@ -50,6 +50,13 @@ MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32',
>  TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}"
>  TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
>  
> +# Various Global Machine Overrides
> +MACHINEOVERRIDES =. "mipsarch:"
> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'r6', 'mipsarchr6:', '' ,d)}"
> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'mipsarchn32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'o32', 'mipsarcho32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarch64${MIPSPKGSFX_ENDIAN}:', '' ,d)}"

how about mips16 ?

> +
>  # Base tunes
>  AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf"
>  TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard"
> 

Re: [Patch 10/13] ghostscript: Reduce duplication in MIPS variants.

[Khem Raj]

On 11/7/16 7:01 AM, Zubair Lutfullah Kakakhel wrote:
> Reduce duplication in MIPS variants now that the MACHINEOVERRIDES
> variable is defined
> 
> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
> ---
>  meta/recipes-extended/ghostscript/ghostscript_9.19.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
> index fe2016b..52f6fe3 100644
> --- a/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
> +++ b/meta/recipes-extended/ghostscript/ghostscript_9.19.bb
> @@ -46,8 +46,8 @@ EXTRA_OECONF = "--without-x --with-system-libtiff --without-jbig2dec \
>                  --with-cups-datadir=${datadir}/cups \
>                  "
>  
> -EXTRA_OECONF_append_mips = " --with-large_color_index=0"
> -EXTRA_OECONF_append_mipsel = " --with-large_color_index=0"
> +EXTRA_OECONF_append_mipsarcho32 = " --with-large_color_index=0"
> +EXTRA_OECONF_append_mipsarcho32el = " --with-large_color_index=0"

Now that you have opened the pandora box
Can there be something like

mipsarch = "common for LE and BE"
mipsarcheb = "BE"
mipsarchel = "LE"

most of the times options are endian independent but LE suffers because its
not default and we assume without qualifying endianness its BE

>  
>  # Explicity disable libtiff, fontconfig,
>  # freetype, cups for ghostscript-native
> 

Re: [Patch 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication

[Khem Raj]

On 11/7/16 8:05 AM, Mark Hatle wrote:
> 
> I've looked over the set, it all looks reasonable to me.

Its an improvement definitely, however we should address
the endianness issue while we are here.

> 
> Acked-by: Mark Hatle <mark.hatle@windriver.com>
> 
> --Mark
> 
> On 11/7/16 9:01 AM, Zubair Lutfullah Kakakhel wrote:
>> Hi,
>>
>> This patch series adds a few MACHINEOVERRIDES options in arch-mips
>> to reduce duplicate configurations in various recipes.
>>
>> Further info in 
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=10404
>>
>> Regards,
>> ZubairLK
>>
>> Zubair Lutfullah Kakakhel (13):
>>   arch-mips: Add MACHINEOVERRIDES variables to reduce duplication
>>   bitbake.conf: Reduce duplication in MIPS variants
>>   fts: Reduce duplication in MIPS variants.
>>   glibc: Reduce duplication in MIPS variants
>>   packagegroup: Reduce duplication in MIPS variants.
>>   gcc-runtime: Reduce duplication in MIPS variants.
>>   gdb: Reduce duplication in MIPS variants.
>>   mmc-utils: Reduce duplication in MIPS variants.
>>   valgrind: Reduce duplication in MIPS variants.
>>   ghostscript: Reduce duplication in MIPS variants.
>>   ltp: Reduce duplication in MIPS variants.
>>   mdadm: Reduce duplication in MIPS variants.
>>   webkit: Reduce duplication in MIPS variants.
>>
>>  meta/conf/bitbake.conf                                  | 11 +----------
>>  meta/conf/machine/include/mips/arch-mips.inc            |  7 +++++++
>>  meta/recipes-core/fts/fts.bb                            |  5 +----
>>  meta/recipes-core/glibc/glibc-ld.inc                    | 17 ++---------------
>>  .../recipes-core/packagegroups/packagegroup-core-sdk.bb |  5 +----
>>  .../packagegroups/packagegroup-core-tools-profile.bb    | 10 ++--------
>>  meta/recipes-devtools/gcc/gcc-runtime.inc               |  9 +--------
>>  meta/recipes-devtools/gdb/gdb-common.inc                |  7 +------
>>  meta/recipes-devtools/mmc/mmc-utils_git.bb              |  6 ++++--
>>  meta/recipes-devtools/valgrind/valgrind_3.12.0.bb       |  3 +--
>>  meta/recipes-extended/ghostscript/ghostscript_9.19.bb   |  4 ++--
>>  meta/recipes-extended/ltp/ltp_20160126.bb               |  3 ++-
>>  meta/recipes-extended/mdadm/mdadm_3.4.bb                |  6 ++++--
>>  meta/recipes-sato/webkit/webkitgtk_2.14.1.bb            |  3 +--
>>  14 files changed, 30 insertions(+), 66 deletions(-)
>>
> 

Re: [Patch 01/13] arch-mips: Add MACHINEOVERRIDES variables to reduce duplication

[Andre McCurdy]

On Mon, Nov 7, 2016 at 9:30 AM, Khem Raj <raj.khem@gmail.com> wrote:
>
> On 11/7/16 7:01 AM, Zubair Lutfullah Kakakhel wrote:
>> In some cases, each MIPS variant in a recipe requires a duplicate
>> line. Even if the passed flag is the same.
>>
>> Add global MACHINEOVERRIDES variables for the following
>>  * mipsarch           : All MIPS
>>  * mipsarchr6         : All MIPS R6
>>  * mipsarcho32{el}    : All MIPS o32
>>  * mipsarchn32{el}    : All MIPS n32
>>  * mipsarchn64{el}    : All MIPS n64
>>
>> This is intended to reduce duplications in recipes
>>
>> [YOCTO #10404]
>>
>> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
>> ---
>>  meta/conf/machine/include/mips/arch-mips.inc | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc
>> index 6069ca1..5b42841 100644
>> --- a/meta/conf/machine/include/mips/arch-mips.inc
>> +++ b/meta/conf/machine/include/mips/arch-mips.inc
>> @@ -50,6 +50,13 @@ MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATURES', 'mipsisa32r6', 'isa32',
>>  TUNE_ARCH = "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSFX_R6}${MIPSPKGSFX_ENDIAN}"
>>  TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
>>
>> +# Various Global Machine Overrides
>> +MACHINEOVERRIDES =. "mipsarch:"
>> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'r6', 'mipsarchr6:', '' ,d)}"
>> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n32', 'mipsarchn32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
>> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'o32', 'mipsarcho32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
>> +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64', 'mipsarch64${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
>
> how about mips16 ?

We explicitly removed _thumb as an over-ride for ARM, so adding the
equivalent for MIPS would be odd, unless you see a clear need for it?

  http://git.openembedded.org/openembedded-core/commit/?id=351443d71eb246a946b41f12b54d57b36fe1574e

>> +
>>  # Base tunes
>>  AVAILTUNES += "mips mips64-n32 mips64 mipsel mips64el-n32 mips64el mips-nf mips64-nf-n32 mips64-nf mipsel-nf mips64el-nf-n32 mips64el-nf"
>>  TUNE_FEATURES_tune-mips = "o32 bigendian fpu-hard"
>>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [Patch 01/13] arch-mips: Add MACHINEOVERRIDES variables to reduce duplication

[André Draszik]

On Mon, 2016-11-07 at 18:32 -0800, Andre McCurdy wrote:
> On Mon, Nov 7, 2016 at 9:30 AM, Khem Raj <raj.khem@gmail.com> wrote:
> > 
> > On 11/7/16 7:01 AM, Zubair Lutfullah Kakakhel wrote:
> > > In some cases, each MIPS variant in a recipe requires a duplicate
> > > line. Even if the passed flag is the same.
> > > 
> > > Add global MACHINEOVERRIDES variables for the following
> > >  * mipsarch           : All MIPS
> > >  * mipsarchr6         : All MIPS R6
> > >  * mipsarcho32{el}    : All MIPS o32
> > >  * mipsarchn32{el}    : All MIPS n32
> > >  * mipsarchn64{el}    : All MIPS n64
> > > 
> > > This is intended to reduce duplications in recipes
> > > 
> > > [YOCTO #10404]
> > > 
> > > Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
> > > ---
> > >  meta/conf/machine/include/mips/arch-mips.inc | 7 +++++++
> > >  1 file changed, 7 insertions(+)
> > > 
> > > diff --git a/meta/conf/machine/include/mips/arch-mips.inc
> > > b/meta/conf/machine/include/mips/arch-mips.inc
> > > index 6069ca1..5b42841 100644
> > > --- a/meta/conf/machine/include/mips/arch-mips.inc
> > > +++ b/meta/conf/machine/include/mips/arch-mips.inc
> > > @@ -50,6 +50,13 @@ MIPSPKGSFX_32R6 = "${@bb.utils.contains('TUNE_FEATU
> > > RES', 'mipsisa32r6', 'isa32',
> > >  TUNE_ARCH =
> > > "mips${MIPSPKGSFX_32R6}${MIPSPKGSFX_64R6}${MIPSPKGSFX_BYTE}${MIPSPKGSF
> > > X_R6}${MIPSPKGSFX_ENDIAN}"
> > >  TUNE_PKGARCH = "${MIPSPKGSFX_VARIANT_tune-
> > > ${DEFAULTTUNE}}${MIPSPKGSFX_FPU}${MIPSPKGSFX_ABI}"
> > > 
> > > +# Various Global Machine Overrides
> > > +MACHINEOVERRIDES =. "mipsarch:"
> > > +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'r6',
> > > 'mipsarchr6:', '' ,d)}"
> > > +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n32',
> > > 'mipsarchn32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
> > > +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'o32',
> > > 'mipsarcho32${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
> > > +MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'n64',
> > > 'mipsarch64${MIPSPKGSFX_ENDIAN}:', '' ,d)}"
> > 
> > how about mips16 ?
> 
> We explicitly removed _thumb as an over-ride for ARM, so adding the
> equivalent for MIPS would be odd, unless you see a clear need for it?

There is a need as not all code compiles in MIPS16e mode... The override is
already there in OE - modelled after the original (now gone) thumb override.

http://git.openembedded.org/openembedded-core/tree/meta/conf/machine/include/mips/feature-mips-mips16e.inc

Cheers,
Andre'