diff options
Diffstat (limited to 'poky/meta-poky/conf')
| -rw-r--r-- | poky/meta-poky/conf/distro/include/gcsections.inc | 44 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc | 4 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/include/poky-floating-revisions.inc | 60 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky-altcfg.conf | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky-tiny.conf | 13 | ||||
| -rw-r--r-- | poky/meta-poky/conf/distro/poky.conf | 4 | ||||
| -rw-r--r-- | poky/meta-poky/conf/layer.conf | 2 | ||||
| -rw-r--r-- | poky/meta-poky/conf/local.conf.sample | 9 | ||||
| -rw-r--r-- | poky/meta-poky/conf/local.conf.sample.extended | 6 |
9 files changed, 71 insertions, 73 deletions
diff --git a/poky/meta-poky/conf/distro/include/gcsections.inc b/poky/meta-poky/conf/distro/include/gcsections.inc index 7157373aa..886a005b3 100644 --- a/poky/meta-poky/conf/distro/include/gcsections.inc +++ b/poky/meta-poky/conf/distro/include/gcsections.inc @@ -2,31 +2,31 @@ CFLAGS_SECTION_REMOVAL = "-ffunction-sections -fdata-sections" LDFLAGS_SECTION_REMOVAL = "-Wl,--gc-sections" # packages with build problems using sections -CFLAGS_SECTION_REMOVAL_pn-glibc = "" -LDFLAGS_SECTION_REMOVAL_pn-glibc = "" -CFLAGS_SECTION_REMOVAL_pn-cairo = "" -LDFLAGS_SECTION_REMOVAL_pn-cairo = "" -CFLAGS_SECTION_REMOVAL_pn-perl = "" -LDFLAGS_SECTION_REMOVAL_pn-perl = "" -CFLAGS_SECTION_REMOVAL_pn-grub-efi = "" -LDFLAGS_SECTION_REMOVAL_pn-grub-efi = "" -CFLAGS_SECTION_REMOVAL_pn-grub = "" -LDFLAGS_SECTION_REMOVAL_pn-grub = "" +CFLAGS_SECTION_REMOVAL:pn-glibc = "" +LDFLAGS_SECTION_REMOVAL:pn-glibc = "" +CFLAGS_SECTION_REMOVAL:pn-cairo = "" +LDFLAGS_SECTION_REMOVAL:pn-cairo = "" +CFLAGS_SECTION_REMOVAL:pn-perl = "" +LDFLAGS_SECTION_REMOVAL:pn-perl = "" +CFLAGS_SECTION_REMOVAL:pn-grub-efi = "" +LDFLAGS_SECTION_REMOVAL:pn-grub-efi = "" +CFLAGS_SECTION_REMOVAL:pn-grub = "" +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-mingw-w64-runtime = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-runtime = "" -CFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-perl = "" -CFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" -LDFLAGS_SECTION_REMOVAL_pn-nativesdk-mingw-w64-winpthreads = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-glibc = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-runtime = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-perl = "" +CFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" +LDFLAGS_SECTION_REMOVAL:pn-nativesdk-mingw-w64-winpthreads = "" # set default for target -CFLAGS_append_class-target = " ${CFLAGS_SECTION_REMOVAL}" -LDFLAGS_append_class-target = " ${LDFLAGS_SECTION_REMOVAL}" +CFLAGS:append:class-target = " ${CFLAGS_SECTION_REMOVAL}" +LDFLAGS:append:class-target = " ${LDFLAGS_SECTION_REMOVAL}" # set default for nativesdk -CFLAGS_append_class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" -LDFLAGS_append_class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" +CFLAGS:append:class-nativesdk = " ${CFLAGS_SECTION_REMOVAL}" +LDFLAGS:append:class-nativesdk = " ${LDFLAGS_SECTION_REMOVAL}" 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 273ebfdfe..9c2d7753a 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 @@ -1,8 +1,8 @@ # Add an extra DISTRO_FEATURE -DISTRO_FEATURES_append = " pam" +DISTRO_FEATURES:append = " pam" # Use the LTSI Kernel PREFERRED_VERSION_linux-yocto = "5.4%" # Ensure the kernel nfs server is enabled -KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" +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 4812959fb..78c9e365e 100644 --- a/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/poky/meta-poky/conf/distro/include/poky-floating-revisions.inc @@ -7,45 +7,45 @@ #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-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}" +SRCREV:pn-dri2proto = "${AUTOREV}" #PREFERRED_VERSION_dri2proto ?= "1.99.1+git%" -SRCREV_pn-libdrm = "${AUTOREV}" +SRCREV:pn-libdrm = "${AUTOREV}" #PREFERRED_VERSION_libdrm ?= "2.4.0+git%" -SRCREV_pn-libxcb = "${AUTOREV}" +SRCREV:pn-libxcb = "${AUTOREV}" #PREFERRED_VERSION_libxcb ?= "1.1.90.1+gitr%" -SRCREV_pn-lib-proto = "${AUTOREV}" +SRCREV:pn-lib-proto = "${AUTOREV}" #PREFERRED_VERSION_xcb-proto ?= "1.2+gitr%" -SRCREV_pn-libxcb-sdk = "${AUTOREV}" +SRCREV:pn-libxcb-sdk = "${AUTOREV}" #PREFERRED_VERSION_libxcb-sdk ?= "1.1.90.1+gitr%" -SRCREV_pn-xf86-input-evdev = "${AUTOREV}" +SRCREV:pn-xf86-input-evdev = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-evdev ?= "2.0.4" -SRCREV_pn-xf86-input-mouse = "${AUTOREV}" +SRCREV:pn-xf86-input-mouse = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-mouse ?= "1.3.0+git%" -SRCREV_pn-xf86-input-keyboard = "${AUTOREV}" +SRCREV:pn-xf86-input-keyboard = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-keyboard ?= "1.3.1+git%" -SRCREV_pn-xf86-input-synaptics = "${AUTOREV}" +SRCREV:pn-xf86-input-synaptics = "${AUTOREV}" #PREFERRED_VERSION_xf86-input-synaptics ?= "0.15.2+git%" #SRCDATE_oprofile ?= "${DATE}" diff --git a/poky/meta-poky/conf/distro/poky-altcfg.conf b/poky/meta-poky/conf/distro/poky-altcfg.conf index 177bf8d18..fbfabecd9 100644 --- a/poky/meta-poky/conf/distro/poky-altcfg.conf +++ b/poky/meta-poky/conf/distro/poky-altcfg.conf @@ -10,6 +10,6 @@ DISTROOVERRIDES = "poky:poky-altcfg" INIT_MANAGER ?= "systemd" # systemd isn't suitable with musl -INIT_MANAGER_libc-musl ?= "sysvinit" +INIT_MANAGER:libc-musl ?= "sysvinit" require conf/distro/include/poky-distro-alt-test-config.inc diff --git a/poky/meta-poky/conf/distro/poky-tiny.conf b/poky/meta-poky/conf/distro/poky-tiny.conf index 8545341d8..c25e50c73 100644 --- a/poky/meta-poky/conf/distro/poky-tiny.conf +++ b/poky/meta-poky/conf/distro/poky-tiny.conf @@ -57,7 +57,7 @@ TCLIBCAPPEND = "" # in the LIBC features below. # Leave native enable to avoid build failures ENABLE_WIDEC = "false" -ENABLE_WIDEC_class-native = "true" +ENABLE_WIDEC:class-native = "true" # Drop native language support. This removes the # eglibc->bash->gettext->libc-posix-clang-wchar dependency. @@ -80,11 +80,10 @@ DISTRO_FEATURES = "${DISTRO_FEATURES_TINY} \ " # Enable LFS - see bug YOCTO #5865 -DISTRO_FEATURES_append_libc-uclibc = " largefile" -DISTRO_FEATURES_append_libc-musl = " largefile" +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}" +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" @@ -111,7 +110,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "" # The mtrace script included by eglibc is a perl script. This means the system # will build perl in case this package is installed. Since we don't care about # this script for the purposes of tiny, remove the dependency from here. -RDEPENDS_${PN}-mtrace_pn-eglibc = "" +RDEPENDS:${PN}-mtrace:pn-eglibc = "" PNBLACKLIST[build-appliance-image] = "not buildable with poky-tiny" PNBLACKLIST[core-image-base] = "not buildable with poky-tiny" @@ -125,4 +124,4 @@ PNBLACKLIST[core-image-x11] = "not buildable with poky-tiny" PNBLACKLIST[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" +PACKAGECONFIG:remove:pn-opkg-utils = "python" diff --git a/poky/meta-poky/conf/distro/poky.conf b/poky/meta-poky/conf/distro/poky.conf index 522cc92f7..c7c46cd22 100644 --- a/poky/meta-poky/conf/distro/poky.conf +++ b/poky/meta-poky/conf/distro/poky.conf @@ -10,7 +10,7 @@ MAINTAINER = "Poky <poky@lists.yoctoproject.org>" TARGET_VENDOR = "-poky" -LOCALCONF_VERSION = "1" +LOCALCONF_VERSION = "2" # Override these in poky based distros POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl ptest multiarch wayland vulkan" @@ -23,7 +23,7 @@ PREFERRED_VERSION_linux-yocto ?= "5.10%" PREFERRED_VERSION_linux-yocto-rt ?= "5.10%" SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" -SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" +SDKPATHINSTALL = "/opt/${DISTRO}/${SDK_VERSION}" DISTRO_EXTRA_RDEPENDS += "${POKY_DEFAULT_EXTRA_RDEPENDS}" DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}" diff --git a/poky/meta-poky/conf/layer.conf b/poky/meta-poky/conf/layer.conf index 22f7fe27c..2d49616cd 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 = "hardknott" +LAYERSERIES_COMPAT_yocto = "honister" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/poky/meta-poky/conf/local.conf.sample b/poky/meta-poky/conf/local.conf.sample index fb14379d2..f1f6d690f 100644 --- a/poky/meta-poky/conf/local.conf.sample +++ b/poky/meta-poky/conf/local.conf.sample @@ -148,8 +148,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-prelink' in order to prelink the filesystem image -USER_CLASSES ?= "buildstats image-prelink" +USER_CLASSES ?= "buildstats" # # Runtime testing of images @@ -235,14 +234,14 @@ BB_DISKMON_DIRS ??= "\ # # By default native qemu will build with a builtin VNC server where graphical output can be # seen. The line below enables the SDL UI frontend too. -PACKAGECONFIG_append_pn-qemu-system-native = " sdl" +PACKAGECONFIG:append:pn-qemu-system-native = " sdl" # By default libsdl2-native will be built, if you want to use your host's libSDL instead of # the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below. #ASSUME_PROVIDED += "libsdl2-native" # You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds # a handy set of menus for controlling the emulator. -#PACKAGECONFIG_append_pn-qemu-system-native = " gtk+" +#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+" # # Hash Equivalence @@ -271,4 +270,4 @@ PACKAGECONFIG_append_pn-qemu-system-native = " sdl" # CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to # track the version of this file when it was generated. This can safely be ignored if # this doesn't mean anything to you. -CONF_VERSION = "1" +CONF_VERSION = "2" diff --git a/poky/meta-poky/conf/local.conf.sample.extended b/poky/meta-poky/conf/local.conf.sample.extended index a670c7400..17e95828d 100644 --- a/poky/meta-poky/conf/local.conf.sample.extended +++ b/poky/meta-poky/conf/local.conf.sample.extended @@ -33,8 +33,8 @@ # If you want to get an image based on directfb without x11 alter # DISTRO_FEATURES: -DISTRO_FEATURES_append = " directfb" -DISTRO_FEATURES_remove = "x11" +DISTRO_FEATURES:append = " directfb" +DISTRO_FEATURES:remove = "x11" # ENABLE_BINARY_LOCALE_GENERATION controls the generation of binary locale # packages at build time using qemu-native. Disabling it (by setting it to 0) @@ -380,7 +380,7 @@ DISTRO_FEATURES_remove = "x11" # Enable LTO system-wide # #require conf/distro/include/lto.inc -#DISTRO_FEATURES_append = " lto" +#DISTRO_FEATURES:append = " lto" # # Set PS1 for SDK |