diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta-poky | |
parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta-poky')
-rw-r--r-- | poky/meta-poky/README.poky | 4 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 18 | ||||
-rw-r--r-- | poky/meta-poky/conf/layer.conf | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 1 |
5 files changed, 16 insertions, 11 deletions
diff --git a/poky/meta-poky/README.poky b/poky/meta-poky/README.poky index 2204801f75..2ba3b5c03e 100644 --- a/poky/meta-poky/README.poky +++ b/poky/meta-poky/README.poky @@ -53,11 +53,11 @@ bitbake: documentation: Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/yocto-docs/ - Mailing list: yocto@yoctoproject.org + Mailing list: docs@lists.yoctoproject.org meta-poky, meta-yocto-bsp: Git repository: http://git.yoctoproject.org/cgit/cgit.cgi/meta-yocto(-bsp) - Mailing list: poky@yoctoproject.org + Mailing list: poky@lists.yoctoproject.org Everything else should be sent to the OpenEmbedded Core mailing list. If in doubt, check the oe-core git repository for the content you intend to modify. diff --git a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 9926c1bb02..0b0412e60c 100644 --- a/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -2,7 +2,7 @@ DISTRO_FEATURES_append = " pam" # Use the LTSI Kernel -PREFERRED_VERSION_linux-yocto ?= "4.19%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" # Ensure the kernel nfs server is enabled KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 619414295b..91779e4e46 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -1,11 +1,11 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "3.0" -DISTRO_CODENAME = "zeus" +DISTRO_VERSION = "3.1" +DISTRO_CODENAME = "dunfell" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${DATE}', 'snapshot')}" -MAINTAINER = "Poky <poky@yoctoproject.org>" +MAINTAINER = "Poky <poky@lists.yoctoproject.org>" TARGET_VENDOR = "-poky" @@ -21,7 +21,7 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.2%" +PREFERRED_VERSION_linux-yocto ?= "5.4%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" @@ -52,13 +52,14 @@ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" SANITY_TESTED_DISTROS ?= " \ poky-2.7 \n \ poky-3.0 \n \ + poky-3.1 \n \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ ubuntu-19.04 \n \ - fedora-28 \n \ - fedora-29 \n \ fedora-30 \n \ + fedora-31 \n \ centos-7 \n \ + centos-8 \n \ debian-8 \n \ debian-9 \n \ debian-10 \n \ @@ -87,3 +88,8 @@ require conf/distro/include/no-static-libs.inc require conf/distro/include/yocto-uninative.inc require conf/distro/include/security_flags.inc INHERIT += "uninative" + +INHERIT += "reproducible_build" + +BB_SIGNATURE_HANDLER ?= "OEEquivHash" +BB_HASHSERVE ??= "auto" diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index a4b3d1e9dd..234be1321c 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 = "zeus" +LAYERSERIES_COMPAT_yocto = "dunfell" # 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 2e0bb41e64..b555f1d21e 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -31,7 +31,6 @@ #MACHINE ?= "beaglebone-yocto" #MACHINE ?= "genericx86" #MACHINE ?= "genericx86-64" -#MACHINE ?= "mpc8315e-rdb" #MACHINE ?= "edgerouter" # # This sets the default machine to be qemux86-64 if no other machine is selected: |