diff options
Diffstat (limited to 'poky/meta-poky')
-rw-r--r-- | poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/include/poky-floating-revisions.inc | 10 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 4 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 2 | ||||
-rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 4 |
6 files changed, 12 insertions, 12 deletions
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 9c2d7753a..0de201382 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 = "5.4%" +PREFERRED_VERSION_linux-yocto = "5.10%" # 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/include/poky-floating-revisions.inc b/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc index 78c9e365e..6f473de88 100644 --- a/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -2,11 +2,11 @@ # Package Versions for cutting edge testing: # -#SRCREV_pn-opkg-native ?= "${AUTOREV}" -#SRCREV_pn-opkg-sdk ?= "${AUTOREV}" -#SRCREV_pn-opkg ?= "${AUTOREV}" -#SRCREV_pn-opkg-utils-native ?= "${AUTOREV}" -#SRCREV_pn-opkg-utils ?= "${AUTOREV}" +#SRCREV:pn-opkg-native ?= "${AUTOREV}" +#SRCREV:pn-opkg-sdk ?= "${AUTOREV}" +#SRCREV:pn-opkg ?= "${AUTOREV}" +#SRCREV:pn-opkg-utils-native ?= "${AUTOREV}" +#SRCREV:pn-opkg-utils ?= "${AUTOREV}" SRCREV:pn-gconf-dbus ?= "${AUTOREV}" SRCREV:pn-matchbox-common ?= "${AUTOREV}" SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}" diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index c25e50c73..b8f5f21a3 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -43,7 +43,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 ?= "5.10%" +PREFERRED_VERSION_linux-yocto-tiny ?= "5.13%" # 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 c7c46cd22..ae0c52178 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -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 ?= "5.10%" -PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" +PREFERRED_VERSION_linux-yocto ?= "5.13%" +PREFERRED_VERSION_linux-yocto-rt ?= "5.13%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index f1f6d690f..75b27167f 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -158,7 +158,7 @@ USER_CLASSES ?= "buildstats" # run tests against any SDK that are built. To enable this uncomment these lines. # See classes/test{image,sdk}.bbclass for further details. #IMAGE_CLASSES += "testimage testsdk" -#TESTIMAGE_AUTO_qemuall = "1" +#TESTIMAGE_AUTO:qemuall = "1" # # Interactive shell configuration diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index 17e95828d..8a384540f 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -135,7 +135,7 @@ DISTRO_FEATURES:remove = "x11" # Uncomment the following lines to enable multilib builds #require conf/multilib.conf #MULTILIBS = "multilib:lib32" -#DEFAULTTUNE_virtclass-multilib-lib32 = "x86" +#DEFAULTTUNE:virtclass-multilib-lib32 = "x86" # Set RPM_PREFER_ELF_ARCH to configure preferred ABI when using rpm packaging # backend to generate a rootfs, choices are: @@ -313,7 +313,7 @@ DISTRO_FEATURES:remove = "x11" # Note this is not officially supported and is just illustrated here to # show an example of how it can be done # You'll also need your fortran recipe to depend on libgfortran -#FORTRAN_forcevariable = ",fortran" +#FORTRAN:forcevariable = ",fortran" # # Kernel image features |