KIRSKSTONE: overwrite syntax

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@foss.st.com>
This commit is contained in:
Christophe Priouzeau committed 2022-05-02 11:53:28 +02:00
1 parent 5e68bca87d
commit 483a6968fa
66 files changed
+551 -552

No files matched your search

+62 -62
View File
@@ -50,7 +50,7 @@ CMSIS_SVD_DATA ?= "\
"
# Empty cmsis-svd packages to use it as a meta package for dependencies install
FILES_${PN}_class-target = ""
FILES:${PN}:class-target = ""
do_configure[noexec] = "1"
do_compile[noexec] = "1"
@@ -84,122 +84,122 @@ do_install () {
}
# For parser and ARM_SAMPLE svd file example
LICENSE_${PN}-parser = "Apache-2.0"
LICENSE_${PN}-apache-license = "Apache-2.0"
LICENSE:${PN}-parser = "Apache-2.0"
LICENSE:${PN}-apache-license = "Apache-2.0"
FILES_${PN}-apache-license = "${INSTALL_PATH}/LICENSE-APACHE"
FILES_${PN}-parser = "${INSTALL_PATH}/*.py ${INSTALL_PATH}/examples ${INSTALL_PATH}/tests ${INSTALL_PATH}/data/ARM_SAMPLE/*.svd"
FILES:${PN}-apache-license = "${INSTALL_PATH}/LICENSE-APACHE"
FILES:${PN}-parser = "${INSTALL_PATH}/*.py ${INSTALL_PATH}/examples ${INSTALL_PATH}/tests ${INSTALL_PATH}/data/ARM_SAMPLE/*.svd"
RDEPENDS_${PN}-parser += "${PN}-apache-license"
RDEPENDS:${PN}-parser += "${PN}-apache-license"
# For python dependencies
RDEPENDS_${PN}-parser += "python3-json"
RDEPENDS_${PN}-parser += "python3-setuptools"
RDEPENDS_${PN}-parser += "python3-six"
RDEPENDS_${PN}-parser += "python3-xml"
RDEPENDS:${PN}-parser += "python3-json"
RDEPENDS:${PN}-parser += "python3-setuptools"
RDEPENDS:${PN}-parser += "python3-six"
RDEPENDS:${PN}-parser += "python3-xml"
# For Atmel
LICENSE_${PN}-data-atmel = "svd-Atmel"
LICENSE_${PN}-atmel-license = "svd-Atmel"
LICENSE:${PN}-data-atmel = "svd-Atmel"
LICENSE:${PN}-atmel-license = "svd-Atmel"
FILES_${PN}-atmel-license = "${INSTALL_PATH}/data/Atmel/License.html"
FILES_${PN}-data-atmel = "${INSTALL_PATH}/data/Atmel/*.svd"
FILES:${PN}-atmel-license = "${INSTALL_PATH}/data/Atmel/License.html"
FILES:${PN}-data-atmel = "${INSTALL_PATH}/data/Atmel/*.svd"
RDEPENDS_${PN}-data-atmel += "${PN}-atmel-license"
RDEPENDS:${PN}-data-atmel += "${PN}-atmel-license"
# For Freescale
LICENSE_${PN}-data-freescale = "svd-Freescale"
LICENSE_${PN}-freescale-license = "svd-Freescale"
LICENSE:${PN}-data-freescale = "svd-Freescale"
LICENSE:${PN}-freescale-license = "svd-Freescale"
FILES_${PN}-freescale-license = "${INSTALL_PATH}/data/Freescale/Freescale*CMSIS-SVD*License*Agreement.pdf"
FILES_${PN}-data-freescale = "${INSTALL_PATH}/data/Freescale/*.svd"
FILES:${PN}-freescale-license = "${INSTALL_PATH}/data/Freescale/Freescale*CMSIS-SVD*License*Agreement.pdf"
FILES:${PN}-data-freescale = "${INSTALL_PATH}/data/Freescale/*.svd"
RDEPENDS_${PN}-data-freescale += "${PN}-freescale-license"
RDEPENDS:${PN}-data-freescale += "${PN}-freescale-license"
# For Fujitsu
LICENSE_${PN}-data-fujitsu = "svd-Fujitsu"
LICENSE_${PN}-fujitsu-license = "svd-Fujitsu"
LICENSE:${PN}-data-fujitsu = "svd-Fujitsu"
LICENSE:${PN}-fujitsu-license = "svd-Fujitsu"
FILES_${PN}-fujitsu-license = "${INSTALL_PATH}/data/Fujitsu/License.html"
FILES_${PN}-data-fujitsu = "${INSTALL_PATH}/data/Fujitsu/*.svd"
FILES:${PN}-fujitsu-license = "${INSTALL_PATH}/data/Fujitsu/License.html"
FILES:${PN}-data-fujitsu = "${INSTALL_PATH}/data/Fujitsu/*.svd"
RDEPENDS_${PN}-data-fujitsu += "${PN}-fujitsu-license"
RDEPENDS:${PN}-data-fujitsu += "${PN}-fujitsu-license"
# For Holtek
LICENSE_${PN}-data-holtek = "Apache-2.0"
LICENSE:${PN}-data-holtek = "Apache-2.0"
FILES_${PN}-data-holtek = "${INSTALL_PATH}/data/Holtek/*.svd"
FILES:${PN}-data-holtek = "${INSTALL_PATH}/data/Holtek/*.svd"
RDEPENDS_${PN}-data-holtek += "${PN}-apache-license"
RDEPENDS:${PN}-data-holtek += "${PN}-apache-license"
# For Nordic
LICENSE_${PN}-data-nordic = "Apache-2.0"
LICENSE:${PN}-data-nordic = "Apache-2.0"
FILES_${PN}-data-nordic = "${INSTALL_PATH}/data/Nordic/*.svd"
FILES:${PN}-data-nordic = "${INSTALL_PATH}/data/Nordic/*.svd"
RDEPENDS_${PN}-data-nordic += "${PN}-apache-license"
RDEPENDS:${PN}-data-nordic += "${PN}-apache-license"
# For Nuvoton
LICENSE_${PN}-data-nuvoton = "Apache-2.0"
LICENSE:${PN}-data-nuvoton = "Apache-2.0"
FILES_${PN}-data-nuvoton = "${INSTALL_PATH}/data/Nuvoton/*.svd"
FILES:${PN}-data-nuvoton = "${INSTALL_PATH}/data/Nuvoton/*.svd"
RDEPENDS_${PN}-data-nuvoton += "${PN}-apache-license"
RDEPENDS:${PN}-data-nuvoton += "${PN}-apache-license"
# For NXP
LICENSE_${PN}-data-nxp = "Apache-2.0"
LICENSE:${PN}-data-nxp = "Apache-2.0"
FILES_${PN}-data-nxp = "${INSTALL_PATH}/data/NXP/*.svd"
FILES:${PN}-data-nxp = "${INSTALL_PATH}/data/NXP/*.svd"
RDEPENDS_${PN}-data-nxp += "${PN}-apache-license"
RDEPENDS:${PN}-data-nxp += "${PN}-apache-license"
# For SiliconLabs
LICENSE_${PN}-data-siliconlabs = "Apache-2.0"
LICENSE:${PN}-data-siliconlabs = "Apache-2.0"
FILES_${PN}-data-siliconlabs = "${INSTALL_PATH}/data/SiliconLabs/*.svd"
FILES:${PN}-data-siliconlabs = "${INSTALL_PATH}/data/SiliconLabs/*.svd"
RDEPENDS_${PN}-data-siliconlabs += "${PN}-apache-license"
RDEPENDS:${PN}-data-siliconlabs += "${PN}-apache-license"
# For Spansion
LICENSE_${PN}-data-spansion = "Apache-2.0"
LICENSE:${PN}-data-spansion = "Apache-2.0"
FILES_${PN}-data-spansion = "${INSTALL_PATH}/data/Spansion/*.svd"
FILES:${PN}-data-spansion = "${INSTALL_PATH}/data/Spansion/*.svd"
RDEPENDS_${PN}-data-spansion += "${PN}-apache-license"
RDEPENDS:${PN}-data-spansion += "${PN}-apache-license"
# For STMicro
LICENSE_${PN}-data-stmicro = "svd-STMicro"
LICENSE_${PN}-stmicro-license = "svd-STMicro"
LICENSE:${PN}-data-stmicro = "svd-STMicro"
LICENSE:${PN}-stmicro-license = "svd-STMicro"
FILES_${PN}-stmicro-license = "${INSTALL_PATH}/data/STMicro/License.html"
FILES_${PN}-data-stmicro = "${INSTALL_PATH}/data/STMicro/*.svd"
FILES:${PN}-stmicro-license = "${INSTALL_PATH}/data/STMicro/License.html"
FILES:${PN}-data-stmicro = "${INSTALL_PATH}/data/STMicro/*.svd"
RDEPENDS_${PN}-data-stmicro += "${PN}-stmicro-license"
RDEPENDS:${PN}-data-stmicro += "${PN}-stmicro-license"
# For TexasInstruments
LICENSE_${PN}-data-texasinstruments = "Apache-2.0"
LICENSE:${PN}-data-texasinstruments = "Apache-2.0"
FILES_${PN}-data-texasinstruments = "${INSTALL_PATH}/data/TexasInstruments/*.svd"
FILES:${PN}-data-texasinstruments = "${INSTALL_PATH}/data/TexasInstruments/*.svd"
RDEPENDS_${PN}-data-texasinstruments += "${PN}-apache-license"
RDEPENDS:${PN}-data-texasinstruments += "${PN}-apache-license"
# For Toshiba
LICENSE_${PN}-data-toshiba = "Apache-2.0"
LICENSE:${PN}-data-toshiba = "Apache-2.0"
FILES_${PN}-data-toshiba = "${INSTALL_PATH}/data/Toshiba/*.svd"
FILES:${PN}-data-toshiba = "${INSTALL_PATH}/data/Toshiba/*.svd"
RDEPENDS_${PN}-data-toshiba += "${PN}-apache-license"
RDEPENDS:${PN}-data-toshiba += "${PN}-apache-license"
# Make cmsis-svd package depend on all of the split-out packages
python populate_packages_prepend () {
python populate_packages:prepend () {
firmware_pkgs = oe.utils.packages_filter_out_system(d)
d.appendVar('RDEPENDS_cmsis-svd', ' ' + ' '.join(firmware_pkgs))
d.appendVar('RRECOMMENDS_cmsis-svd_append_class-nativesdk', ' ' + ' '.join(firmware_pkgs))
d.appendVar('RDEPENDS:cmsis-svd', ' ' + ' '.join(firmware_pkgs))
d.appendVar('RRECOMMENDS:cmsis-svd:append:class-nativesdk', ' ' + ' '.join(firmware_pkgs))
}
# Make sure also to add python dependencies
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-json "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-setuptools "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-six "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-xml "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-json "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-setuptools "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-six "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-xml "
# Make sure to create the cmsis-svd package
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY:${PN} = "1"
@@ -1,4 +1,4 @@
# Add stm32mp1 support
SRC_URI_append_stm32mpcommon = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
SRC_URI:append:stm32mpcommon = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
# Add the same for nativesdk
SRC_URI_append_class-nativesdk = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
SRC_URI:append:class-nativesdk = " file://0001-data-STMicro-add-support-of-stm32mp15xxx.patch"
@@ -16,6 +16,6 @@ do_install() {
cp -r ${S}/. ${D}/${datadir}/gcc-arm-none-eabi
}
INSANE_SKIP_${PN} = "already-stripped file-rdeps"
INSANE_SKIP:${PN} = "already-stripped file-rdeps"
INHIBIT_PACKAGE_STRIP = "1"
INHIBIT_SYSROOT_STRIP = "1"
@@ -5,9 +5,9 @@ require gcc-arm-none-eabi_${PV}.inc
inherit nativesdk
FILES_${PN}-doc = "${datadir}/gcc-arm-none-eabi/share/doc"
FILES:${PN}-doc = "${datadir}/gcc-arm-none-eabi/share/doc"
FILES_${PN}-staticdev = "${datadir}/gcc-arm-none-eabi/*/*/*.a \
FILES:${PN}-staticdev = "${datadir}/gcc-arm-none-eabi/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*/*/*.a \
@@ -16,8 +16,8 @@ FILES_${PN}-staticdev = "${datadir}/gcc-arm-none-eabi/*/*/*.a \
${datadir}/gcc-arm-none-eabi/*/*/*/*/*/*/*/*/*.a \
"
FILES_${PN} += "${datadir}/gcc-arm-none-eabi"
FILES:${PN} += "${datadir}/gcc-arm-none-eabi"
# Some library files in the tarball are not at the expected place,
# and it's working. But QA will complain, so skip the complaint on libdir
INSANE_SKIP_${PN} += "libdir"
INSANE_SKIP:${PN} += "libdir"
@@ -1,18 +1,18 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/files:"
#Add scripts for gdb/openocd/eclipse
SRC_URI_append_stm32mpcommon += " \
SRC_URI:append:stm32mpcommon = " \
file://gdbinit \
"
# Ref to yocto default conf at:
# openembedded-core/meta/recipes-devtools/gdb/gdb-common.inc
# We force activation of tui for the "layout" command.
EXTRA_OECONF_append_stm32mpcommon = " \
EXTRA_OECONF:append:stm32mpcommon = " \
--enable-tui \
"
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
install -d ${D}/${bindir}/
cp -a --no-preserve=ownership ${WORKDIR}/gdbinit ${D}/${bindir}/
}
+4 -4
View File
@@ -1,18 +1,18 @@
FILESEXTRAPATHS_prepend_stm32mpcommon := "${THISDIR}/files:"
FILESEXTRAPATHS:prepend:stm32mpcommon := "${THISDIR}/files:"
#Add scripts for gdb/openocd/eclipse
SRC_URI_append_stm32mpcommon += " \
SRC_URI:append:stm32mpcommon = " \
file://gdbinit \
"
# Ref to yocto default conf at:
# openembedded-core/meta/recipes-devtools/gdb/gdb-common.inc
# We force activation of tui for the "layout" command.
EXTRA_OECONF_append_stm32mpcommon = " \
EXTRA_OECONF:append:stm32mpcommon = " \
--enable-tui \
"
do_install_append_stm32mpcommon() {
do_install:append:stm32mpcommon() {
install -d ${D}/${bindir}/
cp -a ${WORKDIR}/gdbinit ${D}/${bindir}/
}
+9 -8
View File
@@ -1,13 +1,13 @@
DEPENDS = "hidapi-stm32mp"
RDEPENDS_${PN} += "libusb1 hidapi-stm32mp"
RDEPENDS:${PN} += "libusb1 hidapi-stm32mp"
inherit pkgconfig autotools-brokensep gettext
SRC_URI = " \
git://repo.or.cz/git2cl.git;destsuffix=git/tools/git2cl;name=git2cl \
git://github.com/msteveb/jimtcl;protocol=https;destsuffix=git/jimtcl;name=jimtcl \
git://repo.or.cz/libjaylink.git;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink \
git://repo.or.cz/git2cl.git;destsuffix=git/tools/git2cl;name=git2cl;branch=master \
git://github.com/msteveb/jimtcl;protocol=https;destsuffix=git/jimtcl;name=jimtcl;branch=master \
git://repo.or.cz/libjaylink.git;destsuffix=git/src/jtag/drivers/libjaylink;name=libjaylink;branch=master \
"
SRCREV_git2cl = "8373c9f74993e218a08819cbcdbab3f3564bbeba"
@@ -19,10 +19,10 @@ S = "${WORKDIR}/git"
BBCLASSEXTEND += "native nativesdk"
DEPENDS += "hidapi-stm32mp"
DEPENDS_class-native = "hidapi-stm32mp-native"
DEPENDS_class-nativesdk = "nativesdk-hidapi-stm32mp"
DEPENDS:class-native = "hidapi-stm32mp-native"
DEPENDS:class-nativesdk = "nativesdk-hidapi-stm32mp"
RDEPENDS_${PN} += "libusb1 hidapi-stm32mp"
RDEPENDS:${PN} += "libusb1 hidapi-stm32mp"
EXTRA_OECONF = " \
--disable-doxygen-html \
@@ -39,6 +39,7 @@ EXTRA_OECONF = " \
CCACHE_DISABLE = "1"
do_configure() {
export RANLIB="ranlib"
./bootstrap nosubmodule
oe_runconf ${EXTRA_OECONF}
}
@@ -56,7 +57,7 @@ do_install() {
fi
}
FILES_${PN} = " \
FILES:${PN} = " \
${datadir}/openocd/* \
${bindir}/openocd \
"
@@ -2,16 +2,16 @@ SUMMARY = "TA development kit built from optee_os, needed to build OP-TEE TAs"
LICENSE = "MIT"
SRC_URI_append_class-nativesdk = " file://environment.d-optee-sdk.sh"
SRC_URI:append:class-nativesdk = " file://environment.d-optee-sdk.sh"
BBCLASSEXTEND = " nativesdk"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
do_install_append_class-nativesdk () {
do_install:append:class-nativesdk () {
mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
install -m 644 ${WORKDIR}/environment.d-optee-sdk.sh ${D}${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh
}
FILES_${PN}_append_class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh"
FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/optee-sdk.sh"
@@ -9,9 +9,9 @@ SRC_URI = "file://create_sdcard_from_flashlayout.sh"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN}_append = " bash "
RDEPENDS:${PN}:append = " bash "
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-gptfdisk "
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-gptfdisk "
inherit deploy
@@ -28,8 +28,8 @@ do_configure() {
sed 's/^DEFAULT_RAW_SIZE=.*$/DEFAULT_RAW_SIZE='"$raw_size"'/' -i ${WORKDIR}/create_sdcard_from_flashlayout.sh
fi
bbnote "Update DEFAULT_SDCARD_PARTUUID to ${DEVICE_PARTUUID_ROOTFS_SDCARD}"
sed 's/^DEFAULT_SDCARD_PARTUUID=.*$/DEFAULT_SDCARD_PARTUUID='"${DEVICE_PARTUUID_ROOTFS_SDCARD}"'/' -i ${WORKDIR}/create_sdcard_from_flashlayout.sh
bbnote "Update DEFAULT_SDCARD_PARTUUID to ${DEVICE_PARTUUID_ROOTFS:SDCARD}"
sed 's/^DEFAULT_SDCARD_PARTUUID=.*$/DEFAULT_SDCARD_PARTUUID='"${DEVICE_PARTUUID_ROOTFS:SDCARD}"'/' -i ${WORKDIR}/create_sdcard_from_flashlayout.sh
fi
}
@@ -41,7 +41,7 @@ do_install() {
do_deploy() {
:
}
do_deploy_class-native() {
do_deploy:class-native() {
install -d ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}
install -m 0755 ${WORKDIR}/create_sdcard_from_flashlayout.sh ${DEPLOYDIR}/${SCRIPT_DEPLOYDIR}/
}
+5 -5
View File
@@ -13,11 +13,11 @@ S = "${WORKDIR}/git"
BBCLASSEXTEND = "native nativesdk"
RDEPENDS_${PN} += "cmsis-svd"
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-cmsis-svd "
RDEPENDS:${PN} += "cmsis-svd"
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-cmsis-svd "
# For python dependencies
RDEPENDS_${PN} += "python3-terminaltables"
RRECOMMENDS_${PN}_append_class-nativesdk = " nativesdk-python3-terminaltables "
RDEPENDS:${PN} += "python3-terminaltables"
RRECOMMENDS:${PN}:append:class-nativesdk = " nativesdk-python3-terminaltables "
do_configure[noexec] = "1"
do_compile[noexec] = "1"
@@ -30,4 +30,4 @@ do_install () {
install -m 0755 ${S}/gdb-svd.py ${D}${INSTALL_PATH}
}
FILES_${PN} = "${INSTALL_PATH}/*"
FILES:${PN} = "${INSTALL_PATH}/*"
@@ -1,3 +1,3 @@
SRC_URI_append_stm32mpcommon = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"
SRC_URI:append:stm32mpcommon = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"
# Add the same for nativesdk
SRC_URI_append_class-nativesdk = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"
SRC_URI:append:class-nativesdk = " file://0001-SDK-Add-relative-path-for-cmsis-svd.patch"