Skip to content

Commit 53818b1

Browse files
committed
use new override syntax
OE upstream is deprecating the underscore-syntax for declaring variable overrides, in favor of the less-ambiguous colon-syntax. Convert all instance of the underscore-syntax to the colon. This commit is not intended to change behavior. Signed-off-by: Alex Stewart <[email protected]>
1 parent 10d19b8 commit 53818b1

File tree

126 files changed

+524
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+524
-524
lines changed

classes/transconf-hook.bbclass

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
# * These hooks will automatically be installed to the
88
# ${TRANSCONF_HOOKS_RUNPARTS_PATH} location and added to the subpackage's
99
# files.
10-
SUMMARY_${PN}-transconf ?= "${SUMMARY} - Transconf hooks"
11-
DESCRIPTION_${PN}-transconf ?= "${DESCRIPTION} \
10+
SUMMARY:${PN}-transconf ?= "${SUMMARY} - Transconf hooks"
11+
DESCRIPTION:${PN}-transconf ?= "${DESCRIPTION} \
1212
This package contains transconf hooks, used to migrate the parent package's \
1313
configuration files between images."
1414

1515
PACKAGES =+ "${PN}-transconf"
16-
RDEPENDS_${PN}-transconf += "${PN} transconf"
17-
SECTION_${PN}-transconf = "Infrastructure"
16+
RDEPENDS:${PN}-transconf += "${PN} transconf"
17+
SECTION:${PN}-transconf = "Infrastructure"
1818

1919
TRANSCONF_HOOKS_RUNPARTS_PATH ?= "${sysconfdir}/transconf/hooks"
2020
TRANSCONF_HOOKS_${PN} ?= ""
2121

22-
FILES_${PN}-transconf = "${TRANSCONF_HOOKS_RUNPARTS_PATH}"
22+
FILES:${PN}-transconf = "${TRANSCONF_HOOKS_RUNPARTS_PATH}"
2323

