diff options
Diffstat (limited to 'poky/meta-poky')
| -rw-r--r-- | poky/meta-poky/README.poky.md | 15 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 8 | ||||
| -rw-r--r-- | poky/meta-poky/conf/layer.conf | 2 |
4 files changed, 8 insertions, 19 deletions
diff --git a/poky/meta-poky/README.poky.md b/poky/meta-poky/README.poky.md index a99c75ed5c..7dd5e6d831 100644 --- a/poky/meta-poky/README.poky.md +++ b/poky/meta-poky/README.poky.md @@ -34,19 +34,8 @@ For information about OpenEmbedded, see the Contribution Guidelines ----------------------- -The project works using a mailing list patch submission process. Patches -should be sent to the mailing list for the repository the components -originate from (see below). Throughout the Yocto Project, the README -files in the component in question should detail where to send patches, -who the maintainers are and where bugs should be reported. - -A guide to submitting patches to OpenEmbedded is available at: - -<https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded> - -There is good documentation on how to write/format patches at: - -<https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines> +Please refer to our contributor guide here: https://docs.yoctoproject.org/dev/contributor-guide/ +for full details on how to submit changes. Where to Send Patches --------------------- diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 728d161d59..7b04b35d4a 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -44,7 +44,7 @@ FULL_OPTIMIZATION="-Os -pipe ${DEBUG_FLAGS}" # 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 ?= "6.1%" +PREFERRED_VERSION_linux-yocto-tiny ?= "6.4%" # 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 8dfd581efc..3bc7bff011 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 = "4.2" -DISTRO_CODENAME = "mickledore" +DISTRO_VERSION = "4.2+snapshot-${METADATA_REVISION}" +DISTRO_CODENAME = "nanbield" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" @@ -19,8 +19,8 @@ POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "6.1%" -PREFERRED_VERSION_linux-yocto-rt ?= "6.1%" +PREFERRED_VERSION_linux-yocto ?= "6.4%" +PREFERRED_VERSION_linux-yocto-rt ?= "6.4%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index 798269a0ef..5e1c37a9d4 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 = "mickledore" +LAYERSERIES_COMPAT_yocto = "nanbield" # This should only be incremented on significant changes that will # cause compatibility issues with other layers |