From e0b0f343fd1ccbe955ee6925785a3f917f20fb3c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sat, 14 Aug 2021 13:20:20 +0200 Subject: layer: convert to new override syntax This is the result of automated script (0.9.3) conversion: +# meta-toradex-distro +vars = vars + ["preempt-rt","tdx","upstream"] +# meta-toradex-* machines +vars = vars + ["apalis-","colibri-","verdin-","tegra124"] +# meta-freescale +vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"] ../openembedded-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Max Krummenacher --- conf/machine/apalis-tk1.conf | 6 +++--- recipes-bsp/alsa-state/alsa-state.bbappend | 2 +- recipes-bsp/cbootimage/cbootimage.bb | 2 +- recipes-bsp/tdx-k20-fw/tdx-k20-fw_1.5.bb | 2 +- recipes-bsp/tegrarcm/tegrarcm.bb | 8 ++++---- recipes-bsp/tegrastats/tegrastats.bb | 4 ++-- recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb | 6 +++--- recipes-graphics/drm/libdrm_%.bbappend | 4 ++-- recipes-graphics/mesa/mesa-demos_%.bbappend | 2 +- recipes-graphics/mesa/mesa_%.bbappend | 10 +++++----- recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend | 6 +++--- recipes-multimedia/alsa/alsa-lib_%.bbappend | 6 +++--- recipes-support/libcryptopp/libcryptopp_5.6.4.bb | 8 ++++---- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf index 71bf464..a0126f2 100644 --- a/conf/machine/apalis-tk1.conf +++ b/conf/machine/apalis-tk1.conf @@ -33,10 +33,10 @@ WKS_FILE_DEPENDS ?= " \ " WKS_FILE = "sdimage-bootpart-tegra.wks" -WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" +WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update" # The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" PREFERRED_PROVIDER_u-boot = "u-boot-toradex-tk1" PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex-tk1" @@ -60,7 +60,7 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/mesa ?= "mesa" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" -GALLIUMDRIVERS_append_armv7a =",nouveau" +GALLIUMDRIVERS:append:armv7a =",nouveau" XSERVER ?= " \ xserver-xorg \ mesa-driver-nouveau \ diff --git a/recipes-bsp/alsa-state/alsa-state.bbappend b/recipes-bsp/alsa-state/alsa-state.bbappend index 05bfa70..324b51b 100644 --- a/recipes-bsp/alsa-state/alsa-state.bbappend +++ b/recipes-bsp/alsa-state/alsa-state.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/alsa-state/:" +FILESEXTRAPATHS:prepend := "${THISDIR}/alsa-state/:" #make this machine specific, as we have different codecs with different settings PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-bsp/cbootimage/cbootimage.bb b/recipes-bsp/cbootimage/cbootimage.bb index a46cffe..440ef6c 100644 --- a/recipes-bsp/cbootimage/cbootimage.bb +++ b/recipes-bsp/cbootimage/cbootimage.bb @@ -14,7 +14,7 @@ PV = "1.7" EXTRA_OEMAKE = 'PREFIX="${prefix}" LIBDIR="${libdir}"' -EXTRA_OEMAKE_class-native = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include' 'BUILDDIR=${S}'" +EXTRA_OEMAKE:class-native = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include' 'BUILDDIR=${S}'" S = "${WORKDIR}/git" diff --git a/recipes-bsp/tdx-k20-fw/tdx-k20-fw_1.5.bb b/recipes-bsp/tdx-k20-fw/tdx-k20-fw_1.5.bb index 3eafcc7..c22bf20 100644 --- a/recipes-bsp/tdx-k20-fw/tdx-k20-fw_1.5.bb +++ b/recipes-bsp/tdx-k20-fw/tdx-k20-fw_1.5.bb @@ -9,7 +9,7 @@ SRC_URI = " \ LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENCE;md5=a1b1cf31b1b3d185409f31cb9beb25dc" -FILES_${PN} = " /lib/firmware/apalis-tk1-k20.bin " +FILES:${PN} = " /lib/firmware/apalis-tk1-k20.bin " do_install () { install -d ${D}/lib/firmware/ diff --git a/recipes-bsp/tegrarcm/tegrarcm.bb b/recipes-bsp/tegrarcm/tegrarcm.bb index bf00d65..02c789e 100644 --- a/recipes-bsp/tegrarcm/tegrarcm.bb +++ b/recipes-bsp/tegrarcm/tegrarcm.bb @@ -12,7 +12,7 @@ SRC_URI = " \ git://github.com/NVIDIA/tegrarcm.git \ file://0001-makefile-specify-cryptopp-include-path-relative-to-s.patch \ " -SRC_URI_append_class-native = " \ +SRC_URI:append:class-native = " \ file://0001-configure.ac-link-crypotpp-as-a-static-library.patch \ file://0001-cryptopp-use-relative-path-for-cryptopp-headers.patch \ " @@ -22,10 +22,10 @@ PV = "1.7+" EXTRA_OEMAKE = 'PREFIX="${prefix}" LIBDIR="${libdir}"' -LDFLAGS_append = " -static-libstdc++" +LDFLAGS:append = " -static-libstdc++" -EXTRA_OEMAKE_class-native = "CC='${CC}' CXX='${CXX}'" -EXTRA_OEMAKE_class-nativesdk = "CC='${CC}' CXX='${CXX}'" +EXTRA_OEMAKE:class-native = "CC='${CC}' CXX='${CXX}'" +EXTRA_OEMAKE:class-nativesdk = "CC='${CC}' CXX='${CXX}'" S = "${WORKDIR}/git" diff --git a/recipes-bsp/tegrastats/tegrastats.bb b/recipes-bsp/tegrastats/tegrastats.bb index d1bc364..7350b5d 100644 --- a/recipes-bsp/tegrastats/tegrastats.bb +++ b/recipes-bsp/tegrastats/tegrastats.bb @@ -9,13 +9,13 @@ S = "${WORKDIR}" # Inhibit warnings about files being stripped. # Inhibit warnings about missing DEPENDS, Files are provided in binary form" -INSANE_SKIP_${PN} = "already-stripped build-deps file-rdeps ldflags" +INSANE_SKIP:${PN} = "already-stripped build-deps file-rdeps ldflags" do_install() { install -d ${D}${bindir} install -m 0755 ${S}/tegrastats* ${D}${bindir}/ } -FILES_${PN} = "${bindir}/tegrastats" +FILES:${PN} = "${bindir}/tegrastats" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "tegra124" diff --git a/recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb b/recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb index ade3907..7e772bf 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-tk1_2020.07.bb @@ -4,13 +4,13 @@ require recipes-bsp/u-boot/u-boot.inc B = "${WORKDIR}/build" DEPENDS += "bc-native dtc-native" -DEPENDS_append_apalis-tk1 = " cbootimage-native" +DEPENDS:append:apalis-tk1 = " cbootimage-native" PROVIDES += "u-boot" COMPATIBLE_MACHINE = "(apalis-tk1)" -SRC_URI_append_apalis-tk1 = " \ +SRC_URI:append:apalis-tk1 = " \ file://apalis-tk1.img.cfg \ file://fw_env.config \ file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \ @@ -18,7 +18,7 @@ SRC_URI_append_apalis-tk1 = " \ PACKAGE_ARCH = "${MACHINE_ARCH}" -do_deploy_append_apalis-tk1() { +do_deploy:append:apalis-tk1() { cd ${DEPLOYDIR} cp ${WORKDIR}/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct . cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend index f6e2376..a43ac8b 100644 --- a/recipes-graphics/drm/libdrm_%.bbappend +++ b/recipes-graphics/drm/libdrm_%.bbappend @@ -1,4 +1,4 @@ PACKAGES += " ${PN}-tegra" -FILES_${PN}-tegra = "${libdir}/libdrm_tegra.so.*" +FILES:${PN}-tegra = "${libdir}/libdrm_tegra.so.*" -PACKAGECONFIG_append_tegra124 = " tegra" +PACKAGECONFIG:append:tegra124 = " tegra" diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index 1f384c1..d336436 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append_apalis-tk1 = " glut" +PACKAGECONFIG:append:apalis-tk1 = " glut" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index f2f791c..c77609b 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,6 +1,6 @@ -PACKAGECONFIG_append_tegra124 = " dri3 egl gles gallium gbm " -EXTRA_OECONF_append_tegra124 = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug" -DRIDRIVERS_tegra124 = " " -GALLIUMDRIVERS_tegra124 = "nouveau,tegra" +PACKAGECONFIG:append:tegra124 = " dri3 egl gles gallium gbm " +EXTRA_OECONF:append:tegra124 = " --enable-texture-float --without-dri-drivers --enable-glx --enable-osmesa --enable-debug" +DRIDRIVERS:tegra124 = " " +GALLIUMDRIVERS:tegra124 = "nouveau,tegra" -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" +PACKAGE_ARCH:tegra124 = "${MACHINE_ARCH}" diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend index 66e0628..227a5ae 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend @@ -1,5 +1,5 @@ -COMPATIBLE_MACHINE_tegra124 = "(tegra124)" +COMPATIBLE_MACHINE:tegra124 = "(tegra124)" -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" +PACKAGE_ARCH:tegra124 = "${MACHINE_ARCH}" -PACKAGECONFIG_tegra124 ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " +PACKAGECONFIG:tegra124 ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index c03a336..657f2be 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend_tegra124 := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:tegra124 := "${THISDIR}/${PN}:" -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" +PACKAGE_ARCH:tegra124 = "${MACHINE_ARCH}" -SRC_URI_append_tegra124 = " file://0001-alsa-conf-select-default-soundcard.patch" +SRC_URI:append:tegra124 = " file://0001-alsa-conf-select-default-soundcard.patch" diff --git a/recipes-support/libcryptopp/libcryptopp_5.6.4.bb b/recipes-support/libcryptopp/libcryptopp_5.6.4.bb index 68ce50f..c537781 100644 --- a/recipes-support/libcryptopp/libcryptopp_5.6.4.bb +++ b/recipes-support/libcryptopp/libcryptopp_5.6.4.bb @@ -20,13 +20,13 @@ SRC_URI[sha256sum] = "be430377b05c15971d5ccb6e44b4d95470f561024ed6d701fe3da3a188 inherit autotools-brokensep pkgconfig -PACKAGES_prepend = "${PN}-test " +PACKAGES:prepend = "${PN}-test " EXTRA_OECONF = "--libdir=${base_libdir}" TARGET_CC_ARCH += "${LDFLAGS}" export PREFIX="${prefix}" -EXTRA_OEMAKE_class-native = "CC='${CC}' CXX='${CXX}'" +EXTRA_OEMAKE:class-native = "CC='${CC}' CXX='${CXX}'" do_compile() { sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile @@ -35,13 +35,13 @@ do_compile() { } # do not provide the shared object file, so we force to link statically for host tools -do_compile_class-native() { +do_compile:class-native() { sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC" oe_runmake all } -FILES_${PN}-test = " \ +FILES:${PN}-test = " \ ${bindir} \ ${datadir}/cryptopp \ " -- cgit v1.2.3