diff options
Diffstat (limited to 'poky/meta-poky/conf/distro')
-rw-r--r-- | poky/meta-poky/conf/distro/include/poky-world-exclude.inc | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/poky/meta-poky/conf/distro/include/poky-world-exclude.inc b/poky/meta-poky/conf/distro/include/poky-world-exclude.inc index 1a2dea585..f3ac59c51 100644 --- a/poky/meta-poky/conf/distro/include/poky-world-exclude.inc +++ b/poky/meta-poky/conf/distro/include/poky-world-exclude.inc @@ -1,4 +1,4 @@ # -# Things we exlude fromw world testing within the reference distro +# Things we exlude from world testing within the reference distro # diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 5a867b1de..e4ff9752e 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -26,7 +26,7 @@ # [ ] Drop ldconfig from the installation # [ ] Modify the runqemu scripts to work with ext2 parameter: # runqemu qemux86 qemuparams="-nographic" bootparams="console=ttyS0,115200 root=0800" -# [ ] Modify busybox to allow for DISTRO_FEATURES-like confiruration +# [ ] Modify busybox to allow for DISTRO_FEATURES-like configuration require conf/distro/poky.conf require conf/distro/include/gcsections.inc diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 623f39da6..c098b3026 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 = "3.2+snapshot-${METADATA_REVISION}" -DISTRO_CODENAME = "master" +DISTRO_VERSION = "3.3" +DISTRO_CODENAME = "hardknott" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" @@ -25,8 +25,8 @@ PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" -DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" -DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" +DISTRO_EXTRA_RDEPENDS += "${POKY_DEFAULT_EXTRA_RDEPENDS}" +DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" TCLIBCAPPEND = "" @@ -41,9 +41,8 @@ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n" SANITY_TESTED_DISTROS ?= " \ - poky-3.0 \n \ - poky-3.1 \n \ poky-3.2 \n \ + poky-3.3 \n \ ubuntu-16.04 \n \ ubuntu-18.04 \n \ ubuntu-20.04 \n \ |