From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- poky/meta-poky/conf/distro/poky-lsb.conf | 1 - poky/meta-poky/conf/distro/poky-tiny.conf | 2 +- poky/meta-poky/conf/distro/poky.conf | 20 +++++++++++--------- poky/meta-poky/conf/layer.conf | 2 +- poky/meta-poky/conf/local.conf.sample | 6 +++--- poky/meta-poky/conf/local.conf.sample.extended | 7 ++++++- poky/meta-poky/conf/site.conf.sample | 4 +++- 7 files changed, 25 insertions(+), 17 deletions(-) (limited to 'poky/meta-poky/conf') diff --git a/poky/meta-poky/conf/distro/poky-lsb.conf b/poky/meta-poky/conf/distro/poky-lsb.conf index ecfe5d2f4..1c426bae0 100644 --- a/poky/meta-poky/conf/distro/poky-lsb.conf +++ b/poky/meta-poky/conf/distro/poky-lsb.conf @@ -1,6 +1,5 @@ require conf/distro/poky.conf -require conf/distro/include/security_flags.inc DISTRO = "poky-lsb" DISTROOVERRIDES = "poky:linuxstdbase" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 7b22a13ca..690cb0d5c 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -38,7 +38,7 @@ TCLIBC = "musl" # Distro config is evaluated after the machine config, so we have to explicitly # set the kernel provider to override a machine config. PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-tiny" -PREFERRED_VERSION_linux-yocto-tiny ?= "4.14%" +PREFERRED_VERSION_linux-yocto-tiny ?= "4.18%" # We can use packagegroup-core-boot, but in the future we may need a new packagegroup-core-tiny #POKY_DEFAULT_EXTRA_RDEPENDS += "packagegroup-core-boot" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index fb9e78331..7e6fe1308 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,7 +1,7 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.5.2" -DISTRO_CODENAME = "sumo" +DISTRO_VERSION = "2.6" +DISTRO_CODENAME = "thud" SDK_VENDOR = "-pokysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" @@ -21,7 +21,7 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "4.14%" +PREFERRED_VERSION_linux-yocto ?= "4.18%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" @@ -64,16 +64,17 @@ https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" SANITY_TESTED_DISTROS ?= " \ - poky-2.4 \n \ poky-2.5 \n \ - ubuntu-15.04 \n \ + poky-2.6 \n \ ubuntu-16.04 \n \ - ubuntu-18.04 \n \ - fedora-28 \n \ + ubuntu-16.10 \n \ + ubuntu-17.04 \n \ + fedora-26 \n \ centos-7 \n \ debian-8 \n \ debian-9 \n \ - opensuse-42.3 \n \ + opensuse-42.1 \n \ + opensuse-42.2 \n \ " # # OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in @@ -89,11 +90,12 @@ INHERIT += "poky-sanity" # QA check settings - a little stricter than the OE-Core defaults WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \ installed-vs-shipped ldflags pn-overrides rpaths staticdev \ - useless-rpaths" + unknown-configure-option useless-rpaths" WARN_QA_remove = "${WARN_TO_ERROR_QA}" ERROR_QA_append = " ${WARN_TO_ERROR_QA}" require conf/distro/include/poky-world-exclude.inc require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc +require conf/distro/include/security_flags.inc INHERIT += "uninative" diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index 3761f87c6..b9b263716 100644 --- a/poky/meta-poky/conf/layer.conf +++ b/poky/meta-poky/conf/layer.conf @@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto" BBFILE_PATTERN_yocto = "^${LAYERDIR}/" BBFILE_PRIORITY_yocto = "5" -LAYERSERIES_COMPAT_yocto = "sumo" +LAYERSERIES_COMPAT_yocto = "thud" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index aa8df40b8..d28bf58a1 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -234,12 +234,12 @@ BB_DISKMON_DIRS ??= "\ # Qemu configuration # # By default qemu will build with a builtin VNC server where graphical output can be -# seen. The two lines below enable the SDL backend too. By default libsdl-native will +# seen. The two lines below enable the SDL backend too. By default libsdl2-native will # be built, if you want to use your host's libSDL instead of the minimal libsdl built -# by libsdl-native then uncomment the ASSUME_PROVIDED line below. +# by libsdl2-native then uncomment the ASSUME_PROVIDED line below. PACKAGECONFIG_append_pn-qemu-native = " sdl" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" -#ASSUME_PROVIDED += "libsdl-native" +#ASSUME_PROVIDED += "libsdl2-native" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 0560de857..3ba99f489 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -32,7 +32,7 @@ #DISTRO_FEATURES_LIBC = "ipv6 libc-backtrace libc-big-macros libc-bsd libc-cxx-tests libc-catgets libc-charsets libc-crypt \ # libc-crypt-ufc libc-db-aliases libc-envz libc-fcvt libc-fmtmsg libc-fstab libc-ftraverse \ # libc-getlogin libc-idn libc-inet libc-inet-anl libc-libm libc-locales libc-locale-code \ -# libc-memusage libc-nis libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams libc-sunrpc \ +# libc-memusage libc-nsswitch libc-rcmd libc-rtld-debug libc-spawn libc-streams \ # libc-utmp libc-utmpx libc-wordexp libc-posix-clang-wchar libc-posix-regexp libc-posix-regexp-glibc \ # libc-posix-wchar-io" @@ -59,6 +59,11 @@ # NOTE: If removing en_US.UTF-8 you will also need to uncomment, and set # appropriate value for IMAGE_LINGUAS. # WARNING: this may break localisation! +# WARNING: some recipes expect certain localizations to be enabled, e.g. +# bash-ptest: fr-fr, de-de +# glib-2.0-ptest: tr-tr, lt-lt, ja-jp.euc-jp, fa-ir, ru-ru, de-de, hr-hr, el-gr, fr-fr, es-es, en-gb +# if you remove some of these and enable ptest, you'll get QA warning like: +# ERROR: glib-2.0-1_2.58.0-r0 do_package_qa: QA Issue: glib-2.0-ptest rdepends on locale-base-de-de, but it isn't a build dependency? [build-deps] #GLIBC_GENERATE_LOCALES = "en_GB.UTF-8 en_US.UTF-8" #IMAGE_LINGUAS ?= "en-gb" diff --git a/poky/meta-poky/conf/site.conf.sample b/poky/meta-poky/conf/site.conf.sample index 6cfefc574..a4c2f9fee 100644 --- a/poky/meta-poky/conf/site.conf.sample +++ b/poky/meta-poky/conf/site.conf.sample @@ -24,7 +24,9 @@ SCONF_VERSION = "1" #or #ALL_PROXY ?= "https://proxy.example.com:8080" # If you wish to use certain hosts without the proxy, specify them in NO_PROXY. -# See the script for details on syntax. +# See the script for details on syntax. The script oe-git-proxy uses some tools +# that may not be included on HOSTTOOLS, thus add them manually through +# HOSTTOOLS += "getent seq" # Uncomment this to use a shared download directory #DL_DIR = "/some/shared/download/directory/" -- cgit v1.2.3