From 9826f87cb466a85cba736529831175437dcc621a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 25 Jul 2021 22:29:23 +0100 Subject: meta-poky/meta-yocto-bsp: Convert to new override syntax This converts the two layers to the new override syntax. This was done using /scripts/contrib/convert-overrides.py with no manual fixes. (From meta-yocto rev: 387eab70f343966267c2a68746aea1bbb8525191) Signed-off-by: Richard Purdie --- meta-poky/conf/distro/include/gcsections.inc | 44 ++++++++-------- .../distro/include/poky-distro-alt-test-config.inc | 4 +- .../distro/include/poky-floating-revisions.inc | 60 +++++++++++----------- meta-poky/conf/distro/poky-altcfg.conf | 2 +- meta-poky/conf/distro/poky-tiny.conf | 14 ++--- meta-poky/conf/local.conf.sample | 2 +- meta-poky/conf/local.conf.sample.extended | 4 +- meta-poky/recipes-core/busybox/busybox_%.bbappend | 2 +- .../recipes-core/psplash/psplash_git.bbappend | 2 +- meta-poky/recipes-core/tiny-init/tiny-init.bb | 6 +-- 10 files changed, 70 insertions(+), 70 deletions(-) (limited to 'meta-poky') diff --git a/meta-poky/conf/distro/include/gcsections.inc b/meta-poky/conf/distro/include/gcsections.inc index 7157373aa8..886a005b34 100644 --- a/meta-poky/conf/distro/include/gcsections.inc +++ b/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/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc b/meta-poky/conf/distro/include/poky-distro-alt-test-config.inc index 273ebfdfef..9c2d7753a1 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" +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/meta-poky/conf/distro/include/poky-floating-revisions.inc b/meta-poky/conf/distro/include/poky-floating-revisions.inc index 4812959fb7..78c9e365ec 100644 --- a/meta-poky/conf/distro/include/poky-floating-revisions.inc +++ b/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/meta-poky/conf/distro/poky-altcfg.conf b/meta-poky/conf/distro/poky-altcfg.conf index 177bf8d184..fbfabecd9d 100644 --- a/meta-poky/conf/distro/poky-altcfg.conf +++ b/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/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf index 8545341d84..80fb368142 100644 --- a/meta-poky/conf/distro/poky-tiny.conf +++ b/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,11 @@ 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-uclibc = " 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 +111,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 +125,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/meta-poky/conf/local.conf.sample b/meta-poky/conf/local.conf.sample index fb14379d28..53766d1a9b 100644 --- a/meta-poky/conf/local.conf.sample +++ b/meta-poky/conf/local.conf.sample @@ -235,7 +235,7 @@ 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" diff --git a/meta-poky/conf/local.conf.sample.extended b/meta-poky/conf/local.conf.sample.extended index a670c74001..d3a0f762bc 100644 --- a/meta-poky/conf/local.conf.sample.extended +++ b/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) diff --git a/meta-poky/recipes-core/busybox/busybox_%.bbappend b/meta-poky/recipes-core/busybox/busybox_%.bbappend index 000578744a..46dfc12456 100644 --- a/meta-poky/recipes-core/busybox/busybox_%.bbappend +++ b/meta-poky/recipes-core/busybox/busybox_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" diff --git a/meta-poky/recipes-core/psplash/psplash_git.bbappend b/meta-poky/recipes-core/psplash/psplash_git.bbappend index 433ef66977..1533b13c3e 100644 --- a/meta-poky/recipes-core/psplash/psplash_git.bbappend +++ b/meta-poky/recipes-core/psplash/psplash_git.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend_poky := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:poky := "${THISDIR}/files:" diff --git a/meta-poky/recipes-core/tiny-init/tiny-init.bb b/meta-poky/recipes-core/tiny-init/tiny-init.bb index 44c8e1bf5e..1de4f5e715 100644 --- a/meta-poky/recipes-core/tiny-init/tiny-init.bb +++ b/meta-poky/recipes-core/tiny-init/tiny-init.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 PR = "r2" -RDEPENDS_${PN} = "busybox" +RDEPENDS:${PN} = "busybox" SRC_URI = "file://init \ file://rc.local.sample \ @@ -27,5 +27,5 @@ do_install() { install -m 0755 ${WORKDIR}/rc.local.sample ${D}${sysconfdir} } -FILES_${PN} = "/init ${sysconfdir}/rc.local.sample" -RCONFLICTS_${PN} = "systemd" +FILES:${PN} = "/init ${sysconfdir}/rc.local.sample" +RCONFLICTS:${PN} = "systemd" -- cgit v1.2.3-54-g00ecf