diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta-poky/conf | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
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 <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta-poky/conf')
-rw-r--r-- | poky/meta-poky/conf/distro/include/poky-floating-revisions.inc | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky-lsb.conf | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 24 | ||||
-rw-r--r-- | poky/meta-poky/conf/layer.conf | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 4 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 17 | ||||
-rw-r--r-- | poky/meta-poky/conf/site.conf.sample | 2 |
7 files changed, 20 insertions, 33 deletions
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 a3da043d9..1fc504592 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 1c426bae0..5c7e2720a 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 a370b21ed..6544c0339 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 <poky@yoctoproject.org>" @@ -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 \ diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index b9b263716..0d74f4eaa 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 = "thud" +LAYERSERIES_COMPAT_yocto = "warrior" # 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 cf9659881..9068e567d 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -124,6 +124,8 @@ PACKAGE_CLASSES ?= "package_rpm" # variable can contain the following options: # "dbg-pkgs" - add -dbg packages for all installed packages # (adds symbol information for debugging/profiling) +# "src-pkgs" - add -src packages for all installed packages +# (adds source code for debugging) # "dev-pkgs" - add -dev packages for all installed packages # (useful if you want to develop against libs in the image) # "ptest-pkgs" - add -ptest packages for all ptest-enabled packages @@ -239,7 +241,7 @@ BB_DISKMON_DIRS ??= "\ # 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 libsdl2-native then uncomment the ASSUME_PROVIDED line below. -PACKAGECONFIG_append_pn-qemu-native = " sdl" +PACKAGECONFIG_append_pn-qemu-system-native = " sdl" PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl" #ASSUME_PROVIDED += "libsdl2-native" diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 3ba99f489..87d211db3 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -290,18 +290,18 @@ # Image level user/group configuration. # Inherit extrausers to make the setting of EXTRA_USERS_PARAMS effective. -#INHERIT += "extrausers" +#IMAGE_CLASSES += "extrausers" # User / group settings -# The settings are sperated by the ; character. +# The settings are separated by the ; character. # Each setting is actually a command. The supported commands are useradd, # groupadd, userdel, groupdel, usermod and groupmod. #EXTRA_USERS_PARAMS = "\ -#useradd -p '' tester; \ -#groupadd developers; \ -#userdel nobody; \ -#groupdel video; \ -#groupmod -g 1020 developers; \ -#usermod -s /bin/sh tester; \ +# useradd -p '' tester; \ +# groupadd developers; \ +# userdel nobody; \ +# groupdel video; \ +# groupmod -g 1020 developers; \ +# usermod -s /bin/sh tester; \ #" # Various packages dynamically add users and groups to the system at package @@ -395,5 +395,6 @@ # #DISTRO_FEATURES_append = " systemd" #DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit" +#VIRTUAL-RUNTIME_login_manager = "shadow-base" #VIRTUAL-RUNTIME_init_manager = "systemd" #VIRTUAL-RUNTIME_initscripts = "systemd-compat-units" diff --git a/poky/meta-poky/conf/site.conf.sample b/poky/meta-poky/conf/site.conf.sample index a4c2f9fee..5164fedf6 100644 --- a/poky/meta-poky/conf/site.conf.sample +++ b/poky/meta-poky/conf/site.conf.sample @@ -26,7 +26,7 @@ SCONF_VERSION = "1" # If you wish to use certain hosts without the proxy, specify them in NO_PROXY. # 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" +# HOSTTOOLS += "getent" # Uncomment this to use a shared download directory #DL_DIR = "/some/shared/download/directory/" |