24-
do_install_append() {
24+
do_install:append() {
2525
install -d "${D}${TRANSCONF_HOOKS_RUNPARTS_PATH}"
2626

2727
for hook in "${TRANSCONF_HOOKS_${PN}}"; do

conf/distro/nilrt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DISTRO_CODENAME = "${LAYERSERIES_COMPAT_meta-nilrt}"
66

77
NILRT_FEED_NAME = "2023Q1"
88

9-
DISTRO_FEATURES_append_x64 = "\
9+
DISTRO_FEATURES:append:x64 = "\
1010
x11 \
1111
opengl \
1212
"

conf/distro/nilrt.inc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ DISTRO_FEATURES += "\
2424

2525
# Because NIRLT uses opkg so intimately, assert that the rootfs should always
2626
# be made of IPKs.
27-
PACKAGE_CLASSES_prepend =+ "package_ipk"
27+
PACKAGE_CLASSES:prepend =+ "package_ipk"
2828

2929
# Clean *most* package work directories
3030
INHERIT += " rm_work "
@@ -109,14 +109,14 @@ EFI_PROVIDER = "grub-efi"
109109

110110
INCLUDE_PYCS = "0"
111111

112-
DISTRO_FEATURES_BACKFILL_CONSIDERED_arm = "gobject-introspection-data"
112+
DISTRO_FEATURES_BACKFILL_CONSIDERED:arm = "gobject-introspection-data"
113113

114114
# touchsreen calibration doesn't work with xf86-input-libinput, only with xf86-input-edev
115115
BAD_RECOMMENDATIONS += "xf86-input-libinput"
116116

117117
# Do not "--enable-udev_sync" in lvm2/libdevmapper
118-
LVM2_PACKAGECONFIG_remove_class-target = "udev"
119-
RRECOMMENDS_libdevmapper_remove_class-target = "lvm2-udevrules"
118+
LVM2_PACKAGECONFIG:remove:class-target = "udev"
119+
RRECOMMENDS:libdevmapper:remove:class-target = "lvm2-udevrules"
120120

121121
# these bbappends are constantly stale and since we don't use them
122122
# mask to avoid the bitbake warning noise
@@ -137,8 +137,8 @@ PACKAGE_ENABLE_FILELIST ?= "True"
137137
# Root URI of all NILRT feeds
138138
NILRT_FEEDS_URI ?= "http://download.ni.com/ni-linux-rt/feeds"
139139
NILRT_FEEDS_URI_RELEASE ?= "${NILRT_FEEDS_URI}/${NILRT_FEED_NAME}"
140-
NILRT_MACHINE_FEED_URI_x64 ?= "${NILRT_FEEDS_URI_RELEASE}/x64"
141-
NILRT_MACHINE_FEED_URI_xilinx-zynq ?= "${NILRT_FEEDS_URI_RELEASE}/arm"
140+
NILRT_MACHINE_FEED_URI:x64 ?= "${NILRT_FEEDS_URI_RELEASE}/x64"
141+
NILRT_MACHINE_FEED_URI:xilinx-zynq ?= "${NILRT_FEEDS_URI_RELEASE}/arm"
142142

143143
NILRT_MAIN_FEED_VERSION ?= "${NILRT_FEED_NAME}"
144144
NILRT_MACHINE_FEED_URI_nimain ?= "${NILRT_FEEDS_URI}/${NILRT_MAIN_FEED_VERSION}/ni-main"

conf/local.conf.sample

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ BB_DISKMON_DIRS ??= "\
179179
# seen. The two lines below enable the SDL backend too. By default libsdl2-native will
180180
# be built, if you want to use your host's libSDL instead of the minimal libsdl built
181181
# by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
182-
PACKAGECONFIG_append_pn-qemu-system-native = " sdl"
183-
PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
182+
PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
183+
PACKAGECONFIG:append:pn-nativesdk-qemu = " sdl"
184184
#ASSUME_PROVIDED += "libsdl2-native"
185185

186186
# Set a meaningful default BUILDNAME. The bitbake default for the variable is a

recipes-apps/mousepad/mousepad_0.5.%.bbappend

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:${THISDIR}/${PN}-${PV}:"
1+
FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:${THISDIR}/${PN}-${PV}:"
22

33
DEPENDS += "shadow-native pseudo-native niacctbase"
4-
RDEPENDS_${PN} += " niacctbase"
4+
RDEPENDS:${PN} += " niacctbase"
55
do_install[depends] += "niacctbase:do_populate_sysroot"
66

77
SRC_URI += "file://mimeapps.list"
88

9-
FILES_${PN} += "${localdir}/share/applications/mimeapps.list"
9+
FILES:${PN} += "${localdir}/share/applications/mimeapps.list"
1010

1111
homedir = "/home/${LVRT_USER}"
1212
localdir = "${homedir}/.local"
1313

14-
do_install_append () {
14+
do_install:append () {
1515
install -d ${D}${localdir}/share/applications
1616

1717
install -m 0644 ${WORKDIR}/mimeapps.list ${D}${localdir}/share/applications/

recipes-bsp/grub/grub-bootconf_%.bbappend

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
FILESEXTRAPATHS_prepend := "${THISDIR}/grub:"
1+
FILESEXTRAPATHS:prepend := "${THISDIR}/grub:"
22

33
SRC_URI += " \
44
file://grub.cfg \
55
file://grubenv \
66
file://grub.d \
77
"
88

9-
PACKAGES_prepend = "${PN}-nilrt "
9+
PACKAGES:prepend = "${PN}-nilrt "
1010

11-
FILES_${PN}-nilrt += "/boot/efi/nilrt/grub.cfg /boot/grub/grubenv /boot/bootimage.cfg.d/*.cfg"
12-
CONFFILES_${PN}-nilrt += "/boot/efi/nilrt/grub.cfg /boot/grub/grubenv /boot/bootimage.cfg.d/*.cfg"
11+
FILES:${PN}-nilrt += "/boot/efi/nilrt/grub.cfg /boot/grub/grubenv /boot/bootimage.cfg.d/*.cfg"
12+
CONFFILES:${PN}-nilrt += "/boot/efi/nilrt/grub.cfg /boot/grub/grubenv /boot/bootimage.cfg.d/*.cfg"
1313

14-
do_install_append () {
14+
do_install:append () {
1515

1616
# Install NILRT grub.cfg
1717
install -d ${D}/boot/efi/nilrt

recipes-bsp/grub/grub-efi_git.bbappend

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ GRUB_BUILDIN += "smbios chain multiboot efi_uga font gfxterm gfxmenu terminal \
66
regexp probe"
77

88
# Downstream NI-branch code quality is not yet ready to build with -Werror
9-
CFLAGS_append += "-Wno-error"
9+
CFLAGS:append += "-Wno-error"
1010

11-
PACKAGES_prepend = "${PN}-nilrt "
11+
PACKAGES:prepend = "${PN}-nilrt "
1212

13-
do_install_append_class-target() {
13+
do_install:append:class-target() {
1414

1515
# Build NILRT grub image with prefix=\efi\nilrt instead of
1616
# the default \EFI\BOOT. We keep the upstream grub image
@@ -28,4 +28,4 @@ do_install_append_class-target() {
2828
install -m 644 ${B}/${GRUB_IMAGE_PREFIX}nilrt-${GRUB_IMAGE} ${D}/boot/efi/nilrt/${GRUB_IMAGE}
2929
}
3030

31-
FILES_${PN}-nilrt = "/boot/efi/nilrt/${GRUB_IMAGE}"
31+
FILES:${PN}-nilrt = "/boot/efi/nilrt/${GRUB_IMAGE}"

recipes-bsp/grub/grub-nilrt.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FILESEXTRAPATHS_prepend := "${THISDIR}/grub:"
1+
FILESEXTRAPATHS:prepend := "${THISDIR}/grub:"
22

33
SRC_URI += "\
44
file://cmd-test-Add-bitwise-AND-document-the-feature.patch \

recipes-bsp/grub/nilrt-grub-runmode_1.0.bb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ LICENSE = "MIT"
44
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
55
SECTION = "base"
66

7-
FILESEXTRAPATHS_prepend := "${THISDIR}/grub:"
7+
FILESEXTRAPATHS:prepend := "${THISDIR}/grub:"
88

99
SRC_URI += " \
1010
file://grub-runmode-bootimage.cfg \
1111
file://grub.d \
1212
"
1313

14-
FILES_${PN} += "/boot/runmode/bootimage.cfg /boot/runmode/bootimage.cfg.d/*.cfg /boot/runmode/cpu-mitigations.cfg"
15-
CONFFILES_${PN} += "/boot/runmode/bootimage.cfg /boot/runmode/bootimage.cfg.d/*.cfg /boot/runmode/cpu-mitigations.cfg"
14+
FILES:${PN} += "/boot/runmode/bootimage.cfg /boot/runmode/bootimage.cfg.d/*.cfg /boot/runmode/cpu-mitigations.cfg"
15+
CONFFILES:${PN} += "/boot/runmode/bootimage.cfg /boot/runmode/bootimage.cfg.d/*.cfg /boot/runmode/cpu-mitigations.cfg"
1616

1717
do_install () {
1818
install -d ${D}/boot/runmode

recipes-bsp/grub/nilrt-grub-safemode_1.0.bb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ LICENSE = "MIT"
44
LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
55
SECTION = "base"
66

7-
FILESEXTRAPATHS_prepend := "${THISDIR}/grub:"
7+
FILESEXTRAPATHS:prepend := "${THISDIR}/grub:"
88

99
SRC_URI += " \
1010
file://grubenv \
1111
file://grub-safemode.cfg \
1212
file://grub-safemode-bootimage.cfg \
1313
"
1414

15-
FILES_${PN} += " \
15+
FILES:${PN} += " \
1616
/boot/bootimage.cfg \
1717
/boot/grub.cfg \
1818
/boot/grubenv \
1919
"
2020

21-
CONFFILES_${PN} += " \
21+
CONFFILES:${PN} += " \
2222
/boot/bootimage.cfg \
2323
/boot/grub.cfg \
2424
/boot/grubenv \

0 commit comments

Comments
 (0)