From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- .../distro/include/poky-floating-revisions.inc | 2 -- poky/meta-poky/conf/distro/poky-lsb.conf | 2 +- poky/meta-poky/conf/distro/poky.conf | 24 +++++----------------- 3 files changed, 6 insertions(+), 22 deletions(-) (limited to 'poky/meta-poky/conf/distro') diff --git a/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc b/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc index a3da043d9d..1fc5045920 100644 --- a/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -26,8 +26,6 @@ SRCREV_pn-sato-icon-theme ?= "${AUTOREV}" SRCREV_pn-matchbox-desktop-sato ?= "${AUTOREV}" SRCREV_pn-oh-puzzles ?= "${AUTOREV}" SRCREV_pn-libowl ?= "${AUTOREV}" -SRCREV_pn-fstests ?= "${AUTOREV}" -SRCREV_pn-xvideo-tests ?= "${AUTOREV}" SRCREV_pn-clutter ?= "${AUTOREV}" SRCREV_pn-clutter-gst ?= "${AUTOREV}" SRCREV_pn-libmatchbox ?= "${AUTOREV}" diff --git a/poky/meta-poky/conf/distro/poky-lsb.conf b/poky/meta-poky/conf/distro/poky-lsb.conf index 1c426bae0e..5c7e2720ab 100644 --- a/poky/meta-poky/conf/distro/poky-lsb.conf +++ b/poky/meta-poky/conf/distro/poky-lsb.conf @@ -11,4 +11,4 @@ PREFERRED_PROVIDER_virtual/libx11 = "libx11" KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" # Use the LTSI Kernel for LSB Testing -PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.14%" +PREFERRED_VERSION_linux-yocto_linuxstdbase ?= "4.19%" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index a370b21ed8..6544c03396 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,9 +1,9 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "2.6.2" -DISTRO_CODENAME = "thud" +DISTRO_VERSION = "2.6+snapshot-${DATE}" +DISTRO_CODENAME = "master" SDK_VENDOR = "-pokysdk" -SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" +SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" MAINTAINER = "Poky " @@ -21,9 +21,9 @@ 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.18%" +PREFERRED_VERSION_linux-yocto ?= "5.0%" -SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}" +SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" @@ -39,9 +39,6 @@ DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}" TCLIBCAPPEND = "" -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el nios2 ppc x86_64" -# Other QEMU_TARGETS "sh4" - PREMIRRORS ??= "\ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ @@ -52,17 +49,6 @@ osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" -MIRRORS =+ "\ -ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -http://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ -https://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" - -# The CONNECTIVITY_CHECK_URI's are used to test whether we can succesfully -# fetch from the network (and warn you if not). To disable the test set -# the variable to be empty. -# Git example url: git://git.yoctoproject.org/yocto-firewall-test;protocol=git;rev=master -CONNECTIVITY_CHECK_URIS ?= "https://www.example.com/" - SANITY_TESTED_DISTROS ?= " \ poky-2.5 \n \ poky-2.6 \n \ -- cgit v1.2.3