* Re: [PATCH 1/4] linux-dtb.inc: use absolute upd-alt paths
From: Christopher Larson @ 2016-12-21 20:18 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <20161221191030.GF30576@denix.org>
[-- Attachment #1: Type: text/plain, Size: 907 bytes --]
On Wed, Dec 21, 2016 at 12:10 PM, Denys Dmytriyenko <denis@denix.org> wrote:
> On Thu, Nov 12, 2015 at 04:41:28PM -0700, Christopher Larson wrote:
> > From: Christopher Larson <chris_larson@mentor.com>
> >
> > This works around a limitation of the chkconfig update-alternatives, so
> it
> > works with all our update-alternatives providers.
>
> I know this change is old and has been in for over a year...
>
> But the side-effect of it is that it breaks NFS-boot due to absolute DTB
> symlinks. We had to implement a local workaround to switch them back to
> relative links.
>
> Is there another way to fix the original issue w/o absolute links?
I expect so. I’d be fine with dropping this, it was a workaround more than
anything else anyway.
--
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics
[-- Attachment #2: Type: text/html, Size: 1396 bytes --]
^ permalink raw reply
* [RFT][PATCH] gcc6: Upgrade to 6.3.0
From: Khem Raj @ 2016-12-21 20:08 UTC (permalink / raw)
To: openembedded-core
6.3.0 is a bugfix release in gcc 6 series
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/distro/include/tcmode-default.inc | 2 +-
meta/recipes-devtools/gcc/{gcc-6.2.inc => gcc-6.3.inc} | 11 +++++------
.../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0002-uclibc-conf.patch | 0
.../0003-gcc-uclibc-locale-ctype_touplow_t.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0004-uclibc-locale.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0005-uclibc-locale-no__x.patch | 0
.../{gcc-6.2 => gcc-6.3}/0006-uclibc-locale-wchar_fix.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0007-uclibc-locale-update.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0008-missing-execinfo_h.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0009-c99-snprintf.patch | 0
.../0010-gcc-poison-system-directories.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0011-gcc-poison-dir-extend.patch | 0
.../0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0013-64-bit-multilib-hack.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0014-optional-libstdc.patch | 0
.../0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0016-COLLECT_GCC_OPTIONS.patch | 0
...7-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 0
.../0018-fortran-cross-compile-hack.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0019-cpp-honor-sysroot.patch | 0
.../{gcc-6.2 => gcc-6.3}/0020-MIPS64-Default-to-N64-ABI.patch | 0
...Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 0
.../0022-gcc-Fix-argument-list-too-long-error.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0023-Disable-sdt.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0024-libtool.patch | 0
...25-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 0
...Use-the-multilib-config-files-from-B-instead-of-usin.patch | 0
...Avoid-using-libdir-from-.la-which-usually-points-to-.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0028-export-CPP.patch | 0
...Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch | 0
...Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch | 0
| 0
...gcc-4.8-won-t-build-with-disable-dependency-tracking.patch | 0
...Don-t-search-host-directory-during-relink-if-inst_pr.patch | 0
...Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch | 0
.../0035-aarch64-Add-support-for-musl-ldso.patch | 0
.../0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch | 0
.../0037-handle-sysroot-support-for-nativesdk-gcc.patch | 0
...Search-target-sysroot-gcc-version-specific-dirs-with.patch | 0
.../0039-Fix-various-_FOR_BUILD-and-related-variables.patch | 0
.../0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/0041-ssp_nonshared.patch | 0
.../0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch | 0
...-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch | 0
...gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch | 0
.../0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch | 0
...046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch | 0
...libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch | 0
...ARM-PR-target-71056-Don-t-use-vectorized-builtins-wh.patch | 0
.../gcc/{gcc-6.2 => gcc-6.3}/CVE-2016-4490.patch | 0
.../{gcc-cross-canadian_6.2.bb => gcc-cross-canadian_6.3.bb} | 0
.../{gcc-cross-initial_6.2.bb => gcc-cross-initial_6.3.bb} | 0
.../gcc/{gcc-cross_6.2.bb => gcc-cross_6.3.bb} | 0
...cc-crosssdk-initial_6.2.bb => gcc-crosssdk-initial_6.3.bb} | 0
.../gcc/{gcc-crosssdk_6.2.bb => gcc-crosssdk_6.3.bb} | 0
.../gcc/{gcc-runtime_6.2.bb => gcc-runtime_6.3.bb} | 0
.../gcc/{gcc-sanitizers_6.2.bb => gcc-sanitizers_6.3.bb} | 0
.../gcc/{gcc-source_6.2.bb => gcc-source_6.3.bb} | 0
meta/recipes-devtools/gcc/{gcc_6.2.bb => gcc_6.3.bb} | 0
.../gcc/{libgcc-initial_6.2.bb => libgcc-initial_6.3.bb} | 0
meta/recipes-devtools/gcc/{libgcc_6.2.bb => libgcc_6.3.bb} | 0
.../gcc/{libgfortran_6.2.bb => libgfortran_6.3.bb} | 0
63 files changed, 6 insertions(+), 7 deletions(-)
rename meta/recipes-devtools/gcc/{gcc-6.2.inc => gcc-6.3.inc} (95%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0002-uclibc-conf.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0003-gcc-uclibc-locale-ctype_touplow_t.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0004-uclibc-locale.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0005-uclibc-locale-no__x.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0006-uclibc-locale-wchar_fix.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0007-uclibc-locale-update.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0008-missing-execinfo_h.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0009-c99-snprintf.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0010-gcc-poison-system-directories.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0011-gcc-poison-dir-extend.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0013-64-bit-multilib-hack.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0014-optional-libstdc.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0016-COLLECT_GCC_OPTIONS.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0018-fortran-cross-compile-hack.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0019-cpp-honor-sysroot.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0020-MIPS64-Default-to-N64-ABI.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0022-gcc-Fix-argument-list-too-long-error.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0023-Disable-sdt.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0024-libtool.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0028-export-CPP.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0031-Ensure-target-gcc-headers-can-be-included.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0035-aarch64-Add-support-for-musl-ldso.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0037-handle-sysroot-support-for-nativesdk-gcc.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0039-Fix-various-_FOR_BUILD-and-related-variables.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0041-ssp_nonshared.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/0048-ARM-PR-target-71056-Don-t-use-vectorized-builtins-wh.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-6.2 => gcc-6.3}/CVE-2016-4490.patch (100%)
rename meta/recipes-devtools/gcc/{gcc-cross-canadian_6.2.bb => gcc-cross-canadian_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-cross-initial_6.2.bb => gcc-cross-initial_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-cross_6.2.bb => gcc-cross_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-crosssdk-initial_6.2.bb => gcc-crosssdk-initial_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-crosssdk_6.2.bb => gcc-crosssdk_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-runtime_6.2.bb => gcc-runtime_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-sanitizers_6.2.bb => gcc-sanitizers_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc-source_6.2.bb => gcc-source_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{gcc_6.2.bb => gcc_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{libgcc-initial_6.2.bb => libgcc-initial_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{libgcc_6.2.bb => libgcc_6.3.bb} (100%)
rename meta/recipes-devtools/gcc/{libgfortran_6.2.bb => libgfortran_6.3.bb} (100%)
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index ecf235977c..91143c4100 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "${TCLIBC}-initial"
PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial ?= "nativesdk-glibc-initial"
PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
-GCCVERSION ?= "6.2%"
+GCCVERSION ?= "6.3%"
SDKGCCVERSION ?= "${GCCVERSION}"
BINUVERSION ?= "2.27%"
GDBVERSION ?= "7.12%"
diff --git a/meta/recipes-devtools/gcc/gcc-6.2.inc b/meta/recipes-devtools/gcc/gcc-6.3.inc
similarity index 95%
rename from meta/recipes-devtools/gcc/gcc-6.2.inc
rename to meta/recipes-devtools/gcc/gcc-6.3.inc
index b118995e1d..0b84597a42 100644
--- a/meta/recipes-devtools/gcc/gcc-6.2.inc
+++ b/meta/recipes-devtools/gcc/gcc-6.3.inc
@@ -2,13 +2,13 @@ require gcc-common.inc
# Third digit in PV should be incremented after a minor release
-PV = "6.2.0"
+PV = "6.3.0"
# BINV should be incremented to a revision after a minor gcc release
-BINV = "6.2.0"
+BINV = "6.3.0"
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-6.2:${FILE_DIRNAME}/gcc-6.2/backport:"
+FILESEXTRAPATHS =. "${FILE_DIRNAME}/gcc-6.3:${FILE_DIRNAME}/gcc-6.3/backport:"
DEPENDS =+ "mpfr gmp libmpc zlib"
NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
@@ -81,9 +81,8 @@ SRC_URI = "\
${BACKPORTS} \
"
BACKPORTS = ""
-
-SRC_URI[md5sum] = "9768625159663b300ae4de2f4745fcc4"
-SRC_URI[sha256sum] = "9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5"
+SRC_URI[md5sum] = "677a7623c7ef6ab99881bc4e048debb6"
+SRC_URI[sha256sum] = "f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f"
S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}"
#S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/git"
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-6.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0002-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-6.3/0002-uclibc-conf.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0002-uclibc-conf.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0002-uclibc-conf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-6.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0003-gcc-uclibc-locale-ctype_touplow_t.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0003-gcc-uclibc-locale-ctype_touplow_t.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0004-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-6.3/0004-uclibc-locale.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0004-uclibc-locale.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0004-uclibc-locale.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0005-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-6.3/0005-uclibc-locale-no__x.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0005-uclibc-locale-no__x.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0005-uclibc-locale-no__x.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0006-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-6.3/0006-uclibc-locale-wchar_fix.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0006-uclibc-locale-wchar_fix.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0006-uclibc-locale-wchar_fix.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0007-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-6.3/0007-uclibc-locale-update.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0007-uclibc-locale-update.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0007-uclibc-locale-update.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0008-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-6.3/0008-missing-execinfo_h.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0008-missing-execinfo_h.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0008-missing-execinfo_h.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0009-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-6.3/0009-c99-snprintf.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0009-c99-snprintf.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0009-c99-snprintf.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0010-gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-6.3/0010-gcc-poison-system-directories.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0010-gcc-poison-system-directories.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0010-gcc-poison-system-directories.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0011-gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-6.3/0011-gcc-poison-dir-extend.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0011-gcc-poison-dir-extend.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0011-gcc-poison-dir-extend.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-6.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0013-64-bit-multilib-hack.patch b/meta/recipes-devtools/gcc/gcc-6.3/0013-64-bit-multilib-hack.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0013-64-bit-multilib-hack.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0013-64-bit-multilib-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0014-optional-libstdc.patch b/meta/recipes-devtools/gcc/gcc-6.3/0014-optional-libstdc.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0014-optional-libstdc.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0014-optional-libstdc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch b/meta/recipes-devtools/gcc/gcc-6.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0016-COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-6.3/0016-COLLECT_GCC_OPTIONS.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0016-COLLECT_GCC_OPTIONS.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0016-COLLECT_GCC_OPTIONS.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-6.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0017-Use-the-defaults.h-in-B-instead-of-S-and-t-oe-in-B.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0018-fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-6.3/0018-fortran-cross-compile-hack.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0018-fortran-cross-compile-hack.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0018-fortran-cross-compile-hack.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0019-cpp-honor-sysroot.patch b/meta/recipes-devtools/gcc/gcc-6.3/0019-cpp-honor-sysroot.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0019-cpp-honor-sysroot.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0019-cpp-honor-sysroot.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0020-MIPS64-Default-to-N64-ABI.patch b/meta/recipes-devtools/gcc/gcc-6.3/0020-MIPS64-Default-to-N64-ABI.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0020-MIPS64-Default-to-N64-ABI.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0020-MIPS64-Default-to-N64-ABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch b/meta/recipes-devtools/gcc/gcc-6.3/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0021-Define-GLIBC_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0022-gcc-Fix-argument-list-too-long-error.patch b/meta/recipes-devtools/gcc/gcc-6.3/0022-gcc-Fix-argument-list-too-long-error.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0022-gcc-Fix-argument-list-too-long-error.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0022-gcc-Fix-argument-list-too-long-error.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0023-Disable-sdt.patch b/meta/recipes-devtools/gcc/gcc-6.3/0023-Disable-sdt.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0023-Disable-sdt.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0023-Disable-sdt.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0024-libtool.patch b/meta/recipes-devtools/gcc/gcc-6.3/0024-libtool.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0024-libtool.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0024-libtool.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch b/meta/recipes-devtools/gcc/gcc-6.3/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0025-gcc-armv4-pass-fix-v4bx-to-linker-to-support-EABI.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch b/meta/recipes-devtools/gcc/gcc-6.3/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0026-Use-the-multilib-config-files-from-B-instead-of-usin.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch b/meta/recipes-devtools/gcc/gcc-6.3/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0027-Avoid-using-libdir-from-.la-which-usually-points-to-.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0028-export-CPP.patch b/meta/recipes-devtools/gcc/gcc-6.3/0028-export-CPP.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0028-export-CPP.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0028-export-CPP.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch b/meta/recipes-devtools/gcc/gcc-6.3/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0029-Enable-SPE-AltiVec-generation-on-powepc-linux-target.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch b/meta/recipes-devtools/gcc/gcc-6.3/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0030-Disable-the-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0031-Ensure-target-gcc-headers-can-be-included.patch b/meta/recipes-devtools/gcc/gcc-6.3/0031-Ensure-target-gcc-headers-can-be-included.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0031-Ensure-target-gcc-headers-can-be-included.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0031-Ensure-target-gcc-headers-can-be-included.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch b/meta/recipes-devtools/gcc/gcc-6.3/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0032-gcc-4.8-won-t-build-with-disable-dependency-tracking.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch b/meta/recipes-devtools/gcc/gcc-6.3/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0033-Don-t-search-host-directory-during-relink-if-inst_pr.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch b/meta/recipes-devtools/gcc/gcc-6.3/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0034-Use-SYSTEMLIBS_DIR-replacement-instead-of-hardcoding.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0035-aarch64-Add-support-for-musl-ldso.patch b/meta/recipes-devtools/gcc/gcc-6.3/0035-aarch64-Add-support-for-musl-ldso.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0035-aarch64-Add-support-for-musl-ldso.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0035-aarch64-Add-support-for-musl-ldso.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch b/meta/recipes-devtools/gcc/gcc-6.3/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0036-libcc1-fix-libcc1-s-install-path-and-rpath.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0037-handle-sysroot-support-for-nativesdk-gcc.patch b/meta/recipes-devtools/gcc/gcc-6.3/0037-handle-sysroot-support-for-nativesdk-gcc.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0037-handle-sysroot-support-for-nativesdk-gcc.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0037-handle-sysroot-support-for-nativesdk-gcc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch b/meta/recipes-devtools/gcc/gcc-6.3/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0038-Search-target-sysroot-gcc-version-specific-dirs-with.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0039-Fix-various-_FOR_BUILD-and-related-variables.patch b/meta/recipes-devtools/gcc/gcc-6.3/0039-Fix-various-_FOR_BUILD-and-related-variables.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0039-Fix-various-_FOR_BUILD-and-related-variables.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0039-Fix-various-_FOR_BUILD-and-related-variables.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch b/meta/recipes-devtools/gcc/gcc-6.3/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0040-nios2-Define-MUSL_DYNAMIC_LINKER.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0041-ssp_nonshared.patch b/meta/recipes-devtools/gcc/gcc-6.3/0041-ssp_nonshared.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0041-ssp_nonshared.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0041-ssp_nonshared.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch b/meta/recipes-devtools/gcc/gcc-6.3/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0042-gcc-libcpp-support-ffile-prefix-map-old-new.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch b/meta/recipes-devtools/gcc/gcc-6.3/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0043-Reuse-fdebug-prefix-map-to-replace-ffile-prefix-map.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch b/meta/recipes-devtools/gcc/gcc-6.3/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0044-gcc-final.c-fdebug-prefix-map-support-to-remap-sourc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch b/meta/recipes-devtools/gcc/gcc-6.3/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0045-libgcc-Add-knob-to-use-ldbl-128-on-ppc.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch b/meta/recipes-devtools/gcc/gcc-6.3/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0046-Link-libgcc-using-LDFLAGS-not-just-SHLIB_LDFLAGS.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch b/meta/recipes-devtools/gcc/gcc-6.3/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0047-libgcc_s-Use-alias-for-__cpu_indicator_init-instead-.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/0048-ARM-PR-target-71056-Don-t-use-vectorized-builtins-wh.patch b/meta/recipes-devtools/gcc/gcc-6.3/0048-ARM-PR-target-71056-Don-t-use-vectorized-builtins-wh.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/0048-ARM-PR-target-71056-Don-t-use-vectorized-builtins-wh.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/0048-ARM-PR-target-71056-Don-t-use-vectorized-builtins-wh.patch
diff --git a/meta/recipes-devtools/gcc/gcc-6.2/CVE-2016-4490.patch b/meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-4490.patch
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-6.2/CVE-2016-4490.patch
rename to meta/recipes-devtools/gcc/gcc-6.3/CVE-2016-4490.patch
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_6.2.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-canadian_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross-canadian_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_6.2.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross-initial_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross-initial_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-cross_6.2.bb b/meta/recipes-devtools/gcc/gcc-cross_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-cross_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-cross_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-crosssdk-initial_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_6.2.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-crosssdk_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-crosssdk_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_6.2.bb b/meta/recipes-devtools/gcc/gcc-runtime_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-runtime_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-runtime_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers_6.2.bb b/meta/recipes-devtools/gcc/gcc-sanitizers_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-sanitizers_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-sanitizers_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc-source_6.2.bb b/meta/recipes-devtools/gcc/gcc-source_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc-source_6.2.bb
rename to meta/recipes-devtools/gcc/gcc-source_6.3.bb
diff --git a/meta/recipes-devtools/gcc/gcc_6.2.bb b/meta/recipes-devtools/gcc/gcc_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/gcc_6.2.bb
rename to meta/recipes-devtools/gcc/gcc_6.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc-initial_6.2.bb b/meta/recipes-devtools/gcc/libgcc-initial_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc-initial_6.2.bb
rename to meta/recipes-devtools/gcc/libgcc-initial_6.3.bb
diff --git a/meta/recipes-devtools/gcc/libgcc_6.2.bb b/meta/recipes-devtools/gcc/libgcc_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgcc_6.2.bb
rename to meta/recipes-devtools/gcc/libgcc_6.3.bb
diff --git a/meta/recipes-devtools/gcc/libgfortran_6.2.bb b/meta/recipes-devtools/gcc/libgfortran_6.3.bb
similarity index 100%
rename from meta/recipes-devtools/gcc/libgfortran_6.2.bb
rename to meta/recipes-devtools/gcc/libgfortran_6.3.bb
--
2.11.0
^ permalink raw reply related
* Re: [PATCH 1/4] linux-dtb.inc: use absolute upd-alt paths
From: Denys Dmytriyenko @ 2016-12-21 19:10 UTC (permalink / raw)
To: Christopher Larson; +Cc: Christopher Larson, openembedded-core
In-Reply-To: <130d9a6c1f4ecea86748a44b73f51d8ddb2e63da.1447371049.git.chris_larson@mentor.com>
On Thu, Nov 12, 2015 at 04:41:28PM -0700, Christopher Larson wrote:
> From: Christopher Larson <chris_larson@mentor.com>
>
> This works around a limitation of the chkconfig update-alternatives, so it
> works with all our update-alternatives providers.
I know this change is old and has been in for over a year...
But the side-effect of it is that it breaks NFS-boot due to absolute DTB
symlinks. We had to implement a local workaround to switch them back to
relative links.
Is there another way to fix the original issue w/o absolute links?
--
Denys
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
> meta/recipes-kernel/linux/linux-dtb.inc | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc
> index ee3a5e1..5810b10 100644
> --- a/meta/recipes-kernel/linux/linux-dtb.inc
> +++ b/meta/recipes-kernel/linux/linux-dtb.inc
> @@ -64,7 +64,7 @@ pkg_postinst_kernel-devicetree () {
> do
> DTB_BASE_NAME=`basename ${DTB_FILE} | awk -F "." '{print $1}'`
> DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
> - update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> + update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb /boot/devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> done
> }
>
> @@ -74,6 +74,6 @@ pkg_postrm_kernel-devicetree () {
> do
> DTB_BASE_NAME=`basename ${DTB_FILE} | awk -F "." '{print $1}'`
> DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"`
> - update-alternatives --remove ${DTB_BASE_NAME}.dtb devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> + update-alternatives --remove ${DTB_BASE_NAME}.dtb /boot/devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true
> done
> }
> --
> 2.2.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [PATCH 2/9] iasl: move from meta-luv to OE-core
From: Fathi Boudra @ 2016-12-21 18:17 UTC (permalink / raw)
To: Patrick Ohly; +Cc: meta-luv, Neri, Ricardo, openembedded-core
In-Reply-To: <1482334714.6937.34.camel@intel.com>
On 21 December 2016 at 17:38, Patrick Ohly <patrick.ohly@intel.com> wrote:
> On Wed, 2016-12-21 at 16:11 +0200, Fathi Boudra wrote:
>> On 21 December 2016 at 15:11, Patrick Ohly <patrick.ohly@intel.com> wrote:
>> > iasl is also provided by the meta-oe layer's acpica recipe. iasl is a
>> > bit simpler and thus seems more suitable for OE-core.
>>
>> Simpler in what sense?
>
> Less code to compile, which might matter for people who just want a
> working UEFI for qemu and nothing else. I haven't measured the
> difference, though.
to build, it's taking 3-4 minutes on a 3 year old laptop (i5-2520m @ 2.5 Ghz).
>> acpica recipe is trivial and provide fully acpica tools.
>> Would you mind to import meta-oe acpica recipe instead of providing a
>> reduced set of acpica for not much benefit?
>
> I don't have a strong opinion about this and would be fine with moving
> acpica to OE-core instead, too.
It would be nice. thanks.
> --
> Best Regards, Patrick Ohly
>
> The content of this message is my personal opinion only and although
> I am an employee of Intel, the statements I make here in no way
> represent Intel's position on the issue, nor am I authorized to speak
> on behalf of Intel on this matter.
^ permalink raw reply
* [PATCH] opkg-utils: Do not use --ignore-fail-on-non-empty with rmdir
From: Khem Raj @ 2016-12-21 17:34 UTC (permalink / raw)
To: openembedded-core; +Cc: adraszik
--ignore-fail-on-non-empty is coreutils specific, and you
are not always going to have coreutils on target systems
especially small ones. They will use the busybox applet which
does not support --ignore-fail-on-non-empty, use pipe and true
to ignore the errorcode from rmdir instead
Fixes upgrade errors on target e.g.
rmdir: unrecognized option '--ignore-fail-on-non-empty'
BusyBox v1.24.1 (2016-12-20 10:41:39 PST) multi-call binary.
Usage: rmdir [OPTIONS] DIRECTORY...
To remove package debris, try `opkg remove update-alternatives-opkg`.
To re-attempt the install, try `opkg install update-alternatives-opkg`.
Collected errors:
* pkg_run_script: package "update-alternatives-opkg" postrm script returned status 1.
* postrm_upgrade_old_pkg: postrm script for package "update-alternatives-opkg" failed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/opkg-utils/opkg-utils_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index 19a852ec62..a881bbb5d4 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -45,7 +45,7 @@ RCONFLICTS_update-alternatives-opkg = "update-alternatives-cworth"
pkg_postrm_update-alternatives-opkg() {
rm -rf $OPKG_OFFLINE_ROOT${nonarch_libdir}/opkg/alternatives
- rmdir --ignore-fail-on-non-empty $OPKG_OFFLINE_ROOT${nonarch_libdir}/opkg
+ rmdir $OPKG_OFFLINE_ROOT${nonarch_libdir}/opkg || true
}
BBCLASSEXTEND = "native nativesdk"
--
2.11.0
^ permalink raw reply related
* Re: [PATCH] gstreamer: Upgrade to 1.10.2
From: Khem Raj @ 2016-12-21 17:22 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <0e2947f3-9729-a463-3bb8-a11062749ac2@linux.intel.com>
On Wed, Dec 21, 2016 at 4:16 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> On 12/21/2016 09:02 AM, Khem Raj wrote:
>>
>> .../gstreamer/gstreamer1.0-omx_1.10.2.bb | 10 +++++++
>
>
> You should remove the file with previous version, so it becomes a file
> rename like the others.
Old version is still used by some users.
>
> Alex
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply
* Re: [wic][PATCH v2] wic: fix parsing of 'bitbake -e' output
From: Maciej Borzęcki @ 2016-12-21 17:16 UTC (permalink / raw)
To: Ed Bartosh; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1482332711-23829-1-git-send-email-ed.bartosh@linux.intel.com>
On Wed, Dec 21, 2016 at 4:05 PM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> Current parsing code can wrongly interpret arbitrary lines
> that are of 'key=value' format as legitimate bitbake variables.
>
> Implemented more strict parsing of key=value pairs using
> regular expressions.
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
> scripts/lib/wic/utils/oe/misc.py | 14 ++++++--------
> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
> index fe188c9..2a2fcc9 100644
> --- a/scripts/lib/wic/utils/oe/misc.py
> +++ b/scripts/lib/wic/utils/oe/misc.py
> @@ -27,6 +27,7 @@
> """Miscellaneous functions."""
>
> import os
> +import re
> from collections import defaultdict
> from distutils import spawn
>
> @@ -148,21 +149,18 @@ class BitbakeVars(defaultdict):
> self.default_image = None
> self.vars_dir = None
>
> - def _parse_line(self, line, image):
> + def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")):
> """
> Parse one line from bitbake -e output or from .env file.
> Put result key-value pair into the storage.
> """
> if "=" not in line:
> return
> - try:
> - key, val = line.split("=")
> - except ValueError:
> + match = matcher.match(line)
> + if not match:
> return
> - key = key.strip()
> - val = val.strip()
> - if key.replace('_', '').isalnum():
> - self[image][key] = val.strip('"')
> + key, val = match.groups()
> + self[image][key] = val.strip('"')
>
> def get_var(self, var, image=None):
> """
> --
> 2.1.4
>
Looks good to me.
Thanks for fixing this so quickly.
--
Maciej Borzecki
RnDity
^ permalink raw reply
* [PATCH 3/3] gummiboot: Remove gummiboot tests
From: Alejandro Hernandez @ 2016-12-21 17:08 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1482339995.git.alejandro.hernandez@linux.intel.com>
Since we replaced gummiboot with systemd-boot
along with its tests, the gummiboot tests are
no longer necessary.
[YOCTO #10332]
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
---
meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py | 83 ---------------------------
1 file changed, 83 deletions(-)
delete mode 100644 meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py
diff --git a/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py b/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py
deleted file mode 100644
index 00aa36f..0000000
--- a/meta-yocto-bsp/lib/oeqa/selftest/gummiboot.py
+++ /dev/null
@@ -1,83 +0,0 @@
-from oeqa.selftest.base import oeSelfTest
-from oeqa.utils.commands import runCmd, bitbake, get_bb_var, runqemu
-from oeqa.utils.decorators import testcase
-import re
-import os
-import sys
-import logging
-
-
-class Gummiboot(oeSelfTest):
-
- def _common_setup(self):
- """
- Common setup for test cases: 1101, 1103
- """
-
- # Set EFI_PROVIDER = "gummiboot" and MACHINE = "genericx86-64" in conf/local.conf
- features = 'EFI_PROVIDER = "gummiboot"\n'
- features += 'MACHINE = "genericx86-64"'
- self.append_config(features)
-
- def _common_build(self):
- """
- Common build for test cases: 1101, 1103
- """
-
- # Build a genericx86-64/efi gummiboot image
- bitbake('syslinux syslinux-native parted-native dosfstools-native mtools-native core-image-minimal')
-
-
- @testcase(1101)
- def test_efi_gummiboot_images_can_be_built(self):
- """
- Summary: Check if efi/gummiboot images can be built
- Expected: 1. File gummibootx64.efi should be available in build/tmp/deploy/images/genericx86-64
- 2. Efi/gummiboot images can be built
- Product: oe-core
- Author: Ionut Chisanovici <ionutx.chisanovici@intel.com>
- AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
- """
-
- # We'd use DEPLOY_DIR_IMAGE here, except that we need its value for
- # MACHINE="genericx86-64 which is probably not the one configured
- gummibootfile = os.path.join(get_bb_var('DEPLOY_DIR'), 'images', 'genericx86-64', 'gummibootx64.efi')
-
- self._common_setup()
-
- # Ensure we're actually testing that this gets built and not that
- # it was around from an earlier build
- bitbake('-c cleansstate gummiboot')
- runCmd('rm -f %s' % gummibootfile)
-
- self._common_build()
-
- found = os.path.isfile(gummibootfile)
- self.assertTrue(found, 'Gummiboot file %s not found' % gummibootfile)
-
- @testcase(1103)
- def test_wic_command_can_create_efi_gummiboot_installation_images(self):
- """
- Summary: Check that wic command can create efi/gummiboot installation images
- Expected: A .direct file in folder /var/tmp/wic/ must be created.
- Product: oe-core
- Author: Ionut Chisanovici <ionutx.chisanovici@intel.com>
- AutomatedBy: Daniel Istrate <daniel.alexandrux.istrate@intel.com>
- """
-
- self._common_setup()
- self._common_build()
-
- # Create efi/gummiboot installation images
- wic_create_cmd = 'wic create mkgummidisk -e core-image-minimal'
- result = runCmd(wic_create_cmd)
-
- # Find file written by wic from output
- res = re.search('(/var/tmp/wic/.*\.direct)', result.output)
- if res:
- direct_file = res.group(1)
- # Check it actually exists
- if not os.path.exists(direct_file):
- self.fail('wic reported direct file "%s" does not exist; wic output:\n%s' % (direct_file, result.output))
- else:
- self.fail('No .direct file reported in wic output:\n%s' % result.output)
--
2.10.1
^ permalink raw reply related
* [PATCH 2/3] gummiboot: Remove old gummiboot recipe, related class and wks file
From: Alejandro Hernandez @ 2016-12-21 17:08 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1482339995.git.alejandro.hernandez@linux.intel.com>
Since the gummiboot project is no longer being maintained
and we are using systemd-boot as a replacement instead,
we can now clean up all remaining gummiboot files.
[YOCTO #10332]
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
---
meta/classes/gummiboot.bbclass | 121 ---------------------
...-C-syntax-errors-for-function-declaration.patch | 74 -------------
.../gummiboot/gummiboot/fix-objcopy.patch | 45 --------
meta/recipes-bsp/gummiboot/gummiboot_git.bb | 39 -------
scripts/lib/wic/canned-wks/mkgummidisk.wks | 11 --
5 files changed, 290 deletions(-)
delete mode 100644 meta/classes/gummiboot.bbclass
delete mode 100644 meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch
delete mode 100644 meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
delete mode 100644 meta/recipes-bsp/gummiboot/gummiboot_git.bb
delete mode 100644 scripts/lib/wic/canned-wks/mkgummidisk.wks
diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass
deleted file mode 100644
index 4f2dea6..0000000
--- a/meta/classes/gummiboot.bbclass
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright (C) 2014 Intel Corporation
-#
-# Released under the MIT license (see COPYING.MIT)
-
-# gummiboot.bbclass - equivalent of grub-efi.bbclass
-# Set EFI_PROVIDER = "gummiboot" to use gummiboot on your live images instead of grub-efi
-# (images built by image-live.bbclass or image-vm.bbclass)
-
-do_bootimg[depends] += "${MLPREFIX}gummiboot:do_deploy"
-do_bootdirectdisk[depends] += "${MLPREFIX}gummiboot:do_deploy"
-
-EFIDIR = "/EFI/BOOT"
-
-GUMMIBOOT_CFG ?= "${S}/loader.conf"
-GUMMIBOOT_ENTRIES ?= ""
-GUMMIBOOT_TIMEOUT ?= "10"
-
-# Need UUID utility code.
-inherit fs-uuid
-
-efi_populate() {
- DEST=$1
-
- EFI_IMAGE="gummibootia32.efi"
- DEST_EFI_IMAGE="bootia32.efi"
- if [ "${TARGET_ARCH}" = "x86_64" ]; then
- EFI_IMAGE="gummibootx64.efi"
- DEST_EFI_IMAGE="bootx64.efi"
- fi
-
- install -d ${DEST}${EFIDIR}
- # gummiboot requires these paths for configuration files
- # they are not customizable so no point in new vars
- install -d ${DEST}/loader
- install -d ${DEST}/loader/entries
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_IMAGE} ${DEST}${EFIDIR}/${DEST_EFI_IMAGE}
- EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
- printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_EFI_IMAGE" >${DEST}/startup.nsh
- install -m 0644 ${GUMMIBOOT_CFG} ${DEST}/loader/loader.conf
- for i in ${GUMMIBOOT_ENTRIES}; do
- install -m 0644 ${i} ${DEST}/loader/entries
- done
-}
-
-efi_iso_populate() {
- iso_dir=$1
- efi_populate $iso_dir
- mkdir -p ${EFIIMGDIR}/${EFIDIR}
- cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
- cp $iso_dir/vmlinuz ${EFIIMGDIR}
- EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
- echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh
- if [ -f "$iso_dir/initrd" ] ; then
- cp $iso_dir/initrd ${EFIIMGDIR}
- fi
-}
-
-efi_hddimg_populate() {
- efi_populate $1
-}
-
-python build_efi_cfg() {
- s = d.getVar("S", True)
- labels = d.getVar('LABELS', True)
- if not labels:
- bb.debug(1, "LABELS not defined, nothing to do")
- return
-
- if labels == []:
- bb.debug(1, "No labels, nothing to do")
- return
-
- cfile = d.getVar('GUMMIBOOT_CFG', True)
- try:
- cfgfile = open(cfile, 'w')
- except OSError:
- bb.fatal('Unable to open %s' % cfile)
-
- cfgfile.write('# Automatically created by OE\n')
- cfgfile.write('default %s\n' % (labels.split()[0]))
- timeout = d.getVar('GUMMIBOOT_TIMEOUT', True)
- if timeout:
- cfgfile.write('timeout %s\n' % timeout)
- else:
- cfgfile.write('timeout 10\n')
- cfgfile.close()
-
- for label in labels.split():
- localdata = d.createCopy()
-
- overrides = localdata.getVar('OVERRIDES', True)
- if not overrides:
- bb.fatal('OVERRIDES not defined')
-
- entryfile = "%s/%s.conf" % (s, label)
- d.appendVar("GUMMIBOOT_ENTRIES", " " + entryfile)
- try:
- entrycfg = open(entryfile, "w")
- except OSError:
- bb.fatal('Unable to open %s' % entryfile)
- localdata.setVar('OVERRIDES', label + ':' + overrides)
- bb.data.update_data(localdata)
-
- entrycfg.write('title %s\n' % label)
- entrycfg.write('linux /vmlinuz\n')
-
- append = localdata.getVar('APPEND', True)
- initrd = localdata.getVar('INITRD', True)
-
- if initrd:
- entrycfg.write('initrd /initrd\n')
- lb = label
- if label == "install":
- lb = "install-efi"
- entrycfg.write('options LABEL=%s ' % lb)
- if append:
- append = replace_rootfs_uuid(d, append)
- entrycfg.write('%s' % append)
- entrycfg.write('\n')
- entrycfg.close()
-}
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch b/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch
deleted file mode 100644
index fa50bc4..0000000
--- a/meta/recipes-bsp/gummiboot/gummiboot/0001-console-Fix-C-syntax-errors-for-function-declaration.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 55957faf1272c8f5f304909faeebf647a78e3701 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 9 Sep 2015 07:19:45 +0000
-Subject: [PATCH] console: Fix C syntax errors for function declaration
-
-To address this, the semicolons after the function parameters should be
-replaced by commas, and the last one should be omitted
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/efi/console.c | 26 +++++++++++++-------------
- 1 file changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/efi/console.c b/src/efi/console.c
-index 6206c80..66aa88f 100644
---- a/src/efi/console.c
-+++ b/src/efi/console.c
-@@ -27,8 +27,8 @@
- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL;
-
- typedef EFI_STATUS (EFIAPI *EFI_INPUT_RESET_EX)(
-- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
-- BOOLEAN ExtendedVerification;
-+ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+ BOOLEAN ExtendedVerification
- );
-
- typedef UINT8 EFI_KEY_TOGGLE_STATE;
-@@ -44,29 +44,29 @@ typedef struct {
- } EFI_KEY_DATA;
-
- typedef EFI_STATUS (EFIAPI *EFI_INPUT_READ_KEY_EX)(
-- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
-- EFI_KEY_DATA *KeyData;
-+ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+ EFI_KEY_DATA *KeyData
- );
-
- typedef EFI_STATUS (EFIAPI *EFI_SET_STATE)(
-- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
-- EFI_KEY_TOGGLE_STATE *KeyToggleState;
-+ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+ EFI_KEY_TOGGLE_STATE *KeyToggleState
- );
-
- typedef EFI_STATUS (EFIAPI *EFI_KEY_NOTIFY_FUNCTION)(
-- EFI_KEY_DATA *KeyData;
-+ EFI_KEY_DATA *KeyData
- );
-
- typedef EFI_STATUS (EFIAPI *EFI_REGISTER_KEYSTROKE_NOTIFY)(
-- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
-- EFI_KEY_DATA KeyData;
-- EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction;
-- VOID **NotifyHandle;
-+ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+ EFI_KEY_DATA KeyData,
-+ EFI_KEY_NOTIFY_FUNCTION KeyNotificationFunction,
-+ VOID **NotifyHandle
- );
-
- typedef EFI_STATUS (EFIAPI *EFI_UNREGISTER_KEYSTROKE_NOTIFY)(
-- struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This;
-- VOID *NotificationHandle;
-+ struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *This,
-+ VOID *NotificationHandle
- );
-
- typedef struct _EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL {
---
-2.5.1
-
diff --git a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch b/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
deleted file mode 100644
index 49f5593..0000000
--- a/meta/recipes-bsp/gummiboot/gummiboot/fix-objcopy.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 0f7f9e3bb1d0e1b93f3ad8a1d5d7bdd3fbf27494 Mon Sep 17 00:00:00 2001
-From: Robert Yang <liezhi.yang@windriver.com>
-Date: Thu, 27 Mar 2014 07:20:33 +0000
-Subject: [PATCH] Makefile.am: use objcopy from the env
-
-It uses the "objcopy" directly, which is not suitable for cross compile.
-
-Upstream-Status: Pending
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
----
- Makefile.am | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am
-+++ git/Makefile.am
-@@ -19,6 +19,8 @@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- AM_MAKEFLAGS = --no-print-directory
-
-+OBJCOPY ?= objcopy
-+
- gummibootlibdir = $(prefix)/lib/gummiboot
-
- AM_CPPFLAGS = -include config.h
-@@ -148,7 +150,7 @@ $(gummiboot_solib): $(gummiboot_objects)
- .DELETE_ON_ERROR: $(gummboot_solib)
-
- $(gummiboot): $(gummiboot_solib)
-- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
-+ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
- -j .dynsym -j .rel -j .rela -j .reloc \
- --target=efi-app-$(ARCH) $< $@
-
-@@ -183,7 +185,7 @@ $(stub_solib): $(stub_objects)
- .DELETE_ON_ERROR: $(gummboot_solib)
-
- $(stub): $(stub_solib)
-- $(AM_V_GEN) objcopy -j .text -j .sdata -j .data -j .dynamic \
-+ $(AM_V_GEN) $(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
- -j .dynsym -j .rel -j .rela -j .reloc \
- --target=efi-app-$(ARCH) $< $@
-
diff --git a/meta/recipes-bsp/gummiboot/gummiboot_git.bb b/meta/recipes-bsp/gummiboot/gummiboot_git.bb
deleted file mode 100644
index c684b83..0000000
--- a/meta/recipes-bsp/gummiboot/gummiboot_git.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "Gummiboot is a simple UEFI boot manager which executes configured EFI images."
-HOMEPAGE = "http://freedesktop.org/wiki/Software/gummiboot"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
-
-DEPENDS = "gnu-efi util-linux"
-
-inherit autotools pkgconfig manpages
-inherit deploy
-
-PV = "48+git${SRCPV}"
-SRCREV = "2bcd919c681c952eb867ef1bdb458f1bc49c2d55"
-SRC_URI = "git://anongit.freedesktop.org/gummiboot \
- file://fix-objcopy.patch \
- file://0001-console-Fix-C-syntax-errors-for-function-declaration.patch \
- "
-
-PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native"
-
-# Note: Add COMPATIBLE_HOST here is only because it depends on gnu-efi
-# which has set the COMPATIBLE_HOST, the gummiboot itself may work on
-# more hosts.
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF = "--with-efi-includedir=${STAGING_INCDIR} \
- --with-efi-ldsdir=${STAGING_LIBDIR} \
- --with-efi-libdir=${STAGING_LIBDIR}"
-
-EXTRA_OEMAKE += "gummibootlibdir=${libdir}/gummiboot"
-
-TUNE_CCARGS_remove = "-mfpmath=sse"
-
-do_deploy () {
- install ${B}/gummiboot*.efi ${DEPLOYDIR}
-}
-addtask deploy before do_build after do_compile
diff --git a/scripts/lib/wic/canned-wks/mkgummidisk.wks b/scripts/lib/wic/canned-wks/mkgummidisk.wks
deleted file mode 100644
index f3ae090..0000000
--- a/scripts/lib/wic/canned-wks/mkgummidisk.wks
+++ /dev/null
@@ -1,11 +0,0 @@
-# short-description: Create an EFI disk image
-# long-description: Creates a partitioned EFI disk image that the user
-# can directly dd to boot media.
-
-part /boot --source bootimg-efi --sourceparams="loader=gummiboot" --ondisk sda --label msdos --active --align 1024
-
-part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
-
-part swap --ondisk sda --size 44 --label swap1 --fstype=swap
-
-bootloader --ptable gpt --timeout=5 --append="rootwait rootfstype=ext4 console=ttyS0,115200 console=tty0"
--
2.10.1
^ permalink raw reply related
* [PATCH 1/3] gummiboot: Remove/change gummiboot references with systemd-boot
From: Alejandro Hernandez @ 2016-12-21 17:08 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <cover.1482339995.git.alejandro.hernandez@linux.intel.com>
After systemd-boot was introduced, its been tested for a while with no major
issues being found until now, this patch completely replaces all gummiboot
instances with systemd-boot ones, taking the next step into cleaning
up systemd-boot/gummiboot.
[YOCTO #10332]
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
---
meta/classes/fs-uuid.bbclass | 2 +-
meta/classes/systemd-boot.bbclass | 4 +---
meta/conf/distro/include/distro_alias.inc | 2 +-
meta/lib/oeqa/controllers/masterimage.py | 4 ++--
meta/recipes-bsp/systemd-boot/systemd-boot_232.bb | 2 +-
.../initrdscripts/files/init-install-efi-testfs.sh | 12 +++++-----
.../initrdscripts/files/init-install-efi.sh | 12 +++++-----
scripts/contrib/mkefidisk.sh | 26 +++++++++++-----------
scripts/lib/wic/plugins/source/bootimg-efi.py | 22 +++++++++---------
9 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/meta/classes/fs-uuid.bbclass b/meta/classes/fs-uuid.bbclass
index 313c5a3..9b53dfb 100644
--- a/meta/classes/fs-uuid.bbclass
+++ b/meta/classes/fs-uuid.bbclass
@@ -13,7 +13,7 @@ def get_rootfs_uuid(d):
bb.fatal('Could not determine filesystem UUID of %s' % rootfs)
# Replace the special <<uuid-of-rootfs>> inside a string (like the
-# root= APPEND string in a syslinux.cfg or gummiboot entry) with the
+# root= APPEND string in a syslinux.cfg or systemd-boot entry) with the
# actual UUID of the rootfs. Does nothing if the special string
# is not used.
def replace_rootfs_uuid(d, string):
diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass
index 60729a7..6718783 100644
--- a/meta/classes/systemd-boot.bbclass
+++ b/meta/classes/systemd-boot.bbclass
@@ -4,9 +4,7 @@
# systemd-boot.bbclass - The "systemd-boot" is essentially the gummiboot merged into systemd.
# The original standalone gummiboot project is dead without any more
-# maintenance. As a start point, we replace all gummitboot occurrences
-# with systemd-boot in gummiboot.bbclass to have a base version of this
-# systemd-boot.bbclass.
+# maintenance.
#
# Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live images instead of grub-efi
# (images built by image-live.bbclass or image-vm.bbclass)
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index a59265a..489f5ea 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -135,7 +135,7 @@ DISTRO_PN_ALIAS_pn-gtk-doc = "Fedora=gtk-doc Ubuntu=gtk-doc"
DISTRO_PN_ALIAS_pn-gtk-engines = "Fedora=gtk2-engines OpenSuSE=gtk2-engines Ubuntu=gtk2-engines Mandriva=gtk-engines2 Debian=gtk2-engines"
DISTRO_PN_ALIAS_pn-gtk-sato-engine = "OpenedHand"
DISTRO_PN_ALIAS_pn-gtk-icon-utils-native = "OSPDT"
-DISTRO_PN_ALIAS_pn-gummiboot = "Debian=gummiboot Fedora=gummiboot"
+DISTRO_PN_ALIAS_pn-systemd-boot = "Ubuntu=systemd-boot Fedora=systemd-boot"
DISTRO_PN_ALIAS_pn-hello-mod = "OE-Core"
DISTRO_PN_ALIAS_pn-hostap-conf = "OE-Core"
DISTRO_PN_ALIAS_pn-hwlatdetect = "OSPDT"
diff --git a/meta/lib/oeqa/controllers/masterimage.py b/meta/lib/oeqa/controllers/masterimage.py
index d796fc3..07418fc 100644
--- a/meta/lib/oeqa/controllers/masterimage.py
+++ b/meta/lib/oeqa/controllers/masterimage.py
@@ -159,10 +159,10 @@ class MasterImageHardwareTarget(oeqa.targetcontrol.BaseTarget, metaclass=ABCMeta
self.power_cycle(self.connection)
-class GummibootTarget(MasterImageHardwareTarget):
+class SystemdbootTarget(MasterImageHardwareTarget):
def __init__(self, d):
- super(GummibootTarget, self).__init__(d)
+ super(SystemdbootTarget, self).__init__(d)
# this the value we need to set in the LoaderEntryOneShot EFI variable
# so the system boots the 'test' bootloader label and not the default
# The first four bytes are EFI bits, and the rest is an utf-16le string
diff --git a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb b/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
index 7036664..602052c 100644
--- a/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
+++ b/meta/recipes-bsp/systemd-boot/systemd-boot_232.bb
@@ -15,7 +15,7 @@ EXTRA_OECONF = " --enable-gnuefi \
--disable-manpages \
"
-# Imported from gummiboot recipe
+# Imported from the old gummiboot recipe
TUNE_CCARGS_remove = "-mfpmath=sse"
COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
index b562109..9c4b263 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi-testfs.sh
@@ -171,19 +171,19 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then
fi
if [ -d /run/media/$1/loader ]; then
- GUMMIBOOT_CFGS="/ssd/loader/entries/*.conf"
- # copy config files for gummiboot
+ SYSTEMDBOOT_CFGS="/ssd/loader/entries/*.conf"
+ # copy config files for systemd-boot
cp -dr /run/media/$1/loader /ssd
# delete the install entry
rm -f /ssd/loader/entries/install.conf
# delete the initrd lines
- sed -i "/initrd /d" $GUMMIBOOT_CFGS
+ sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
# delete any LABEL= strings
- sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS
+ sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
# delete any root= strings
- sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS
+ sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
# add the root= and other standard boot options
- sed -i "s@options *@options root=$rootfs rw $rootwait quiet @" $GUMMIBOOT_CFGS
+ sed -i "s@options *@options root=$rootfs rw $rootwait quiet @" $SYSTEMDBOOT_CFGS
# Add the test label
echo -ne "title test\nlinux /test-kernel\noptions root=$testfs rw $rootwait quiet\n" > /ssd/loader/entries/test.conf
fi
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index ffb709c..5ad3a60 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -245,19 +245,19 @@ fi
if [ -d /run/media/$1/loader ]; then
rootuuid=$(blkid -o value -s PARTUUID ${rootfs})
- GUMMIBOOT_CFGS="/boot/loader/entries/*.conf"
- # copy config files for gummiboot
+ SYSTEMDBOOT_CFGS="/boot/loader/entries/*.conf"
+ # copy config files for systemd-boot
cp -dr /run/media/$1/loader /boot
# delete the install entry
rm -f /boot/loader/entries/install.conf
# delete the initrd lines
- sed -i "/initrd /d" $GUMMIBOOT_CFGS
+ sed -i "/initrd /d" $SYSTEMDBOOT_CFGS
# delete any LABEL= strings
- sed -i "s/ LABEL=[^ ]*/ /" $GUMMIBOOT_CFGS
+ sed -i "s/ LABEL=[^ ]*/ /" $SYSTEMDBOOT_CFGS
# delete any root= strings
- sed -i "s/ root=[^ ]*/ /" $GUMMIBOOT_CFGS
+ sed -i "s/ root=[^ ]*/ /" $SYSTEMDBOOT_CFGS
# add the root= and other standard boot options
- sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $GUMMIBOOT_CFGS
+ sed -i "s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @" $SYSTEMDBOOT_CFGS
fi
umount /tgt_root
diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh
index a175895..800733f 100755
--- a/scripts/contrib/mkefidisk.sh
+++ b/scripts/contrib/mkefidisk.sh
@@ -384,7 +384,7 @@ EFIDIR="$BOOTFS_MNT/EFI/BOOT"
cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy vmlinuz"
# Copy the efi loader and configs (booti*.efi and grub.cfg if it exists)
cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT >$OUT 2>&1 || error "Failed to copy EFI dir"
-# Silently ignore a missing gummiboot loader dir (we might just be a GRUB image)
+# Silently ignore a missing systemd-boot loader dir (we might just be a GRUB image)
cp -r $HDDIMG_MNT/loader $BOOTFS_MNT >$OUT 2>&1
# Update the boot loaders configurations for an installed image
@@ -410,25 +410,25 @@ if [ -e "$GRUB_CFG" ]; then
sed -i "s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GRUB_CFG
fi
-# Look for a gummiboot installation
-GUMMI_ENTRIES="$BOOTFS_MNT/loader/entries"
-GUMMI_CFG="$GUMMI_ENTRIES/boot.conf"
-if [ -d "$GUMMI_ENTRIES" ]; then
- info "Configuring Gummiboot"
+# Look for a systemd-boot installation
+SYSTEMD_BOOT_ENTRIES="$BOOTFS_MNT/loader/entries"
+SYSTEMD_BOOT_CFG="$SYSTEMD_BOOT_ENTRIES/boot.conf"
+if [ -d "$SYSTEMD_BOOT_ENTRIES" ]; then
+ info "Configuring SystemD-boot"
# remove the install target if it exists
- rm $GUMMI_ENTRIES/install.conf >$OUT 2>&1
+ rm $SYSTEMD_BOOT_ENTRIES/install.conf >$OUT 2>&1
- if [ ! -e "$GUMMI_CFG" ]; then
- echo "ERROR: $GUMMI_CFG not found"
+ if [ ! -e "$SYSTEMD_BOOT_CFG" ]; then
+ echo "ERROR: $SYSTEMD_BOOT_CFG not found"
fi
- sed -i "/initrd /d" $GUMMI_CFG
- sed -i "s@ root=[^ ]*@ @" $GUMMI_CFG
- sed -i "s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $GUMMI_CFG
+ sed -i "/initrd /d" $SYSTEMD_BOOT_CFG
+ sed -i "s@ root=[^ ]*@ @" $SYSTEMD_BOOT_CFG
+ sed -i "s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait console=ttyS0 console=tty0 @" $SYSTEMD_BOOT_CFG
fi
# Ensure we have at least one EFI bootloader configured
-if [ ! -e $GRUB_CFG ] && [ ! -e $GUMMI_CFG ]; then
+if [ ! -e $GRUB_CFG ] && [ ! -e $SYSTEMD_BOOT_CFG ]; then
die "No EFI bootloader configuration found"
fi
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 4adb80b..305e910 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -36,7 +36,7 @@ from wic.utils.oe.misc import exec_cmd, exec_native_cmd, get_bitbake_var, \
class BootimgEFIPlugin(SourcePlugin):
"""
Create EFI boot partition.
- This plugin supports GRUB 2 and gummiboot bootloaders.
+ This plugin supports GRUB 2 and systemd-boot bootloaders.
"""
name = 'bootimg-efi'
@@ -82,7 +82,7 @@ class BootimgEFIPlugin(SourcePlugin):
cfg.close()
@classmethod
- def do_configure_gummiboot(cls, hdddir, creator, cr_workdir):
+ def do_configure_systemdboot(cls, hdddir, creator, cr_workdir):
"""
Create loader-specific systemd-boot/gummiboot config
"""
@@ -98,7 +98,7 @@ class BootimgEFIPlugin(SourcePlugin):
loader_conf += "default boot\n"
loader_conf += "timeout %d\n" % bootloader.timeout
- msger.debug("Writing gummiboot config %s/hdd/boot/loader/loader.conf" \
+ msger.debug("Writing systemd-boot config %s/hdd/boot/loader/loader.conf" \
% cr_workdir)
cfg = open("%s/hdd/boot/loader/loader.conf" % cr_workdir, "w")
cfg.write(loader_conf)
@@ -109,16 +109,16 @@ class BootimgEFIPlugin(SourcePlugin):
if configfile:
custom_cfg = get_custom_config(configfile)
if custom_cfg:
- # Use a custom configuration for gummiboot
+ # Use a custom configuration for systemd-boot
boot_conf = custom_cfg
msger.debug("Using custom configuration file "
- "%s for gummiboots's boot.conf" % configfile)
+ "%s for systemd-boots's boot.conf" % configfile)
else:
msger.error("configfile is specified but failed to "
"get it from %s." % configfile)
if not custom_cfg:
- # Create gummiboot configuration using parameters from wks file
+ # Create systemd-boot configuration using parameters from wks file
kernel = "/bzImage"
boot_conf = ""
@@ -127,7 +127,7 @@ class BootimgEFIPlugin(SourcePlugin):
boot_conf += "options LABEL=Boot root=%s %s\n" % \
(creator.rootdev, bootloader.append)
- msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \
+ msger.debug("Writing systemd-boot config %s/hdd/boot/loader/entries/boot.conf" \
% cr_workdir)
cfg = open("%s/hdd/boot/loader/entries/boot.conf" % cr_workdir, "w")
cfg.write(boot_conf)
@@ -149,9 +149,8 @@ class BootimgEFIPlugin(SourcePlugin):
try:
if source_params['loader'] == 'grub-efi':
cls.do_configure_grubefi(hdddir, creator, cr_workdir)
- elif source_params['loader'] == 'gummiboot' \
- or source_params['loader'] == 'systemd-boot':
- cls.do_configure_gummiboot(hdddir, creator, cr_workdir)
+ elif source_params['loader'] == 'systemd-boot':
+ cls.do_configure_systemdboot(hdddir, creator, cr_workdir)
else:
msger.error("unrecognized bootimg-efi loader: %s" % source_params['loader'])
except KeyError:
@@ -190,8 +189,7 @@ class BootimgEFIPlugin(SourcePlugin):
exec_cmd(cp_cmd, True)
shutil.move("%s/grub.cfg" % cr_workdir,
"%s/hdd/boot/EFI/BOOT/grub.cfg" % cr_workdir)
- elif source_params['loader'] == 'gummiboot' \
- or source_params['loader'] == 'systemd-boot':
+ elif source_params['loader'] == 'systemd-boot':
cp_cmd = "cp %s/EFI/BOOT/* %s/EFI/BOOT" % (bootimg_dir, hdddir)
exec_cmd(cp_cmd, True)
else:
--
2.10.1
^ permalink raw reply related
* [PATCH 1/4] uninative: Parameterise the use of STAGING_DIR
From: Richard Purdie @ 2016-12-21 17:05 UTC (permalink / raw)
To: openembedded-core
This means that a user can change TMPDIR in a multiconfig situation
and still only have one path to the uninative setup. Without this change
its not possile to make such a setup work.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/uninative.bbclass | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 177af73..03ad5d6 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -1,4 +1,5 @@
-UNINATIVE_LOADER ?= "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}"
+UNINATIVE_LOADER ?= "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/lib/${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'ld-linux-x86-64.so.2', 'ld-linux.so.2', d)}"
+UNINATIVE_STAGING_DIR ?= "${STAGING_DIR}"
UNINATIVE_URL ?= "unset"
UNINATIVE_TARBALL ?= "${BUILD_ARCH}-nativesdk-libc.tar.bz2"
@@ -58,7 +59,7 @@ python uninative_event_fetchloader() {
if localpath != tarballpath and os.path.exists(localpath) and not os.path.exists(tarballpath):
os.symlink(localpath, tarballpath)
- cmd = d.expand("mkdir -p ${STAGING_DIR}-uninative; cd ${STAGING_DIR}-uninative; tar -xjf ${UNINATIVE_DLDIR}/%s/${UNINATIVE_TARBALL}; ${STAGING_DIR}-uninative/relocate_sdk.py ${STAGING_DIR}-uninative/${BUILD_ARCH}-linux ${UNINATIVE_LOADER} ${UNINATIVE_LOADER} ${STAGING_DIR}-uninative/${BUILD_ARCH}-linux/${bindir_native}/patchelf-uninative ${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${base_libdir_native}/libc*.so" % chksum)
+ cmd = d.expand("mkdir -p ${UNINATIVE_STAGING_DIR}-uninative; cd ${UNINATIVE_STAGING_DIR}-uninative; tar -xjf ${UNINATIVE_DLDIR}/%s/${UNINATIVE_TARBALL}; ${UNINATIVE_STAGING_DIR}-uninative/relocate_sdk.py ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux ${UNINATIVE_LOADER} ${UNINATIVE_LOADER} ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux/${bindir_native}/patchelf-uninative ${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux${base_libdir_native}/libc*.so" % chksum)
subprocess.check_call(cmd, shell=True)
with open(loaderchksum, "w") as f:
@@ -90,7 +91,7 @@ def enable_uninative(d):
bb.debug(2, "Enabling uninative")
d.setVar("NATIVELSBSTRING", "universal%s" % oe.utils.host_gcc_version(d))
d.appendVar("SSTATEPOSTUNPACKFUNCS", " uninative_changeinterp")
- d.prependVar("PATH", "${STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
+ d.prependVar("PATH", "${UNINATIVE_STAGING_DIR}-uninative/${BUILD_ARCH}-linux${bindir_native}:")
python uninative_changeinterp () {
import subprocess
--
2.7.4
^ permalink raw reply related
* [PATCH 3/4] libgcc-common: Don't apply symlinks for nativesdk
From: Richard Purdie @ 2016-12-21 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482339945-26418-1-git-send-email-richard.purdie@linuxfoundation.org>
nativesdk-libgcc doesn't need a symlink into the target space and if we do this
sstate installation of the recipe can fail depending on whether it races with
the cross-canadian toolchains.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-devtools/gcc/libgcc-common.inc | 3 +++
1 file changed, 3 insertions(+)
diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc
index 74e9faa..7a3b410 100644
--- a/meta/recipes-devtools/gcc/libgcc-common.inc
+++ b/meta/recipes-devtools/gcc/libgcc-common.inc
@@ -144,6 +144,9 @@ BASETARGET_SYS = "${@get_original_os(d)}"
addtask extra_symlinks after do_multilib_install before do_package do_populate_sysroot
fakeroot python do_extra_symlinks() {
+ if bb.data.inherits_class('nativesdk', d):
+ return
+
targetsys = d.getVar('BASETARGET_SYS')
if targetsys != d.getVar('TARGET_SYS'):
--
2.7.4
^ permalink raw reply related
* [PATCH 4/4] lib/oe/utils: Drop python2 compatibility code
From: Richard Purdie @ 2016-12-21 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482339945-26418-1-git-send-email-richard.purdie@linuxfoundation.org>
We've moved to python3, we don't need this compatibility code which just makes
the code less readable.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/lib/oe/utils.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index bf440ec..3de21fc 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -1,9 +1,4 @@
-try:
- # Python 2
- import commands as cmdstatus
-except ImportError:
- # Python 3
- import subprocess as cmdstatus
+import subprocess
def read_file(filename):
try:
@@ -144,7 +139,7 @@ def packages_filter_out_system(d):
return pkgs
def getstatusoutput(cmd):
- return cmdstatus.getstatusoutput(cmd)
+ return subprocess.getstatusoutput(cmd)
def trim_version(version, num_parts=2):
--
2.7.4
^ permalink raw reply related
* [PATCH 2/4] bitbake.conf: Add inclusion of BB_CURRENT_MC.conf after local.conf
From: Richard Purdie @ 2016-12-21 17:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482339945-26418-1-git-send-email-richard.purdie@linuxfoundation.org>
People are strugling with multiconfig as the up front inclusion of the
configuration file doesn't do what people expect. The only way to meet
user expectations is to include the file immediately after local.conf.
We add BB_CURRENT_MC to bitbake so that the metadata can determine when
to include the extra configuration.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/conf/bitbake.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index aee9919..7b0ae65 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -701,6 +701,7 @@ require conf/abi_version.conf
include conf/site.conf
include conf/auto.conf
include conf/local.conf
+include conf/multiconfig/${BB_CURRENT_MC}.conf
include conf/build/${BUILD_SYS}.conf
include conf/target/${TARGET_SYS}.conf
include conf/machine/${MACHINE}.conf
--
2.7.4
^ permalink raw reply related
* [PATCH] populate_sdk: don't force target debug packages into SDK
From: Ross Burton @ 2016-12-21 16:58 UTC (permalink / raw)
To: openembedded-core
TOOLCHAIN_TARGET_TASK doesn't need to explicitly list sdk-target-dbg because if
SDKIMAGE_FEATURES contains dbg-pkgs (as it does by default) then they'll all be
installed anyway. This means that if the user removes dbg-pkgs from
SDKIMAGE_FEATURES then the SDK correctly doesn't have debug packages in.
[ YOCTO #9078 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/classes/populate_sdk_base.bbclass | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 48bc395..8d117a9 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -34,10 +34,7 @@ SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${REAL_MULTIMACH_TARGET_SYS}"
TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${MACHINE}"
TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
-TOOLCHAIN_TARGET_TASK ?= " \
- ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')} \
- ${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target-dbg')} \
- "
+TOOLCHAIN_TARGET_TASK ?= "${@multilib_pkg_extend(d, 'packagegroup-core-standalone-sdk-target')}"
TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${SDK_VERSION}"
--
2.8.1
^ permalink raw reply related
* [PATCH 00/26] Consolidated pull
From: Ross Burton @ 2016-12-21 16:19 UTC (permalink / raw)
To: openembedded-core
A selection of patches from the list, some wic/selftest improvements, and most
importantly the ncurses fix for util-linux-native!
Ross
The following changes since commit 8ccf396c7284acd7e0fdf95473d317d23d05475f:
Revert "selftest/wic: extending test coverage for WIC script options" (2016-12-20 17:06:38 +0000)
are available in the git repository at:
ssh://git@git.yoctoproject.org/poky-contrib ross/mut
for you to fetch changes up to 2df1397b1894cd7cd67a33dde96e60fcc72c78f5:
ncurses.inc: add v6 binconfig-disabled entries (2016-12-20 18:16:19 +0000)
----------------------------------------------------------------
Alejandro Hernandez (1):
example-recipe: Fix LDFLAGS compilation issue on newly created recipes
Andre McCurdy (1):
glew: build for EGL in non-X11 distros
André Draszik (1):
initscripts: populate-volatile: suppress read-only-rootfs warnings
David Vincent (1):
kernel: Fix symlinks
Dengke Du (2):
Revert "subversion: fix "svnadmin create" fail on x86"
apr: fix off_t size can't match when configure and in target glibc
Ed Bartosh (2):
wic: look for wks files in <layer>/wic
wic: add kickstart file for MPC8315
Edwin Plauchu (1):
ruby: upgrade to 2.3.3
Jair Gonzalez (4):
selftest/wic: adding Testopia ID numbers to test cases missing it
selftest/wic: code cleanup
selftest/wic: reorganizing test methods by functionality
selftest/wic: extending test coverage for WIC script options
Khem Raj (4):
systemd: point to correct resolv.conf when resolved is enabled
x264: Fix build on mips architectures
gnutls: Do not use libunistring prefix
gstreamer1.0-libav: Fix build on mips64
Maciej Borzecki (2):
oeqa/utils/commands.py: allow use of binaries from native sysroot
wic: add --fixed-size wks option
Mans Rullgard (1):
initscripts: populate-volatile: don't run commands in background
Paul Eggleton (2):
devtool: modify: fix usage on the kernel
packagegroup-core-standalone-sdk-target: add libssp
Trevor Woerner (1):
ncurses.inc: add v6 binconfig-disabled entries
Zheng Ruoqin (1):
shared-mime-info 1.6 -> 1.8
Zubair Lutfullah Kakakhel (2):
openssl: Add support for many MIPS configurations
arch-mips: Add MIPS 64r6 N32 tune
meta/classes/binconfig-disabled.bbclass | 1 +
meta/classes/insane.bbclass | 2 +
meta/classes/kernel.bbclass | 6 +-
meta/classes/siteinfo.bbclass | 2 +
meta/conf/machine/include/tune-mips64r6.inc | 26 ++
meta/lib/oeqa/selftest/wic.py | 370 +++++++++++++--------
meta/lib/oeqa/utils/commands.py | 9 +-
meta/recipes-connectivity/openssl/openssl.inc | 24 +-
.../initscripts-1.0/populate-volatile.sh | 8 +-
meta/recipes-core/ncurses/ncurses.inc | 5 +-
.../packagegroup-core-standalone-sdk-target.bb | 5 +
meta/recipes-core/systemd/systemd_232.bb | 11 +-
.../ruby/{ruby_2.3.1.bb => ruby_2.3.3.bb} | 4 +-
.../0001-fix-svnadmin-create-fail-on-x86.patch | 56 ----
.../subversion/subversion_1.9.5.bb | 1 -
meta/recipes-graphics/glew/glew_2.0.0.bb | 19 +-
meta/recipes-kernel/linux/linux-dtb.inc | 4 +-
.../gstreamer1.0-libav/mips64_cpu_detection.patch | 32 ++
.../gstreamer/gstreamer1.0-libav_1.10.1.bb | 1 +
meta/recipes-multimedia/x264/x264_git.bb | 1 +
..._t-size-doesn-t-match-in-glibc-when-cross.patch | 76 +++++
meta/recipes-support/apr/apr_1.5.2.bb | 1 +
meta/recipes-support/gnutls/gnutls.inc | 1 +
.../shared-mime-info/shared-mime-info_1.6.bb | 7 -
.../shared-mime-info/shared-mime-info_1.8.bb | 7 +
.../recipes-example/example/example-recipe-0.1.bb | 2 +-
scripts/lib/devtool/standard.py | 2 +
scripts/lib/wic/canned-wks/mpc8315e-rdb.wks | 6 +
scripts/lib/wic/engine.py | 7 +-
scripts/lib/wic/help.py | 14 +-
scripts/lib/wic/imager/direct.py | 2 +-
scripts/lib/wic/ksparser.py | 41 ++-
scripts/lib/wic/partition.py | 88 +++--
scripts/lib/wic/utils/partitionedfs.py | 2 +-
34 files changed, 567 insertions(+), 276 deletions(-)
rename meta/recipes-devtools/ruby/{ruby_2.3.1.bb => ruby_2.3.3.bb} (89%)
delete mode 100644 meta/recipes-devtools/subversion/subversion/0001-fix-svnadmin-create-fail-on-x86.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
create mode 100644 meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
delete mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_1.6.bb
create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info_1.8.bb
create mode 100644 scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
Alejandro Hernandez (1):
example-recipe: Fix LDFLAGS compilation issue on newly created recipes
Andre McCurdy (1):
glew: build for EGL in non-X11 distros
André Draszik (1):
initscripts: populate-volatile: suppress read-only-rootfs warnings
David Vincent (1):
kernel: Fix symlinks
Dengke Du (2):
Revert "subversion: fix "svnadmin create" fail on x86"
apr: fix off_t size can't match when configure and in target glibc
Ed Bartosh (2):
wic: look for wks files in <layer>/wic
wic: add kickstart file for MPC8315
Edwin Plauchu (1):
ruby: upgrade to 2.3.3
Jair Gonzalez (4):
selftest/wic: adding Testopia ID numbers to test cases missing it
selftest/wic: code cleanup
selftest/wic: reorganizing test methods by functionality
selftest/wic: extending test coverage for WIC script options
Khem Raj (4):
systemd: point to correct resolv.conf when resolved is enabled
x264: Fix build on mips architectures
gnutls: Do not use libunistring prefix
gstreamer1.0-libav: Fix build on mips64
Maciej Borzecki (2):
oeqa/utils/commands.py: allow use of binaries from native sysroot
wic: add --fixed-size wks option
Mans Rullgard (1):
initscripts: populate-volatile: don't run commands in background
Paul Eggleton (2):
devtool: modify: fix usage on the kernel
packagegroup-core-standalone-sdk-target: add libssp
Trevor Woerner (1):
ncurses.inc: add v6 binconfig-disabled entries
Zheng Ruoqin (1):
shared-mime-info 1.6 -> 1.8
Zubair Lutfullah Kakakhel (2):
openssl: Add support for many MIPS configurations
arch-mips: Add MIPS 64r6 N32 tune
meta/classes/binconfig-disabled.bbclass | 1 +
meta/classes/insane.bbclass | 2 +
meta/classes/kernel.bbclass | 6 +-
meta/classes/siteinfo.bbclass | 2 +
meta/conf/machine/include/tune-mips64r6.inc | 26 ++
meta/lib/oeqa/selftest/wic.py | 370 +++++++++++++--------
meta/lib/oeqa/utils/commands.py | 9 +-
meta/recipes-connectivity/openssl/openssl.inc | 24 +-
.../initscripts-1.0/populate-volatile.sh | 8 +-
meta/recipes-core/ncurses/ncurses.inc | 5 +-
.../packagegroup-core-standalone-sdk-target.bb | 5 +
meta/recipes-core/systemd/systemd_232.bb | 11 +-
.../ruby/{ruby_2.3.1.bb => ruby_2.3.3.bb} | 4 +-
.../0001-fix-svnadmin-create-fail-on-x86.patch | 56 ----
.../subversion/subversion_1.9.5.bb | 1 -
meta/recipes-graphics/glew/glew_2.0.0.bb | 19 +-
meta/recipes-kernel/linux/linux-dtb.inc | 4 +-
.../gstreamer1.0-libav/mips64_cpu_detection.patch | 32 ++
.../gstreamer/gstreamer1.0-libav_1.10.1.bb | 1 +
meta/recipes-multimedia/x264/x264_git.bb | 1 +
..._t-size-doesn-t-match-in-glibc-when-cross.patch | 76 +++++
meta/recipes-support/apr/apr_1.5.2.bb | 1 +
meta/recipes-support/gnutls/gnutls.inc | 1 +
...ed-mime-info_1.6.bb => shared-mime-info_1.8.bb} | 4 +-
.../recipes-example/example/example-recipe-0.1.bb | 2 +-
scripts/lib/devtool/standard.py | 2 +
scripts/lib/wic/canned-wks/mpc8315e-rdb.wks | 6 +
scripts/lib/wic/engine.py | 7 +-
scripts/lib/wic/help.py | 14 +-
scripts/lib/wic/imager/direct.py | 2 +-
scripts/lib/wic/ksparser.py | 41 ++-
scripts/lib/wic/partition.py | 88 +++--
scripts/lib/wic/utils/partitionedfs.py | 2 +-
33 files changed, 562 insertions(+), 271 deletions(-)
rename meta/recipes-devtools/ruby/{ruby_2.3.1.bb => ruby_2.3.3.bb} (89%)
delete mode 100644 meta/recipes-devtools/subversion/subversion/0001-fix-svnadmin-create-fail-on-x86.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/mips64_cpu_detection.patch
create mode 100644 meta/recipes-support/apr/apr/0001-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
rename meta/recipes-support/shared-mime-info/{shared-mime-info_1.6.bb => shared-mime-info_1.8.bb} (43%)
create mode 100644 scripts/lib/wic/canned-wks/mpc8315e-rdb.wks
--
2.8.1
^ permalink raw reply
* Re: [PATCH 2/9] iasl: move from meta-luv to OE-core
From: Patrick Ohly @ 2016-12-21 15:38 UTC (permalink / raw)
To: Fathi Boudra; +Cc: meta-luv, Neri, Ricardo, openembedded-core
In-Reply-To: <CAGNsrLBx=+yvgDAsaqz8mYm30WG0TVEV3eR2PNMj+VHK4ceSOw@mail.gmail.com>
On Wed, 2016-12-21 at 16:11 +0200, Fathi Boudra wrote:
> On 21 December 2016 at 15:11, Patrick Ohly <patrick.ohly@intel.com> wrote:
> > iasl is also provided by the meta-oe layer's acpica recipe. iasl is a
> > bit simpler and thus seems more suitable for OE-core.
>
> Simpler in what sense?
Less code to compile, which might matter for people who just want a
working UEFI for qemu and nothing else. I haven't measured the
difference, though.
> acpica recipe is trivial and provide fully acpica tools.
> Would you mind to import meta-oe acpica recipe instead of providing a
> reduced set of acpica for not much benefit?
I don't have a strong opinion about this and would be fine with moving
acpica to OE-core instead, too.
--
Best Regards, Patrick Ohly
The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.
^ permalink raw reply
* [PATCH 2/3] sqlite3: upgrade to 3.15.2
From: Maxin B. John @ 2016-12-21 15:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482333628-15689-1-git-send-email-maxin.john@intel.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
meta/recipes-support/sqlite/{sqlite3_3.15.1.bb => sqlite3_3.15.2.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/sqlite/{sqlite3_3.15.1.bb => sqlite3_3.15.2.bb} (66%)
diff --git a/meta/recipes-support/sqlite/sqlite3_3.15.1.bb b/meta/recipes-support/sqlite/sqlite3_3.15.2.bb
similarity index 66%
rename from meta/recipes-support/sqlite/sqlite3_3.15.1.bb
rename to meta/recipes-support/sqlite/sqlite3_3.15.2.bb
index c315a53..20bc515 100644
--- a/meta/recipes-support/sqlite/sqlite3_3.15.1.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.15.2.bb
@@ -8,5 +8,5 @@ SRC_URI = "\
file://0001-revert-ad601c7962-that-brings-2-increase-of-build-ti.patch \
"
-SRC_URI[md5sum] = "0259d52be88f085d104c6d2aaa8349ac"
-SRC_URI[sha256sum] = "5dfa89b7697ee3c2ac7b44e8e157e7f204bf999c866afcaa8bb1c7ff656ae2c5"
+SRC_URI[md5sum] = "6b4fc0d8f7f02dd56bbde10a7c497a05"
+SRC_URI[sha256sum] = "07b35063b9386865b78226cdaca9a299d938a87aaa8fdc4d73edb0cef30f3149"
--
2.4.0
^ permalink raw reply related
* [PATCH 3/3] ifupdown: upgrade to 0.8.16
From: Maxin B. John @ 2016-12-21 15:20 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <1482333628-15689-1-git-send-email-maxin.john@intel.com>
Refreshed the following patch:
* inet-6-.defn-fix-inverted-checks-for-loopback.patch
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
...-6-.defn-fix-inverted-checks-for-loopback.patch | 395 +++++++++++++++++++--
.../{ifupdown_0.8.2.bb => ifupdown_0.8.16.bb} | 4 +-
2 files changed, 359 insertions(+), 40 deletions(-)
rename meta/recipes-core/ifupdown/{ifupdown_0.8.2.bb => ifupdown_0.8.16.bb} (95%)
diff --git a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch b/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
index bff352e..2013933 100644
--- a/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
+++ b/meta/recipes-core/ifupdown/files/inet-6-.defn-fix-inverted-checks-for-loopback.patch
@@ -1,7 +1,7 @@
-From 74152ac74a3e1ea0f3be292aa1eeca5ad1fe69c0 Mon Sep 17 00:00:00 2001
-From: Paul Gortmaker <paul.gortmaker@windriver.com>
-Date: Wed, 6 Aug 2014 15:12:11 -0400
-Subject: [PATCH 2/2] inet[6].defn: fix inverted checks for loopback
+From d88af5aa0312ea18aac791d66661da79b7bcd032 Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.john@intel.com>
+Date: Wed, 21 Dec 2016 15:32:07 +0200
+Subject: [PATCH] inet[6].defn: fix inverted checks for loopback
Compared to the hurd link.defn for loopback, we see these
are inverted, meaning that you would only be able to configure
@@ -11,60 +11,335 @@ The result was that we'd update /run/network/ifstate for "lo"
but never actually do anything for up/down, as shown below:
root@localhost:~# ifconfig -s
-Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
-eth0 1500 0 7736329 0 2016 0 5289422 0 0 0 BMRU
-lo 65536 0 18 0 0 0 18 0 0 0 LRU
+Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
+eth0 1500 0 7736329 0 2016 0 5289422 0 0 0 BMRU
+lo 65536 0 18 0 0 0 18 0 0 0 LRU
root@localhost:~# ifdown lo
root@localhost:~# echo $?
0
root@localhost:~# ifconfig -s
-Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
-eth0 1500 0 7736406 0 2016 0 5289455 0 0 0 BMRU
-lo 65536 0 18 0 0 0 18 0 0 0 LRU
+Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
+eth0 1500 0 7736406 0 2016 0 5289455 0 0 0 BMRU
+lo 65536 0 18 0 0 0 18 0 0 0 LRU
root@localhost:~# ifconfig lo down
root@localhost:~# ifconfig -s
Iface MTU Met RX-OK RX-ERR RX-DRP RX-OVR TX-OK TX-ERR TX-DRP TX-OVR Flg
-eth0 1500 0 7736474 0 2016 0 5289481 0 0 0 BMRU
+eth0 1500 0 7736474 0 2016 0 5289481 0 0 0 BMRU
root@localhost:~#
+Also reverted the commit:
+commit 80b878497663dae08f70b4d3cffe127b57a3cfc
+which uses absolute paths to binaries called by ifup/ifdown.
+
+Upstream-Status: Inappropriate [OE specific]
+
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
- inet.defn | 12 ++++++------
- inet6.defn | 8 ++++----
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ inet.defn | 148 +++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 74 insertions(+), 74 deletions(-)
diff --git a/inet.defn b/inet.defn
-index b176ab4ed03e..5fdfb14a0e1c 100644
+index 75e6744..b5f5da2 100644
--- a/inet.defn
+++ b/inet.defn
@@ -6,10 +6,10 @@ method loopback
This method may be used to define the IPv4 loopback interface.
up
-- ip link set dev %iface% up if (!iface_is_lo())
+- /bin/ip link set dev %iface% up if (!iface_is_lo())
+ ip link set dev %iface% up if (iface_is_lo())
down
-- ip link set dev %iface% down if (!iface_is_lo())
+- /bin/ip link set dev %iface% down if (!iface_is_lo())
+ ip link set dev %iface% down if (iface_is_lo())
method static
description
-@@ -212,11 +212,11 @@ method loopback
+@@ -36,17 +36,17 @@ method static
+ broadcast compute_v4_broadcast
+
+ up
+- /bin/ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \
++ ip addr add %address%[[/%netmask%]] [[broadcast %broadcast%]] \
+ [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label %iface%
+- /bin/ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]] up
++ ip link set dev %iface% [[mtu %mtu%]] [[address %hwaddress%]] up
+
+- [[ /bin/ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
++ [[ ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
+
+ down
+- [[ /bin/ip route del default via %gateway% [[metric %metric%]] dev %iface% 2>&1 1>/dev/null || true ]]
+- /bin/ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \
++ [[ ip route del default via %gateway% [[metric %metric%]] dev %iface% 2>&1 1>/dev/null || true ]]
++ ip addr del %address%[[/%netmask%]] [[broadcast %broadcast%]] \
+ [[peer %pointopoint%]] [[scope %scope%]] dev %iface% label %iface%
+- /bin/ip link set dev %iface% down \
++ ip link set dev %iface% down \
+ if (iface_is_link())
+
+ method manual
+@@ -63,12 +63,12 @@ method manual
+ hwaddress cleanup_hwaddress
+
+ up
+- [[/bin/ip link set dev %iface% mtu %mtu%]]
+- [[/bin/ip link set dev %iface% address %hwaddress%]]
+- /bin/ip link set dev %iface% up 2>/dev/null || true
++ [[ip link set dev %iface% mtu %mtu%]]
++ [[ip link set dev %iface% address %hwaddress%]]
++ ip link set dev %iface% up 2>/dev/null || true
+
+ down
+- /bin/ip link set dev %iface% down 2>/dev/null || true \
++ ip link set dev %iface% down 2>/dev/null || true \
+ if (iface_is_link() && !do_all)
+
+ method dhcp
+@@ -93,33 +93,33 @@ method dhcp
+ hwaddress cleanup_hwaddress
+
+ up
+- [[/bin/ip link set dev %iface% address %hwaddress%]]
+- /sbin/dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
++ [[ip link set dev %iface% address %hwaddress%]]
++ dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+ [[-e IF_METRIC=%metric%]] \
+ if (execable("/sbin/dhclient"))
+- /sbin/pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
++ pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]] \
+ elsif (execable("/sbin/pump"))
+- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
++ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-x hostname:%hostname%]] \
+ elsif (execable("/sbin/udhcpc"))
+- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
++ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+ [[-l %leasetime%]] [[-m %metric%]] %iface% \
+ elsif (execable("/sbin/dhcpcd"))
+ echo 'No DHCP client software found!' >/dev/stderr; false \
+ elsif (1)
+
+ down
+- /sbin/dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
++ dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+ if (execable("/sbin/dhclient"))
+- /sbin/pump -i %iface% -r \
++ pump -i %iface% -r \
+ elsif (execable("/sbin/pump"))
+- if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \
++ if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \
+ elsif (execable("/sbin/udhcpc"))
+- /sbin/dhcpcd -k %iface% \
++ dhcpcd -k %iface% \
+ elsif (execable("/sbin/dhcpcd"))
+ echo 'No DHCP client software found!' >/dev/stderr; false \
+ elsif (1)
+
+- /bin/ip link set dev %iface% down \
++ ip link set dev %iface% down \
+ if (iface_is_link())
+
+ method bootp
+@@ -134,11 +134,11 @@ method bootp
+ whatever it really is.
+
+ up
+- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
++ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
+ [[--hwaddr %hwaddr%]] --returniffail --serverbcast
+
+ down
+- /bin/ip link set dev %iface% down \
++ ip link set dev %iface% down \
+ if (iface_is_link())
+
+ method tunnel
+@@ -158,13 +158,13 @@ method tunnel
+ ttl time -- TTL setting
+ mtu size -- MTU size
+ up
+- /bin/ip tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \
++ ip tunnel add %iface% mode %mode% remote %endpoint% [[local %local%]] \
+ [[ttl %ttl%]]
+- /bin/ip link set %iface% up [[mtu %mtu%]]
+- /bin/ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]]
+- [[ /bin/ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
++ ip link set %iface% up [[mtu %mtu%]]
++ ip addr add %address%/%netmask% dev %iface% [[peer %dstaddr%]]
++ [[ ip route add default via %gateway% [[metric %metric%]] dev %iface% onlink ]]
+ down
+- /bin/ip tunnel del %iface%
++ ip tunnel del %iface%
+
+ method ppp
+ description
+@@ -175,9 +175,9 @@ method ppp
+ unit number -- Use /number/ as the ppp unit number.
+ options string -- Pass /string/ as additional options to pon.
+ up
+- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
++ pon [[%provider%]] [[unit %unit%]] [[%options%]]
+ down
+- /usr/bin/poff [[%provider%]]
++ poff [[%provider%]]
+
+ method wvdial
+ description
+@@ -186,10 +186,10 @@ method wvdial
+ options
+ provider name -- Use /name/ as the provider (from /etc/wvdial.conf).
+ up
+- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
++ start-stop-daemon --start -x /usr/bin/wvdial \
+ -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
+ down
+- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
++ start-stop-daemon --stop -x /usr/bin/wvdial \
+ -p /run/wvdial.%iface%.pid -s 2
+
+
+@@ -200,9 +200,9 @@ method ipv4ll
+ known as APIPA or IPAC, and often colloquially referred to
+ as "Zeroconf address".
+ up
+- /usr/sbin/avahi-autoipd -D %iface%
++ avahi-autoipd -D %iface%
+ down
+- /usr/sbin/avahi-autoipd --kill %iface%
++ avahi-autoipd --kill %iface%
+
+ architecture kfreebsd
+
+@@ -211,12 +211,12 @@ method loopback
+ This method may be used to define the IPv4 loopback interface.
up
- ifconfig %iface% 127.0.0.1 up \
+- /sbin/ifconfig %iface% 127.0.0.1 up \
- if (!iface_is_lo())
++ ifconfig %iface% 127.0.0.1 up \
+ if (iface_is_lo())
down
- ifconfig %iface% down \
+- /sbin/ifconfig %iface% down \
- if (!iface_is_lo())
++ ifconfig %iface% down \
+ if (iface_is_lo())
method static
description
-@@ -371,11 +371,11 @@ method loopback
+@@ -238,15 +238,15 @@ method static
+ hwaddress cleanup_hwaddress
+
+ up
+- [[ /sbin/ifconfig %iface% link %hwaddress%]]
+- /sbin/ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \
++ [[ ifconfig %iface% link %hwaddress%]]
++ ifconfig %iface% %address% [[netmask %netmask%]] [[broadcast %broadcast%]] \
+ [[pointopoint %pointopoint%]] [[media %media%]] [[mtu %mtu%]] \
+ up
+- [[ /sbin/route add default %gateway% ]]
++ [[ route add default %gateway% ]]
+
+ down
+- [[ /sbin/route del default %gateway% 2>&1 1>/dev/null || true ]]
+- /sbin/ifconfig %iface% down
++ [[ route del default %gateway% 2>&1 1>/dev/null || true ]]
++ ifconfig %iface% down
+
+ method manual
+ description
+@@ -279,30 +279,30 @@ method dhcp
+ hwaddress cleanup_hwaddress
+
+ up
+- [[/sbin/ifconfig %iface% link %hwaddress%]]
+- /sbin/dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
++ [[ifconfig %iface% link %hwaddress%]]
++ dhclient -v -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+ [[-e IF_METRIC=%metric%]] \
+ if (execable("/sbin/dhclient"))
+- /sbin/udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
++ udhcpc -n -p /run/udhcpc.%iface%.pid -i %iface% [[-H %hostname%]] \
+ [[-c %client%]] \
+ elsif (execable("/sbin/udhcpc"))
+- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
++ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+ [[-l %leasetime%]] %iface% \
+ elsif (execable("/sbin/dhcpcd"))
+ echo 'No DHCP client software found!' >/dev/stderr; false \
+ elsif (1)
+
+ down
+- /sbin/dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
++ dhclient -v -r -pf /run/dhclient.%iface%.pid -lf /var/lib/dhcp/dhclient.%iface%.leases -I -df /var/lib/dhcp/dhclient6.%iface%.leases %iface% \
+ if (execable("/sbin/dhclient"))
+- if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface%.pid); fi \
++ if test -f /run/udhcpc.%iface%.pid; then kill -USR2 $(cat /run/udhcpc.%iface%.pid); kill -TERM $(cat /run/udhcpc.%iface%.pid); fi \
+ elsif (execable("/sbin/udhcpc"))
+- /sbin/dhcpcd -k %iface% \
++ dhcpcd -k %iface% \
+ elsif (execable("/sbin/dhcpcd"))
+ echo 'No DHCP client software found!' >/dev/stderr; false \
+ elsif (1)
+
+- /sbin/ifconfig %iface% down
++ ifconfig %iface% down
+
+ method bootp
+ description
+@@ -316,11 +316,11 @@ method bootp
+ whatever it really is.
+
+ up
+- /sbin/bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
++ bootpc [[--bootfile %bootfile%]] --dev %iface% [[--server %server%]] \
+ [[--hwaddr %hwaddr%]] --returniffail --serverbcast
+
+ down
+- /sbin/ifconfig %iface% down
++ ifconfig %iface% down
+
+ method ppp
+ description
+@@ -331,9 +331,9 @@ method ppp
+ unit number -- Use /number/ as the ppp unit number.
+ options string -- Pass /string/ as additional options to pon.
+ up
+- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
++ pon [[%provider%]] [[unit %unit%]] [[%options%]]
+ down
+- /usr/bin/poff [[%provider%]]
++ poff [[%provider%]]
+
+ method wvdial
+ description
+@@ -342,10 +342,10 @@ method wvdial
+ options
+ provider name -- Use /name/ as the provider (from /etc/wvdial.conf).
+ up
+- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
++ start-stop-daemon --start -x /usr/bin/wvdial \
+ -p /run/wvdial.%iface%.pid -b -m -- [[ %provider% ]]
+ down
+- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
++ start-stop-daemon --stop -x /usr/bin/wvdial \
+ -p /run/wvdial.%iface%.pid -s 2
+
+
+@@ -356,9 +356,9 @@ method ipv4ll
+ known as APIPA or IPAC, and often colloquially referred to
+ as "Zeroconf address".
+ up
+- /usr/sbin/avahi-autoipd -D %iface%
++ avahi-autoipd -D %iface%
+ down
+- /usr/sbin/avahi-autoipd --kill %iface%
++ avahi-autoipd --kill %iface%
+ architecture hurd
+
+ method loopback
+@@ -367,11 +367,11 @@ method loopback
up
inetutils-ifconfig --interface %iface% --address 127.0.0.1 --up \
@@ -78,26 +353,70 @@ index b176ab4ed03e..5fdfb14a0e1c 100644
method static
description
-diff --git a/inet6.defn b/inet6.defn
-index 09325539cd01..4df64aff38cc 100644
---- a/inet6.defn
-+++ b/inet6.defn
-@@ -33,11 +33,11 @@ method loopback
- description
- This method may be used to define the IPv6 loopback interface.
+@@ -432,23 +432,23 @@ method dhcp
+
up
-- -ip link set dev %iface% up 2>/dev/null if (!iface_is_lo())
-- -ip addr add dev %iface% ::1 2>/dev/null if (!iface_is_lo())
-+ -ip link set dev %iface% up 2>/dev/null if (iface_is_lo())
-+ -ip addr add dev %iface% ::1 2>/dev/null if (iface_is_lo())
+ [[Warning: Option hwaddress: %hwaddress% not yet supported]]
+- /sbin/dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
++ dhclient -v -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
+ if (execable("/sbin/dhclient"))
+- /sbin/udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
++ udhcpc -n -p /run/udhcpc.%iface///.%.pid -i %iface% [[-H %hostname%]] \
+ [[-c %client%]] \
+ elsif (execable("/sbin/udhcpc"))
+- /sbin/dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
++ dhcpcd [[-h %hostname%]] [[-i %vendor%]] [[-I %client%]] \
+ [[-l %leasetime%]] %iface% \
+ elsif (execable("/sbin/dhcpcd"))
+ echo 'No DHCP client software found!' >/dev/stderr; false \
+ elsif (1)
+
+ down
+- /sbin/dhclient -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
++ dhclient -v -r -pf /run/dhclient.%iface///.%.pid -lf /var/lib/dhcp/dhclient.%iface///.%.leases -I -df /var/lib/dhcp/dhclient6.%iface///.%.leases %iface% \
+ if (execable("/sbin/dhclient"))
+- if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(/bin/cat /run/udhcpc.%iface///.%.pid); kill -TERM $(/bin/cat /run/udhcpc.%iface///.%.pid); fi \
++ if test -f /run/udhcpc.%iface///.%.pid; then kill -USR2 $(cat /run/udhcpc.%iface///.%.pid); kill -TERM $(cat /run/udhcpc.%iface///.%.pid); fi \
+ elsif (execable("/sbin/udhcpc"))
+- /sbin/dhcpcd -k %iface% \
++ dhcpcd -k %iface% \
+ elsif (execable("/sbin/dhcpcd"))
+ echo 'No DHCP client software found!' >/dev/stderr; false \
+ elsif (1)
+@@ -482,9 +482,9 @@ method ppp
+ unit number -- Use /number/ as the ppp unit number.
+ options string -- Pass /string/ as additional options to pon.
+ up
+- /usr/bin/pon [[%provider%]] [[unit %unit%]] [[%options%]]
++ pon [[%provider%]] [[unit %unit%]] [[%options%]]
down
-- -ip addr del dev %iface% ::1 2>/dev/null if (!iface_is_lo())
-- -ip link set dev %iface% down 2>/dev/null if (!iface_is_lo())
-+ -ip addr del dev %iface% ::1 2>/dev/null if (iface_is_lo())
-+ -ip link set dev %iface% down 2>/dev/null if (iface_is_lo())
+- /usr/bin/poff [[%provider%]]
++ poff [[%provider%]]
- method static
+ method wvdial
description
+@@ -493,10 +493,10 @@ method wvdial
+ options
+ provider name -- Use /name/ as the provider (from /etc/wvdial.conf).
+ up
+- /sbin/start-stop-daemon --start -x /usr/bin/wvdial \
++ start-stop-daemon --start -x /usr/bin/wvdial \
+ -p /run/wvdial.%iface///.%.pid -b -m -- [[ %provider% ]]
+ down
+- /sbin/start-stop-daemon --stop -x /usr/bin/wvdial \
++ start-stop-daemon --stop -x /usr/bin/wvdial \
+ -p /run/wvdial.%iface///.%.pid -s 2
+
+
+@@ -507,6 +507,6 @@ method ipv4ll
+ known as APIPA or IPAC, and often colloquially referred to
+ as "Zeroconf address".
+ up
+- /usr/sbin/avahi-autoipd -D %iface%
++ avahi-autoipd -D %iface%
+ down
+- /usr/sbin/avahi-autoipd --kill %iface%
++ avahi-autoipd --kill %iface%
--
-1.9.1
+2.4.0
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.2.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
similarity index 95%
rename from meta/recipes-core/ifupdown/ifupdown_0.8.2.bb
rename to meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
index 9de01f9..eb8426c 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.2.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.16.bb
@@ -6,12 +6,12 @@ the file /etc/network/interfaces."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-SRC_URI = "git://anonscm.debian.org/git/collab-maint/ifupdown.git;protocol=https \
+SRC_URI = "git://anonscm.debian.org/git/collab-maint/ifupdown.git \
file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
file://inet-6-.defn-fix-inverted-checks-for-loopback.patch \
file://99_network \
"
-SRCREV = "05ea2fd4f49bb1201aeef2a42efbcff8f336112f"
+SRCREV = "11b9f99f7ecc7052497e6786156cfed531f11823"
S = "${WORKDIR}/git"
--
2.4.0
^ permalink raw reply related
* [PATCH 1/3 V2] curl: add ptest
From: Maxin B. John @ 2016-12-21 15:20 UTC (permalink / raw)
To: openembedded-core; +Cc: Cristian Iorga
Add ptest support to curl
[YOCTO #6707]
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
Changes in V2:
Drop ptest dependency on openssh since the Test suite "will not run ssh
server as root to mitigate security risks".
---
.../curl/0001-runtests.pl-remove-warning.patch | 31 ++++++++++++++++++++++
meta/recipes-support/curl/curl/run-ptest | 5 ++++
meta/recipes-support/curl/curl_7.51.0.bb | 25 +++++++++++++++--
3 files changed, 59 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/curl/curl/0001-runtests.pl-remove-warning.patch
create mode 100644 meta/recipes-support/curl/curl/run-ptest
diff --git a/meta/recipes-support/curl/curl/0001-runtests.pl-remove-warning.patch b/meta/recipes-support/curl/curl/0001-runtests.pl-remove-warning.patch
new file mode 100644
index 0000000..283aa20
--- /dev/null
+++ b/meta/recipes-support/curl/curl/0001-runtests.pl-remove-warning.patch
@@ -0,0 +1,31 @@
+From c1d3bf13567909395715e441bc329793a5d2566b Mon Sep 17 00:00:00 2001
+From: "Maxin B. John" <maxin.john@intel.com>
+Date: Mon, 12 Dec 2016 12:49:46 +0200
+Subject: [PATCH] runtests.pl: remove warning
+
+Remove the warning which floods the console while executing tests.
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+ tests/runtests.pl | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/runtests.pl b/tests/runtests.pl
+index b8497f9..3cc6415 100755
+--- a/tests/runtests.pl
++++ b/tests/runtests.pl
+@@ -2879,9 +2879,6 @@ sub singletest {
+ # timestamp test preparation start
+ $timeprepini{$testnum} = Time::HiRes::time() if($timestats);
+
+- if($disttests !~ /test$testnum\W/ ) {
+- logmsg "Warning: test$testnum not present in tests/data/Makefile.inc\n";
+- }
+ if($disabled{$testnum}) {
+ logmsg "Warning: test$testnum is explicitly disabled\n";
+ }
+--
+2.4.0
+
diff --git a/meta/recipes-support/curl/curl/run-ptest b/meta/recipes-support/curl/curl/run-ptest
new file mode 100644
index 0000000..c91f294
--- /dev/null
+++ b/meta/recipes-support/curl/curl/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd tests
+./runtests.pl -a -n -s | sed \
+ -e 's|\([^ ]* *\) \([^ ]* *\)...OK|PASS: \1 \2|' \
+ -e 's|\([^ ]* *\) \([^ ]* *\)...FAILED|FAIL: \1 \2|'
diff --git a/meta/recipes-support/curl/curl_7.51.0.bb b/meta/recipes-support/curl/curl_7.51.0.bb
index a9589b8..880ace2 100644
--- a/meta/recipes-support/curl/curl_7.51.0.bb
+++ b/meta/recipes-support/curl/curl_7.51.0.bb
@@ -7,6 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=8;md5=3a34942f4ae3fbf1a303160714e66
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://0001-replace-krb5-config-with-pkg-config.patch \
+ file://0001-runtests.pl-remove-warning.patch \
+ file://run-ptest \
"
# curl likes to set -g0 in CFLAGS, so we stop it
@@ -18,7 +20,8 @@ SRC_URI[md5sum] = "09a7c5769a7eae676d5e2c86d51f167e"
SRC_URI[sha256sum] = "7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde"
CVE_PRODUCT = "libcurl"
-inherit autotools pkgconfig binconfig multilib_header
+
+inherit autotools pkgconfig binconfig multilib_header ptest
PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls proxy zlib"
PACKAGECONFIG_class-native = "ipv6 proxy ssl zlib"
@@ -62,11 +65,29 @@ do_install_append_class-target() {
sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/curl-config
}
+do_compile_ptest() {
+ oe_runmake test
+ oe_runmake -C ${B}/tests/data/ show
+ oe_runmake -C ${B}/tests/server
+}
+
+do_install_ptest() {
+ cp -rf ${B}/tests ${D}${PTEST_PATH}
+ cp -rf ${S}/tests ${D}${PTEST_PATH}
+ install -d ${D}${PTEST_PATH}/src
+ ln -sf ${bindir}/curl ${D}${PTEST_PATH}/src/curl
+}
+
PACKAGES =+ "lib${BPN}"
FILES_lib${BPN} = "${libdir}/lib*.so.*"
RRECOMMENDS_lib${BPN} += "ca-certificates"
-
+RDEPENDS_${PN}-ptest += "make bash perl perl-module-cwd \
+ perl-module-ipc-open2 perl-module-digest-md5\
+ perl-module-file-basename perl-module-posix \
+ perl-module-errno python python-netserver \
+ python-argparse python-pprint diffutils \
+ "
FILES_${PN} += "${datadir}/zsh"
BBCLASSEXTEND = "native nativesdk"
--
2.4.0
^ permalink raw reply related
* [wic][PATCH v2] wic: fix parsing of 'bitbake -e' output
From: Ed Bartosh @ 2016-12-21 15:05 UTC (permalink / raw)
To: openembedded-core
In-Reply-To: <CAD4b0_Kh=LmRhtmKdpS48E5VAb66fj7f2PVbqYeirLj-ZrTX=Q@mail.gmail.com>
Current parsing code can wrongly interpret arbitrary lines
that are of 'key=value' format as legitimate bitbake variables.
Implemented more strict parsing of key=value pairs using
regular expressions.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/utils/oe/misc.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
index fe188c9..2a2fcc9 100644
--- a/scripts/lib/wic/utils/oe/misc.py
+++ b/scripts/lib/wic/utils/oe/misc.py
@@ -27,6 +27,7 @@
"""Miscellaneous functions."""
import os
+import re
from collections import defaultdict
from distutils import spawn
@@ -148,21 +149,18 @@ class BitbakeVars(defaultdict):
self.default_image = None
self.vars_dir = None
- def _parse_line(self, line, image):
+ def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")):
"""
Parse one line from bitbake -e output or from .env file.
Put result key-value pair into the storage.
"""
if "=" not in line:
return
- try:
- key, val = line.split("=")
- except ValueError:
+ match = matcher.match(line)
+ if not match:
return
- key = key.strip()
- val = val.strip()
- if key.replace('_', '').isalnum():
- self[image][key] = val.strip('"')
+ key, val = match.groups()
+ self[image][key] = val.strip('"')
def get_var(self, var, image=None):
"""
--
2.1.4
^ permalink raw reply related
* Re: [wic][PATCH] wic: fix parsing of 'bitbake -e' output
From: Maciej Borzęcki @ 2016-12-21 14:31 UTC (permalink / raw)
To: Ed Bartosh; +Cc: Patches and discussions about the oe-core layer
In-Reply-To: <1482329997-20677-1-git-send-email-ed.bartosh@linux.intel.com>
On Wed, Dec 21, 2016 at 3:19 PM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> Current parsing code can wrongly interpret arbitrary lines
> that are of 'key=value' format as legitimate bitbake variables.
>
> Implemented more strict parsing of key=value pairs using
> regular expressions.
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
> scripts/lib/wic/utils/oe/misc.py | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
> index fe188c9..1dbbe92 100644
> --- a/scripts/lib/wic/utils/oe/misc.py
> +++ b/scripts/lib/wic/utils/oe/misc.py
> @@ -27,6 +27,7 @@
> """Miscellaneous functions."""
>
> import os
> +import re
> from collections import defaultdict
> from distutils import spawn
>
> @@ -155,14 +156,11 @@ class BitbakeVars(defaultdict):
> """
> if "=" not in line:
> return
> - try:
> - key, val = line.split("=")
> - except ValueError:
> + match = re.match("^(\w+)=(.+)", line)
match = re.match(r"^(\w+)=(.+)", line)
I don't remember if regexps are cached when compiled in re.match(), but
perhaps it would be better to `re.compile(r"^(\w+)=(.+)")` in
BitbakeVars.__init__() and just use a cached object here?
> + if not match:
> return
> - key = key.strip()
> - val = val.strip()
> - if key.replace('_', '').isalnum():
> - self[image][key] = val.strip('"')
> + key, val = match.groups()
> + self[image][key] = val.strip('"')
>
> def get_var(self, var, image=None):
> """
> --
> 2.1.4
>
--
Maciej Borzecki
RnDity
^ permalink raw reply
* [wic][PATCH] wic: fix parsing of 'bitbake -e' output
From: Ed Bartosh @ 2016-12-21 14:19 UTC (permalink / raw)
To: openembedded-core
Current parsing code can wrongly interpret arbitrary lines
that are of 'key=value' format as legitimate bitbake variables.
Implemented more strict parsing of key=value pairs using
regular expressions.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
scripts/lib/wic/utils/oe/misc.py | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
index fe188c9..1dbbe92 100644
--- a/scripts/lib/wic/utils/oe/misc.py
+++ b/scripts/lib/wic/utils/oe/misc.py
@@ -27,6 +27,7 @@
"""Miscellaneous functions."""
import os
+import re
from collections import defaultdict
from distutils import spawn
@@ -155,14 +156,11 @@ class BitbakeVars(defaultdict):
"""
if "=" not in line:
return
- try:
- key, val = line.split("=")
- except ValueError:
+ match = re.match("^(\w+)=(.+)", line)
+ if not match:
return
- key = key.strip()
- val = val.strip()
- if key.replace('_', '').isalnum():
- self[image][key] = val.strip('"')
+ key, val = match.groups()
+ self[image][key] = val.strip('"')
def get_var(self, var, image=None):
"""
--
2.1.4
^ permalink raw reply related
* Re: [PATCH v6 0/5] wic: bugfixes & --fixed-size support, tests, oeqa: enhancements
From: Maciej Borzęcki @ 2016-12-21 14:19 UTC (permalink / raw)
To: Ed Bartosh
Cc: Maciej Borzecki, Patches and discussions about the oe-core layer
In-Reply-To: <20161221130043.GA9628@linux.intel.com>
On Wed, Dec 21, 2016 at 2:00 PM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
> On Tue, Dec 20, 2016 at 07:27:04PM +0100, Maciej Borzęcki wrote:
>> On Tue, Dec 20, 2016 at 3:04 PM, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
>> > On Mon, Dec 19, 2016 at 12:20:56PM +0100, Maciej Borzecki wrote:
>> >> v6 of a patch series previously posted here [1].
>> >>
>> >> Changes since v5:
>> >>
>> >> * `oe-selftest: enforce en_US.UTF-8 locale` was merged to master, hence it's no
>> >> longer part of this series
>> >>
>> >> * rebased on top of master (d0d260b0b85790ceb136dd6b0445e8e33d038f5e)
>> >>
>> >
>> > The patchset looks good to me. Thank you.
>> >
>> > Couple of questions:
>> > - did you test if Lars' change
>> > https://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=db08ffee0ad1451f3bf710f4d1b623938ba9aefb
>> > works with your patchset?
>>
>> Yes. The series was rebased on top of
>> d0d260b0b85790ceb136dd6b0445e8e33d038f5e, which includes Lars' patch.
>
> The series causes conflicts on the latest master. Can you check if it's
> really the case or it's just something wrong with my setup?
Just rebased on top current master d41d2fd and pushed to
https://github.com/bboozzoo/poky branch bboozzoo/wic-fixed-size-v7 in
case you want to test locally. I guess the conflict was with patch
aa1c50a `selftest/wic: extending test coverage for WIC script
options`, which has been reverted yesterday by RP.
Jair has posted a v2 yesterday and I expect it to be merged soon. So,
I think I'll just wait a couple of days (actually more like until the
beginning of January) before publishing a rebased version of my
series.
<snip>
>
>>
>> I've run it on beaglebone, vexpress-qemu, qemux86 and qemuarm. Agree
>> with your observation though. I think that at least these TCs could be
>> made machine agnostic:
>>
>> - test_build_artifacts
>> - test_build_image_name
>> - test_compress_*
>> - test_gpt_image
>> - test_wic_image_type
>> - test_wrong_compressor
>> - test_rootfs_*
>>
>>
>
> Yes, that's exactly my point. We should make generic tests work on any
> machine.
>
> Would you be willing to do this in a separate patchset together with
> your oe-selftest core fixes?
>
> I'd suggest to only include new testcase that works on qemu-x86* into
> this patchset. It will make it faster to get merged.
>
I would prefer to post these changes as a separate patchset. It looks
like there's already a couple of potentially conflicting patches
floating on the mailing list, so I would prefer to get --fixed-size
merged before starting another one.
Regards,
--
Maciej Borzecki
RnDity
^ permalink raw reply
* Re: [PATCH 0/9] UEFI + Secure Boot + qemu
From: Fathi Boudra @ 2016-12-21 14:19 UTC (permalink / raw)
To: Patrick Ohly; +Cc: Neri, Ricardo, openembedded-core
In-Reply-To: <cover.1482324587.git.patrick.ohly@intel.com>
Hi,
On 21 December 2016 at 15:11, Patrick Ohly <patrick.ohly@intel.com> wrote:
> There seems to be a consensus that supporting UEFI in OE-core for qemu
> would be valuable, and there have been some (stalled) attempts to add
> it. For reference, see:
> [OE-core] [PATCH V3 0/3] Add UEFI firmware for qemux86*
> [OE-core] Add ovmf-native to make qemu-native/runqemu support boot UEFI image?
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=5654
> https://github.com/01org/luv-yocto/issues/38
>
> This patch set includes the necessary recipes (ovmf and iasl from
> meta-luv), some improvements to them (in particular, enabling Secure
> Boot), and changes to runqemu to make it easier to boot with UEFI. A
> special image recipes builds an image which can be used to lock down a
> virtual machine by enrolling the "normal" pre-installed certificates.
>
> I decided to keep the setup simple and use just a single file for UEFI
> code and variables because that makes the usage via runqemu very
> easy. See the "runqemu: support UEFI with OVMF firmware" patch for
> details. The downside is that the firmware can't be updated without
> loosing variables. I don't see a big need for long-lived virtual
> machine instances, but would like to hear from others about that.
>
> What's missing is automated testing of this new feature. I'm open for
> suggestions here; right now I don't know enough about the automated
> testing in the AB to propose something.
>
> I've discussed the usage of ovmf/iasl with Ricardo and he agreed that
> moving ovmf and iasl from meta-luv to OE-core makes sense. Ricardo,
> would you be willing to act as maintainer of it there, like you did in
> meta-luv?
fwiw, I've been maintaining acpica recipe in meta-oe, and will keep an
eye here as well.
meta-luv supports both x86* and arm*, and we have an interest in
having the same features available and working for qemuaarch64.
> Beware that "git am --keep-cr" must be used to import the ovmf patches
> correctly.
>
> The following changes since commit 5e21afc9395060b489156d3f90505a372b713f37:
>
> Revert "selftest/wic: extending test coverage for WIC script options" (2016-12-20 17:06:01 +0000)
>
> are available in the git repository at:
>
> git://github.com/pohly/openembedded-core secure-boot
> https://github.com/pohly/openembedded-core/tree/secure-boot
>
> Patrick Ohly (7):
> ovmf: explicitly depend on nasm-native
> ovmf: deploy firmware in image directory
> ovmf_git.bb: enable parallel compilation
> ovmf_git.bb: enable Secure Boot
> runqemu: let command line parameters override defaults
> runqemu: support UEFI with OVMF firmware
> ovmf: build image which enrolls standard keys
>
> meta-luv (2):
> ovmf: move from meta-luv to OE-core
> iasl: move from meta-luv to OE-core
>
> meta/recipes-core/ovmf/ovmf-shell-image.bb | 22 +
> ...s-Force-tools-variables-to-host-toolchain.patch | 48 +
> .../ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch | 110 ++
> ...0002-ovmf-update-path-to-native-BaseTools.patch | 32 +
> ...makefile-adjust-to-build-in-under-bitbake.patch | 39 +
> ...ollDefaultKeys-application-for-enrolling-.patch | 1123 ++++++++++++++++++++
> meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks | 4 +
> meta/recipes-core/ovmf/ovmf_git.bb | 178 ++++
> meta/recipes-extended/iasl/iasl_20120215.bb | 27 +
> meta/recipes-extended/iasl/iasl_20150410.bb | 27 +
> meta/recipes-extended/iasl/iasl_20150515.bb | 27 +
> scripts/runqemu | 37 +-
> 12 files changed, 1673 insertions(+), 1 deletion(-)
> create mode 100644 meta/recipes-core/ovmf/ovmf-shell-image.bb
> create mode 100644 meta/recipes-core/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0001-OvmfPkg-Enable-BGRT-in-OVMF.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0002-ovmf-update-path-to-native-BaseTools.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0003-BaseTools-makefile-adjust-to-build-in-under-bitbake.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/0007-OvmfPkg-EnrollDefaultKeys-application-for-enrolling-.patch
> create mode 100644 meta/recipes-core/ovmf/ovmf/ovmf-shell-image.wks
> create mode 100644 meta/recipes-core/ovmf/ovmf_git.bb
> create mode 100644 meta/recipes-extended/iasl/iasl_20120215.bb
> create mode 100644 meta/recipes-extended/iasl/iasl_20150410.bb
> create mode 100644 meta/recipes-extended/iasl/iasl_20150515.bb
>
> --
> 2.1.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Cheers,
--
Fathi
^ 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