* Re: [PATCH] mkefidisk.sh: add deprecation warning to the output
From: Ed Bartosh @ 2016-11-07 23:00 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
In-Reply-To: <CD1ACFFA-619F-4C36-99AC-76D6A6068E74@gmail.com>
On Thu, Nov 03, 2016 at 02:42:39PM -0700, Khem Raj wrote:
>
> > On Oct 31, 2016, at 3:46 AM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> >
> > mkefidisk.sh will soon be deprecated in favor of .wic images.
> >
> > Added deprecation warning to the script to inform users that
> > this script will soon be removed from the codebase.
> >
> > Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> > ---
> > scripts/contrib/mkefidisk.sh | 5 +++++
> > 1 file changed, 5 insertions(+)
> >
> > diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
> > index d8db3c0..a175895 100755
> > --- a/scripts/contrib/mkefidisk.sh
> > +++ b/scripts/contrib/mkefidisk.sh
> > @@ -20,6 +20,11 @@
> >
> > LANG=C
> >
> > +echo
> > +echo "WARNING: This script is deprecated and will be removed soon."
> > +echo "Please consider using wic EFI images instead."
> > +echo
> > +
>
> is .wic image dd’able directly ?
Yes, they are.
> We should also document, the wic steps in wiki pages e.g. http://wiki.minnowboard.org/Yocto_Project
It's already documented in README.hardware: https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/README.hardware
And in Yocto manual:
http://www.yoctoproject.org/docs/2.2/mega-manual/mega-manual.html#building-an-image-for-hardware
--
Regards,
Ed
^ permalink raw reply
* [PATCH 4/4] lib/oe/lsb: attempt to ensure consistent distro id regardless of source
From: Joshua Lock @ 2016-11-07 22:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1478558432.git.joshua.g.lock@intel.com>
The LSB Distributor ID and os-release NAME differ for most of the
distributions tested by the Yocto Project (CentOS, Debian, Fedora,
openSUSE and Ubuntu) however for all but openSUSE the os-release ID
matches the LSB Distributor ID when both are lowered before
comparison.
Therefore, in order to improve the consistency of identification of
a distribution, switch to using the os-release ID and converting
the ID value to lowercase.
Table showing comparison of LSB Distributor ID to os-release fields NAME
and ID for current Yocto Project supported host distributions:
Distribution | Version | Distributor ID | NAME | ID |
-------------------------------------------------------------------------
CentOS | 7 | CentOS | CentOS Linux | centos |
Debian | 8 | Debian | Debian GNU/Linux | debian |
Fedora | 23 | Fedora | Fedora | fedora |
Fedora | 24 | Fedora | Fedora | fedora |
openSUSE | 13.2 | openSUSE project | openSUSE | opensuse |
openSUSE | 42.1 | SUSE LINUX | openSUSE Leap | opensuse |
Ubuntu | 14.04 | Ubuntu | Ubuntu | ubuntu |
Ubuntu | 16.04 | Ubuntu | Ubuntu | ubuntu |
[YOCTO #10591]
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
meta/lib/oe/lsb.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py
index bdc893f..cd43731 100644
--- a/meta/lib/oe/lsb.py
+++ b/meta/lib/oe/lsb.py
@@ -7,7 +7,7 @@ def release_dict_osr():
with open('/etc/os-release') as f:
for line in f:
key, val = line.rstrip().split('=', 1)
- if key == 'NAME':
+ if key == 'ID':
data['DISTRIB_ID'] = val
if key == 'VERSION_ID':
data['DISTRIB_RELEASE'] = val
@@ -104,7 +104,7 @@ def distro_identifier(adjust_hook=None):
distro_id = re.sub(r'\W', '', distro_id)
if release:
- id_str = '{0}-{1}'.format(distro_id, release)
+ id_str = '{0}-{1}'.format(distro_id.lower(), release)
else:
id_str = distro_id
return id_str.replace(' ','-').replace('/','-')
--
2.7.4
^ permalink raw reply related
* [PATCH 3/4] lib/oe/lsb: prefer /etc/os-release for distribution data
From: Joshua Lock @ 2016-11-07 22:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1478558432.git.joshua.g.lock@intel.com>
os-release(5) is an increasingly standard source of operating system
identification and more likely to be present on modern OS deployments, i.e.
many container variants of common distros include os-release and not the
lsb_release tool.
Therefore we should favour parsing /etc/os-release in distro_identifier(),
try lsb_release when that fails and finally fall back on various distro
specific sources of OS identification.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
meta/lib/oe/lsb.py | 34 +++++++++++++++++++++++++---------
1 file changed, 25 insertions(+), 9 deletions(-)
diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py
index 0bb7686..bdc893f 100644
--- a/meta/lib/oe/lsb.py
+++ b/meta/lib/oe/lsb.py
@@ -1,3 +1,22 @@
+def release_dict_osr():
+ """ Populate a dict with pertinent values from /etc/os-release """
+ if not os.path.exists('/etc/os-release'):
+ return None
+
+ data = {}
+ with open('/etc/os-release') as f:
+ for line in f:
+ key, val = line.rstrip().split('=', 1)
+ if key == 'NAME':
+ data['DISTRIB_ID'] = val
+ if key == 'VERSION_ID':
+ data['DISTRIB_RELEASE'] = val
+
+ if len(data.keys()) != 2:
+ return None
+
+ return data
+
def release_dict_lsb():
""" Return the output of lsb_release -ir as a dictionary """
from subprocess import PIPE
@@ -46,14 +65,6 @@ def release_dict_file():
if match:
data['DISTRIB_ID'] = match.group(1)
data['DISTRIB_RELEASE'] = match.group(2)
- elif os.path.exists('/etc/os-release'):
- data = {}
- with open('/etc/os-release') as f:
- for line in f:
- if line.startswith('NAME='):
- data['DISTRIB_ID'] = line[5:].rstrip().strip('"')
- if line.startswith('VERSION_ID='):
- data['DISTRIB_RELEASE'] = line[11:].rstrip().strip('"')
elif os.path.exists('/etc/SuSE-release'):
data = {}
data['DISTRIB_ID'] = 'SUSE LINUX'
@@ -73,7 +84,12 @@ def distro_identifier(adjust_hook=None):
import re
- distro_data = release_dict_lsb()
+ # Try /etc/os-release first, then the output of `lsb_release -ir` and
+ # finally fall back on parsing various release files in order to determine
+ # host distro name and version.
+ distro_data = release_dict_osr()
+ if not distro_data:
+ distro_data = release_dict_lsb()
if not distro_data:
distro_data = release_dict_file()
--
2.7.4
^ permalink raw reply related
* [PATCH 2/4] lib/oe/lsb: make the release dict keys consistent regardless of source
From: Joshua Lock @ 2016-11-07 22:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1478558432.git.joshua.g.lock@intel.com>
Rather than have the distro_identifier method look for different keys in
the dict depending on the source ensure that each function for retrieving
release data uses the same key names in the returned dict.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
meta/lib/oe/lsb.py | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/meta/lib/oe/lsb.py b/meta/lib/oe/lsb.py
index e0bdfba..0bb7686 100644
--- a/meta/lib/oe/lsb.py
+++ b/meta/lib/oe/lsb.py
@@ -1,5 +1,5 @@
-def release_dict():
- """Return the output of lsb_release -ir as a dictionary"""
+def release_dict_lsb():
+ """ Return the output of lsb_release -ir as a dictionary """
from subprocess import PIPE
try:
@@ -7,19 +7,28 @@ def release_dict():
except bb.process.CmdError as exc:
return None
+ lsb_map = { 'Distributor ID': 'DISTRIB_ID',
+ 'Release': 'DISTRIB_RELEASE'}
+ lsb_keys = lsb_map.keys()
+
data = {}
for line in output.splitlines():
- if line.startswith("-e"): line = line[3:]
+ if line.startswith("-e"):
+ line = line[3:]
try:
key, value = line.split(":\t", 1)
except ValueError:
continue
- else:
- data[key] = value
+ if key in lsb_keys:
+ data[lsb_map[key]] = value
+
+ if len(data.keys()) != 2:
+ return None
+
return data
def release_dict_file():
- """ Try to gather LSB release information manually when lsb_release tool is unavailable """
+ """ Try to gather release information manually when other methods fail """
data = None
try:
if os.path.exists('/etc/lsb-release'):
@@ -64,15 +73,12 @@ def distro_identifier(adjust_hook=None):
import re
- lsb_data = release_dict()
- if lsb_data:
- distro_id, release = lsb_data['Distributor ID'], lsb_data['Release']
- else:
- lsb_data_file = release_dict_file()
- if lsb_data_file:
- distro_id, release = lsb_data_file['DISTRIB_ID'], lsb_data_file.get('DISTRIB_RELEASE', None)
- else:
- distro_id, release = None, None
+ distro_data = release_dict_lsb()
+ if not distro_data:
+ distro_data = release_dict_file()
+
+ distro_id = distro_data['DISTRIB_ID']
+ release = distro_data['DISTRIB_RELEASE']
if adjust_hook:
distro_id, release = adjust_hook(distro_id, release)
--
2.7.4
^ permalink raw reply related
* [PATCH 1/4] lib/oe/path: remove duplicate import
From: Joshua Lock @ 2016-11-07 22:47 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1478558432.git.joshua.g.lock@intel.com>
There's no need to import glob inside copyhardlinktree() as it's
already imported for the entire path module.
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
---
meta/lib/oe/path.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 06a5af2..f73fd4a 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -81,7 +81,6 @@ def copyhardlinktree(src, dst):
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
source = ''
if os.path.isdir(src):
- import glob
if len(glob.glob('%s/.??*' % src)) > 0:
source = '%s/.??* ' % src
source = source + '%s/*' % src
--
2.7.4
^ permalink raw reply related
* [PATCH 0/4] Make oe.lsb.distro_identifier() more consistent
From: Joshua Lock @ 2016-11-07 22:47 UTC (permalink / raw)
To: openembedded-core
The oe.lsb.distro_identifier() method call will return different identification
information depending on the source which is found to provide that information.
This series attempts to address this in two ways:
1) preferring os-release(5) as the source of distribution identification. this
increasingly common standard mechanism is available on each of the build host
distributions we commonly test on.
2) converting the distribution identifier to lower case before including it in
the distro_identifier return value. This ensures that, for most of the tested
distros, the identifier returned via the LSB code paths matches that returned
by the os-release code paths.
The following changes since commit 98c6ebf1e05158c689e01b785d32757847cdb10c:
oeqa/selftest/kernel.py: Add new file destined for kernel related tests (2016-11-01 10:05:40 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib joshuagl/liboe
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/liboe
Joshua Lock (4):
lib/oe/path: remove duplicate import
lib/oe/lsb: make the release dict keys consistent regardless of source
lib/oe/lsb: prefer /etc/os-release for distribution data
lib/oe/lsb: attempt to ensure consistent distro id regardless of
source
meta/lib/oe/lsb.py | 70 +++++++++++++++++++++++++++++++++++------------------
meta/lib/oe/path.py | 1 -
2 files changed, 46 insertions(+), 25 deletions(-)
--
2.7.4
^ permalink raw reply
* Re: [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Jussi Kukkonen @ 2016-11-07 20:43 UTC (permalink / raw)
To: Marek Vasut; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161107182006.4207-1-marex@denx.de>
[-- Attachment #1: Type: text/plain, Size: 2306 bytes --]
On 7 November 2016 at 20:20, Marek Vasut <marex@denx.de> wrote:
> The build failed on qemux86-64 because it couldn't execute
> tools/bin2header on a host due to it being compiled with target
> toolchain. Drop the incorrect EXTRA_OEMAKE, U-Boot Kbuild/Kconfig
> respects the flags from OE. Moreover, since U-Boot buildsystem
> already strips the tools, add INSANE_SKIP = "already-stripped" .
>
The INSANE_SKIP mentioned here is no longer included in the patch.
Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb | 11 ++++++++++-
> 1 file changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
> b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
> index 5025961..8adc1e6 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
> @@ -3,10 +3,19 @@ require u-boot-common_${PV}.inc
> SUMMARY = "U-Boot bootloader image creation tool"
> DEPENDS = "openssl"
>
> -EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS}
> ${LDFLAGS}" STRIP=true V=1'
> +EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
> +EXTRA_OEMAKE_append_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}"
> CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
> +EXTRA_OEMAKE_append_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS}
> ${BUILD_LDFLAGS}" STRIP=true V=1'
> +EXTRA_OEMAKE_append_class-nativesdk = 'CC="${BUILD_CC} ${BUILD_CFLAGS}
> ${BUILD_LDFLAGS}" STRIP=true V=1'
>
> do_compile () {
> oe_runmake sandbox_defconfig
> +
> + # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
> + # generating it requires bin2header tool, which for target build
> + # is built with target tools and thus cannot be executed on host.
> + sed -i "s/CONFIG_CMD_LICENSE.*/# CONFIG_CMD_LICENSE is not set/"
> .config
> +
> oe_runmake cross_tools NO_SDL=1
> }
>
> --
> 2.9.3
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
[-- Attachment #2: Type: text/html, Size: 3814 bytes --]
^ permalink raw reply
* Re: [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Burton, Ross @ 2016-11-07 20:21 UTC (permalink / raw)
To: Marek Vasut; +Cc: OE-core
In-Reply-To: <CAJTo0LYgvyAriBj2Wf839f6E6Vv04+MLh++gBOEdqSQS+zizwg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
On 7 November 2016 at 20:15, Burton, Ross <ross.burton@intel.com> wrote:
> Looking at the makefile this isn't the case - it's part of hostprogs so if
> anyone of the host-built tools work, they all should.
>
Just verified that the HOSTCC changes in this patch make it work for me
even after removing the sed. Can you send a revision?
Also the u-boot series went through a number of revisions, can you verify
that the patches in poky-contrib:ross/mut match what you expect to see?
Thanks,
Ross
[-- Attachment #2: Type: text/html, Size: 1060 bytes --]
^ permalink raw reply
* Re: [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Burton, Ross @ 2016-11-07 20:15 UTC (permalink / raw)
To: Marek Vasut; +Cc: OE-core
In-Reply-To: <20161107182006.4207-1-marex@denx.de>
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
On 7 November 2016 at 18:20, Marek Vasut <marex@denx.de> wrote:
> + # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
> + # generating it requires bin2header tool, which for target build
> + # is built with target tools and thus cannot be executed on host.
> + sed -i "s/CONFIG_CMD_LICENSE.*/# CONFIG_CMD_LICENSE is not set/"
> .config
>
Looking at the makefile this isn't the case - it's part of hostprogs so if
anyone of the host-built tools work, they all should.
Ross
[-- Attachment #2: Type: text/html, Size: 959 bytes --]
^ permalink raw reply
* [PATCH] u-boot: mkimage: Fix build of u-boot-mkimage
From: Marek Vasut @ 2016-11-07 18:20 UTC (permalink / raw)
To: openembedded-core; +Cc: Marek Vasut
The build failed on qemux86-64 because it couldn't execute
tools/bin2header on a host due to it being compiled with target
toolchain. Drop the incorrect EXTRA_OEMAKE, U-Boot Kbuild/Kconfig
respects the flags from OE. Moreover, since U-Boot buildsystem
already strips the tools, add INSANE_SKIP = "already-stripped" .
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Ross Burton <ross.burton@intel.com>
---
meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
index 5025961..8adc1e6 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2016.09.01.bb
@@ -3,10 +3,19 @@ require u-boot-common_${PV}.inc
SUMMARY = "U-Boot bootloader image creation tool"
DEPENDS = "openssl"
-EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
+EXTRA_OEMAKE = 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"'
+EXTRA_OEMAKE_append_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" STRIP=true V=1'
+EXTRA_OEMAKE_append_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
+EXTRA_OEMAKE_append_class-nativesdk = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
do_compile () {
oe_runmake sandbox_defconfig
+
+ # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
+ # generating it requires bin2header tool, which for target build
+ # is built with target tools and thus cannot be executed on host.
+ sed -i "s/CONFIG_CMD_LICENSE.*/# CONFIG_CMD_LICENSE is not set/" .config
+
oe_runmake cross_tools NO_SDL=1
}
--
2.9.3
^ permalink raw reply related
* Re: [Patch 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication
From: Khem Raj @ 2016-11-07 17:34 UTC (permalink / raw)
To: Mark Hatle, Zubair Lutfullah Kakakhel, openembedded-core
In-Reply-To: <72beb05b-1399-f8c7-f258-94a7885cc188@windriver.com>
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(-)
>>
>
^ permalink raw reply
* Re: [PATCH] packagegroup-core-sdk: Disable sanitizers for mips64el
From: Burton, Ross @ 2016-11-07 17:51 UTC (permalink / raw)
To: jackie.huang@windriver.com; +Cc: OE-core
In-Reply-To: <20161107081541.14964-1-jackie.huang@windriver.com>
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
On 7 November 2016 at 08:15, <jackie.huang@windriver.com> wrote:
> These are not available on mips64el yet, so disable them.
>
This was just superseded by the MIPS arch override, so this won't be
applied.
Ross
[-- Attachment #2: Type: text/html, Size: 638 bytes --]
^ permalink raw reply
* Re: [Patch 10/13] ghostscript: Reduce duplication in MIPS variants.
From: Khem Raj @ 2016-11-07 17:33 UTC (permalink / raw)
To: Zubair Lutfullah Kakakhel, openembedded-core
In-Reply-To: <20161107150135.40266-11-Zubair.Kakakhel@imgtec.com>
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
>
^ permalink raw reply
* Re: [Patch 01/13] arch-mips: Add MACHINEOVERRIDES variables to reduce duplication
From: Khem Raj @ 2016-11-07 17:30 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <20161107150135.40266-2-Zubair.Kakakhel@imgtec.com>
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"
>
^ permalink raw reply
* Re: [PATCH] packagegroup-core-sdk: Disable sanitizers for mips64el
From: Khem Raj @ 2016-11-07 17:20 UTC (permalink / raw)
To: jackie.huang, openembedded-core
In-Reply-To: <20161107081541.14964-1-jackie.huang@windriver.com>
On 11/7/16 12:15 AM, jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> These are not available on mips64el yet, so disable them.
this is ok
>
> 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 = ""
>
^ permalink raw reply
* [PATCH] musl: Upgrade to master tip
From: Khem Raj @ 2016-11-07 17:08 UTC (permalink / raw)
To: openembedded-core
Drop backported patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-core/musl/files/CVE-2016-8859.patch | 79 ------------------------
meta/recipes-core/musl/musl_git.bb | 3 +-
2 files changed, 1 insertion(+), 81 deletions(-)
delete mode 100644 meta/recipes-core/musl/files/CVE-2016-8859.patch
diff --git a/meta/recipes-core/musl/files/CVE-2016-8859.patch b/meta/recipes-core/musl/files/CVE-2016-8859.patch
deleted file mode 100644
index 82da86f..0000000
--- a/meta/recipes-core/musl/files/CVE-2016-8859.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From c3edc06d1e1360f3570db9155d6b318ae0d0f0f7 Mon Sep 17 00:00:00 2001
-From: Rich Felker <dalias@aerifal.cx>
-Date: Thu, 6 Oct 2016 18:34:58 -0400
-Subject: [PATCH] fix missing integer overflow checks in regexec buffer size
- computations
-
-most of the possible overflows were already ruled out in practice by
-regcomp having already succeeded performing larger allocations.
-however at least the num_states*num_tags multiplication can clearly
-overflow in practice. for safety, check them all, and use the proper
-type, size_t, rather than int.
-
-also improve comments, use calloc in place of malloc+memset, and
-remove bogus casts.
-
-Upstream-Status: Backport
-CVE: CVE-2016-8859
-
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
----
- src/regex/regexec.c | 23 ++++++++++++++++++-----
- 1 file changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/src/regex/regexec.c b/src/regex/regexec.c
-index 16c5d0a..dd52319 100644
---- a/src/regex/regexec.c
-+++ b/src/regex/regexec.c
-@@ -34,6 +34,7 @@
- #include <wchar.h>
- #include <wctype.h>
- #include <limits.h>
-+#include <stdint.h>
-
- #include <regex.h>
-
-@@ -206,11 +207,24 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
-
- /* Allocate memory for temporary data required for matching. This needs to
- be done for every matching operation to be thread safe. This allocates
-- everything in a single large block from the stack frame using alloca()
-- or with malloc() if alloca is unavailable. */
-+ everything in a single large block with calloc(). */
- {
-- int tbytes, rbytes, pbytes, xbytes, total_bytes;
-+ size_t tbytes, rbytes, pbytes, xbytes, total_bytes;
- char *tmp_buf;
-+
-+ /* Ensure that tbytes and xbytes*num_states cannot overflow, and that
-+ * they don't contribute more than 1/8 of SIZE_MAX to total_bytes. */
-+ if (num_tags > SIZE_MAX/(8 * sizeof(int) * tnfa->num_states))
-+ goto error_exit;
-+
-+ /* Likewise check rbytes. */
-+ if (tnfa->num_states+1 > SIZE_MAX/(8 * sizeof(*reach_next)))
-+ goto error_exit;
-+
-+ /* Likewise check pbytes. */
-+ if (tnfa->num_states > SIZE_MAX/(8 * sizeof(*reach_pos)))
-+ goto error_exit;
-+
- /* Compute the length of the block we need. */
- tbytes = sizeof(*tmp_tags) * num_tags;
- rbytes = sizeof(*reach_next) * (tnfa->num_states + 1);
-@@ -221,10 +235,9 @@ tre_tnfa_run_parallel(const tre_tnfa_t *tnfa, const void *string,
- + (rbytes + xbytes * tnfa->num_states) * 2 + tbytes + pbytes;
-
- /* Allocate the memory. */
-- buf = xmalloc((unsigned)total_bytes);
-+ buf = calloc(total_bytes, 1);
- if (buf == NULL)
- return REG_ESPACE;
-- memset(buf, 0, (size_t)total_bytes);
-
- /* Get the various pointers within tmp_buf (properly aligned). */
- tmp_tags = (void *)buf;
---
-2.7.4
-
diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
index 1ee56b6..63f3334 100644
--- a/meta/recipes-core/musl/musl_git.bb
+++ b/meta/recipes-core/musl/musl_git.bb
@@ -3,7 +3,7 @@
require musl.inc
-SRCREV = "39494a273eaa6b714e0fa0c59ce7a1f5fbc80a1e"
+SRCREV = "7597fc25a2743d49500926a286da71f8e033936c"
PV = "1.1.15+git${SRCPV}"
@@ -11,7 +11,6 @@ PV = "1.1.15+git${SRCPV}"
SRC_URI = "git://git.musl-libc.org/musl \
file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
- file://CVE-2016-8859.patch \
"
S = "${WORKDIR}/git"
--
2.10.2
^ permalink raw reply related
* [PATCH][V2] lib/oe/qa: handle binaries with segments outside the first 4kb
From: Ross Burton @ 2016-11-07 16:45 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 | 82 +++++++++++++++++++++++++++----------------------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index fbe719d..22d76dc 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,46 @@ 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)
+ try:
+ self.data = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ)
+ except ValueError:
+ # This means the file is empty
+ raise NotELFFileError("%s is empty" % self.name)
+ # 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 +85,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 +117,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 +165,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 00/13] MIPS: Use MACHINEOVERRIDES and reduce duplication
From: Mark Hatle @ 2016-11-07 16:05 UTC (permalink / raw)
To: Zubair Lutfullah Kakakhel, openembedded-core
In-Reply-To: <20161107150135.40266-1-Zubair.Kakakhel@imgtec.com>
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(-)
>
^ permalink raw reply
* [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
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