diff options
Diffstat (limited to 'meta-poky/conf/distro')
| -rw-r--r-- | meta-poky/conf/distro/include/gcsections.inc | 4 | ||||
| -rw-r--r-- | meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 8 | ||||
| -rw-r--r-- | meta-poky/conf/distro/include/poky-floating-revisions.inc | 68 | ||||
| -rw-r--r-- | meta-poky/conf/distro/poky-altcfg.conf | 6 | ||||
| -rw-r--r-- | meta-poky/conf/distro/poky-bleeding.conf | 6 | ||||
| -rw-r--r-- | meta-poky/conf/distro/poky-tiny.conf | 35 | ||||
| -rw-r--r-- | meta-poky/conf/distro/poky.conf | 54 |
7 files changed, 77 insertions, 104 deletions
diff --git a/meta-poky/conf/distro/include/gcsections.inc b/meta-poky/conf/distro/include/gcsections.inc index 886a005b34..0e7bd2efff 100644 --- a/meta-poky/conf/distro/include/gcsections.inc +++ b/meta-poky/conf/distro/include/gcsections.inc @@ -16,6 +16,8 @@ LDFLAGS_SECTION_REMOVAL:pn-grub = "" # SDK packages with build problems using sections CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-cairo = "" CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" @@ -25,8 +27,10 @@ LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" # set default for target CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}" +CXXFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}" LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}" # set default for nativesdk CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" +CXXFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" LDFLAGS:append:class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" diff --git a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 0de2013826..3e10251e8b 100644 --- a/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc +++ b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc @@ -1,8 +1,8 @@ -# Add an extra DISTRO_FEATURE -DISTRO_FEATURES:append = " pam" +# Add extra DISTRO_FEATUREs +DISTRO_FEATURES:append = " pam usrmerge" -# Use the LTSI Kernel -PREFERRED_VERSION_linux-yocto = "5.10%" +# Use our alternate kernel version +PREFERRED_VERSION_linux-yocto = "6.6%" # Ensure the kernel nfs server is enabled KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" diff --git a/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc index 6f473de88c..0721a718bd 100644 --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -1,54 +1,22 @@ # -# Package Versions for cutting edge testing: +# Set recipe versions to auto-rev 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-gconf-dbus ?= "${AUTOREV}" -SRCREV:pn-matchbox-common ?= "${AUTOREV}" -SRCREV:pn-matchbox-config-gtk ?= "${AUTOREV}" -SRCREV:pn-matchbox-desktop ?= "${AUTOREV}" -SRCREV:pn-matchbox-keyboard ?= "${AUTOREV}" -SRCREV:pn-matchbox-panel-2 ?= "${AUTOREV}" -SRCREV:pn-matchbox-themes-extra ?= "${AUTOREV}" -SRCREV:pn-matchbox-terminal ?= "${AUTOREV}" -SRCREV:pn-matchbox-wm ?= "${AUTOREV}" -SRCREV:pn-settings-daemon ?= "${AUTOREV}" -SRCREV:pn-screenshot ?= "${AUTOREV}" -SRCREV:pn-libfakekey ?= "${AUTOREV}" -SRCREV:pn-psplash ?= "${AUTOREV}" -SRCREV:pn-gtk-sato-engine ?= "${AUTOREV}" -SRCREV:pn-matchbox-theme-sato ?= "${AUTOREV}" -SRCREV:pn-sato-icon-theme ?= "${AUTOREV}" -SRCREV:pn-matchbox-desktop-sato ?= "${AUTOREV}" -SRCREV:pn-oh-puzzles ?= "${AUTOREV}" -SRCREV:pn-libowl ?= "${AUTOREV}" -SRCREV:pn-libmatchbox ?= "${AUTOREV}" -SRCREV:pn-ofono ?= "${AUTOREV}" - -SRCREV:pn-dri2proto = "${AUTOREV}" -#PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" -SRCREV:pn-libdrm = "${AUTOREV}" -#PREFERRED_VERSION_libdrm ?= "2.4.0+git%" -SRCREV:pn-libxcb = "${AUTOREV}" -#PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" -SRCREV:pn-lib-proto = "${AUTOREV}" -#PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" -SRCREV:pn-libxcb-sdk = "${AUTOREV}" -#PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" -SRCREV:pn-xf86-input-evdev = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" -SRCREV:pn-xf86-input-mouse = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" -SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" -SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" -#PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" - -#SRCDATE_oprofile ?= "${DATE}" - -PREFERRED_VERSION_oprofile ?= "0.9.4+cvs${SRCDATE_oprofile}" +INHERIT += "poky-bleeding" +POKY_AUTOREV_RECIPES = "\ + libmatchbox \ + opkg-utils \ + matchbox-config-gtk \ + matchbox-desktop \ + matchbox-keyboard \ + matchbox-panel-2 \ + matchbox-terminal \ + matchbox-theme-sato \ + matchbox-wm \ + pseudo \ + puzzles \ + sato-icon-theme \ + sato-screenshot \ + settings-daemon \ +" diff --git a/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf index fbfabecd9d..3d64bdd1fe 100644 --- a/meta-poky/conf/distro/poky-altcfg.conf +++ b/meta-poky/conf/distro/poky-altcfg.conf @@ -2,14 +2,16 @@ # An example of subclassing a distro, primarily used for testing alternate configuration # combinations on the Yocto Project autobuilder # + +PACKAGE_CLASSES ?= "package_ipk" require conf/distro/poky.conf DISTRO = "poky-altcfg" DISTROOVERRIDES = "poky:poky-altcfg" #DISTROOVERRIDES = "poky:linuxstdbase" -INIT_MANAGER ?= "systemd" +POKY_INIT_MANAGER:poky-altcfg = "systemd" # systemd isn't suitable with musl -INIT_MANAGER:libc-musl ?= "sysvinit" +POKY_INIT_MANAGER:poky-altcfg:libc-musl = "sysvinit" require conf/distro/include/poky-distro-alt-test-config.inc diff --git a/meta-poky/conf/distro/poky-bleeding.conf b/meta-poky/conf/distro/poky-bleeding.conf index 2d3e046a45..8cbf2284d0 100644 --- a/meta-poky/conf/distro/poky-bleeding.conf +++ b/meta-poky/conf/distro/poky-bleeding.conf @@ -1,8 +1,4 @@ -PREFERRED_VERSION_glib-2.0 ?= "2.17.4" -PREFERRED_VERSION_glib-2.0-native ?= "2.17.4" -PREFERRED_VERSION_atk ?= "1.22.0" -PREFERRED_VERSION_pango ?= "1.21.2" -PREFERRED_VERSION_gtk+ ?= "2.13.3" +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" require conf/distro/include/poky-floating-revisions.inc require conf/distro/poky.conf diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index 756c65a2f9..f3dfa8107a 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/meta-poky/conf/distro/poky-tiny.conf @@ -32,6 +32,7 @@ require conf/distro/poky.conf require conf/distro/include/gcsections.inc DISTRO = "poky-tiny" +DISTRO_NAME = "Poky Tiny" DISTROOVERRIDES = "poky:poky-tiny" TCLIBC = "musl" @@ -43,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 ?= "5.14%" +PREFERRED_VERSION_linux-yocto-tiny ?= "6.6%" # 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" @@ -62,6 +63,8 @@ ENABLE_WIDEC:class-native = "true" # Drop native language support. This removes the # eglibc->bash->gettext->libc-posix-clang-wchar dependency. USE_NLS="no" +# As we don't have native language support, don't install locales into images +IMAGE_LINGUAS = "" # Comment out any of the lines below to disable them in the build # DISTRO_FEATURES options: @@ -79,14 +82,11 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \ ${DISTRO_FEATURES_WIFI} \ " -# Enable LFS - see bug YOCTO #5865 -DISTRO_FEATURES:append:libc-musl = " largefile" - DISTRO_FEATURES:class-native = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" DISTRO_FEATURES:class-nativesdk = "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" # enable mdev/busybox for init -INIT_MANAGER ?= "mdev-busybox" +POKY_INIT_MANAGER:poky-tiny = "mdev-busybox" # FIXME: Consider adding "modules" to MACHINE_FEATURES and using that in # packagegroup-core-base to select modutils-initscripts or not. Similar with "net" and @@ -97,8 +97,7 @@ INIT_MANAGER ?= "mdev-busybox" # udev, grub, etc. These pull in gettext, which fails to build with wide # character support. IMAGE_FSTYPES = "cpio.gz" - -QB_DEFAULT_FSTYPE = "${IMAGE_FSTYPES}" +QB_DEFAULT_FSTYPE = "cpio.gz" # Drop v86d from qemu dependency list (we support serial) # Drop grub from meta-intel BSPs @@ -112,16 +111,18 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" # this script for the purposes of tiny, remove the dependency from here. RDEPENDS:${PN}-mtrace:pn-eglibc = "" -PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-full-cmdline] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-rt] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-rt-sdk] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato-dev] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-sato-sdk] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" -PNBLACKLIST[core-image-weston] = "not buildable with poky-tiny" +SKIP_RECIPE[build-appliance-image] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-rt] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-rt-sdk] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato-dev] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-sato-sdk] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-x11] = "not buildable with poky-tiny" +SKIP_RECIPE[core-image-weston] = "not buildable with poky-tiny" # Disable python usage in opkg-utils since it won't build with tiny config PACKAGECONFIG:remove:pn-opkg-utils = "python" + +# If shadow-base is brought into the image, logins will fail because it +# doesn't have the heuristics to work when CONFIG_MULTIUSER is unset. +PACKAGE_EXCLUDE += "shadow-base" diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 16b3bed1e8..5285753c31 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -1,26 +1,26 @@ DISTRO = "poky" DISTRO_NAME = "Poky (Yocto Project Reference Distro)" -DISTRO_VERSION = "3.4" -DISTRO_CODENAME = "honister" +DISTRO_VERSION = "5.0+snapshot-${METADATA_REVISION}" +DISTRO_CODENAME = "styhead" SDK_VENDOR = "-pokysdk" SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" SDK_VERSION[vardepvalue] = "${SDK_VERSION}" -MAINTAINER = "Poky <poky@lists.yoctoproject.org>" +MAINTAINER = "Poky Maintainers <poky@lists.yoctoproject.org>" TARGET_VENDOR = "-poky" LOCALCONF_VERSION = "2" # Override these in poky based distros -POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" +POKY_DEFAULT_DISTRO_FEATURES = "opengl ptest multiarch wayland vulkan" POKY_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot" POKY_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet" DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${POKY_DEFAULT_DISTRO_FEATURES}" -PREFERRED_VERSION_linux-yocto ?= "5.14%" -PREFERRED_VERSION_linux-yocto-rt ?= "5.14%" +PREFERRED_VERSION_linux-yocto ?= "6.6%" +PREFERRED_VERSION_linux-yocto-rt ?= "6.6%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" @@ -30,30 +30,23 @@ DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" TCLIBCAPPEND = "" -PREMIRRORS ??= "\ -bzr://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -cvs://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -git://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -gitsm://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -hg://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -osc://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -p4://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n \ -svn://.*/.* https://downloads.yoctoproject.org/mirror/sources/ \n" +PACKAGE_CLASSES ?= "package_rpm" SANITY_TESTED_DISTROS ?= " \ - poky-3.3 \n \ - poky-3.4 \n \ - ubuntu-16.04 \n \ - ubuntu-18.04 \n \ + poky-4.3 \n \ + poky-5.0 \n \ ubuntu-20.04 \n \ - fedora-33 \n \ - fedora-34 \n \ - centos-7 \n \ - centos-8 \n \ - debian-9 \n \ - debian-10 \n \ + ubuntu-22.04 \n \ + ubuntu-23.04 \n \ + fedora-38 \n \ + fedora-39 \n \ + centosstream-8 \n \ debian-11 \n \ - opensuseleap-15.2 \n \ + debian-12 \n \ + opensuseleap-15.4 \n \ + almalinux-8.8 \n \ + almalinux-9.2 \n \ + rocky-9 \n \ " # add poky sanity bbclass INHERIT += "poky-sanity" @@ -72,3 +65,12 @@ INHERIT += "uninative" BB_SIGNATURE_HANDLER ?= "OEEquivHash" BB_HASHSERVE ??= "auto" + +POKY_INIT_MANAGER = "sysvinit" +INIT_MANAGER ?= "${POKY_INIT_MANAGER}" + +# We need debug symbols so that SPDX license manifests for the kernel work +KERNEL_EXTRA_FEATURES:append = " features/debug/debug-kernel.scc" + +# Enable creation of SPDX manifests by default +INHERIT += "create-spdx" |