* Re: Kernel: Builds use old version of defconfig
From: Andre McCurdy @ 2016-11-29 17:49 UTC (permalink / raw)
To: Mike Looijmans; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <de64dc20-cff3-5f25-7e66-55887e641e3e@topic.nl>
On Mon, Nov 28, 2016 at 11:58 PM, Mike Looijmans
<mike.looijmans@topic.nl> wrote:
>
> The current system assumes that the kernel recipe creates a
> do_configure_prepend to do the mangling, which is rather counterintuitive,
> one would expect to "append" extra actions.
For reference, I've implemented support for merging of config
fragments in kernel.bbclass based kernel recipes just by over-riding
KERNEL_CONFIG_COMMAND. No do_configure_prepend required.
The basic version is:
KERNEL_CONFIG_COMMAND = " \
cd ${S} ; \
${WORKDIR}/merge_config.sh -r -O ${B} ${B}/.config `ls
${WORKDIR}/*.cfg 2>/dev/null` ; \
cd ${B} \
"
The debug version, with lots of error checking etc to verify that
calling merge_config.sh with no config fragments is equivalent to the
default KERNEL_CONFIG_COMMAND (which calls "make oldnoconfig" with a
fallback to "yes '' | make oldconfig" for _very_ old kernels) is:
KERNEL_CONFIG_COMMAND = " \
set -x ; \
cp .config .config_original ; \
cd ${S} ; \
oe_runmake_call O=${B} oldnoconfig ; \
mv ${B}/.config ${B}/.config_oldnoconfig ; \
cp ${B}/.config_original ${B}/.config ; \
${WORKDIR}/merge_config.sh -r -O ${B} ${B}/.config ; \
mv ${B}/.config ${B}/.config_merged_no_fragments ; \
cp ${B}/.config_original ${B}/.config ; \
${WORKDIR}/merge_config.sh -r -O ${B} ${B}/.config `ls
${WORKDIR}/*.cfg 2>/dev/null` ; \
cp ${B}/.config ${B}/.config_merged_with_fragments ; \
cd ${B} ; \
diff -u .config_oldnoconfig .config_merged_no_fragments ; \
diff -u .config_oldnoconfig .config_merged_with_fragments || true \
"
> A structured approach would be to split the do_configure into two parts that
> should run in sequence, and then kernel recipes can inject their actions by
> appending to them as they see fit. The first task would create the .config
> file by (forcibly) copying any defconfig or starting point. The second task
> would call the kernel's make script to futher process it.
>
> But this too would break existing recipes.
>
^ permalink raw reply
* Re: [PATCH] devtool: execute associated functions while preparing the source tree
From: Paul Eggleton @ 2016-11-29 18:01 UTC (permalink / raw)
To: Jiajie Hu; +Cc: openembedded-core
In-Reply-To: <1480388349-4206-1-git-send-email-jiajie.hu@intel.com>
Hi Jiajie,
On Tue, 29 Nov 2016 10:59:09 Jiajie Hu wrote:
> Execute prefuncs and postfuncs associated with the task while preparing
> the source tree. If any changes are made to the source tree by these
> prefuncs or postfuncs, a separate commit will be created so that the
> changes won't get incorporated with other patches.
So this in itself looks reasonable in theory, but I have to warn you that when
we switch to tinfoil2 [1] these commits are going to be done via the metadata
instead, and beyond a possible hack that I'd really rather not think about
it's going to be a bit difficult to intercept the prefuncs/postfuncs there. At
least they will be executed though since with tinfoil2 we'll be going through
a much more standard path to run the tasks.
Cheers,
Paul
[1] https://wiki.yoctoproject.org/wiki/Tinfoil2
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: [PATCH] qemu*.conf: Add slirp support for all qemu machines
From: Randy Witt @ 2016-11-29 18:24 UTC (permalink / raw)
To: Robert Yang, openembedded-core
In-Reply-To: <f4759de9-823a-bfcd-9305-e14438347631@windriver.com>
>
> "-device virtio-net-device,netdev=net0" and
> "-netdev user,id=net0,hostfwd=tcp::2222-:22"
>
> Then there is no way for user to override the second part, and we can't
> call the first part as a "QB_SLIRP_OPT" since it is only part of them,
> so I won't break them into 2, and if the user defines QB_SLIRP_OPT
> in there bsp conf file, then it will be replaced totally.
>
I'm aware that this will only work for one instance, but currently it doesn't
work at all and it blocks a high priority bug. The only way to make it 100%
work, would be to have qemu do the binding of the port to a dynamic one and then
the user queries it after. Otherwise there is always a window where another
process could bind to the port.
I don't think the bsp should be in the business of choosing which ports to
forward. And if it is, then it should be a separate option in the qemuboot.conf,
with just the "-netdev user" part because otherwise the user will always have to
modify qemuboot.conf just to forward different ports.
It makes more sense to let the user do something like "runqemu slirp=22,65,..."
and then return back the actual port used in the forwarding.
^ permalink raw reply
* [PATCH] sysvinit-inittab: fix getty device removal
From: leonardo.sandoval.gonzalez @ 2016-11-29 18:29 UTC (permalink / raw)
To: openembedded-core
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
getty devices were not being removed in some cases because device name
was not at the end of the line, for example a ttyS1 device:
S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
Removing this limitation allows sed to remove any line containing
the device.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index c219cbf..dd30f43 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
k=`echo ${i} | sed s/^.*\://g`
if [ -z "`grep ${j} /proc/consoles`" ]; then
if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
- sed -i /^.*${j}$/d /etc/inittab
+ sed -i /^.*${j}/d /etc/inittab
fi
fi
done
--
2.1.4
^ permalink raw reply related
* [PATCH] tune-cortexa*.inc: squash whitespace within TUNE_FEATURES strings
From: Andre McCurdy @ 2016-11-29 18:36 UTC (permalink / raw)
To: openembedded-core
TUNE_FEATURES is include in BUILDCFG_VARS, so any whitespace is
visible to the user during the build process. Remove the extra
whitespace added during the 2.1 development cycle:
http://git.openembedded.org/openembedded-core/commit/?id=f774b44fa007a2a756ada892ede832b1251d940c
For consistency, squash whitespace within PACKAGE_EXTRA_ARCHS strings
too.
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
meta/conf/machine/include/tune-cortexa15.inc | 32 ++++++++++++-------------
meta/conf/machine/include/tune-cortexa17.inc | 32 ++++++++++++-------------
meta/conf/machine/include/tune-cortexa5.inc | 24 +++++++++----------
meta/conf/machine/include/tune-cortexa7.inc | 32 ++++++++++++-------------
meta/conf/machine/include/tune-cortexa8.inc | 24 +++++++++----------
meta/conf/machine/include/tune-cortexa9.inc | 36 ++++++++++++++--------------
6 files changed, 90 insertions(+), 90 deletions(-)
diff --git a/meta/conf/machine/include/tune-cortexa15.inc b/meta/conf/machine/include/tune-cortexa15.inc
index a33b27f..03de602 100644
--- a/meta/conf/machine/include/tune-cortexa15.inc
+++ b/meta/conf/machine/include/tune-cortexa15.inc
@@ -13,17 +13,17 @@ ARMPKGARCH_tune-cortexa15-neon = "cortexa15"
ARMPKGARCH_tune-cortexa15t-neon = "cortexa15"
ARMPKGARCH_tune-cortexa15-neon-vfpv4 = "cortexa15"
ARMPKGARCH_tune-cortexa15t-neon-vfpv4 = "cortexa15"
-TUNE_FEATURES_tune-cortexa15 = "${TUNE_FEATURES_tune-armv7ve} cortexa15"
-TUNE_FEATURES_tune-cortexa15t = "${TUNE_FEATURES_tune-armv7vet} cortexa15"
-TUNE_FEATURES_tune-cortexa15-neon = "${TUNE_FEATURES_tune-armv7ve-neon} cortexa15"
-TUNE_FEATURES_tune-cortexa15t-neon = "${TUNE_FEATURES_tune-armv7vet-neon} cortexa15"
-TUNE_FEATURES_tune-cortexa15-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} cortexa15"
+TUNE_FEATURES_tune-cortexa15 = "${TUNE_FEATURES_tune-armv7ve} cortexa15"
+TUNE_FEATURES_tune-cortexa15t = "${TUNE_FEATURES_tune-armv7vet} cortexa15"
+TUNE_FEATURES_tune-cortexa15-neon = "${TUNE_FEATURES_tune-armv7ve-neon} cortexa15"
+TUNE_FEATURES_tune-cortexa15t-neon = "${TUNE_FEATURES_tune-armv7vet-neon} cortexa15"
+TUNE_FEATURES_tune-cortexa15-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} cortexa15"
TUNE_FEATURES_tune-cortexa15t-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vet-neon-vfpv4} cortexa15"
-PACKAGE_EXTRA_ARCHS_tune-cortexa15 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa15-vfp"
+PACKAGE_EXTRA_ARCHS_tune-cortexa15 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa15-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa15t = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} cortexa15-vfp cortexa15t2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa15-vfp cortexa15-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa15-vfp cortexa15-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa15t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} cortexa15-vfp cortexa15-neon cortexa15t2-vfp cortexa15t2-neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4"
+PACKAGE_EXTRA_ARCHS_tune-cortexa15-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-cortexa15t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4} cortexa15-vfp cortexa15-neon cortexa15-neon-vfpv4 cortexa15t2-vfp cortexa15t2-neon cortexa15t2-neon-vfpv4"
# HF Tunes
@@ -34,15 +34,15 @@ ARMPKGARCH_tune-cortexa15hf-neon = "cortexa15"
ARMPKGARCH_tune-cortexa15thf-neon = "cortexa15"
ARMPKGARCH_tune-cortexa15hf-neon-vfpv4 = "cortexa15"
ARMPKGARCH_tune-cortexa15thf-neon-vfpv4 = "cortexa15"
-TUNE_FEATURES_tune-cortexa15hf = "${TUNE_FEATURES_tune-armv7vehf} cortexa15"
-TUNE_FEATURES_tune-cortexa15thf = "${TUNE_FEATURES_tune-armv7vethf} cortexa15"
-TUNE_FEATURES_tune-cortexa15hf-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} cortexa15"
-TUNE_FEATURES_tune-cortexa15thf-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} cortexa15"
-TUNE_FEATURES_tune-cortexa15hf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} cortexa15"
+TUNE_FEATURES_tune-cortexa15hf = "${TUNE_FEATURES_tune-armv7vehf} cortexa15"
+TUNE_FEATURES_tune-cortexa15thf = "${TUNE_FEATURES_tune-armv7vethf} cortexa15"
+TUNE_FEATURES_tune-cortexa15hf-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} cortexa15"
+TUNE_FEATURES_tune-cortexa15thf-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} cortexa15"
+TUNE_FEATURES_tune-cortexa15hf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} cortexa15"
TUNE_FEATURES_tune-cortexa15thf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vethf-neon-vfpv4} cortexa15"
-PACKAGE_EXTRA_ARCHS_tune-cortexa15hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa15hf-vfp"
+PACKAGE_EXTRA_ARCHS_tune-cortexa15hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa15hf-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa15thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} cortexa15hf-vfp cortexa15t2hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa15hf-vfp cortexa15hf-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa15hf-vfp cortexa15hf-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa15thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} cortexa15hf-vfp cortexa15hf-neon cortexa15t2hf-vfp cortexa15t2hf-neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4"
+PACKAGE_EXTRA_ARCHS_tune-cortexa15hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-cortexa15thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4} cortexa15hf-vfp cortexa15hf-neon cortexa15hf-neon-vfpv4 cortexa15t2hf-vfp cortexa15t2hf-neon cortexa15t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa17.inc b/meta/conf/machine/include/tune-cortexa17.inc
index d08b002..f659a62 100644
--- a/meta/conf/machine/include/tune-cortexa17.inc
+++ b/meta/conf/machine/include/tune-cortexa17.inc
@@ -13,17 +13,17 @@ ARMPKGARCH_tune-cortexa17-neon = "cortexa17"
ARMPKGARCH_tune-cortexa17t-neon = "cortexa17"
ARMPKGARCH_tune-cortexa17-neon-vfpv4 = "cortexa17"
ARMPKGARCH_tune-cortexa17t-neon-vfpv4 = "cortexa17"
-TUNE_FEATURES_tune-cortexa17 = "${TUNE_FEATURES_tune-armv7ve} cortexa17"
-TUNE_FEATURES_tune-cortexa17t = "${TUNE_FEATURES_tune-armv7vet} cortexa17"
-TUNE_FEATURES_tune-cortexa17-neon = "${TUNE_FEATURES_tune-armv7ve-neon} cortexa17"
-TUNE_FEATURES_tune-cortexa17t-neon = "${TUNE_FEATURES_tune-armv7vet-neon} cortexa17"
-TUNE_FEATURES_tune-cortexa17-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} cortexa17"
+TUNE_FEATURES_tune-cortexa17 = "${TUNE_FEATURES_tune-armv7ve} cortexa17"
+TUNE_FEATURES_tune-cortexa17t = "${TUNE_FEATURES_tune-armv7vet} cortexa17"
+TUNE_FEATURES_tune-cortexa17-neon = "${TUNE_FEATURES_tune-armv7ve-neon} cortexa17"
+TUNE_FEATURES_tune-cortexa17t-neon = "${TUNE_FEATURES_tune-armv7vet-neon} cortexa17"
+TUNE_FEATURES_tune-cortexa17-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} cortexa17"
TUNE_FEATURES_tune-cortexa17t-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vet-neon-vfpv4} cortexa17"
-PACKAGE_EXTRA_ARCHS_tune-cortexa17 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa17-vfp"
+PACKAGE_EXTRA_ARCHS_tune-cortexa17 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa17-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa17t = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} cortexa17-vfp cortexa17t2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa17-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa17-vfp cortexa17-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa17-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa17-vfp cortexa17-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa17t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} cortexa17-vfp cortexa17-neon cortexa17t2-vfp cortexa17t2-neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa17-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4"
+PACKAGE_EXTRA_ARCHS_tune-cortexa17-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-cortexa17t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4} cortexa17-vfp cortexa17-neon cortexa17-neon-vfpv4 cortexa17t2-vfp cortexa17t2-neon cortexa17t2-neon-vfpv4"
# HF Tunes
@@ -34,15 +34,15 @@ ARMPKGARCH_tune-cortexa17hf-neon = "cortexa17"
ARMPKGARCH_tune-cortexa17thf-neon = "cortexa17"
ARMPKGARCH_tune-cortexa17hf-neon-vfpv4 = "cortexa17"
ARMPKGARCH_tune-cortexa17thf-neon-vfpv4 = "cortexa17"
-TUNE_FEATURES_tune-cortexa17hf = "${TUNE_FEATURES_tune-armv7vehf} cortexa17"
-TUNE_FEATURES_tune-cortexa17thf = "${TUNE_FEATURES_tune-armv7vethf} cortexa17"
-TUNE_FEATURES_tune-cortexa17hf-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} cortexa17"
-TUNE_FEATURES_tune-cortexa17thf-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} cortexa17"
-TUNE_FEATURES_tune-cortexa17hf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} cortexa17"
+TUNE_FEATURES_tune-cortexa17hf = "${TUNE_FEATURES_tune-armv7vehf} cortexa17"
+TUNE_FEATURES_tune-cortexa17thf = "${TUNE_FEATURES_tune-armv7vethf} cortexa17"
+TUNE_FEATURES_tune-cortexa17hf-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} cortexa17"
+TUNE_FEATURES_tune-cortexa17thf-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} cortexa17"
+TUNE_FEATURES_tune-cortexa17hf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} cortexa17"
TUNE_FEATURES_tune-cortexa17thf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vethf-neon-vfpv4} cortexa17"
-PACKAGE_EXTRA_ARCHS_tune-cortexa17hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa17hf-vfp"
+PACKAGE_EXTRA_ARCHS_tune-cortexa17hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa17hf-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa17thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} cortexa17hf-vfp cortexa17t2hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa17hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa17hf-vfp cortexa17hf-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa17hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa17hf-vfp cortexa17hf-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa17thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} cortexa17hf-vfp cortexa17hf-neon cortexa17t2hf-vfp cortexa17t2hf-neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa17hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4"
+PACKAGE_EXTRA_ARCHS_tune-cortexa17hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-cortexa17thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4} cortexa17hf-vfp cortexa17hf-neon cortexa17hf-neon-vfpv4 cortexa17t2hf-vfp cortexa17t2hf-neon cortexa17t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa5.inc b/meta/conf/machine/include/tune-cortexa5.inc
index c7e5ab9..93f9ca4 100644
--- a/meta/conf/machine/include/tune-cortexa5.inc
+++ b/meta/conf/machine/include/tune-cortexa5.inc
@@ -11,13 +11,13 @@ ARMPKGARCH_tune-cortexa5 = "cortexa5"
ARMPKGARCH_tune-cortexa5t = "cortexa5"
ARMPKGARCH_tune-cortexa5-neon = "cortexa5"
ARMPKGARCH_tune-cortexa5t-neon = "cortexa5"
-TUNE_FEATURES_tune-cortexa5 = "${TUNE_FEATURES_tune-armv7a} cortexa5"
-TUNE_FEATURES_tune-cortexa5t = "${TUNE_FEATURES_tune-armv7at} cortexa5"
-TUNE_FEATURES_tune-cortexa5-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa5"
-TUNE_FEATURES_tune-cortexa5t-neon = "${TUNE_FEATURES_tune-armv7at-neon} cortexa5"
-PACKAGE_EXTRA_ARCHS_tune-cortexa5 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa5-vfp"
+TUNE_FEATURES_tune-cortexa5 = "${TUNE_FEATURES_tune-armv7a} cortexa5"
+TUNE_FEATURES_tune-cortexa5t = "${TUNE_FEATURES_tune-armv7at} cortexa5"
+TUNE_FEATURES_tune-cortexa5-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa5"
+TUNE_FEATURES_tune-cortexa5t-neon = "${TUNE_FEATURES_tune-armv7at-neon} cortexa5"
+PACKAGE_EXTRA_ARCHS_tune-cortexa5 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa5-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa5t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} cortexa5-vfp cortexa5t2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa5-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa5-vfp cortexa5-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa5-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa5-vfp cortexa5-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa5t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} cortexa5-vfp cortexa5-neon cortexa5t2-vfp cortexa5t2-neon"
# HF Tunes
@@ -26,11 +26,11 @@ ARMPKGARCH_tune-cortexa5hf = "cortexa5"
ARMPKGARCH_tune-cortexa5thf = "cortexa5"
ARMPKGARCH_tune-cortexa5hf-neon = "cortexa5"
ARMPKGARCH_tune-cortexa5thf-neon = "cortexa5"
-TUNE_FEATURES_tune-cortexa5hf = "${TUNE_FEATURES_tune-armv7ahf} cortexa5"
-TUNE_FEATURES_tune-cortexa5thf = "${TUNE_FEATURES_tune-armv7athf} cortexa5"
-TUNE_FEATURES_tune-cortexa5hf-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa5"
-TUNE_FEATURES_tune-cortexa5thf-neon = "${TUNE_FEATURES_tune-armv7athf-neon} cortexa5"
-PACKAGE_EXTRA_ARCHS_tune-cortexa5hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa5hf-vfp"
+TUNE_FEATURES_tune-cortexa5hf = "${TUNE_FEATURES_tune-armv7ahf} cortexa5"
+TUNE_FEATURES_tune-cortexa5thf = "${TUNE_FEATURES_tune-armv7athf} cortexa5"
+TUNE_FEATURES_tune-cortexa5hf-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa5"
+TUNE_FEATURES_tune-cortexa5thf-neon = "${TUNE_FEATURES_tune-armv7athf-neon} cortexa5"
+PACKAGE_EXTRA_ARCHS_tune-cortexa5hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa5hf-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa5thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} cortexa5hf-vfp cortexa5t2hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa5hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa5hf-vfp cortexa5hf-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa5hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa5hf-vfp cortexa5hf-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa5thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} cortexa5hf-vfp cortexa5hf-neon cortexa5t2hf-vfp cortexa5t2hf-neon"
diff --git a/meta/conf/machine/include/tune-cortexa7.inc b/meta/conf/machine/include/tune-cortexa7.inc
index 10b6ea7..52e06b8 100644
--- a/meta/conf/machine/include/tune-cortexa7.inc
+++ b/meta/conf/machine/include/tune-cortexa7.inc
@@ -13,17 +13,17 @@ ARMPKGARCH_tune-cortexa7-neon = "cortexa7"
ARMPKGARCH_tune-cortexa7t-neon = "cortexa7"
ARMPKGARCH_tune-cortexa7-neon-vfpv4 = "cortexa7"
ARMPKGARCH_tune-cortexa7t-neon-vfpv4 = "cortexa7"
-TUNE_FEATURES_tune-cortexa7 = "${TUNE_FEATURES_tune-armv7ve} cortexa7"
-TUNE_FEATURES_tune-cortexa7t = "${TUNE_FEATURES_tune-armv7vet} cortexa7"
-TUNE_FEATURES_tune-cortexa7-neon = "${TUNE_FEATURES_tune-armv7ve-neon} cortexa7"
-TUNE_FEATURES_tune-cortexa7t-neon = "${TUNE_FEATURES_tune-armv7vet-neon} cortexa7"
-TUNE_FEATURES_tune-cortexa7-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} cortexa7"
+TUNE_FEATURES_tune-cortexa7 = "${TUNE_FEATURES_tune-armv7ve} cortexa7"
+TUNE_FEATURES_tune-cortexa7t = "${TUNE_FEATURES_tune-armv7vet} cortexa7"
+TUNE_FEATURES_tune-cortexa7-neon = "${TUNE_FEATURES_tune-armv7ve-neon} cortexa7"
+TUNE_FEATURES_tune-cortexa7t-neon = "${TUNE_FEATURES_tune-armv7vet-neon} cortexa7"
+TUNE_FEATURES_tune-cortexa7-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7ve-neon-vfpv4} cortexa7"
TUNE_FEATURES_tune-cortexa7t-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vet-neon-vfpv4} cortexa7"
-PACKAGE_EXTRA_ARCHS_tune-cortexa7 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa7-vfp"
+PACKAGE_EXTRA_ARCHS_tune-cortexa7 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve} cortexa7-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa7t = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet} cortexa7-vfp cortexa7t2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa7-vfp cortexa7-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon} cortexa7-vfp cortexa7-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon} cortexa7-vfp cortexa7-neon cortexa7t2-vfp cortexa7t2-neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4"
+PACKAGE_EXTRA_ARCHS_tune-cortexa7-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ve-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-cortexa7t-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vet-neon-vfpv4} cortexa7-vfp cortexa7-neon cortexa7-neon-vfpv4 cortexa7t2-vfp cortexa7t2-neon cortexa7t2-neon-vfpv4"
# HF Tunes
@@ -34,15 +34,15 @@ ARMPKGARCH_tune-cortexa7hf-neon = "cortexa7"
ARMPKGARCH_tune-cortexa7thf-neon = "cortexa7"
ARMPKGARCH_tune-cortexa7hf-neon-vfpv4 = "cortexa7"
ARMPKGARCH_tune-cortexa7thf-neon-vfpv4 = "cortexa7"
-TUNE_FEATURES_tune-cortexa7hf = "${TUNE_FEATURES_tune-armv7vehf} cortexa7"
-TUNE_FEATURES_tune-cortexa7thf = "${TUNE_FEATURES_tune-armv7vethf} cortexa7"
-TUNE_FEATURES_tune-cortexa7hf-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} cortexa7"
-TUNE_FEATURES_tune-cortexa7thf-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} cortexa7"
-TUNE_FEATURES_tune-cortexa7hf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} cortexa7"
+TUNE_FEATURES_tune-cortexa7hf = "${TUNE_FEATURES_tune-armv7vehf} cortexa7"
+TUNE_FEATURES_tune-cortexa7thf = "${TUNE_FEATURES_tune-armv7vethf} cortexa7"
+TUNE_FEATURES_tune-cortexa7hf-neon = "${TUNE_FEATURES_tune-armv7vehf-neon} cortexa7"
+TUNE_FEATURES_tune-cortexa7thf-neon = "${TUNE_FEATURES_tune-armv7vethf-neon} cortexa7"
+TUNE_FEATURES_tune-cortexa7hf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vehf-neon-vfpv4} cortexa7"
TUNE_FEATURES_tune-cortexa7thf-neon-vfpv4 = "${TUNE_FEATURES_tune-armv7vethf-neon-vfpv4} cortexa7"
-PACKAGE_EXTRA_ARCHS_tune-cortexa7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa7hf-vfp"
+PACKAGE_EXTRA_ARCHS_tune-cortexa7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf} cortexa7hf-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf} cortexa7hf-vfp cortexa7t2hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa7hf-vfp cortexa7hf-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon} cortexa7hf-vfp cortexa7hf-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa7thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon} cortexa7hf-vfp cortexa7hf-neon cortexa7t2hf-vfp cortexa7t2hf-neon"
-PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4"
+PACKAGE_EXTRA_ARCHS_tune-cortexa7hf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vehf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4"
PACKAGE_EXTRA_ARCHS_tune-cortexa7thf-neon-vfpv4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7vethf-neon-vfpv4} cortexa7hf-vfp cortexa7hf-neon cortexa7hf-neon-vfpv4 cortexa7t2hf-vfp cortexa7t2hf-neon cortexa7t2hf-neon-vfpv4"
diff --git a/meta/conf/machine/include/tune-cortexa8.inc b/meta/conf/machine/include/tune-cortexa8.inc
index c8ce021..a831bd5 100644
--- a/meta/conf/machine/include/tune-cortexa8.inc
+++ b/meta/conf/machine/include/tune-cortexa8.inc
@@ -11,13 +11,13 @@ ARMPKGARCH_tune-cortexa8 = "cortexa8"
ARMPKGARCH_tune-cortexa8t = "cortexa8"
ARMPKGARCH_tune-cortexa8-neon = "cortexa8"
ARMPKGARCH_tune-cortexa8t-neon = "cortexa8"
-TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8"
-TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8"
-TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa8"
-TUNE_FEATURES_tune-cortexa8t-neon = "${TUNE_FEATURES_tune-armv7at-neon} cortexa8"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa8-vfp"
+TUNE_FEATURES_tune-cortexa8 = "${TUNE_FEATURES_tune-armv7a} cortexa8"
+TUNE_FEATURES_tune-cortexa8t = "${TUNE_FEATURES_tune-armv7at} cortexa8"
+TUNE_FEATURES_tune-cortexa8-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa8"
+TUNE_FEATURES_tune-cortexa8t-neon = "${TUNE_FEATURES_tune-armv7at-neon} cortexa8"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa8-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa8t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} cortexa8-vfp cortexa8t2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa8-vfp cortexa8-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa8-vfp cortexa8-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa8t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} cortexa8-vfp cortexa8-neon cortexa8t2-vfp cortexa8t2-neon"
# HF Tunes
@@ -26,11 +26,11 @@ ARMPKGARCH_tune-cortexa8hf = "cortexa8"
ARMPKGARCH_tune-cortexa8thf = "cortexa8"
ARMPKGARCH_tune-cortexa8hf-neon = "cortexa8"
ARMPKGARCH_tune-cortexa8thf-neon = "cortexa8"
-TUNE_FEATURES_tune-cortexa8hf = "${TUNE_FEATURES_tune-armv7ahf} cortexa8"
-TUNE_FEATURES_tune-cortexa8thf = "${TUNE_FEATURES_tune-armv7athf} cortexa8"
-TUNE_FEATURES_tune-cortexa8hf-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa8"
-TUNE_FEATURES_tune-cortexa8thf-neon = "${TUNE_FEATURES_tune-armv7athf-neon} cortexa8"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa8hf-vfp"
+TUNE_FEATURES_tune-cortexa8hf = "${TUNE_FEATURES_tune-armv7ahf} cortexa8"
+TUNE_FEATURES_tune-cortexa8thf = "${TUNE_FEATURES_tune-armv7athf} cortexa8"
+TUNE_FEATURES_tune-cortexa8hf-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa8"
+TUNE_FEATURES_tune-cortexa8thf-neon = "${TUNE_FEATURES_tune-armv7athf-neon} cortexa8"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa8hf-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa8thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} cortexa8hf-vfp cortexa8t2hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa8hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa8hf-vfp cortexa8hf-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa8hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa8hf-vfp cortexa8hf-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa8thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} cortexa8hf-vfp cortexa8hf-neon cortexa8t2hf-vfp cortexa8t2hf-neon"
diff --git a/meta/conf/machine/include/tune-cortexa9.inc b/meta/conf/machine/include/tune-cortexa9.inc
index 3d8dc1d..8b84e60 100644
--- a/meta/conf/machine/include/tune-cortexa9.inc
+++ b/meta/conf/machine/include/tune-cortexa9.inc
@@ -11,13 +11,13 @@ ARMPKGARCH_tune-cortexa9 = "cortexa9"
ARMPKGARCH_tune-cortexa9t = "cortexa9"
ARMPKGARCH_tune-cortexa9-neon = "cortexa9"
ARMPKGARCH_tune-cortexa9t-neon = "cortexa9"
-TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9"
-TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9"
-TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9"
-TUNE_FEATURES_tune-cortexa9t-neon = "${TUNE_FEATURES_tune-armv7at-neon} cortexa9"
-PACKAGE_EXTRA_ARCHS_tune-cortexa9 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa9-vfp"
+TUNE_FEATURES_tune-cortexa9 = "${TUNE_FEATURES_tune-armv7a} cortexa9"
+TUNE_FEATURES_tune-cortexa9t = "${TUNE_FEATURES_tune-armv7at} cortexa9"
+TUNE_FEATURES_tune-cortexa9-neon = "${TUNE_FEATURES_tune-armv7a-neon} cortexa9"
+TUNE_FEATURES_tune-cortexa9t-neon = "${TUNE_FEATURES_tune-armv7at-neon} cortexa9"
+PACKAGE_EXTRA_ARCHS_tune-cortexa9 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a} cortexa9-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa9t = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} cortexa9-vfp cortexa9t2-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa9-vfp cortexa9-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa9-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-neon} cortexa9-vfp cortexa9-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa9t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-neon} cortexa9-vfp cortexa9-neon cortexa9t2-vfp cortexa9t2-neon"
# HF Tunes
@@ -26,13 +26,13 @@ ARMPKGARCH_tune-cortexa9hf = "cortexa9"
ARMPKGARCH_tune-cortexa9thf = "cortexa9"
ARMPKGARCH_tune-cortexa9hf-neon = "cortexa9"
ARMPKGARCH_tune-cortexa9thf-neon = "cortexa9"
-TUNE_FEATURES_tune-cortexa9hf = "${TUNE_FEATURES_tune-armv7ahf} cortexa9"
-TUNE_FEATURES_tune-cortexa9thf = "${TUNE_FEATURES_tune-armv7athf} cortexa9"
-TUNE_FEATURES_tune-cortexa9hf-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa9"
-TUNE_FEATURES_tune-cortexa9thf-neon = "${TUNE_FEATURES_tune-armv7athf-neon} cortexa9"
-PACKAGE_EXTRA_ARCHS_tune-cortexa9hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa9hf-vfp"
+TUNE_FEATURES_tune-cortexa9hf = "${TUNE_FEATURES_tune-armv7ahf} cortexa9"
+TUNE_FEATURES_tune-cortexa9thf = "${TUNE_FEATURES_tune-armv7athf} cortexa9"
+TUNE_FEATURES_tune-cortexa9hf-neon = "${TUNE_FEATURES_tune-armv7ahf-neon} cortexa9"
+TUNE_FEATURES_tune-cortexa9thf-neon = "${TUNE_FEATURES_tune-armv7athf-neon} cortexa9"
+PACKAGE_EXTRA_ARCHS_tune-cortexa9hf = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf} cortexa9hf-vfp"
PACKAGE_EXTRA_ARCHS_tune-cortexa9thf = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf} cortexa9hf-vfp cortexa9t2hf-vfp"
-PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa9hf-vfp cortexa9hf-neon"
+PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-neon} cortexa9hf-vfp cortexa9hf-neon"
PACKAGE_EXTRA_ARCHS_tune-cortexa9thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-neon} cortexa9hf-vfp cortexa9hf-neon cortexa9t2hf-vfp cortexa9t2hf-neon"
# VFPv3 Tunes
@@ -41,11 +41,11 @@ ARMPKGARCH_tune-cortexa9-vfpv3 = "cortexa9"
ARMPKGARCH_tune-cortexa9t-vfpv3 = "cortexa9"
ARMPKGARCH_tune-cortexa9hf-vfpv3 = "cortexa9"
ARMPKGARCH_tune-cortexa9thf-vfpv3 = "cortexa9"
-TUNE_FEATURES_tune-cortexa9-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3} cortexa9"
-TUNE_FEATURES_tune-cortexa9t-vfpv3 = "${TUNE_FEATURES_tune-armv7at-vfpv3} cortexa9"
-TUNE_FEATURES_tune-cortexa9hf-vfpv3 = "${TUNE_FEATURES_tune-armv7ahf-vfpv3} cortexa9"
-TUNE_FEATURES_tune-cortexa9thf-vfpv3 = "${TUNE_FEATURES_tune-armv7athf-vfpv3} cortexa9"
-PACKAGE_EXTRA_ARCHS_tune-cortexa9-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3} cortexa9-vfp cortexa9-vfpv3"
+TUNE_FEATURES_tune-cortexa9-vfpv3 = "${TUNE_FEATURES_tune-armv7a-vfpv3} cortexa9"
+TUNE_FEATURES_tune-cortexa9t-vfpv3 = "${TUNE_FEATURES_tune-armv7at-vfpv3} cortexa9"
+TUNE_FEATURES_tune-cortexa9hf-vfpv3 = "${TUNE_FEATURES_tune-armv7ahf-vfpv3} cortexa9"
+TUNE_FEATURES_tune-cortexa9thf-vfpv3 = "${TUNE_FEATURES_tune-armv7athf-vfpv3} cortexa9"
+PACKAGE_EXTRA_ARCHS_tune-cortexa9-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7a-vfpv3} cortexa9-vfp cortexa9-vfpv3"
PACKAGE_EXTRA_ARCHS_tune-cortexa9t-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at-vfpv3} cortexa9-vfp cortexa9-vfpv3 cortexa9t2-vfp cortexa9t2-vfpv3"
-PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3"
+PACKAGE_EXTRA_ARCHS_tune-cortexa9hf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7ahf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3"
PACKAGE_EXTRA_ARCHS_tune-cortexa9thf-vfpv3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7athf-vfpv3} cortexa9hf-vfp cortexa9hf-vfpv3 cortexa9t2hf-vfp cortexa9t2hf-vfpv3"
--
1.9.1
^ permalink raw reply related
* Re: [PATCH] sysvinit-inittab: fix getty device removal
From: Christopher Larson @ 2016-11-29 20:15 UTC (permalink / raw)
To: Leonardo Sandoval; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1480444188-27310-1-git-send-email-leonardo.sandoval.gonzalez@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]
On Tue, Nov 29, 2016 at 11:29 AM, <
leonardo.sandoval.gonzalez@linux.intel.com> wrote:
> From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
>
> getty devices were not being removed in some cases because device name
> was not at the end of the line, for example a ttyS1 device:
>
> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
>
> Removing this limitation allows sed to remove any line containing
> the device.
>
> Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@
> linux.intel.com>
> ---
> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> index c219cbf..dd30f43 100644
> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> @@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
> k=`echo ${i} | sed s/^.*\://g`
> if [ -z "`grep ${j} /proc/consoles`" ]; then
> if [ -z "${k}" ] || [ -z "`grep ${k}
> /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
> - sed -i /^.*${j}$/d /etc/inittab
> + sed -i /^.*${j}/d /etc/inittab
>
This doesn’t check for the end of a word, so it’d match a partial as well.
Would that be a problem? i.e. ttyS1 vs ttyS10.
--
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 2877 bytes --]
^ permalink raw reply
* [PATCH 1/1] parselogs.py: Whitelist iwlwifi firmware load error messages
From: California Sullivan @ 2016-11-29 20:28 UTC (permalink / raw)
To: openembedded-core
The iwlwifi module of any given kernel has a minimum and maximum
supported firmware version. The kernel begins by attempting to load the
maximum version, and decrements until it is successful. The 4.8 kernel's
maximum supported firmware version is 24, but thus far only 22 has been
released, meaning we get errors for 24 and 23.
Filter out iwlwifi firmware load error messages, as they are not
necessarily indicative of real problems.
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
meta/lib/oeqa/runtime/parselogs.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/lib/oeqa/runtime/parselogs.py b/meta/lib/oeqa/runtime/parselogs.py
index 58f62da..8610863 100644
--- a/meta/lib/oeqa/runtime/parselogs.py
+++ b/meta/lib/oeqa/runtime/parselogs.py
@@ -58,6 +58,7 @@ x86_common = [
'failed to setup card detect gpio',
'amd_nb: Cannot enumerate AMD northbridges',
'failed to retrieve link info, disabling eDP',
+ 'Direct firmware load for iwlwifi',
] + common_errors
qemux86_common = [
--
2.5.5
^ permalink raw reply related
* Re: [PATCH] sysvinit-inittab: fix getty device removal
From: Leonardo Sandoval @ 2016-11-29 20:52 UTC (permalink / raw)
To: Christopher Larson; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CABcZANnQ87Q=h4-ponSyGP_-Q8bsRPfMOQ+UZWf0S7i85D2-GQ@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 2445 bytes --]
On 11/29/2016 02:15 PM, Christopher Larson wrote:
>
> On Tue, Nov 29, 2016 at 11:29 AM,
> <leonardo.sandoval.gonzalez@linux.intel.com
> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>> wrote:
>
> From: Leonardo Sandoval
> <leonardo.sandoval.gonzalez@linux.intel.com
> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>
> getty devices were not being removed in some cases because device name
> was not at the end of the line, for example a ttyS1 device:
>
> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
>
> Removing this limitation allows sed to remove any line containing
> the device.
>
> Signed-off-by: Leonardo Sandoval
> <leonardo.sandoval.gonzalez@linux.intel.com
> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
> ---
> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> <http://sysvinit-inittab_2.88dsf.bb> | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git
> a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> <http://sysvinit-inittab_2.88dsf.bb>
> b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> <http://sysvinit-inittab_2.88dsf.bb>
> index c219cbf..dd30f43 100644
> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> <http://sysvinit-inittab_2.88dsf.bb>
> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
> <http://sysvinit-inittab_2.88dsf.bb>
> @@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
> k=`echo ${i} | sed s/^.*\://g`
> if [ -z "`grep ${j} /proc/consoles`" ]; then
> if [ -z "${k}" ] || [ -z "`grep ${k}
> /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
> - sed -i /^.*${j}$/d /etc/inittab
> + sed -i /^.*${j}/d /etc/inittab
>
>
> This doesn’t check for the end of a word, so it’d match a partial as
> well. Would that be a problem? i.e. ttyS1 vs ttyS10.
That is the intention, that line removal is not tied to finding the
device at the end of the line. With proposed patch, it removes the
device, no matter where is located.
> --
> Christopher Larson
> clarson at kergoth dot com
> Founder - BitBake, OpenEmbedded, OpenZaurus
> Maintainer - Tslib
> Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 5099 bytes --]
^ permalink raw reply
* Re: [PATCH] sysvinit-inittab: fix getty device removal
From: Cal Sullivan @ 2016-11-29 21:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <2a1fd093-8b07-1e04-4167-f52c0698446e@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 2965 bytes --]
On 11/29/2016 12:52 PM, Leonardo Sandoval wrote:
>
>
>
> On 11/29/2016 02:15 PM, Christopher Larson wrote:
>>
>> On Tue, Nov 29, 2016 at 11:29 AM,
>> <leonardo.sandoval.gonzalez@linux.intel.com
>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>> wrote:
>>
>> From: Leonardo Sandoval
>> <leonardo.sandoval.gonzalez@linux.intel.com
>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>>
>> getty devices were not being removed in some cases because device
>> name
>> was not at the end of the line, for example a ttyS1 device:
>>
>> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
>>
>> Removing this limitation allows sed to remove any line containing
>> the device.
>>
>> Signed-off-by: Leonardo Sandoval
>> <leonardo.sandoval.gonzalez@linux.intel.com
>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>> ---
>> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> <http://sysvinit-inittab_2.88dsf.bb> | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git
>> a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> <http://sysvinit-inittab_2.88dsf.bb>
>> b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> <http://sysvinit-inittab_2.88dsf.bb>
>> index c219cbf..dd30f43 100644
>> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> <http://sysvinit-inittab_2.88dsf.bb>
>> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>> <http://sysvinit-inittab_2.88dsf.bb>
>> @@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
>> k=`echo ${i} | sed s/^.*\://g`
>> if [ -z "`grep ${j} /proc/consoles`" ]; then
>> if [ -z "${k}" ] || [ -z "`grep ${k}
>> /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
>> - sed -i /^.*${j}$/d /etc/inittab
>> + sed -i /^.*${j}/d /etc/inittab
>>
>>
>> This doesn’t check for the end of a word, so it’d match a partial as
>> well. Would that be a problem? i.e. ttyS1 vs ttyS10.
>
> That is the intention, that line removal is not tied to finding the
> device at the end of the line. With proposed patch, it removes the
> device, no matter where is located.
>
Right, but look at this hypothetical example:
S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
S10:12345:respawn:/bin/start_getty 115200 ttyS10
Both would match, when you only want the top to match. This is untested
but likely more what we want:
sed -i /^.*${j}[\ $]/d /etc/inittab
That way we either match up to a space (end of word) or end of line.
---
Cal
>
>> --
>> Christopher Larson
>> clarson at kergoth dot com
>> Founder - BitBake, OpenEmbedded, OpenZaurus
>> Maintainer - Tslib
>> Senior Software Engineer, Mentor Graphics
>
>
>
[-- Attachment #2: Type: text/html, Size: 6320 bytes --]
^ permalink raw reply
* Re: [PATCH] sysvinit-inittab: fix getty device removal
From: Cal Sullivan @ 2016-11-29 21:08 UTC (permalink / raw)
To: openembedded-core; +Cc: clarson
In-Reply-To: <effe6688-33a7-7bda-8dea-471e58149824@intel.com>
[-- Attachment #1: Type: text/plain, Size: 3162 bytes --]
Oops, accidentally dropped CCs. See my reply below.
On 11/29/2016 01:05 PM, Cal Sullivan wrote:
>
>
> On 11/29/2016 12:52 PM, Leonardo Sandoval wrote:
>>
>>
>>
>> On 11/29/2016 02:15 PM, Christopher Larson wrote:
>>>
>>> On Tue, Nov 29, 2016 at 11:29 AM,
>>> <leonardo.sandoval.gonzalez@linux.intel.com
>>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>> wrote:
>>>
>>> From: Leonardo Sandoval
>>> <leonardo.sandoval.gonzalez@linux.intel.com
>>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>>>
>>> getty devices were not being removed in some cases because
>>> device name
>>> was not at the end of the line, for example a ttyS1 device:
>>>
>>> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
>>>
>>> Removing this limitation allows sed to remove any line containing
>>> the device.
>>>
>>> Signed-off-by: Leonardo Sandoval
>>> <leonardo.sandoval.gonzalez@linux.intel.com
>>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>>> ---
>>> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>> <http://sysvinit-inittab_2.88dsf.bb> | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git
>>> a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>> <http://sysvinit-inittab_2.88dsf.bb>
>>> b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>> <http://sysvinit-inittab_2.88dsf.bb>
>>> index c219cbf..dd30f43 100644
>>> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>> <http://sysvinit-inittab_2.88dsf.bb>
>>> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>> <http://sysvinit-inittab_2.88dsf.bb>
>>> @@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
>>> k=`echo ${i} | sed s/^.*\://g`
>>> if [ -z "`grep ${j} /proc/consoles`" ]; then
>>> if [ -z "${k}" ] || [ -z "`grep ${k}
>>> /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
>>> - sed -i /^.*${j}$/d /etc/inittab
>>> + sed -i /^.*${j}/d /etc/inittab
>>>
>>>
>>> This doesn’t check for the end of a word, so it’d match a partial as
>>> well. Would that be a problem? i.e. ttyS1 vs ttyS10.
>>
>> That is the intention, that line removal is not tied to finding the
>> device at the end of the line. With proposed patch, it removes the
>> device, no matter where is located.
>>
> Right, but look at this hypothetical example:
>
> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
> S10:12345:respawn:/bin/start_getty 115200 ttyS10
>
> Both would match, when you only want the top to match. This is
> untested but likely more what we want:
>
> sed -i /^.*${j}[\ $]/d /etc/inittab
>
> That way we either match up to a space (end of word) or end of line.
>
> ---
> Cal
>
>>
>>> --
>>> Christopher Larson
>>> clarson at kergoth dot com
>>> Founder - BitBake, OpenEmbedded, OpenZaurus
>>> Maintainer - Tslib
>>> Senior Software Engineer, Mentor Graphics
>>
>>
>>
>
[-- Attachment #2: Type: text/html, Size: 7040 bytes --]
^ permalink raw reply
* [PATCH] texinfo upgrade to 6.3
From: Edwin Plauchu @ 2016-11-29 21:17 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@linux.intel.com>
---
.../texinfo/texinfo/dont-depend-on-help2man.patch | 19 ++++---
.../texinfo/texinfo/texinfo-4.12-zlib.patch | 65 +++++++++++++++-------
.../texinfo/{texinfo_6.0.bb => texinfo_6.3.bb} | 5 +-
3 files changed, 56 insertions(+), 33 deletions(-)
rename meta/recipes-extended/texinfo/{texinfo_6.0.bb => texinfo_6.3.bb} (93%)
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
index 0ce47ec..f418439 100644
--- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
+++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
@@ -1,31 +1,32 @@
-From 6f1f3912fcb900b3a3e6cbe3360306fade333497 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 6 Aug 2015 14:55:08 +0300
+From e89b1c57d76f5cf5acbb0d0187374f7a77bce1e2 Mon Sep 17 00:00:00 2001
+From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
+Date: Tue, 29 Nov 2016 13:43:24 -0600
Subject: [PATCH] dont-depend-on-help2man
Upstream-Status: Inappropriate
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
doc/Makefile.am | 2 +-
man/Makefile.am | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 7198a6b..4bba550 100644
+index 39db834..1bb2a4f
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
+@@ -38,7 +38,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
# Include our texinfo.tex, not Automake's.
EXTRA_DIST = epsf.tex texinfo.tex \
fdl.texi \
- $(man_MANS) $(TXI_XLATE) \
+ $(TXI_XLATE) \
- $(refcard_files)
+ $(refcard_files) texinfo-tex-test.texi \
+ texinfo-ja.tex short-sample-ja.texi
- if INSTALL_WARNINGS
diff --git a/man/Makefile.am b/man/Makefile.am
-index a08d603..bdfc9a4 100644
+index 6bfcb3d..a820c96
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,24 +13,24 @@
@@ -60,5 +61,5 @@ index a08d603..bdfc9a4 100644
# Maintainers should be able to regenerate.
MAINTAINERCLEANFILES = $(man_MANS)
--
-2.1.4
+2.9.3
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
index 41bd220..f25352c 100644
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
+++ b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
@@ -1,19 +1,22 @@
-From 20e1d8a9481dc13dd1d4d168b90e0ed2ff097b98 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 6 Aug 2015 14:29:57 +0300
+From fe4f00459601efe0cfa75d92749a32237800a530 Mon Sep 17 00:00:00 2001
+From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
+Date: Tue, 29 Nov 2016 12:27:17 -0600
Subject: [PATCH] texinfo-4.12-zlib
Upstream-Status: Pending
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
- install-info/Makefile.in | 2 +-
- install-info/install-info.c | 67 +++++++++++++++++++++++++++------------------
- 2 files changed, 42 insertions(+), 27 deletions(-)
+ install-info/Makefile.in | 12 ++-----
+ install-info/install-info.c | 79 +++++++++++++++++++++++++++------------------
+ 2 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/install-info/Makefile.in b/install-info/Makefile.in
-index ad73abb..eaa2153 100644
+index 837d020..ba96579 100644
--- a/install-info/Makefile.in
+++ b/install-info/Makefile.in
-@@ -241,7 +241,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+@@ -216,7 +208,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
@@ -23,7 +26,7 @@ index ad73abb..eaa2153 100644
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1)
diff --git a/install-info/install-info.c b/install-info/install-info.c
-index b454c15..4e39122 100644
+index e58189c..8617787 100644
--- a/install-info/install-info.c
+++ b/install-info/install-info.c
@@ -22,6 +22,7 @@
@@ -43,7 +46,7 @@ index b454c15..4e39122 100644
open_possibly_compressed_file (char *filename,
void (*create_callback) (char *),
- char **opened_filename, char **compression_program)
-+ char **opened_filename, char **compression_program, int *is_pipe)
++ char **opened_filename, char **compression_program, int *is_pipe)
{
char *local_opened_filename, *local_compression_program;
int nread;
@@ -119,7 +122,7 @@ index b454c15..4e39122 100644
if (!f)
return 0;
}
-@@ -767,12 +768,12 @@ open_possibly_compressed_file (char *filename,
+@@ -767,26 +768,26 @@ open_possibly_compressed_file (char *filename,
/* Read first few bytes of file rather than relying on the filename.
If the file is shorter than this it can't be usable anyway. */
@@ -128,14 +131,34 @@ index b454c15..4e39122 100644
+ nread = gzread (f, data, sizeof (data));
+ if (nread != sizeof (data))
{
- /* Empty files don't set errno. Calling code can check for
- this, so make sure errno == 0 just in case it isn't already. */
- if (nread == 0)
+ if (nread >= 0)
- errno = 0;
- return 0;
- }
-@@ -838,35 +839,40 @@ open_possibly_compressed_file (char *filename,
+ {
+ /* Try to create the file if its empty. */
+- if (feof (f) && create_callback)
++ if (gzeof(f) && create_callback)
+ {
+- if (fclose (f) != 0)
++ if (gzclose(f) != 0)
+ return 0; /* unknown error closing file */
+
+- if (remove (filename) != 0)
++ if (remove(filename) != 0)
+ return 0; /* unknown error deleting file */
+
+ (*create_callback) (filename);
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ if (!f)
+ return 0;
+- nread = fread (data, sizeof (data), 1, f);
+- if (nread == 0)
++ nread = gzread(f, data, sizeof (data));
++ if (nread >= 0)
+ return 0;
+ goto determine_file_type; /* success */
+ }
+@@ -857,35 +858,40 @@ determine_file_type:
*compression_program = NULL;
/* Seek back over the magic bytes. */
@@ -183,7 +206,7 @@ index b454c15..4e39122 100644
}
return f;
-@@ -885,7 +891,8 @@ readfile (char *filename, int *sizep,
+@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep,
void (*create_callback) (char *), char **opened_filename,
char **compression_program)
{
@@ -193,7 +216,7 @@ index b454c15..4e39122 100644
int filled = 0;
int data_size = 8192;
char *data = xmalloc (data_size);
-@@ -893,14 +900,20 @@ readfile (char *filename, int *sizep,
+@@ -912,14 +919,20 @@ readfile (char *filename, int *sizep,
/* If they passed the space for the file name to return, use it. */
f = open_possibly_compressed_file (filename, create_callback,
opened_filename,
@@ -216,7 +239,7 @@ index b454c15..4e39122 100644
if (nread < 0)
return 0;
if (nread == 0)
-@@ -919,8 +932,10 @@ readfile (char *filename, int *sizep,
+@@ -938,8 +951,10 @@ readfile (char *filename, int *sizep,
/* We need to close the stream, since on some systems the pipe created
by popen is simulated by a temporary file which only gets removed
inside pclose. */
@@ -229,5 +252,5 @@ index b454c15..4e39122 100644
*sizep = filled;
return data;
--
-2.1.4
+2.9.3
diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb b/meta/recipes-extended/texinfo/texinfo_6.3.bb
similarity index 93%
rename from meta/recipes-extended/texinfo/texinfo_6.0.bb
rename to meta/recipes-extended/texinfo/texinfo_6.3.bb
index 8638bb1..cd9a844 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.3.bb
@@ -30,15 +30,14 @@ TARGET_PATCH_class-native = ""
SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
file://texinfo-4.12-zlib.patch \
- file://disable-native-tools.patch \
file://link-zip.patch \
file://dont-depend-on-help2man.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
${TARGET_PATCH} \
"
-SRC_URI[md5sum] = "e1a2ef5dce5018b53f0f6eed45b247a7"
-SRC_URI[sha256sum] = "83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2"
+SRC_URI[md5sum] = "9b08daca9bf8eccae9b0f884aba41f9e"
+SRC_URI[sha256sum] = "300a6ba4958c2dd4a6d5ce60f0a335daf7e379f5374f276f6ba31a221f02f606"
tex_texinfo = "texmf/tex/texinfo"
--
2.9.3
^ permalink raw reply related
* Re: [PATCH] texinfo upgrade to 6.3
From: Burton, Ross @ 2016-11-29 21:40 UTC (permalink / raw)
To: Edwin Plauchu; +Cc: OE-core
In-Reply-To: <20161129211720.12594-1-edwin.plauchu.camacho@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
On 29 November 2016 at 21:17, Edwin Plauchu <
edwin.plauchu.camacho@linux.intel.com> wrote:
> - file://disable-native-tools.patch \
>
Should this patch be deleted?
Ross
[-- Attachment #2: Type: text/html, Size: 623 bytes --]
^ permalink raw reply
* Re: [PATCH] sysvinit-inittab: fix getty device removal
From: Leonardo Sandoval @ 2016-11-29 21:53 UTC (permalink / raw)
To: Cal Sullivan, openembedded-core; +Cc: clarson
In-Reply-To: <e91e2209-1d22-a53b-8cf4-e37eb86d9a14@intel.com>
[-- Attachment #1: Type: text/plain, Size: 3352 bytes --]
On 11/29/2016 03:08 PM, Cal Sullivan wrote:
> Oops, accidentally dropped CCs. See my reply below.
>
> On 11/29/2016 01:05 PM, Cal Sullivan wrote:
>>
>>
>> On 11/29/2016 12:52 PM, Leonardo Sandoval wrote:
>>>
>>>
>>>
>>> On 11/29/2016 02:15 PM, Christopher Larson wrote:
>>>>
>>>> On Tue, Nov 29, 2016 at 11:29 AM,
>>>> <leonardo.sandoval.gonzalez@linux.intel.com
>>>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>> wrote:
>>>>
>>>> From: Leonardo Sandoval
>>>> <leonardo.sandoval.gonzalez@linux.intel.com
>>>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>>>>
>>>> getty devices were not being removed in some cases because
>>>> device name
>>>> was not at the end of the line, for example a ttyS1 device:
>>>>
>>>> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
>>>>
>>>> Removing this limitation allows sed to remove any line containing
>>>> the device.
>>>>
>>>> Signed-off-by: Leonardo Sandoval
>>>> <leonardo.sandoval.gonzalez@linux.intel.com
>>>> <mailto:leonardo.sandoval.gonzalez@linux.intel.com>>
>>>> ---
>>>> meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>>> <http://sysvinit-inittab_2.88dsf.bb> | 2 +-
>>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git
>>>> a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>>> <http://sysvinit-inittab_2.88dsf.bb>
>>>> b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>>> <http://sysvinit-inittab_2.88dsf.bb>
>>>> index c219cbf..dd30f43 100644
>>>> --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>>> <http://sysvinit-inittab_2.88dsf.bb>
>>>> +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
>>>> <http://sysvinit-inittab_2.88dsf.bb>
>>>> @@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
>>>> k=`echo ${i} | sed s/^.*\://g`
>>>> if [ -z "`grep ${j} /proc/consoles`" ]; then
>>>> if [ -z "${k}" ] || [ -z "`grep ${k}
>>>> /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
>>>> - sed -i /^.*${j}$/d /etc/inittab
>>>> + sed -i /^.*${j}/d /etc/inittab
>>>>
>>>>
>>>> This doesn’t check for the end of a word, so it’d match a partial
>>>> as well. Would that be a problem? i.e. ttyS1 vs ttyS10.
>>>
>>> That is the intention, that line removal is not tied to finding the
>>> device at the end of the line. With proposed patch, it removes the
>>> device, no matter where is located.
>>>
>> Right, but look at this hypothetical example:
>>
>> S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
>> S10:12345:respawn:/bin/start_getty 115200 ttyS10
>>
>> Both would match, when you only want the top to match. This is
>> untested but likely more what we want:
>>
>> sed -i /^.*${j}[\ $]/d /etc/inittab
>>
>> That way we either match up to a space (end of word) or end of line.
Got it, that can be possible. Sending a v2
>>
>> ---
>> Cal
>>
>>>
>>>> --
>>>> Christopher Larson
>>>> clarson at kergoth dot com
>>>> Founder - BitBake, OpenEmbedded, OpenZaurus
>>>> Maintainer - Tslib
>>>> Senior Software Engineer, Mentor Graphics
>>>
>>>
>>>
>>
>
[-- Attachment #2: Type: text/html, Size: 8005 bytes --]
^ permalink raw reply
* [PATCH V2] texinfo upgrade to 6.3
From: Edwin Plauchu @ 2016-11-29 21:49 UTC (permalink / raw)
To: openembedded-core; +Cc: Edwin Plauchu
From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
.../texinfo/texinfo/disable-native-tools.patch | 43 --------------
.../texinfo/texinfo/dont-depend-on-help2man.patch | 19 ++++---
.../texinfo/texinfo/texinfo-4.12-zlib.patch | 65 +++++++++++++++-------
.../texinfo/{texinfo_6.0.bb => texinfo_6.3.bb} | 5 +-
4 files changed, 56 insertions(+), 76 deletions(-)
delete mode 100644 meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
rename meta/recipes-extended/texinfo/{texinfo_6.0.bb => texinfo_6.3.bb} (93%)
diff --git a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch b/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
deleted file mode 100644
index ab6f165..0000000
--- a/meta/recipes-extended/texinfo/texinfo/disable-native-tools.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-We already DEPEND on the native texinfo being present before building so
-there isn't any need to try and build the required native texinfo binaries
-before cross-compiling. This simplifies the recipe somewhat!
-
-Upstream-Status: Inappropriate oe specific
-
-Signed-off-by: Joshua Lock <josh@linux.intel.com>
-
-Index: texinfo-4.13/configure.ac
-===================================================================
---- texinfo-4.13.orig/configure.ac
-+++ texinfo-4.13/configure.ac
-@@ -100,29 +100,7 @@ AC_CANONICAL_BUILD
- # $native_tools is also added to SUBDIRS in the main Makefile.am,
- # so that make compiles the native tools first.
- #
--if test "$cross_compiling" = no; then
-- native_tools=
--else
-- native_tools=tools
-- test -d "$native_tools" || mkdir "$native_tools"
-- confdir=`(cd "$srcdir";pwd)`
-- # Make sure the secondary configure won't fail with
-- # "error: source directory already configured".
-- rm -f config.status
-- AC_MSG_NOTICE([[Doing configure of native tools (${build}).]])
-- cd "$native_tools" || exit 1
-- # Run secondary configure in alternate environment or
-- # it gets the wrong CC etc.
-- # env -i gives this build host configure a clean environment;
-- # consequently, we have to re-initialize $PATH.
-- env -i CC="$BUILD_CC" AR="$BUILD_AR" RANLIB="$BUILD_RANLIB" \
-- PATH="$PATH" \
-- tools_only=1 \
-- ${confdir}/configure --build=${build} --host=${build} \
-- --disable-rpath --disable-nls
-- cd .. || exit 1
-- AC_MSG_NOTICE([[Continuing with main configure (${host}).]])
--fi
-+native_tools=
- AC_SUBST(native_tools)
- AM_CONDITIONAL(TOOLS_ONLY, [[test "x$tools_only" = x1]])
-
diff --git a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
index 0ce47ec..f418439 100644
--- a/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
+++ b/meta/recipes-extended/texinfo/texinfo/dont-depend-on-help2man.patch
@@ -1,31 +1,32 @@
-From 6f1f3912fcb900b3a3e6cbe3360306fade333497 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 6 Aug 2015 14:55:08 +0300
+From e89b1c57d76f5cf5acbb0d0187374f7a77bce1e2 Mon Sep 17 00:00:00 2001
+From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
+Date: Tue, 29 Nov 2016 13:43:24 -0600
Subject: [PATCH] dont-depend-on-help2man
Upstream-Status: Inappropriate
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
doc/Makefile.am | 2 +-
man/Makefile.am | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 7198a6b..4bba550 100644
+index 39db834..1bb2a4f
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
-@@ -40,7 +40,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
+@@ -38,7 +38,7 @@ refcard_files = refcard/Makefile refcard/txicmdcheck \
# Include our texinfo.tex, not Automake's.
EXTRA_DIST = epsf.tex texinfo.tex \
fdl.texi \
- $(man_MANS) $(TXI_XLATE) \
+ $(TXI_XLATE) \
- $(refcard_files)
+ $(refcard_files) texinfo-tex-test.texi \
+ texinfo-ja.tex short-sample-ja.texi
- if INSTALL_WARNINGS
diff --git a/man/Makefile.am b/man/Makefile.am
-index a08d603..bdfc9a4 100644
+index 6bfcb3d..a820c96
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -13,24 +13,24 @@
@@ -60,5 +61,5 @@ index a08d603..bdfc9a4 100644
# Maintainers should be able to regenerate.
MAINTAINERCLEANFILES = $(man_MANS)
--
-2.1.4
+2.9.3
diff --git a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
index 41bd220..f25352c 100644
--- a/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
+++ b/meta/recipes-extended/texinfo/texinfo/texinfo-4.12-zlib.patch
@@ -1,19 +1,22 @@
-From 20e1d8a9481dc13dd1d4d168b90e0ed2ff097b98 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Thu, 6 Aug 2015 14:29:57 +0300
+From fe4f00459601efe0cfa75d92749a32237800a530 Mon Sep 17 00:00:00 2001
+From: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
+Date: Tue, 29 Nov 2016 12:27:17 -0600
Subject: [PATCH] texinfo-4.12-zlib
Upstream-Status: Pending
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Signed-off-by: Edwin Plauchu <edwin.plauchu.camacho@intel.com>
---
- install-info/Makefile.in | 2 +-
- install-info/install-info.c | 67 +++++++++++++++++++++++++++------------------
- 2 files changed, 42 insertions(+), 27 deletions(-)
+ install-info/Makefile.in | 12 ++-----
+ install-info/install-info.c | 79 +++++++++++++++++++++++++++------------------
+ 2 files changed, 49 insertions(+), 42 deletions(-)
diff --git a/install-info/Makefile.in b/install-info/Makefile.in
-index ad73abb..eaa2153 100644
+index 837d020..ba96579 100644
--- a/install-info/Makefile.in
+++ b/install-info/Makefile.in
-@@ -241,7 +241,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
+@@ -216,7 +208,7 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)"
PROGRAMS = $(bin_PROGRAMS)
am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
@@ -23,7 +26,7 @@ index ad73abb..eaa2153 100644
ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
$(am__DEPENDENCIES_1)
diff --git a/install-info/install-info.c b/install-info/install-info.c
-index b454c15..4e39122 100644
+index e58189c..8617787 100644
--- a/install-info/install-info.c
+++ b/install-info/install-info.c
@@ -22,6 +22,7 @@
@@ -43,7 +46,7 @@ index b454c15..4e39122 100644
open_possibly_compressed_file (char *filename,
void (*create_callback) (char *),
- char **opened_filename, char **compression_program)
-+ char **opened_filename, char **compression_program, int *is_pipe)
++ char **opened_filename, char **compression_program, int *is_pipe)
{
char *local_opened_filename, *local_compression_program;
int nread;
@@ -119,7 +122,7 @@ index b454c15..4e39122 100644
if (!f)
return 0;
}
-@@ -767,12 +768,12 @@ open_possibly_compressed_file (char *filename,
+@@ -767,26 +768,26 @@ open_possibly_compressed_file (char *filename,
/* Read first few bytes of file rather than relying on the filename.
If the file is shorter than this it can't be usable anyway. */
@@ -128,14 +131,34 @@ index b454c15..4e39122 100644
+ nread = gzread (f, data, sizeof (data));
+ if (nread != sizeof (data))
{
- /* Empty files don't set errno. Calling code can check for
- this, so make sure errno == 0 just in case it isn't already. */
- if (nread == 0)
+ if (nread >= 0)
- errno = 0;
- return 0;
- }
-@@ -838,35 +839,40 @@ open_possibly_compressed_file (char *filename,
+ {
+ /* Try to create the file if its empty. */
+- if (feof (f) && create_callback)
++ if (gzeof(f) && create_callback)
+ {
+- if (fclose (f) != 0)
++ if (gzclose(f) != 0)
+ return 0; /* unknown error closing file */
+
+- if (remove (filename) != 0)
++ if (remove(filename) != 0)
+ return 0; /* unknown error deleting file */
+
+ (*create_callback) (filename);
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = gzopen (*opened_filename, FOPEN_RBIN);
+ if (!f)
+ return 0;
+- nread = fread (data, sizeof (data), 1, f);
+- if (nread == 0)
++ nread = gzread(f, data, sizeof (data));
++ if (nread >= 0)
+ return 0;
+ goto determine_file_type; /* success */
+ }
+@@ -857,35 +858,40 @@ determine_file_type:
*compression_program = NULL;
/* Seek back over the magic bytes. */
@@ -183,7 +206,7 @@ index b454c15..4e39122 100644
}
return f;
-@@ -885,7 +891,8 @@ readfile (char *filename, int *sizep,
+@@ -904,7 +910,8 @@ readfile (char *filename, int *sizep,
void (*create_callback) (char *), char **opened_filename,
char **compression_program)
{
@@ -193,7 +216,7 @@ index b454c15..4e39122 100644
int filled = 0;
int data_size = 8192;
char *data = xmalloc (data_size);
-@@ -893,14 +900,20 @@ readfile (char *filename, int *sizep,
+@@ -912,14 +919,20 @@ readfile (char *filename, int *sizep,
/* If they passed the space for the file name to return, use it. */
f = open_possibly_compressed_file (filename, create_callback,
opened_filename,
@@ -216,7 +239,7 @@ index b454c15..4e39122 100644
if (nread < 0)
return 0;
if (nread == 0)
-@@ -919,8 +932,10 @@ readfile (char *filename, int *sizep,
+@@ -938,8 +951,10 @@ readfile (char *filename, int *sizep,
/* We need to close the stream, since on some systems the pipe created
by popen is simulated by a temporary file which only gets removed
inside pclose. */
@@ -229,5 +252,5 @@ index b454c15..4e39122 100644
*sizep = filled;
return data;
--
-2.1.4
+2.9.3
diff --git a/meta/recipes-extended/texinfo/texinfo_6.0.bb b/meta/recipes-extended/texinfo/texinfo_6.3.bb
similarity index 93%
rename from meta/recipes-extended/texinfo/texinfo_6.0.bb
rename to meta/recipes-extended/texinfo/texinfo_6.3.bb
index 8638bb1..cd9a844 100644
--- a/meta/recipes-extended/texinfo/texinfo_6.0.bb
+++ b/meta/recipes-extended/texinfo/texinfo_6.3.bb
@@ -30,15 +30,14 @@ TARGET_PATCH_class-native = ""
SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
file://texinfo-4.12-zlib.patch \
- file://disable-native-tools.patch \
file://link-zip.patch \
file://dont-depend-on-help2man.patch \
file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
${TARGET_PATCH} \
"
-SRC_URI[md5sum] = "e1a2ef5dce5018b53f0f6eed45b247a7"
-SRC_URI[sha256sum] = "83d3183290f34e7f958d209d0b20022c6fe9e921eb6fe94c27d988827d4878d2"
+SRC_URI[md5sum] = "9b08daca9bf8eccae9b0f884aba41f9e"
+SRC_URI[sha256sum] = "300a6ba4958c2dd4a6d5ce60f0a335daf7e379f5374f276f6ba31a221f02f606"
tex_texinfo = "texmf/tex/texinfo"
--
2.9.3
^ permalink raw reply related
* [PATCH v2] sysvinit-inittab: fix getty device removal
From: leonardo.sandoval.gonzalez @ 2016-11-29 21:56 UTC (permalink / raw)
To: openembedded-core
From: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
getty devices were not being removed in some cases because device name
was not at the end of the line, for example a ttyS1 device:
S1:12345:respawn:/bin/start_getty 115200 ttyS1 vt102
Removing this limitation allows sed to remove any line containing
the device.
Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com>
---
meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index c219cbf..5b9c422 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -62,7 +62,7 @@ if [ "x$D" = "x" ] && [ -e /proc/consoles ]; then
k=`echo ${i} | sed s/^.*\://g`
if [ -z "`grep ${j} /proc/consoles`" ]; then
if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then
- sed -i /^.*${j}$/d /etc/inittab
+ sed -i -e /^.*${j}\ /d -e /^.*${j}$/d /etc/inittab
fi
fi
done
--
2.1.4
^ permalink raw reply related
* Re: [PATCH 1/2] oeqa/utils/metadata.py: Add metadata library
From: Benjamin Esquivel @ 2016-11-29 22:17 UTC (permalink / raw)
To: mariano.lopez, openembedded-core
In-Reply-To: <310d0b7be34ba56f287e60209a53474809e1121a.1480429545.git.mariano.lopez@linux.intel.com>
On Tue, 2016-11-29 at 08:42 -0600, mariano.lopez@linux.intel.com wrote:
> From: Mariano Lopez <mariano.lopez@linux.intel.com>
>
> Adds functions to get metadata from the host running the tests.
>
> [YOCTO #9954]
>
> Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
> ---
> meta/lib/oeqa/utils/metadata.py | 77
> +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 77 insertions(+)
> create mode 100644 meta/lib/oeqa/utils/metadata.py
>
> diff --git a/meta/lib/oeqa/utils/metadata.py
> b/meta/lib/oeqa/utils/metadata.py
> new file mode 100644
> index 0000000..3be805c
> --- /dev/null
> +++ b/meta/lib/oeqa/utils/metadata.py
> @@ -0,0 +1,77 @@
> +# Copyright (C) 2016 Intel Corporation
> +#
> +# Released under the MIT license (see COPYING.MIT)
> +#
> +# Functions to get metadata from the testing host used
> +# for analytics of test results.
> +
> +from git import Repo
> +from collections import OrderedDict
> +from collections.abc import MutableMapping
> +from xml.dom.minidom import parseString
> +from xml.etree.ElementTree import Element, tostring
> +
> +from oe.lsb import distro_identifier
> +from oeqa.utils.commands import runCmd, get_bb_var
> +
> +def metadata_from_bb():
> + """ Returns test's metadata as OrderedDict.
> +
> + Data will be gathered using bitbake -e thanks to get_bb_var.
> + """
> +
> + info_dict = OrderedDict()
> + hostname = runCmd('hostname')
> + info_dict['hostname'] = hostname.output
> + info_dict['machine'] = get_bb_var('MACHINE')
> + info_dict['distro'] = get_bb_var('DISTRO')
> + info_dict['distro_version'] = get_bb_var('DISTRO_VERSION')
> + host_distro= distro_identifier()
> + host_distro, _, host_distro_release = host_distro.partition('-')
> + info_dict['host_distro'] = host_distro
> + info_dict['host_distro_release'] = host_distro_release
> + info_dict['layers'] = get_layers(get_bb_var('BBLAYERS'))
is none of the upper statements going to throw exceptions? otherwise
try/except as appropriate.
> + return info_dict
> +
> +def metadata_from_data_store(d):
> + """ Returns test's metadata as OrderedDict.
> +
> + Data will be collected from the provided data store.
> + """
> + # TODO: Getting metadata from the data store would
> + # be useful when running within bitbake.
> + pass
> +
> +def get_layers(layers):
> + """ Returns layer name, branch, and revision as OrderedDict. """
> +
> + layer_dict = OrderedDict()
> + for layer in layers.split():
> + layer_name = os.path.basename(layer)
> + layer_dict[layer_name] = OrderedDict()
> + repo = Repo(layer, search_parent_directories=True)
> + revision, branch = repo.head.object.name_rev.split()
> + layer_dict[layer_name]['branch'] = branch
> + layer_dict[layer_name]['revision'] = revision
same here for the try/except, did you test with usual cases of zero
input and unexisting path's, etc?
> + return layer_dict
> +
> +def write_metadata_file(file_path, metadata):
> + """ Writes metadata to a XML file in directory. """
> +
> + xml = dict_to_XML('metadata', metadata)
> + xml_doc = parseString(tostring(xml).decode('UTF-8'))
> + with open(file_path, 'w') as f:
> + f.write(xml_doc.toprettyxml())
> +
> +def dict_to_XML(tag, dictionary):
> + """ Return XML element converting dicts recursively. """
> +
> + elem = Element(tag)
> + for key, val in dictionary.items():
> + if isinstance(val, MutableMapping):
> + child = (dict_to_XML(key, val))
> + else:
> + child = Element(key)
> + child.text = str(val)
> + elem.append(child)
> + return elem
> --
> 2.7.3
>
^ permalink raw reply
* Re: [PATCH 2/2] oe-selftest: Add option to submit test result to a git repository.
From: Benjamin Esquivel @ 2016-11-29 22:26 UTC (permalink / raw)
To: mariano.lopez, openembedded-core
In-Reply-To: <d576d1ae718e3ac9b589e3c23e1f2052dae5c487.1480429545.git.mariano.lopez@linux.intel.com>
On Tue, 2016-11-29 at 08:42 -0600, mariano.lopez@linux.intel.com wrote:
> From: Mariano Lopez <mariano.lopez@linux.intel.com>
>
> This new option allows to commit the result to a git repository,
> along with the results it will add a metadata file for information
> of the current selftest run, such as: hostname, machine, distro,
> distro version, host version, and layers.
>
> This implementation will have a branch per different hostname,
> testing branch, and machine.
>
> To use this feature use:
>
> oe-selftest <options> --repository <repository_link>
>
> [YOCTO #9954]
>
> Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
> ---
> scripts/oe-selftest | 98
> +++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 98 insertions(+)
>
> diff --git a/scripts/oe-selftest b/scripts/oe-selftest
> index deaa432..81dfa3d 100755
> --- a/scripts/oe-selftest
> +++ b/scripts/oe-selftest
> @@ -36,6 +36,7 @@ import re
> import fnmatch
> import collections
> import imp
> +import git
>
> sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) +
> '/lib')
> import scriptpath
> @@ -46,6 +47,7 @@ import argparse_oe
> import oeqa.selftest
> import oeqa.utils.ftools as ftools
> from oeqa.utils.commands import runCmd, get_bb_var, get_test_layer
> +from oeqa.utils.metadata import metadata_from_bb,
> write_metadata_file
> from oeqa.selftest.base import oeSelfTest, get_available_machines
>
> try:
> @@ -106,6 +108,8 @@ def get_args_parser():
> help='List all tags that have been set to
> test cases.')
> parser.add_argument('--machine', required=False, dest='machine',
> choices=['random', 'all'], default=None,
> help='Run tests on different machines
> (random/all).')
> + parser.add_argument('--repository', required=False,
> dest='repository', default='', action='store',
> + help='Submit test results to a repository')
> return parser
>
>
> @@ -572,6 +576,71 @@ def main():
>
> log.info("Finished")
>
> + if args.repository:
oe-selftest is already long and not so modular, is there a chance to
send these actions to methods outside oe-selftest and import them? it
would also make them accessible to other data flows that wish to do the
same.
> + # Commit tests results to repository
> + metadata = metadata_from_bb()
> + git_dir = os.path.join(os.getcwd(), 'selftest')
> + if not os.path.isdir(git_dir):
> + os.mkdir(git_dir)
> +
> + log.debug('Checking for git repository in %s' % git_dir)
> + try:
> + repo = git.Repo(git_dir)
> + except git.exc.InvalidGitRepositoryError:
> + log.debug("Couldn't find git repository %s; "
> + "cloning from %s" % (git_dir,
> args.repository))
> + repo = git.Repo.clone_from(args.repository, git_dir)
> +
> + r_branches = repo.git.branch(r=True)
> + r_branches = set(r_branches.replace('origin/',
> '').split())
> + l_branches = {str(branch) for branch in repo.branches}
> + branch = '%s/%s/%s' % (metadata['hostname'],
> + metadata['layers']['meta']['branc
> h'],
> + metadata['machine'])
> +
> + if branch in r_branches:
> + log.debug('Found branch in remote repository,
> checking'
> + ' out and pulling')
> + repo.git.checkout(branch)
> + repo.git.pull()
> + elif branch in l_branches:
> + log.debug('Found branch in local repository,
> checking out')
> + repo.git.checkout(branch)
can you explain why the remote branches have precedence over the local
branches here?
> + else:
> + log.debug('New branch %s' % branch)
> + repo.git.checkout('master')
> + repo.git.checkout(b=branch)
> +
> + cleanResultsDir(repo)
> + xml_dir = os.path.join(os.getcwd(), log_prefix)
> + copyResultFiles(xml_dir, git_dir, repo)
> + metadata_file = os.path.join(git_dir, 'metadata.xml')
> + write_metadata_file(metadata_file, metadata)
> + repo.index.add([metadata_file])
> + repo.index.write()
> +
> + # Get information for commit message
> + layer_info = ''
> + for layer, values in metadata['layers'].items():
> + layer_info = '%s%-17s = %s:%s\n' % (layer_info,
> layer,
> + values['branch'], values['revision'])
> + msg = 'Selftest for build %s of %s %s for machine %s on
> %s\n\n%s' % (
> + log_prefix[12:], metadata['distro'],
> metadata['distro_version'],
> + metadata['machine'], metadata['hostname'],
> layer_info)
> +
> + log.debug('Commiting results to local repository')
> + repo.index.commit(msg)
> + if not repo.is_dirty():
> + if branch in r_branches:
> + log.debug('Pushing changes to remote
> repository')
> + repo.git.push()
what happens here if you don't have permission to push? does it throw
an exception or a return code?
> + else:
> + log.debug('Pushing changes to remote repository
> '
> + 'creating new branch')
> + repo.git.push('-u', 'origin', branch)
same comment about the permission above
> + else:
> + log.error('Local repository is dirty, not pushing
> commits')
> +
> if result.wasSuccessful():
> return 0
> else:
> @@ -655,6 +724,35 @@ def buildResultClass(args):
>
> return StampedResult
>
> +def cleanResultsDir(repo):
> + """ Remove result files from directory """
> +
> + xml_files = []
> + directory = repo.working_tree_dir
> + for f in os.listdir(directory):
> + path = os.path.join(directory, f)
> + if os.path.isfile(path) and path.endswith('.xml'):
> + xml_files.append(f)
> + repo.index.remove(xml_files, working_tree=True)
> +
> +def copyResultFiles(src, dst, repo):
> + """ Copy result files from src to dst removing the time stamp.
> """
> +
> + import shutil
> +
> + re_time = re.compile("-[0-9]+")
> + file_list = []
> +
> + for root, subdirs, files in os.walk(src):
> + tmp_dir = root.replace(src, '').lstrip('/')
> + for s in subdirs:
> + os.mkdir(os.path.join(dst, tmp_dir, s))
> + for f in files:
> + file_name = os.path.join(dst, tmp_dir, re_time.sub("",
> f))
> + shutil.copy2(os.path.join(root, f), file_name)
> + file_list.append(file_name)
> + repo.index.add(file_list)
> +
> class TestRunner(_TestRunner):
> """Test runner class aware of exporting tests."""
> def __init__(self, *args, **kwargs):
> --
> 2.7.3
>
^ permalink raw reply
* Re: [PATCH 1/2] oeqa/utils/metadata.py: Add metadata library
From: Mariano Lopez @ 2016-11-29 22:38 UTC (permalink / raw)
To: benjamin.esquivel; +Cc: openembedded-core
In-Reply-To: <1480457845.2973.3.camel@linux.intel.com>
On Tuesday, November 29, 2016 04:17:25 PM Benjamin Esquivel wrote:
> On Tue, 2016-11-29 at 08:42 -0600, mariano.lopez@linux.intel.com wrote:
> > From: Mariano Lopez <mariano.lopez@linux.intel.com>
> >
> > Adds functions to get metadata from the host running the tests.
> >
> > [YOCTO #9954]
> >
> > Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
> > ---
> > meta/lib/oeqa/utils/metadata.py | 77
> > +++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 77 insertions(+)
> > create mode 100644 meta/lib/oeqa/utils/metadata.py
> >
> > diff --git a/meta/lib/oeqa/utils/metadata.py
> > b/meta/lib/oeqa/utils/metadata.py
> > new file mode 100644
> > index 0000000..3be805c
> > --- /dev/null
> > +++ b/meta/lib/oeqa/utils/metadata.py
> > @@ -0,0 +1,77 @@
> > +# Copyright (C) 2016 Intel Corporation
> > +#
> > +# Released under the MIT license (see COPYING.MIT)
> > +#
> > +# Functions to get metadata from the testing host used
> > +# for analytics of test results.
> > +
> > +from git import Repo
> > +from collections import OrderedDict
> > +from collections.abc import MutableMapping
> > +from xml.dom.minidom import parseString
> > +from xml.etree.ElementTree import Element, tostring
> > +
> > +from oe.lsb import distro_identifier
> > +from oeqa.utils.commands import runCmd, get_bb_var
> > +
> > +def metadata_from_bb():
> > + """ Returns test's metadata as OrderedDict.
> > +
> > + Data will be gathered using bitbake -e thanks to get_bb_var.
> > + """
> > +
> > + info_dict = OrderedDict()
> > + hostname = runCmd('hostname')
> > + info_dict['hostname'] = hostname.output
> > + info_dict['machine'] = get_bb_var('MACHINE')
> > + info_dict['distro'] = get_bb_var('DISTRO')
> > + info_dict['distro_version'] = get_bb_var('DISTRO_VERSION')
> > + host_distro= distro_identifier()
> > + host_distro, _, host_distro_release = host_distro.partition('-')
> > + info_dict['host_distro'] = host_distro
> > + info_dict['host_distro_release'] = host_distro_release
> > + info_dict['layers'] = get_layers(get_bb_var('BBLAYERS'))
> is none of the upper statements going to throw exceptions? otherwise
> try/except as appropriate.
I really don't expect this code to throw an exception, these are bitbake
commands running in the host.
> > + return info_dict
> > +
> > +def metadata_from_data_store(d):
> > + """ Returns test's metadata as OrderedDict.
> > +
> > + Data will be collected from the provided data store.
> > + """
> > + # TODO: Getting metadata from the data store would
> > + # be useful when running within bitbake.
> > + pass
> > +
> > +def get_layers(layers):
> > + """ Returns layer name, branch, and revision as OrderedDict. """
> > +
> > + layer_dict = OrderedDict()
> > + for layer in layers.split():
> > + layer_name = os.path.basename(layer)
> > + layer_dict[layer_name] = OrderedDict()
> > + repo = Repo(layer, search_parent_directories=True)
> > + revision, branch = repo.head.object.name_rev.split()
> > + layer_dict[layer_name]['branch'] = branch
> > + layer_dict[layer_name]['revision'] = revision
> same here for the try/except, did you test with usual cases of zero
> input and unexisting path's, etc?
If the function doesn't receive input, it won't enter in the loop, in case the
directory doesn't exists bitbake would complain long before reaching this
code. If the user gets creative enough to not pass a valid BBLAYER value
I think s/he deserve to be bitten by the exception.
> > + return layer_dict
> > +
> > +def write_metadata_file(file_path, metadata):
> > + """ Writes metadata to a XML file in directory. """
> > +
> > + xml = dict_to_XML('metadata', metadata)
> > + xml_doc = parseString(tostring(xml).decode('UTF-8'))
> > + with open(file_path, 'w') as f:
> > + f.write(xml_doc.toprettyxml())
> > +
> > +def dict_to_XML(tag, dictionary):
> > + """ Return XML element converting dicts recursively. """
> > +
> > + elem = Element(tag)
> > + for key, val in dictionary.items():
> > + if isinstance(val, MutableMapping):
> > + child = (dict_to_XML(key, val))
> > + else:
> > + child = Element(key)
> > + child.text = str(val)
> > + elem.append(child)
> > + return elem
> > --
> > 2.7.3
> >
^ permalink raw reply
* Re: [PATCH 2/2] oe-selftest: Add option to submit test result to a git repository.
From: Mariano Lopez @ 2016-11-29 22:49 UTC (permalink / raw)
To: benjamin.esquivel; +Cc: openembedded-core
In-Reply-To: <1480458405.2973.9.camel@linux.intel.com>
On Tuesday, November 29, 2016 04:26:45 PM Benjamin Esquivel wrote:
> On Tue, 2016-11-29 at 08:42 -0600, mariano.lopez@linux.intel.com wrote:
> > From: Mariano Lopez <mariano.lopez@linux.intel.com>
> >
> > This new option allows to commit the result to a git repository,
> > along with the results it will add a metadata file for information
> > of the current selftest run, such as: hostname, machine, distro,
> > distro version, host version, and layers.
> >
> > This implementation will have a branch per different hostname,
> > testing branch, and machine.
> >
> > To use this feature use:
> >
> > oe-selftest <options> --repository <repository_link>
> >
> > [YOCTO #9954]
> >
> > Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
> > ---
> > scripts/oe-selftest | 98
> > +++++++++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 98 insertions(+)
> >
> > diff --git a/scripts/oe-selftest b/scripts/oe-selftest
> > index deaa432..81dfa3d 100755
> > --- a/scripts/oe-selftest
> > +++ b/scripts/oe-selftest
> > @@ -36,6 +36,7 @@ import re
> > import fnmatch
> > import collections
> > import imp
> > +import git
> >
> > sys.path.insert(0, os.path.dirname(os.path.realpath(__file__)) +
> > '/lib')
> > import scriptpath
> > @@ -46,6 +47,7 @@ import argparse_oe
> > import oeqa.selftest
> > import oeqa.utils.ftools as ftools
> > from oeqa.utils.commands import runCmd, get_bb_var, get_test_layer
> > +from oeqa.utils.metadata import metadata_from_bb,
> > write_metadata_file
> > from oeqa.selftest.base import oeSelfTest, get_available_machines
> >
> > try:
> > @@ -106,6 +108,8 @@ def get_args_parser():
> > help='List all tags that have been set to
> > test cases.')
> > parser.add_argument('--machine', required=False, dest='machine',
> > choices=['random', 'all'], default=None,
> > help='Run tests on different machines
> > (random/all).')
> > + parser.add_argument('--repository', required=False,
> > dest='repository', default='', action='store',
> > + help='Submit test results to a repository')
> > return parser
> >
> >
> > @@ -572,6 +576,71 @@ def main():
> >
> > log.info("Finished")
> >
> > + if args.repository:
> oe-selftest is already long and not so modular, is there a chance to
> send these actions to methods outside oe-selftest and import them? it
> would also make them accessible to other data flows that wish to do the
> same.
It would be possible to move this code to a module, although the specific
needs of every test would be different, for example the clean and add
functions must be different for everyone. I would leave it here and check
the needs of other test to check if this can be reused. I would do that
work, because I'm already familiar with this.
> > + # Commit tests results to repository
> > + metadata = metadata_from_bb()
> > + git_dir = os.path.join(os.getcwd(), 'selftest')
> > + if not os.path.isdir(git_dir):
> > + os.mkdir(git_dir)
> > +
> > + log.debug('Checking for git repository in %s' % git_dir)
> > + try:
> > + repo = git.Repo(git_dir)
> > + except git.exc.InvalidGitRepositoryError:
> > + log.debug("Couldn't find git repository %s; "
> > + "cloning from %s" % (git_dir,
> > args.repository))
> > + repo = git.Repo.clone_from(args.repository, git_dir)
> > +
> > + r_branches = repo.git.branch(r=True)
> > + r_branches = set(r_branches.replace('origin/',
> > '').split())
> > + l_branches = {str(branch) for branch in repo.branches}
> > + branch = '%s/%s/%s' % (metadata['hostname'],
> > + metadata['layers']['meta']['branc
> > h'],
> > + metadata['machine'])
> > +
> > + if branch in r_branches:
> > + log.debug('Found branch in remote repository,
> > checking'
> > + ' out and pulling')
> > + repo.git.checkout(branch)
> > + repo.git.pull()
> > + elif branch in l_branches:
> > + log.debug('Found branch in local repository,
> > checking out')
> > + repo.git.checkout(branch)
> can you explain why the remote branches have precedence over the local
> branches here?
Because some other system could have pushed before and our branch is
not up date.
> > + else:
> > + log.debug('New branch %s' % branch)
> > + repo.git.checkout('master')
> > + repo.git.checkout(b=branch)
> > +
> > + cleanResultsDir(repo)
> > + xml_dir = os.path.join(os.getcwd(), log_prefix)
> > + copyResultFiles(xml_dir, git_dir, repo)
> > + metadata_file = os.path.join(git_dir, 'metadata.xml')
> > + write_metadata_file(metadata_file, metadata)
> > + repo.index.add([metadata_file])
> > + repo.index.write()
> > +
> > + # Get information for commit message
> > + layer_info = ''
> > + for layer, values in metadata['layers'].items():
> > + layer_info = '%s%-17s = %s:%s\n' % (layer_info,
> > layer,
> > + values['branch'], values['revision'])
> > + msg = 'Selftest for build %s of %s %s for machine %s on
> > %s\n\n%s' % (
> > + log_prefix[12:], metadata['distro'],
> > metadata['distro_version'],
> > + metadata['machine'], metadata['hostname'],
> > layer_info)
> > +
> > + log.debug('Commiting results to local repository')
> > + repo.index.commit(msg)
> > + if not repo.is_dirty():
> > + if branch in r_branches:
> > + log.debug('Pushing changes to remote
> > repository')
> > + repo.git.push()
> what happens here if you don't have permission to push? does it throw
> an exception or a return code?
It will throw an exception, that I think is good here, because your host
won't be publishing the results, and for the consumer is like this test
never happened. Usually you will act more on an exception than in a warning.
> > + else:
> > + log.debug('Pushing changes to remote repository
> > '
> > + 'creating new branch')
> > + repo.git.push('-u', 'origin', branch)
> same comment about the permission above
Same as above.
> > + else:
> > + log.error('Local repository is dirty, not pushing
> > commits')
> > +
> > if result.wasSuccessful():
> > return 0
> > else:
> > @@ -655,6 +724,35 @@ def buildResultClass(args):
> >
> > return StampedResult
> >
> > +def cleanResultsDir(repo):
> > + """ Remove result files from directory """
> > +
> > + xml_files = []
> > + directory = repo.working_tree_dir
> > + for f in os.listdir(directory):
> > + path = os.path.join(directory, f)
> > + if os.path.isfile(path) and path.endswith('.xml'):
> > + xml_files.append(f)
> > + repo.index.remove(xml_files, working_tree=True)
> > +
> > +def copyResultFiles(src, dst, repo):
> > + """ Copy result files from src to dst removing the time stamp.
> > """
> > +
> > + import shutil
> > +
> > + re_time = re.compile("-[0-9]+")
> > + file_list = []
> > +
> > + for root, subdirs, files in os.walk(src):
> > + tmp_dir = root.replace(src, '').lstrip('/')
> > + for s in subdirs:
> > + os.mkdir(os.path.join(dst, tmp_dir, s))
> > + for f in files:
> > + file_name = os.path.join(dst, tmp_dir, re_time.sub("",
> > f))
> > + shutil.copy2(os.path.join(root, f), file_name)
> > + file_list.append(file_name)
> > + repo.index.add(file_list)
> > +
> > class TestRunner(_TestRunner):
> > """Test runner class aware of exporting tests."""
> > def __init__(self, *args, **kwargs):
> > --
> > 2.7.3
> >
^ permalink raw reply
* [PATCH] sqlite3: 3.14.1 -> 3.15.1
From: huangqy @ 2016-11-30 9:19 UTC (permalink / raw)
To: openembedded-core
From: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Upgrade sqlite3 from 3.14.1 to 3.15.1.
Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
---
meta/recipes-support/sqlite/{sqlite3_3.14.1.bb => sqlite3_3.15.1.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/sqlite/{sqlite3_3.14.1.bb => sqlite3_3.15.1.bb} (66%)
diff --git a/meta/recipes-support/sqlite/sqlite3_3.14.1.bb b/meta/recipes-support/sqlite/sqlite3_3.15.1.bb
similarity index 66%
rename from meta/recipes-support/sqlite/sqlite3_3.14.1.bb
rename to meta/recipes-support/sqlite/sqlite3_3.15.1.bb
index 7c8fa40..c315a53 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.14.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.15.1.bb
@@ -8,5 +8,5 @@ SRC_URI = "\
file://0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch \
"
-SRC_URI[md5sum] = "3634a90a3f49541462bcaed3474b2684"
-SRC_URI[sha256sum] = "bc7182476900017becb81565ecea7775d46ab747a97281aa610f4f45881c47a6"
+SRC_URI[md5sum] = "0259d52be88f085d104c6d2aaa8349ac"
+SRC_URI[sha256sum] = "5dfa89b7697ee3c2ac7b44e8e157e7f204bf999c866afcaa8bb1c7ff656ae2c5"
--
2.7.4
^ permalink raw reply related
* Re: [PATCH] devtool: execute associated functions while preparing the source tree
From: Jiajie Hu @ 2016-11-30 1:33 UTC (permalink / raw)
To: Paul Eggleton; +Cc: openembedded-core
In-Reply-To: <4232623.fUgL5pQE4S@peggleto-mobl.ger.corp.intel.com>
Hi, Paul
On Wednesday, November 30, 2016 07:01:30 AM Paul Eggleton wrote:
> So this in itself looks reasonable in theory, but I have to warn you that
> when we switch to tinfoil2 [1] these commits are going to be done via the
> metadata instead, and beyond a possible hack that I'd really rather not
> think about it's going to be a bit difficult to intercept the
> prefuncs/postfuncs there. At least they will be executed though since with
> tinfoil2 we'll be going through a much more standard path to run the tasks.
>
> Cheers,
> Paul
>
> [1] https://wiki.yoctoproject.org/wiki/Tinfoil2
Glad to know that my fix can be superseded by tinfoil2 APIs. Do you have any
estimation when the switch will happen?
^ permalink raw reply
* Re: [PATCH] devtool: execute associated functions while preparing the source tree
From: Paul Eggleton @ 2016-11-30 1:39 UTC (permalink / raw)
To: Jiajie Hu; +Cc: openembedded-core
In-Reply-To: <1896562.UY4VSfhxnH@jiajiehu>
On Wed, 30 Nov 2016 09:33:22 Jiajie Hu wrote:
> On Wednesday, November 30, 2016 07:01:30 AM Paul Eggleton wrote:
> > So this in itself looks reasonable in theory, but I have to warn you that
> > when we switch to tinfoil2 [1] these commits are going to be done via the
> > metadata instead, and beyond a possible hack that I'd really rather not
> > think about it's going to be a bit difficult to intercept the
> > prefuncs/postfuncs there. At least they will be executed though since with
> > tinfoil2 we'll be going through a much more standard path to run the
> > tasks.
> >
> > [1] https://wiki.yoctoproject.org/wiki/Tinfoil2
>
> Glad to know that my fix can be superseded by tinfoil2 APIs. Do you have any
> estimation when the switch will happen?
The target is 2.3 milestone 1, which is in December. However there are still a
lot of things to be fixed as I've noted on the wiki page I linked.
Thinking about it though it's possible I could split out this particular
change and get it sent earlier - in fact that may be a good idea anyway. I'll
look into that.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply
* Re: [PATCH] qemu*.conf: Add slirp support for all qemu machines
From: Robert Yang @ 2016-11-30 2:00 UTC (permalink / raw)
To: Randy Witt, openembedded-core
In-Reply-To: <7b78a4a8-3157-ed82-6efa-1ec699ec8a71@linux.intel.com>
On 11/30/2016 02:24 AM, Randy Witt wrote:
>
>>
>> "-device virtio-net-device,netdev=net0" and
>> "-netdev user,id=net0,hostfwd=tcp::2222-:22"
>>
>> Then there is no way for user to override the second part, and we can't
>> call the first part as a "QB_SLIRP_OPT" since it is only part of them,
>> so I won't break them into 2, and if the user defines QB_SLIRP_OPT
>> in there bsp conf file, then it will be replaced totally.
>>
>
> I'm aware that this will only work for one instance, but currently it doesn't
> work at all and it blocks a high priority bug. The only way to make it 100%
> work, would be to have qemu do the binding of the port to a dynamic one and then
> the user queries it after. Otherwise there is always a window where another
> process could bind to the port.
We can check whether the port is free and use another one if not, we've
already done similar things in runqemu-export-rootfs for nfs, please see:
http://lists.openembedded.org/pipermail/openembedded-core/2016-November/129376.html
// Robert
>
> I don't think the bsp should be in the business of choosing which ports to
> forward. And if it is, then it should be a separate option in the qemuboot.conf,
> with just the "-netdev user" part because otherwise the user will always have to
> modify qemuboot.conf just to forward different ports.
>
> It makes more sense to let the user do something like "runqemu slirp=22,65,..."
> and then return back the actual port used in the forwarding.
>
>
^ permalink raw reply
* Re: [PATCH 1/1] kernel-devsrc: remove symlink source
From: Robert Yang @ 2016-11-30 2:21 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <CADkTA4M7q_FGt4f2sVnjJx2dXCnhY2yy-jTf7rqOwVu6is3gpA@mail.gmail.com>
On 11/29/2016 06:57 PM, Bruce Ashfield wrote:
>
>
> On Tue, Nov 29, 2016 at 4:16 AM, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
> Fixed:
> $ rpm -qplv tmp/deploy/rpm/qemuppc/kernel-devsrc-1.0-r0.qemuppc.rpm | grep
> kernel/source
> /usr/src/kernel/source ->
> /buildarea/lyang1/test_yocto/tmp/work/qemuppc-poky-linux/kernel-devsrc/1.0-r0/image/usr/src/kernel
>
> It is generated by kernel's "make clean _mrproper_scripts", the
> kernel-devsrc includeds full sources, this symlink is not needed, and
> the path is invalid on target, so remove it.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>>
> ---
> meta/recipes-kernel/linux/kernel-devsrc.bb <http://kernel-devsrc.bb> | 7
> +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
> <http://kernel-devsrc.bb> b/meta/recipes-kernel/linux/kernel-devsrc.bb
> <http://kernel-devsrc.bb>
> index 9fd2e08..b182936 100644
> --- a/meta/recipes-kernel/linux/kernel-devsrc.bb <http://kernel-devsrc.bb>
> +++ b/meta/recipes-kernel/linux/kernel-devsrc.bb <http://kernel-devsrc.bb>
> @@ -53,6 +53,13 @@ do_install() {
> # architecture (since scripts and helpers are native format).
> KBUILD_OUTPUT="$kerneldir"
> oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
> _mrproper_scripts
> + # make clean generates an absolute path symlink called "source"
> + # in $kerneldir points to $kerneldir, which doesn't make any
> + # sense, so remove it.
> + if [ -L $kerneldir/source ]; then
> + bbnote "Removing $kerneldir/source"
>
>
> This message needs to be clarified. When that comes out, I'd read it and think
> "it is removing my kernel source".
>
> Maybe:
>
> bbnote "Removing $kerneldir/source symlink"
>
> is better.
Thanks, updated in the repo:
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb
b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 9fd2e08..7004261 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -53,6 +53,13 @@ do_install() {
# architecture (since scripts and helpers are native format).
KBUILD_OUTPUT="$kerneldir"
oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean
_mrproper_scripts
+ # make clean generates an absolute path symlink called "source"
+ # in $kerneldir points to $kerneldir, which doesn't make any
+ # sense, so remove it.
+ if [ -L $kerneldir/source ]; then
+ bbnote "Removing $kerneldir/source symlink"
+ rm -f $kerneldir/source
+ fi
# As of Linux kernel version 3.0.1, the clean target removes
# arch/powerpc/lib/crtsavres.o which is present in
// Robert
>
> Bruce
>
>
> + rm -f $kerneldir/source
> + fi
>
> # As of Linux kernel version 3.0.1, the clean target removes
> # arch/powerpc/lib/crtsavres.o which is present in
> --
> 2.9.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> <mailto:Openembedded-core@lists.openembedded.org>
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
> <http://lists.openembedded.org/mailman/listinfo/openembedded-core>
>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await thee at its
> end"
^ permalink raw reply related
* Re: [PATCH] devtool: execute associated functions while preparing the source tree
From: Paul Eggleton @ 2016-11-30 3:14 UTC (permalink / raw)
To: Jiajie Hu; +Cc: openembedded-core
In-Reply-To: <9313919.Y4CtTjI68L@peggleto-mobl.ger.corp.intel.com>
On Wed, 30 Nov 2016 14:39:12 Paul Eggleton wrote:
> On Wed, 30 Nov 2016 09:33:22 Jiajie Hu wrote:
> > On Wednesday, November 30, 2016 07:01:30 AM Paul Eggleton wrote:
> > > So this in itself looks reasonable in theory, but I have to warn you
> > > that when we switch to tinfoil2 [1] these commits are going to be done
> > > via the metadata instead, and beyond a possible hack that I'd really
> > > rather not think about it's going to be a bit difficult to intercept the
> > > prefuncs/postfuncs there. At least they will be executed though since
> > > with tinfoil2 we'll be going through a much more standard path to run
> > > the tasks.
> > >
> > > [1] https://wiki.yoctoproject.org/wiki/Tinfoil2
> >
> > Glad to know that my fix can be superseded by tinfoil2 APIs. Do you have
> > any estimation when the switch will happen?
>
> The target is 2.3 milestone 1, which is in December. However there are still
> a lot of things to be fixed as I've noted on the wiki page I linked.
>
> Thinking about it though it's possible I could split out this particular
> change and get it sent earlier - in fact that may be a good idea anyway.
> I'll look into that.
Actually, I spoke too soon. Whilst moving the creation of commits out to the
metadata can be done separately (and is already implemented in a separate
patch), it won't actually help on its own because it doesn't change how the
tasks are executed. The bit we need is executing the tasks as they would be
executed normally, and unfortunately that's not possible without the full
tinfoil2 changeset.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ 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