summaryrefslogtreecommitdiff
path: root/poky/meta-poky
diff options
context:
space:
mode:
Diffstat (limited to 'poky/meta-poky')
-rw-r--r--poky/meta-poky/conf/distro/poky.conf21
-rw-r--r--poky/meta-poky/conf/local.conf.sample11
2 files changed, 13 insertions, 19 deletions
diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf
index 47ef9fa2ee..179329f5fa 100644
--- a/poky/meta-poky/conf/distro/poky.conf
+++ b/poky/meta-poky/conf/distro/poky.conf
@@ -1,7 +1,8 @@
DISTRO = "poky"
DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
-DISTRO_VERSION = "3.4+snapshot-${METADATA_REVISION}"
-DISTRO_CODENAME = "master"
+#DISTRO_VERSION = "3.4+snapshot-${METADATA_REVISION}"
+DISTRO_VERSION = "4.0"
+DISTRO_CODENAME = "kirkstone"
SDK_VENDOR = "-pokysdk"
SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}"
SDK_VERSION[vardepvalue] = "${SDK_VERSION}"
@@ -30,30 +31,22 @@ DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
TCLIBCAPPEND = ""
-PREMIRRORS ??= "\
-bzr://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-cvs://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-gitsm://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-hg://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-osc://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-p4://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \
-svn://.*/.* https://downloads.yoctoproject.org/mirror/sources/"
-
SANITY_TESTED_DISTROS ?= " \
poky-3.3 \n \
poky-3.4 \n \
ubuntu-16.04 \n \
ubuntu-18.04 \n \
ubuntu-20.04 \n \
- fedora-33 \n \
+ ubuntu-21.10 \n \
fedora-34 \n \
+ fedora-35 \n \
centos-7 \n \
centos-8 \n \
debian-9 \n \
debian-10 \n \
debian-11 \n \
- opensuseleap-15.2 \n \
+ opensuseleap-15.3 \n \
+ almalinux-8.5 \n \
"
# add poky sanity bbclass
INHERIT += "poky-sanity"
diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample
index 55e90e008e..17cbf3a3b3 100644
--- a/poky/meta-poky/conf/local.conf.sample
+++ b/poky/meta-poky/conf/local.conf.sample
@@ -2,9 +2,10 @@
# This file is your local configuration file and is where all local user settings
# are placed. The comments in this file give some guide to the options a new user
# to the system might want to change but pretty much any configuration option can
-# be set in this file. More adventurous users can look at local.conf.extended
-# which contains other examples of configuration which can be placed in this file
-# but new users likely won't need any of them initially.
+# be set in this file. More adventurous users can look at
+# local.conf.sample.extended which contains other examples of configuration which
+# can be placed in this file but new users likely won't need any of them
+# initially.
#
# Lines starting with the '#' character are commented out and in some cases the
# default values are provided as comments to show people example syntax. Enabling
@@ -206,7 +207,7 @@ BB_DISKMON_DIRS ??= "\
# used to accelerate build time. This variable can be used to configure the system
# to search other mirror locations for these objects before it builds the data itself.
#
-# This can be a filesystem directory, or a remote url such as http or ftp. These
+# This can be a filesystem directory, or a remote url such as https or ftp. These
# would contain the sstate-cache results from previous builds (possibly from other
# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
# cache locations to check for the shared objects.
@@ -214,7 +215,7 @@ BB_DISKMON_DIRS ??= "\
# at the end as shown in the examples below. This will be substituted with the
# correct path within the directory structure.
#SSTATE_MIRRORS ?= "\
-#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
+#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
#file://.* file:///some/local/dir/sstate/PATH"
#