* [Patch 02/13] bitbake.conf: Reduce duplication in MIPS variants
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 10/13] ghostscript: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 11/13] ltp: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 07/13] gdb: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 06/13] gcc-runtime: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 12/13] mdadm: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 08/13] mmc-utils: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 09/13] valgrind: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 05/13] packagegroup: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 01/13] arch-mips: Add MACHINEOVERRIDES variables to reduce duplication
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 13/13] webkit: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
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
^ permalink raw reply
* [Patch 03/13] fts: Reduce duplication in MIPS variants.
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* [Patch 04/13] glibc: Reduce duplication in MIPS variants
From: Zubair Lutfullah Kakakhel @ 2016-11-07 15:01 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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
^ permalink raw reply related
* Re: [PATCH] u-boot: mkimage: fix build
From: Burton, Ross @ 2016-11-07 15:00 UTC (permalink / raw)
To: Stefan Müller-Klieser; +Cc: OE-core
In-Reply-To: <1478257606-15637-1-git-send-email-s.mueller-klieser@phytec.de>
[-- Attachment #1: Type: text/plain, Size: 1493 bytes --]
On 4 November 2016 at 11:06, Stefan Müller-Klieser <
s.mueller-klieser@phytec.de> wrote:
> This fixes the mkimage build for situations where HOSTCC and friends
> need to be overridden and the u-boot makefile defaults don't work.
>
I applied this on top of the u-boot upgrades and it still breaks:
make -f ./scripts/Makefile.build obj=tools
x86_64-poky-linux-gcc -m64 -march=corei7 -mtune=corei7 -mfpmath=sse
-msse4.2 --sysroot=/data/poky-master/tmp-glibc/sysroots/intel-corei7-64
-Wp,-MD,tools/.bin2header.d -O2 -pipe -g -feliminate-unused-debug-types
-fdebug-prefix-map=/data/poky-master/tmp-glibc/work/corei7-64-poky-linux/u-boot-mkimage/2016.09.01-r0=/usr/src/debug/u-boot-mkimage/2016.09.01-r0
-fdebug-prefix-map=/data/poky-master/tmp-glibc/sysroots/x86_64-linux=
-fdebug-prefix-map=/data/poky-master/tmp-glibc/sysroots/intel-corei7-64=
-fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat
-Wformat-security -Werror=format-security -DCONFIG_FIT_SIGNATURE -include
./include/libfdt_env.h -idirafterinclude -idirafter./arch/sandbox/include
-I./lib/libfdt -I./tools -DCONFIG_SYS_TEXT_BASE=0 -DUSE_HOSTCC
-D__KERNEL_STRICT_NAMES -D_GNU_SOURCE -o tools/bin2header
tools/bin2header.c
...
cat ./Licenses/gpl-2.0.txt | gzip -9 -c | \
tools/bin2header license_gzip > ./include/license.h
/bin/sh: 2: tools/bin2header: not found
tools/Makefile:256: recipe for target 'include/license.h' failed
Looks like HOSTCC isn't being set correctly.
Ross
[-- Attachment #2: Type: text/html, Size: 2295 bytes --]
^ permalink raw reply
* [PATCH] lib/oe/qa: handle binaries with segments outside the first 4kb
From: Ross Burton @ 2016-11-07 14:14 UTC (permalink / raw)
To: openembedded-core
The ELF parser was assuming that the segment tables are in the first 4kb of the
binary. Whilst this generally appears to be the case, there have been instances
where the segment table is elsewhere (offset 2MB, in this sample I have). Solve
this problem by mmap()ing the file instead.
Also clean up the code a little whilst chasing the problem.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/lib/oe/qa.py | 78 ++++++++++++++++++++++++++-----------------------------
1 file changed, 37 insertions(+), 41 deletions(-)
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index fbe719d..3eda923 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -1,4 +1,4 @@
-import os, struct
+import os, struct, mmap
class NotELFFileError(Exception):
pass
@@ -23,9 +23,9 @@ class ELFFile:
EV_CURRENT = 1
# possible values for EI_DATA
- ELFDATANONE = 0
- ELFDATA2LSB = 1
- ELFDATA2MSB = 2
+ EI_DATA_NONE = 0
+ EI_DATA_LSB = 1
+ EI_DATA_MSB = 2
PT_INTERP = 3
@@ -34,51 +34,42 @@ class ELFFile:
#print "'%x','%x' %s" % (ord(expectation), ord(result), self.name)
raise NotELFFileError("%s is not an ELF" % self.name)
- def __init__(self, name, bits = 0):
+ def __init__(self, name):
self.name = name
- self.bits = bits
self.objdump_output = {}
- def open(self):
- if not os.path.isfile(self.name):
- raise NotELFFileError("%s is not a normal file" % self.name)
+ # Context Manager functions to close the mmap explicitly
+ def __enter__(self):
+ return self
+
+ def __exit__(self, exc_type, exc_value, traceback):
+ self.data.close()
+ def open(self):
with open(self.name, "rb") as f:
- # Read 4k which should cover most of the headers we're after
- self.data = f.read(4096)
+ self.data = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+ # Check the file has the minimum number of ELF table entries
if len(self.data) < ELFFile.EI_NIDENT + 4:
raise NotELFFileError("%s is not an ELF" % self.name)
+ # ELF header
self.my_assert(self.data[0], 0x7f)
self.my_assert(self.data[1], ord('E'))
self.my_assert(self.data[2], ord('L'))
self.my_assert(self.data[3], ord('F'))
- if self.bits == 0:
- if self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS32:
- self.bits = 32
- elif self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS64:
- self.bits = 64
- else:
- # Not 32-bit or 64.. lets assert
- raise NotELFFileError("ELF but not 32 or 64 bit.")
- elif self.bits == 32:
- self.my_assert(self.data[ELFFile.EI_CLASS], ELFFile.ELFCLASS32)
- elif self.bits == 64:
- self.my_assert(self.data[ELFFile.EI_CLASS], ELFFile.ELFCLASS64)
+ if self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS32:
+ self.bits = 32
+ elif self.data[ELFFile.EI_CLASS] == ELFFile.ELFCLASS64:
+ self.bits = 64
else:
- raise NotELFFileError("Must specify unknown, 32 or 64 bit size.")
+ # Not 32-bit or 64.. lets assert
+ raise NotELFFileError("ELF but not 32 or 64 bit.")
self.my_assert(self.data[ELFFile.EI_VERSION], ELFFile.EV_CURRENT)
- self.sex = self.data[ELFFile.EI_DATA]
- if self.sex == ELFFile.ELFDATANONE:
- raise NotELFFileError("self.sex == ELFDATANONE")
- elif self.sex == ELFFile.ELFDATA2LSB:
- self.sex = "<"
- elif self.sex == ELFFile.ELFDATA2MSB:
- self.sex = ">"
- else:
- raise NotELFFileError("Unknown self.sex")
+ self.endian = self.data[ELFFile.EI_DATA]
+ if self.endian not in (ELFFile.EI_DATA_LSB, ELFFile.EI_DATA_MSB):
+ raise NotELFFileError("Unexpected EI_DATA %x" % self.endian)
def osAbi(self):
return self.data[ELFFile.EI_OSABI]
@@ -90,16 +81,20 @@ class ELFFile:
return self.bits
def isLittleEndian(self):
- return self.sex == "<"
+ return self.endian == ELFFile.EI_DATA_LSB
def isBigEndian(self):
- return self.sex == ">"
+ return self.endian == ELFFile.EI_DATA_MSB
+
+ def getStructEndian(self):
+ return {ELFFile.EI_DATA_LSB: "<",
+ ELFFile.EI_DATA_MSB: ">"}[self.endian]
def getShort(self, offset):
- return struct.unpack_from(self.sex+"H", self.data, offset)[0]
+ return struct.unpack_from(self.getStructEndian() + "H", self.data, offset)[0]
def getWord(self, offset):
- return struct.unpack_from(self.sex+"i", self.data, offset)[0]
+ return struct.unpack_from(self.getStructEndian() + "i", self.data, offset)[0]
def isDynamic(self):
"""
@@ -118,7 +113,7 @@ class ELFFile:
def machine(self):
"""
- We know the sex stored in self.sex and we
+ We know the endian stored in self.endian and we
know the position
"""
return self.getShort(ELFFile.E_MACHINE)
@@ -166,6 +161,7 @@ def elf_machine_to_string(machine):
if __name__ == "__main__":
import sys
- elf = ELFFile(sys.argv[1])
- elf.open()
- print(elf.isDynamic())
+
+ with ELFFile(sys.argv[1]) as elf:
+ elf.open()
+ print(elf.isDynamic())
--
2.8.1
^ permalink raw reply related
* Re: [PATCH] libbsd 0.8.3: BBCLASSEXTEND to native and nativesdk
From: Burton, Ross @ 2016-11-07 9:54 UTC (permalink / raw)
To: Nicolas Dechesne; +Cc: Koen Kooi, OE-core
In-Reply-To: <CAP71WjyP-GE7evimye661zy-L4G7VdAwNX_8-6qOVSTj1y11eg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 272 bytes --]
On 7 November 2016 at 09:42, Nicolas Dechesne <nicolas.dechesne@linaro.org>
wrote:
> great. Does that mean that this patch can be merged or do you have any
> other issue?
>
Yeah, it's queued in my staging branch now. Sorry for user error stalling
this.
Ross
[-- Attachment #2: Type: text/html, Size: 690 bytes --]
^ permalink raw reply
* Re: [PATCH] libbsd 0.8.3: BBCLASSEXTEND to native and nativesdk
From: Nicolas Dechesne @ 2016-11-07 9:42 UTC (permalink / raw)
To: Burton, Ross; +Cc: Koen Kooi, OE-core
In-Reply-To: <CAJTo0LbiSBPq3ZHKmmHYpoM+GZWcOgDNyJy3-Cd4XhRxF9Lt1w@mail.gmail.com>
On Mon, Nov 7, 2016 at 10:30 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 7 November 2016 at 09:28, Burton, Ross <ross.burton@intel.com> wrote:
>>
>> Ah. I might (cough) have a hybrid stable/testing setup as I needed a
>> newer kernel. I'll have a look.
>
>
> $ grep -r getrandom
> x86_64-linux-gnu/bits/syscall.h:#define SYS_getrandom __NR_getrandom
> x86_64-linux-gnu/bits/syscall.h:#define SYS_getrandom __NR_getrandom
> x86_64-linux-gnu/bits/syscall.h:#define SYS_getrandom __NR_getrandom
> x86_64-linux-gnu/asm/unistd_x32.h:#define __NR_getrandom (__X32_SYSCALL_BIT
> + 318)
> x86_64-linux-gnu/asm/unistd_64.h:#define __NR_getrandom 318
> x86_64-linux-gnu/asm/unistd_32.h:#define __NR_getrandom 355
>
> That's better. Thanks Phil.
great. Does that mean that this patch can be merged or do you have any
other issue?
It's needed to get the android tools -native.. and we will need a
backport on morty too (but we will send that separately).
^ permalink raw reply
* Re: [PATCH] libbsd 0.8.3: BBCLASSEXTEND to native and nativesdk
From: Burton, Ross @ 2016-11-07 9:30 UTC (permalink / raw)
To: Phil Blundell; +Cc: Koen Kooi, OE-core
In-Reply-To: <CAJTo0LaKjNiFY3Z41Zk0Ln1fH_mLBF+hjKhr46+f3tewO5bTow@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 668 bytes --]
On 7 November 2016 at 09:28, Burton, Ross <ross.burton@intel.com> wrote:
> Ah. I might (cough) have a hybrid stable/testing setup as I needed a
> newer kernel. I'll have a look.
>
$ grep -r getrandom
x86_64-linux-gnu/bits/syscall.h:#define SYS_getrandom __NR_getrandom
x86_64-linux-gnu/bits/syscall.h:#define SYS_getrandom __NR_getrandom
x86_64-linux-gnu/bits/syscall.h:#define SYS_getrandom __NR_getrandom
x86_64-linux-gnu/asm/unistd_x32.h:#define __NR_getrandom (__X32_SYSCALL_BIT
+ 318)
x86_64-linux-gnu/asm/unistd_64.h:#define __NR_getrandom 318
x86_64-linux-gnu/asm/unistd_32.h:#define __NR_getrandom 355
That's better. Thanks Phil.
Ross
[-- Attachment #2: Type: text/html, Size: 1207 bytes --]
^ permalink raw reply
* Re: [PATCH] libbsd 0.8.3: BBCLASSEXTEND to native and nativesdk
From: Burton, Ross @ 2016-11-07 9:28 UTC (permalink / raw)
To: Phil Blundell; +Cc: Koen Kooi, OE-core
In-Reply-To: <1478304597.3662.28.camel@pbcl.net>
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
On 5 November 2016 at 00:09, Phil Blundell <pb@pbcl.net> wrote:
> That would happen if your glibc was compiled against a newer version of
> the kernel headers than you actually have installed (bits/syscall.h is
> auto-generated from the kernel headers at build time). If this is a clean
> Debian install then it does sound like they have messed up the packaging
> somehow.
>
Ah. I might (cough) have a hybrid stable/testing setup as I needed a newer
kernel. I'll have a look.
Ross
[-- Attachment #2: Type: text/html, Size: 828 bytes --]
^ permalink raw reply
* Re: [PATCH 1/1] trace-cmd: fix QA warning
From: Burton, Ross @ 2016-11-07 9:21 UTC (permalink / raw)
To: Dengke Du; +Cc: OE-core
In-Reply-To: <d0e0e5d4c0fb820f9917735e384e55eac602b587.1478323482.git.dengke.du@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 753 bytes --]
On 5 November 2016 at 05:29, Dengke Du <dengke.du@windriver.com> wrote:
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[audit] = ",,audit"
> +
> EXTRA_OEMAKE = "\
> 'prefix=${prefix}' \
> 'bindir=${bindir}' \
> @@ -20,6 +23,7 @@ EXTRA_OEMAKE = "\
> 'libdir=${@oe.path.relative(prefix, libdir)}' \
> \
> NO_PYTHON=1 \
> + ${@bb.utils.contains('PACKAGECONFIG', 'audit', '', 'NO_AUDIT=1', d)}
> \
> "
>
A neater way of doing this would be:
PACKAGECONFIG ??= ""
PACKAGECONFIG[audit] = ',NO_AUDIT=1,audit'
EXTRA_OECMAKE = ".... ${PACKAGECONFIG_CONFARGS}"
This works as the PACKAGECONFIG expansion adds the active expressions to
PACKAGECONFIG_CONFARGS, so you can add that directly to EXTRA_OEMAKE.
Ross
[-- Attachment #2: Type: text/html, Size: 1592 bytes --]
^ permalink raw reply
* Re: ✗ patchtest: failure for populate_sdk_ext.bbclass: check unfsd before create it
From: Burton, Ross @ 2016-11-07 9:17 UTC (permalink / raw)
To: OE-core; +Cc: Lock, Joshua G, Paul Eggleton, daniela.plascencia
In-Reply-To: <20161107085544.2205.30867@do.openembedded.org>
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
On 7 November 2016 at 08:55, Patchwork <patchwork@patchwork.openembedded.org
> wrote:
> Test Name test_signed_off_by_presence
> Proposed Fix Sign off the patch
> Commit shortlog populate_sdk_ext.bbclass: check unfsd before create it
>
The patch has a s-o-b, so this is a false positive. Is this checking the
cover letter instead of the patch?
Ross
[-- Attachment #2: Type: text/html, Size: 902 bytes --]
^ permalink raw reply
* [PATCH] packagegroup-core-sdk: Disable sanitizers for mips64el
From: jackie.huang @ 2016-11-07 8:15 UTC (permalink / raw)
To: openembedded-core
From: Jackie Huang <jackie.huang@windriver.com>
These are not available on mips64el yet, so disable them.
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index aceba78..9c4ea9b 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -31,6 +31,7 @@ SANITIZERS_aarch64 = ""
SANITIZERS_mips = ""
SANITIZERS_mipsel = ""
SANITIZERS_mips64 = ""
+SANITIZERS_mips64el = ""
SANITIZERS_mips64n32 = ""
SANITIZERS_nios2 = ""
SANITIZERS_powerpc64 = ""
--
2.8.3
^ permalink raw reply related
* [PATCH 1/1] populate_sdk_ext.bbclass: check unfsd before create it
From: Robert Yang @ 2016-11-07 8:03 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1478505779.git.liezhi.yang@windriver.com>
Fixed when nativesdk-unfs3 is installed:
$ bitbake <image> -c populate_sdk_ext
| Traceback (most recent call last):
| File "/path/to/oe-core/scripts/lnr", line 21, in <module>
| os.symlink(target, linkname)
| FileExistsError: [Errno 17] File exists: '../../../../tmp/sysroots/x86_64-linux/usr/bin/unfsd' -> '/path/to/9.0/sysroots/x86_64-wrlinuxsdk-linux/usr/bin/unfsd'
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/populate_sdk_ext.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index a0856d4..26b5ca6 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -502,9 +502,10 @@ install_tools() {
done
# We can't use the same method as above because files in the sysroot won't exist at this point
# (they get populated from sstate on installation)
- if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" ] ; then
+ unfsd_path="${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd"
+ if [ "${SDK_INCLUDE_TOOLCHAIN}" == "1" -a ! -e $unfsd_path ] ; then
binrelpath=${@os.path.relpath(d.getVar('STAGING_BINDIR_NATIVE',True), d.getVar('TOPDIR', True))}
- lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd ${SDK_OUTPUT}/${SDKPATHNATIVE}${bindir_nativesdk}/unfsd
+ lnr ${SDK_OUTPUT}/${SDKPATH}/$binrelpath/unfsd $unfsd_path
fi
touch ${SDK_OUTPUT}/${SDKPATH}/.devtoolbase
--
2.9.0
^ permalink raw reply related
* [PATCH 0/1] populate_sdk_ext.bbclass: check unfsd before create it
From: Robert Yang @ 2016-11-07 8:03 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 58de12eaaac9c60bb8fc84a3a965ef86d2a39ae0:
distro_check: partial rewrite to make it work again (2016-11-06 23:35:23 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/ext
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/ext
Robert Yang (1):
populate_sdk_ext.bbclass: check unfsd before create it
meta/classes/populate_sdk_ext.bbclass | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
2.9.0
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox