diff options
Diffstat (limited to 'meta-agl-core')
52 files changed, 160 insertions, 160 deletions
diff --git a/meta-agl-core/classes/image_types_wic_workaround.bbclass b/meta-agl-core/classes/image_types_wic_workaround.bbclass index a6ea0580f..1a287ff7c 100644 --- a/meta-agl-core/classes/image_types_wic_workaround.bbclass +++ b/meta-agl-core/classes/image_types_wic_workaround.bbclass @@ -29,4 +29,4 @@ def get_workaround_wic_typedeps(d): else: return '' -IMAGE_TYPEDEP_wic += "${@get_workaround_wic_typedeps(d)}" +IMAGE_TYPEDEP:wic += "${@get_workaround_wic_typedeps(d)}" diff --git a/meta-agl-core/conf/distro/include/aarch64-tune.inc b/meta-agl-core/conf/distro/include/aarch64-tune.inc index 553bb5a64..320b4f1ac 100644 --- a/meta-agl-core/conf/distro/include/aarch64-tune.inc +++ b/meta-agl-core/conf/distro/include/aarch64-tune.inc @@ -4,7 +4,7 @@ # A double inclusion would produce a warning. This include line is just for reference # include conf/machine/include/arm/arch-armv8.inc -DEFAULTTUNE_poky-agl := "aarch64" +DEFAULTTUNE:poky-agl := "aarch64" # not yet ready #QB_SYSTEM_NAME ?= "qemu-system-aarch" #QB_DEFAULT_KERNEL ?= "zImage" diff --git a/meta-agl-core/conf/distro/include/x86_64-tune.inc b/meta-agl-core/conf/distro/include/x86_64-tune.inc index 9f2bdc867..a0b5abdfb 100644 --- a/meta-agl-core/conf/distro/include/x86_64-tune.inc +++ b/meta-agl-core/conf/distro/include/x86_64-tune.inc @@ -15,41 +15,41 @@ TUNE_CCARGS = "${@bb.utils.contains('TUNE_FEATURES', 'corei7', ' -march=corei7 - # Extra tune selections AVAILTUNES += "corei7-32" -TUNE_FEATURES_tune-corei7-32 = "${TUNE_FEATURES_tune-x86} corei7" -BASE_LIB_tune-corei7-32 = "lib" -TUNE_PKGARCH_tune-corei7-32 = "corei7-32" -PACKAGE_EXTRA_ARCHS_tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-32} corei7-32" +TUNE_FEATURES:tune-corei7-32 = "${TUNE_FEATURES:tune-x86} corei7" +BASE_LIB:tune-corei7-32 = "lib" +TUNE_PKGARCH:tune-corei7-32 = "corei7-32" +PACKAGE_EXTRA_ARCHS:tune-corei7-32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-32} corei7-32" QEMU_EXTRAOPTIONS_corei7-32 = " -cpu Nehalem,check=false" AVAILTUNES += "corei7-64" -TUNE_FEATURES_tune-corei7-64 = "${TUNE_FEATURES_tune-x86-64} corei7" -BASE_LIB_tune-corei7-64 = "lib64" -TUNE_PKGARCH_tune-corei7-64 = "corei7-64" -PACKAGE_EXTRA_ARCHS_tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" +TUNE_FEATURES:tune-corei7-64 = "${TUNE_FEATURES:tune-x86-64} corei7" +BASE_LIB:tune-corei7-64 = "lib64" +TUNE_PKGARCH:tune-corei7-64 = "corei7-64" +PACKAGE_EXTRA_ARCHS:tune-corei7-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64" QEMU_EXTRAOPTIONS_corei7-64 = " -cpu Nehalem,check=false" AVAILTUNES += "corei7-64-x32" -TUNE_FEATURES_tune-corei7-64-x32 = "${TUNE_FEATURES_tune-x86-64-x32} corei7" -BASE_LIB_tune-corei7-64-x32 = "libx32" -TUNE_PKGARCH_tune-corei7-64-x32 = "corei7-64-x32" -PACKAGE_EXTRA_ARCHS_tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64-x32} corei7-64-x32" +TUNE_FEATURES:tune-corei7-64-x32 = "${TUNE_FEATURES:tune-x86-64-x32} corei7" +BASE_LIB:tune-corei7-64-x32 = "libx32" +TUNE_PKGARCH:tune-corei7-64-x32 = "corei7-64-x32" +PACKAGE_EXTRA_ARCHS:tune-corei7-64-x32 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64-x32} corei7-64-x32" QEMU_EXTRAOPTIONS_corei7-64-x32 = " -cpu Nehalem,check=false" TUNE_ARCH = "${@bb.utils.contains('TUNE_FEATURES', 'm64', '${X86ARCH64}', '' ,d)}" # Bump qemux86-64 up to corei7 AVAILTUNES += "qemux86-64" -TUNE_FEATURES_tune-qemux86-64 = "${TUNE_FEATURES_tune-x86-64} corei7" -BASE_LIB_tune-qemux86-64 = "lib64" -TUNE_PKGARCH_tune-qemux86-64 = "corei7-64" -PACKAGE_EXTRA_ARCHS_tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS_tune-core2-64} corei7-64" -QEMU_EXTRAOPTIONS_qemux86-64 = " -cpu Nehalem,check=false" +TUNE_FEATURES:tune-qemux86-64 = "${TUNE_FEATURES:tune-x86-64} corei7" +BASE_LIB:tune-qemux86-64 = "lib64" +TUNE_PKGARCH:tune-qemux86-64 = "corei7-64" +PACKAGE_EXTRA_ARCHS:tune-qemux86-64 = "${PACKAGE_EXTRA_ARCHS:tune-core2-64} corei7-64" +QEMU_EXTRAOPTIONS:qemux86-64 = " -cpu Nehalem,check=false" # QEMU / runqemu options (partly overrides qemuboot-x86.inc) QB_MACHINE = "-machine q35" -QB_SYSTEM_NAME_x86-64 = "qemu-system-x86_64" -QB_CPU_x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" -QB_CPU_KVM_x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" +QB_SYSTEM_NAME:x86-64 = "qemu-system-x86_64" +QB_CPU:x86-64 = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" +QB_CPU_KVM:x86-64 = "-cpu kvm64 -cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt" # Add the 'virtio-rng-pci' device otherwise the guest may run out of entropy QB_OPT_APPEND = "-vga vmware -show-cursor -usb -device usb-tablet -device virtio-rng-pci" diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index e13dff4ee..973eb94f9 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -54,7 +54,7 @@ AGL_DEFAULT_DISTRO_FEATURES = "largefile opengl wayland pam bluetooth bluez5 3g POKY_DEFAULT_DISTRO_FEATURES := "${AGL_DEFAULT_DISTRO_FEATURES}" OVERRIDES .= ":${DISTRO_CODENAME}" -DISTRO_FEATURES_remove = "x11" +DISTRO_FEATURES:remove = "x11" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" INIT_MANAGER = "systemd" @@ -107,7 +107,7 @@ CONNECTIVITY_CHECK_URIS ?= "" #BB_DANGLINGAPPENDS_WARNONLY = "1" # Not yet upstreamed; should be submitted. -SECURITY_CFLAGS_pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}" +SECURITY_CFLAGS:pn-qtwebengine = "${SECURITY_NO_PIE_CFLAGS}" #Redefined USER_CLASSES #Disable prelink. It is unmaintained and likely will go away. @@ -118,7 +118,7 @@ USER_CLASSES = "buildstats image-mklibs" # 2 for ARM 32bit # - a high and a medium setting for the CCARGS # - the high setting is default (needs >= cortex-a15) -# - the medium setting is enabled with: DISTRO_FEATURES_append = " agl-medium-arm-compiler " +# - the medium setting is enabled with: DISTRO_FEATURES:append = " agl-medium-arm-compiler " # 1 for ARM 64bit / AARCH64 # 1 for x86-64 # 1 for RISC-V 64-bit @@ -140,8 +140,8 @@ AGL_EXTRA_INITRAMFS_FSTYPES ??= "" # # Default IMAGE FSTYPES wic.xz AGL_DEFAULT_IMAGE_FSTYPES ?= "wic.xz wic.bmap wic.xz.sha256sum" -AGL_DEFAULT_IMAGE_FSTYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" -AGL_DEFAULT_IMAGE_FSTYPES_append_netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" +AGL_DEFAULT_IMAGE_FSTYPES:qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" +AGL_DEFAULT_IMAGE_FSTYPES:append:netboot = " ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}" AGL_DEFAULT_INITRAMFS_FSTYPES ?= "ext4.gz" # DEFAULT IMAGE_FSTYPES for AGL (no - BSPs should not set this) @@ -150,7 +150,7 @@ IMAGE_FSTYPES = "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}" INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTYPES}" # # THE FUTURE is 'wic' -# IMAGE_FSTYPES_append = " wic" +# IMAGE_FSTYPES:append = " wic" # Complementary package definitions for agl-test-wgt and agl-devel-wgt # image features @@ -159,7 +159,7 @@ COMPLEMENTARY_GLOB[agl-devel-wgt] = '*-coverage *-debug' # Fix for rpm metadata clash between nativesdk-cmake and nativesdk-qtbase-tools # (revalidate after 2017-10-15, 2018-06-12: still required) -DIRFILES_pn-nativesdk-cmake = "1" +DIRFILES:pn-nativesdk-cmake = "1" # For https://jira.automotivelinux.org/browse/SPEC-1629 : # We exclude the conflicting vars from the sstate task hash. diff --git a/meta-agl-core/conf/include/agl-devel.inc b/meta-agl-core/conf/include/agl-devel.inc index 919f066a7..394ff07b9 100644 --- a/meta-agl-core/conf/include/agl-devel.inc +++ b/meta-agl-core/conf/include/agl-devel.inc @@ -1,13 +1,13 @@ IMAGE_FEATURES =+ "debug-tweaks tools-debug tools-profile" -IMAGE_INSTALL_append = " \ +IMAGE_INSTALL:append = " \ packagegroup-agl-core-devel \ " # Install libdrm-test, including modetest, to images with GUI -IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}" +IMAGE_INSTALL:append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}" -IMAGE_FEATURES_append = " agl-devel-wgt" +IMAGE_FEATURES:append = " agl-devel-wgt" # disable install of debug files in SDK # initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs" @@ -15,4 +15,4 @@ SDKIMAGE_FEATURES="dev-pkgs" # allows insertion of code or items specific to developement OVERRIDES .= ":agl-devel" -DISTRO_FEATURES_append = " agl-devel" +DISTRO_FEATURES:append = " agl-devel" diff --git a/meta-agl-core/conf/include/base-agl.inc b/meta-agl-core/conf/include/base-agl.inc index f132359a9..30bfc93d3 100644 --- a/meta-agl-core/conf/include/base-agl.inc +++ b/meta-agl-core/conf/include/base-agl.inc @@ -4,10 +4,10 @@ MODULE_TARBALL_DEPLOY ?= "0" # Comment out below if want to use QtWebkit -PACKAGECONFIG_remove_pn-qtquick1 = "webkit" +PACKAGECONFIG:remove:pn-qtquick1 = "webkit" -ASSUME_PROVIDED_remove = "tar-native" +ASSUME_PROVIDED:remove = "tar-native" # Use static IDs to enable full-filesystem updates USERADDEXTENSION = "useradd-staticids" diff --git a/meta-agl-core/conf/local.conf.sample b/meta-agl-core/conf/local.conf.sample index 82c9dddc1..8fa6d05a2 100644 --- a/meta-agl-core/conf/local.conf.sample +++ b/meta-agl-core/conf/local.conf.sample @@ -152,7 +152,7 @@ EXTRA_IMAGE_FEATURES ?= "debug-tweaks" # - 'image-prelink' in order to prelink the filesystem image # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-mklibs image-prelink" +USER_CLASSES ?= "buildstats image-prelink" # # Runtime testing of images @@ -162,7 +162,7 @@ USER_CLASSES ?= "buildstats image-mklibs image-prelink" # 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 @@ -238,14 +238,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 @@ -270,8 +270,8 @@ CONF_VERSION = "1" AGL_FEATURES ?= "" AGL_EXTRA_IMAGE_FSTYPES ?= "" -DISTRO_FEATURES_append = " systemd " -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd " +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" # soon: INIT_MANAGER = "systemd" diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc index ae5444e13..54a6311fb 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc +++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtbase_aglcore.inc @@ -2,7 +2,7 @@ PACKAGECONFIG_WAYLAND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'way PACKAGECONFIG_GL = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}" -PACKAGECONFIG_append = " ${PACKAGECONFIG_WAYLAND}" +PACKAGECONFIG:append = " ${PACKAGECONFIG_WAYLAND}" # '-qpa wayland-egl' set wayland-egl as default of platform plugins PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard" diff --git a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc index ef5d0c7b5..08837ce26 100644 --- a/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc +++ b/meta-agl-core/dynamic-layers/meta-qt5/recipes-qt/qt5/qtwayland_aglcore.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/qtwayland:" +FILESEXTRAPATHS:prepend := "${THISDIR}/qtwayland:" # Patch reported in https://bugreports.qt.io/browse/QTBUG-79838, not upstreamed SRC_URI += " \ diff --git a/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc b/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc index babf0261f..88ff7daec 100644 --- a/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc +++ b/meta-agl-core/recipes-connectivity/busybox/busybox_aglcore.inc @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI_append = " file://enable-wget-https.cfg" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:append = " file://enable-wget-https.cfg" diff --git a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb index bfedb06ab..903ebc686 100644 --- a/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb +++ b/meta-agl-core/recipes-connectivity/connman-ncurses/connman-ncurses_git.bb @@ -25,4 +25,4 @@ do_install () { install -Dm755 connman_ncurses ${D}${bindir} } -FILES_${PN} = "${bindir}/connman_ncurses" +FILES:${PN} = "${bindir}/connman_ncurses" diff --git a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc index e701630ee..7299d18f3 100644 --- a/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc +++ b/meta-agl-core/recipes-connectivity/connman/connman_aglcore.inc @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://0001-disable-when-booting-over-nfs.patch \ file://main.conf \ " -FILES_${PN} += "${sysconfdir}/connman/main.conf" +FILES:${PN} += "${sysconfdir}/connman/main.conf" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/connman install -m 0644 ${WORKDIR}/main.conf ${D}${sysconfdir}/connman } diff --git a/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc index 6661eab6c..a539d1826 100644 --- a/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc +++ b/meta-agl-core/recipes-core/systemd/systemd-conf_aglcore.inc @@ -1,4 +1,4 @@ -do_install_append() { +do_install:append() { # Remove ethernet script deployed by upstream unconditionally (SPEC-3221) rm -rf ${D}${systemd_unitdir}/network/80-wired.network || true }
\ No newline at end of file diff --git a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc index feca107a8..51a5ff45f 100644 --- a/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc +++ b/meta-agl-core/recipes-core/systemd/systemd_aglcore.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" +FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" SRC_URI += "\ file://0002-network-add-CAN-Termination-tristate-option.patch \ @@ -8,11 +8,11 @@ SRC_URI += "\ " # enable networkd/resolved support -PACKAGECONFIG_append_pn-systemd = " \ +PACKAGECONFIG:append:pn-systemd = " \ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','systemd','networkd resolved','',d)} \ " -do_install_append() { +do_install:append() { # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time install -m 644 -p -D ${WORKDIR}/e2fsck.conf ${D}${sysconfdir}/e2fsck.conf @@ -25,10 +25,10 @@ do_install_append() { fi } -FILES_${PN} += "${sysconfdir}/e2fsck.conf " +FILES:${PN} += "${sysconfdir}/e2fsck.conf " # SPEC-737: connmand also has a NTP client which races with systemd-timesyncd -PACKAGECONFIG_remove = "timesyncd" +PACKAGECONFIG:remove = "timesyncd" # Enable systemd-coredump when agl-devel is set on -PACKAGECONFIG_append_agl-devel = " coredump" +PACKAGECONFIG:append:agl-devel = " coredump" diff --git a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc b/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc index 2de1e6836..2d50a1f24 100644 --- a/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc +++ b/meta-agl-core/recipes-devtools/cmake/cmake_aglcore.inc @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/files" +FILESEXTRAPATHS:append := ":${THISDIR}/files" -SRC_URI_append_class-nativesdk = " \ +SRC_URI:append:class-nativesdk = " \ file://environment.d-cmake-agl.sh \ " -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { install -m 644 ${WORKDIR}/environment.d-cmake-agl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/cmake-agl.sh } diff --git a/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc b/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc index 7cba933af..213542ec5 100644 --- a/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc +++ b/meta-agl-core/recipes-devtools/gdb/gdb_aglcore.inc @@ -1 +1 @@ -PACKAGECONFIG_remove = "readline" +PACKAGECONFIG:remove = "readline" diff --git a/meta-agl-core/recipes-graphics/rba/librba_1.0.bb b/meta-agl-core/recipes-graphics/rba/librba_1.0.bb index b04774c84..e8b1e0dbc 100644 --- a/meta-agl-core/recipes-graphics/rba/librba_1.0.bb +++ b/meta-agl-core/recipes-graphics/rba/librba_1.0.bb @@ -16,9 +16,9 @@ S = "${WORKDIR}/git" inherit pkgconfig cmake -FILES_${PN} = "${libdir}/" -FILES_${PN}-dev = "${libdir}/pkgconfig/librba.pc \ +FILES:${PN} = "${libdir}/" +FILES:${PN}-dev = "${libdir}/pkgconfig/librba.pc \ ${includedir}/ \ " -INSANE_SKIP_${PN} += "dev-so" -INSANE_SKIP_${PN}-dev += "dev-elf" +INSANE_SKIP:${PN} += "dev-so" +INSANE_SKIP:${PN}-dev += "dev-elf" diff --git a/meta-agl-core/recipes-graphics/rba/rba-config.bb b/meta-agl-core/recipes-graphics/rba/rba-config.bb index 17b7a6708..cbed9df0c 100644 --- a/meta-agl-core/recipes-graphics/rba/rba-config.bb +++ b/meta-agl-core/recipes-graphics/rba/rba-config.bb @@ -9,7 +9,7 @@ S = "${WORKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1" -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/rba install -m 0644 ${WORKDIR}/RBAModel.json ${D}/${sysconfdir}/rba } diff --git a/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf b/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf index bb66fd2bb..ee75c7335 100644 --- a/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf +++ b/meta-agl-core/recipes-graphics/wayland/Readme.weston-ini-conf @@ -5,7 +5,7 @@ do_configure() function to your bbappend, using machine (e.g. h3ulcb) overrides (i.e. use the MACHINE name where "machine" is used below): ''' -do_configure_machine() { +do_configure:machine() { echo repaint-window=34 >> ${WORKDIR}/core.cfg echo transition-duration=300 >> ${WORKDIR}/ivishell.cfg @@ -14,17 +14,17 @@ do_configure_machine() { ''' or: ''' -do_configure_machine() { +do_configure:machine() { sed -i -e 's/drm-backend/fbdev-backend/' ${WORKDIR}/core.cfg } ''' To add new non-display sections, just list them in SRC_URI and WESTON_FRAGMENTS: ''' -FILESEXTRAPATHS_prepend_machine := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:machine := "${THISDIR}/${PN}:" -SRC_URI_append_machine = " file://foo.cfg" -WESTON_FRAGMENTS_append_machine = " foo" +SRC_URI:append:machine = " file://foo.cfg" +WESTON_FRAGMENTS:append:machine = " foo" ''' @@ -33,7 +33,7 @@ HDMI-1-A connected screen that needs to be rotated 270 degrees to one that is rotated 90 degrees, redefine the WESTON_DISPLAYS variable: ''' -WESTON_DISPLAYS_machine = "hdmi-a-1-90" +WESTON_DISPLAYS:machine = "hdmi-a-1-90" ''' Note that the weston-ini-conf recipe automatically generates a landscape diff --git a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb index fe565c0f5..df6ae5e90 100644 --- a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb +++ b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb @@ -23,16 +23,16 @@ PACKAGECONFIG[policy-deny-all] = "-Dpolicy-default=deny-all,," inherit meson pkgconfig python3native -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/agl-compositor \ ${bindir}/agl-screenshooter \ ${libdir}/agl-compositor/libexec_compositor.so.0 \ ${libdir}/agl-compositor/libexec_compositor.so.0.0.0 \ " -RDEPENDS_${PN} += " ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}" +RDEPENDS:${PN} += " ${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ ${datadir}/agl-compositor/protocols/agl-shell.xml \ ${datadir}/agl-compositor/protocols/agl-shell-desktop.xml \ ${libdir}/agl-compositor/libexec_compositor.so \ diff --git a/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb index fe0b61f85..049068341 100644 --- a/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb +++ b/meta-agl-core/recipes-graphics/wayland/agl-shell-activator_git.bb @@ -18,5 +18,5 @@ S = "${WORKDIR}/git" inherit meson pkgconfig python3native -FILES_${PN} = " ${bindir}/agl-shell-activator \ +FILES:${PN} = " ${bindir}/agl-shell-activator \ ${bindir}/agl-activator " diff --git a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb index aed96de21..466985f41 100644 --- a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb +++ b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb @@ -13,5 +13,5 @@ S = "${WORKDIR}/git" inherit meson pkgconfig python3native -FILES_${PN} += "${libdir}/*" -FILES_${PN} += "${bindir}/*" +FILES:${PN} += "${libdir}/*" +FILES:${PN} += "${bindir}/*" diff --git a/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend b/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend index 8d0436a3b..302eba4d2 100644 --- a/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend +++ b/meta-agl-core/recipes-graphics/wayland/waltham_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = "\ +SRC_URI:append = "\ file://0001-waltham-Fix-compile-build-error.patch \ file://0002-commandxml-Add-support-wthp_app_id-interface.patch \ file://0001-Use-python3-instead-of-2.patch \ diff --git a/meta-agl-core/recipes-graphics/wayland/waltham_git.bb b/meta-agl-core/recipes-graphics/wayland/waltham_git.bb index 01023a1f2..2a2592d40 100644 --- a/meta-agl-core/recipes-graphics/wayland/waltham_git.bb +++ b/meta-agl-core/recipes-graphics/wayland/waltham_git.bb @@ -13,4 +13,4 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig DEPENDS += "libdrm virtual/kernel wayland" -RDEPENDS_${PN} += "libdrm"
\ No newline at end of file +RDEPENDS:${PN} += "libdrm"
\ No newline at end of file diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb index b3a5a4712..8842a5a46 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -63,7 +63,7 @@ do_compile() { sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted } -do_install_append() { +do_install:append() { install -d ${D}${weston_ini_dir} install -m 0644 ${WORKDIR}/weston.ini.default ${D}${weston_ini_dir}/ install -m 0644 ${WORKDIR}/weston.ini.landscape ${D}${weston_ini_dir}/ @@ -81,28 +81,28 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini" -RDEPENDS_${PN} = "weston-init" -RPROVIDES_${PN} = "weston-ini" -RCONFLICTS_${PN} = "${PN}-landscape" -ALTERNATIVE_${PN} = "weston.ini" +RDEPENDS:${PN} = "weston-init" +RPROVIDES:${PN} = "weston-ini" +RCONFLICTS:${PN} = "${PN}-landscape" +ALTERNATIVE:${PN} = "weston.ini" ALTERNATIVE_TARGET_${PN} = "${weston_ini_dir}/weston.ini.default" PACKAGE_BEFORE_PN += "${PN}-landscape" -FILES_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" +FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" -RDEPENDS_${PN}-landscape = "weston-init" -RPROVIDES_${PN}-landscape = "weston-ini" -RCONFLICTS_${PN}-landscape = "${PN}" -ALTERNATIVE_${PN}-landscape = "weston.ini" +RDEPENDS:${PN}-landscape = "weston-init" +RPROVIDES:${PN}-landscape = "weston-ini" +RCONFLICTS:${PN}-landscape = "${PN}" +ALTERNATIVE:${PN}-landscape = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape" PACKAGE_BEFORE_PN += "${PN}-landscape-inverted" -FILES_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" +FILES:${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" -RDEPENDS_${PN}-landscape-inverted = "weston-init" -RPROVIDES_${PN}-landscape-inverted = "weston-ini" -RCONFLICTS_${PN}-landscape-inverted = "${PN}" -ALTERNATIVE_${PN}-landscape-inverted = "weston.ini" +RDEPENDS:${PN}-landscape-inverted = "weston-init" +RPROVIDES:${PN}-landscape-inverted = "weston-ini" +RCONFLICTS:${PN}-landscape-inverted = "${PN}" +ALTERNATIVE:${PN}-landscape-inverted = "weston.ini" ALTERNATIVE_TARGET_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted" diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend index 88590c602..c4cf6c152 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend @@ -1,12 +1,12 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" PACKAGE_ARCH = "${MACHINE_ARCH}" -WESTON_DISPLAYS_append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}" -WESTON_DISPLAYS_append = "${@bb.utils.contains("AGL_FEATURES", "waltham-remoting", " transmitter-output", "", d)}" +WESTON_DISPLAYS:append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}" +WESTON_DISPLAYS:append = "${@bb.utils.contains("AGL_FEATURES", "waltham-remoting", " transmitter-output", "", d)}" # For virtual machines and intel-corei7-64 we want to support both the HDMI-A-1 # and Virtual-1 outputs. This allows us to run virtual images on real hardware # and vice versa. -WESTON_DISPLAYS_append_qemuall = " virtual-270" -WESTON_DISPLAYS_append_intel-corei7-64 = " virtual-270" +WESTON_DISPLAYS:append:qemuall = " virtual-270" +WESTON_DISPLAYS:append:intel-corei7-64 = " virtual-270" diff --git a/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc index fc6ab5d97..896f1eafb 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc +++ b/meta-agl-core/recipes-graphics/wayland/weston-init_aglcore.inc @@ -1,8 +1,8 @@ SYSTEMD_AUTO_ENABLE = "enable" -do_install_append() { +do_install:append() { # Remove upstream weston.ini to avoid conflict with weston-ini-conf package rm -f ${D}${sysconfdir}/xdg/weston/weston.ini } -RDEPENDS_${PN} += "weston-ini" +RDEPENDS:${PN} += "weston-ini" diff --git a/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc b/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc index d7c15e2d3..598215e7e 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc +++ b/meta-agl-core/recipes-graphics/wayland/weston_8.0_aglcore.inc @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_append := ":${THISDIR}/weston" +FILESEXTRAPATHS:append := ":${THISDIR}/weston" -SRC_URI_append = "\ +SRC_URI:append = "\ file://0005-correctly-tear-down-drm-backend.patch \ " @@ -8,8 +8,8 @@ SRC_URI_append = "\ PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" PACKAGECONFIG[headless] = "-Dbackend-headless=true" -PACKAGECONFIG_append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}" -PACKAGECONFIG_append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', ' remoting', '', d)}" +PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'weston-remoting', ' remoting', '', d)}" +PACKAGECONFIG:append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', ' remoting', '', d)}" # seat management is only for waltham-transmitter-plugin -SRC_URI_append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'file://0001-libweston-Migrate-weston_seat_init-release-to-public.patch', '', d)}" +SRC_URI:append = "${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'file://0001-libweston-Migrate-weston_seat_init-release-to-public.patch', '', d)}" diff --git a/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc b/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc index 52fe69d24..39289fef7 100644 --- a/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc +++ b/meta-agl-core/recipes-kernel/linux/kernel-devsrc_agl.inc @@ -1,5 +1,5 @@ # fix for kernel using hardcoded awk while our filesystem only provides gawk -do_install_append() { +do_install:append() { # enforce all scripts to use /usr/bin/awk . This fixes the rpm dependency failure on install of kernel-devsrc cd ${D} || true ( for i in `grep -srI "\!/bin/awk" | cut -d":" -f1 ` ; do sed -i -e "s#\!/bin/awk#\!/usr/bin/env awk#g" $i ; done ) || true diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc index 6d5c67021..8476f343b 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl-4.14.inc @@ -1,14 +1,14 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.14:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-4.14:" #------------------------------------------------------------------------- # smack patches for kernels keys -SRC_URI_append_with-lsm-smack = "\ +SRC_URI:append:with-lsm-smack = "\ file://Smack-Privilege-check-on-key-operations.patch \ file://Smack-Handle-CGROUP2-in-the-same-way-that-CGROUP.patch \ " -SRC_URI_append = "\ +SRC_URI:append = "\ file://net-sch_generic-add-if_afp.h-header-to-get-ARPHRD_CA.patch \ file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \ " diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc index da4e0c067..1ea476426 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl-4.19.inc @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/linux-4.19:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-4.19:" -SRC_URI_append = "\ +SRC_URI:append = "\ file://net-sch_generic-Use-pfifo_fast-as-fallback-scheduler.patch \ " diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc index 4003dd970..a5e9c375a 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl-config.inc @@ -22,14 +22,14 @@ # perspective) AGL additions. # -FILESEXTRAPATHS_prepend := "${THISDIR}/linux:" +FILESEXTRAPATHS:prepend := "${THISDIR}/linux:" # NOTE: AGL_KERNEL_SRC is explicitly intended as an intermediate variable # that can be used as a last resort to completely disable all AGL # additions, modifying or appending it is not recommended. AGL_KERNEL_SRC ?= "${@' '.join(['file://' + x for x in d.getVar('AGL_KCONFIG_FRAGMENTS').split()])}" -SRC_URI_append = " ${AGL_KERNEL_SRC}" +SRC_URI:append = " ${AGL_KERNEL_SRC}" # For meta-ti and meta-qcom KERNEL_CONFIG_FRAGMENTS ?= "${@' '.join(['${WORKDIR}/' + x for x in d.getVar('AGL_KCONFIG_FRAGMENTS').split()])}" @@ -54,29 +54,29 @@ AGL_KCONFIG_FRAGMENTS += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-devel', ' # # Enable required features for the agl-netboot feature -AGL_KCONFIG_FRAGMENTS_append_netboot = " \ +AGL_KCONFIG_FRAGMENTS:append:netboot = " \ nbd.cfg \ ramdisk.cfg \ " # Add hda audio and required virtio device support for qemu -AGL_KCONFIG_FRAGMENTS_append_qemuall = " \ +AGL_KCONFIG_FRAGMENTS:append:qemuall = " \ sound-hda.cfg \ qemu-virtio.cfg \ qemu-drm.cfg \ " # Configuration for using the ARM virt machine (and not versatilepb) -AGL_KCONFIG_FRAGMENTS_append_qemuarm = " qemuarm.cfg" +AGL_KCONFIG_FRAGMENTS:append:qemuarm = " qemuarm.cfg" # Additional drivers for virtual machines # OVERRIDES save us some c'n'p below ... -OVERRIDES_prepend_qemux86 = "virtualmachine:" -OVERRIDES_prepend_qemux86-64 = "virtualmachine:" -AGL_KCONFIG_FRAGMENTS_append_virtualmachine = " vbox-vmware-sata.cfg" +OVERRIDES:prepend:qemux86 = "virtualmachine:" +OVERRIDES:prepend:qemux86-64 = "virtualmachine:" +AGL_KCONFIG_FRAGMENTS:append_virtualmachine = " vbox-vmware-sata.cfg" # Extra configuration for using qemux86-64 image on physical hardware -AGL_KCONFIG_FRAGMENTS_append_qemux86-64 = " \ +AGL_KCONFIG_FRAGMENTS:append:qemux86-64 = " \ x86-extra-graphic-devices.cfg \ x86-net-devices.cfg \ x86-security-tpm.cfg \ diff --git a/meta-agl-core/recipes-kernel/linux/linux-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-agl.inc index 547c23987..c318716fe 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-agl.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-agl.inc @@ -15,7 +15,7 @@ def find_cfgs(d): return sources_list -do_configure_append () { +do_configure:append () { if [ -n "${AGL_KCONFIG_FRAGMENTS}" ]; then [ ! -f .config ] && cp -a ${WORKDIR}/defconfig .config merge_config.sh -m .config ${@" ".join(find_cfgs(d))} diff --git a/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc b/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc index dd4e8e87c..8628731cb 100644 --- a/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc +++ b/meta-agl-core/recipes-kernel/linux/linux-yocto-agl.inc @@ -4,9 +4,9 @@ include linux-agl-config.inc # For qemuarm, build a generic v7 kernel instead of the arm926j one that # upstream qemuarm defaults to. -KBUILD_DEFCONFIG_qemuarm = "multi_v7_defconfig" +KBUILD_DEFCONFIG:qemuarm = "multi_v7_defconfig" # Use alldefconfig for the qemu targets, but let other kernel-yocto # based BSPs use their own defaults (note that linux-renesas and # linux-raspberrypi also default to alldefconfig). -KCONFIG_MODE_qemuall = "--alldefconfig" +KCONFIG_MODE:qemuall = "--alldefconfig" diff --git a/meta-agl-core/recipes-platform/images/agl-image-boot.bb b/meta-agl-core/recipes-platform/images/agl-image-boot.bb index 84cdbcf31..6e2b89324 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-boot.bb +++ b/meta-agl-core/recipes-platform/images/agl-image-boot.bb @@ -4,6 +4,6 @@ require agl-image-boot.inc LICENSE = "MIT" -IMAGE_INSTALL_append = "\ +IMAGE_INSTALL:append = "\ packagegroup-agl-image-boot \ " diff --git a/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb b/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb index 866d98177..3a887a5c0 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb +++ b/meta-agl-core/recipes-platform/images/agl-image-core-autobuilder.bb @@ -4,7 +4,7 @@ require agl-image-weston.inc LICENSE = "MIT" -IMAGE_INSTALL_append = "\ +IMAGE_INSTALL:append = "\ packagegroup-agl-profile-graphical \ busybox \ psplash \ diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc b/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc index a69e698a1..8695d8d4b 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc +++ b/meta-agl-core/recipes-platform/images/agl-image-minimal-crosssdk.inc @@ -1,5 +1,5 @@ -IMAGE_FEATURES_append = " dev-pkgs" -IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" +IMAGE_FEATURES:append = " dev-pkgs" +IMAGE_INSTALL:append = " kernel-dev kernel-devsrc" @@ -8,7 +8,7 @@ IMAGE_INSTALL_append = " kernel-dev kernel-devsrc" # FIXME: # Always include the test widgets -#IMAGE_FEATURES_append = " agl-test-wgt" +#IMAGE_FEATURES:append = " agl-test-wgt" # # Required dependencies for app and test builds #TOOLCHAIN_HOST_TASK += " \ diff --git a/meta-agl-core/recipes-platform/images/agl-image-minimal.bb b/meta-agl-core/recipes-platform/images/agl-image-minimal.bb index 1fd213d0f..52cc06aeb 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-minimal.bb +++ b/meta-agl-core/recipes-platform/images/agl-image-minimal.bb @@ -4,6 +4,6 @@ require agl-image-minimal.inc LICENSE = "MIT" -IMAGE_INSTALL_append = "\ +IMAGE_INSTALL:append = "\ packagegroup-agl-image-minimal \ " diff --git a/meta-agl-core/recipes-platform/images/agl-image-weston.bb b/meta-agl-core/recipes-platform/images/agl-image-weston.bb index bbb61c922..7e9f8814e 100644 --- a/meta-agl-core/recipes-platform/images/agl-image-weston.bb +++ b/meta-agl-core/recipes-platform/images/agl-image-weston.bb @@ -4,6 +4,6 @@ require agl-image-weston.inc LICENSE = "MIT" -IMAGE_INSTALL_append = "\ +IMAGE_INSTALL:append = "\ packagegroup-agl-profile-graphical \ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb index 2717dd153..fe1ee7b8c 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-boot.bb @@ -14,12 +14,12 @@ inherit packagegroup # Disto can override VIRTUAL-RUNTIME_rngd ?= "rng-tools" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ packagegroup-core-boot \ ${VIRTUAL-RUNTIME_rngd} \ " -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ tzdata \ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb index b4fe577a0..5dd274026 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-connectivity.bb @@ -7,11 +7,11 @@ PACKAGES = "\ packagegroup-agl-core-connectivity \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PKGGROUP_ZEROCONF = "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '', d)}" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${@bb.utils.contains('VIRTUAL-RUNTIME_net_manager','connman','connman connman-client connman-tests \ connman-tools connman-ncurses' ,'',d)} \ ${@bb.utils.contains('AGL_FEATURES', 'agl-devel', '${PKGGROUP_ZEROCONF}', '', d)} \ diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb index 3909f0351..f3e2a9eff 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-devel.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" inherit packagegroup -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ strace \ ldd \ less \ @@ -22,7 +22,7 @@ RDEPENDS_${PN} = "\ " # needs meta-oe present -#RRECOMMENDS_${PN} = "\ +#RRECOMMENDS:${PN} = "\ # jq \ # htop \ # tree \ diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb index aef732838..0ee63e82a 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-os-commonlibs.bb @@ -8,7 +8,7 @@ PACKAGES = "\ packagegroup-agl-core-os-commonlibs \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb index 0ae5c77a3..7532f4cd7 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-core-security.bb @@ -8,7 +8,7 @@ PACKAGES = "\ packagegroup-agl-core-security \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb index cd37cb7d5..f9903d942 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-multimedia.bb @@ -10,7 +10,7 @@ PACKAGES = "\ packagegroup-agl-graphical-multimedia \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ alsa-utils \ gstreamer1.0-meta-base \ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb index 6d3435d99..859303049 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-graphical-weston.bb @@ -7,9 +7,9 @@ PACKAGES = "\ packagegroup-agl-graphical-weston \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ weston \ weston-init \ weston-examples \ diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb index afa04e7a1..8b2cfbb31 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-boot.bb @@ -7,12 +7,12 @@ PACKAGES = "\ packagegroup-agl-image-boot \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-core-boot \ packagegroup-machine-base \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ " diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb index 45107ed9c..1a51a9bf1 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-image-minimal.bb @@ -8,17 +8,17 @@ PACKAGES = "\ profile-agl-minimal \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-core-boot \ packagegroup-machine-base \ " -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-core-connectivity \ packagegroup-agl-core-os-commonlibs \ packagegroup-agl-core-security \ " -RDEPENDS_profile-agl-minimal = "${PN}" +RDEPENDS:profile-agl-minimal = "${PN}" diff --git a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb index bfc5e19e8..2b708603b 100644 --- a/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb +++ b/meta-agl-core/recipes-platform/packagegroups/packagegroup-agl-profile-graphical.bb @@ -9,9 +9,9 @@ PACKAGES = "\ profile-graphical \ " -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ packagegroup-agl-image-minimal \ packagegroup-agl-graphical-weston \ packagegroup-agl-graphical-multimedia \ @@ -19,4 +19,4 @@ RDEPENDS_${PN} += "\ # FIXME: Removed due to issues building against weston 5.0.0: # waltham-transmitter -RDEPENDS_profile-graphical = "${PN}" +RDEPENDS:profile-graphical = "${PN}" diff --git a/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc b/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc index 1dcbe0b7b..593ad13a6 100644 --- a/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc +++ b/meta-agl-core/recipes-support/ptest-runner/ptest-runner_agl.inc @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/ptest-runner:" +FILESEXTRAPATHS:prepend := "${THISDIR}/ptest-runner:" SRC_URI += "file://0007-WIP-Initial-LAVA-support.patch" diff --git a/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh b/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh index 93403b974..fec73069e 100755 --- a/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh +++ b/meta-agl-core/scripts/run-yocto-check-layer-feature-enabled.sh @@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf # we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd smack" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" # workaround: diff --git a/meta-agl-core/scripts/run-yocto-check-layer.sh b/meta-agl-core/scripts/run-yocto-check-layer.sh index 9082be920..369ed98b4 100755 --- a/meta-agl-core/scripts/run-yocto-check-layer.sh +++ b/meta-agl-core/scripts/run-yocto-check-layer.sh @@ -20,8 +20,8 @@ AGL_EXTRA_IMAGE_FSTYPES ?= "" # important settings imported from poky-agl.conf # we do not import -DISTRO_FEATURES_append = " systemd smack" -DISTRO_FEATURES_BACKFILL_CONSIDERED_append = " sysvinit" +DISTRO_FEATURES:append = " systemd smack" +DISTRO_FEATURES_BACKFILL_CONSIDERED:append = " sysvinit" VIRTUAL-RUNTIME_init_manager = "systemd" # workaround: |