From 730b1f554d874a1d363d41d4c73d7c8e074e22ff Mon Sep 17 00:00:00 2001 From: Marc Mattmueller Date: Tue, 19 Jul 2022 11:17:29 +0000 Subject: [PATCH] yocto env: migrated recipes and conf file from dunfell to kirkstone Part of yocto upgrade from dunfell to kirkstone Signed-off-by: Marc Mattmueller --- .../recipes-support/vnstat/vnstat_2.6.bb | 8 ++++---- .../recipes-extended/ethtool/ethtool_5.13.bb | 2 +- .../recipes-extended/tmate/tmate_2.4.0.bb | 2 +- .../base-files/base-files_%.bbappend | 4 ++-- .../core/recipes-core/busybox/busybox_%.bbappend | 2 +- .../recipes-core/systemd/systemd-conf_%.bbappend | 4 ++-- .../core/recipes-core/systemd/systemd_%.bbappend | 12 ++++++------ .../recipes-devtools/python/python3_%.bbappend | 2 +- .../core/recipes-support/curl/curl_%.bbappend | 2 +- .../speedtest-cli/speedtest-cli_2.1.2.bbappend | 1 - .../recipes-support/chrony/chrony_%.bbappend | 6 +++--- .../recipes-support/dnsmasq/dnsmasq_%.bbappend | 4 ++-- .../recipes-extended/haveged/haveged_%.bbappend | 4 ++-- .../images/initramfs-ostree-image.bbappend | 2 +- .../ostree-initrd/ostree-initrd.bbappend | 2 +- conf/distro/netmodule-linux-minimal.conf | 9 ++++----- conf/distro/netmodule-linux-ostree.conf | 2 +- conf/distro/netmodule-linux.conf | 16 ++++++++-------- conf/layer.conf | 2 +- conf/local.conf.sample | 16 ++++++++-------- .../benchmarking-cpu/benchmarking-cpu.bb | 4 ++-- recipes-core/images/netmodule-linux-image-dev.bb | 10 +++++----- recipes-core/images/netmodule-linux-image.bb | 4 ++-- .../packagegroup-feature.inc | 6 +++--- .../packagegroup-nm-bluetooth.bb | 4 ++-- .../packagegroup-nm-boot-tools.bb | 2 +- .../packagegroup-nm-can.bb | 4 ++-- .../packagegroup-nm-fpga.bb | 2 +- .../packagegroup-nm-gnss.bb | 2 +- .../packagegroup-nm-imu.bb | 2 +- .../packagegroup-nm-net.bb | 6 +++--- .../packagegroup-nm-spi.bb | 2 +- .../packagegroup-nm-time.bb | 2 +- .../packagegroup-nm-user-module.bb | 2 +- .../packagegroup-nm-v2x.bb | 2 +- .../packagegroup-nm-wakeup-timer.bb | 2 +- .../packagegroup-nm-wifi.bb | 4 ++-- .../packagegroup-nm-wwan.bb | 2 +- .../packagegroups-sets/packagegroup-nm-base.bb | 2 +- .../packagegroup-nm-extended.bb | 4 ++-- .../packagegroup-nm-minimal.bb | 2 +- .../packagegroups-sets/packagegroup-nm.inc | 2 +- recipes-core/sdk/netmodule-linux-sdk.bb | 2 +- .../java-se-embedded/java-ejdk_1.8.0.bb | 6 +++--- recipes-extended/imu-setup/imu-setup_0.0.1.bb | 8 ++++---- recipes-extended/mount-overlay/mount-overlay.bb | 4 ++-- recipes-testing/cpputest/cpputest_git.bb | 4 ++-- .../ti-utils/ti-wl18xx-calibrator_git.bb | 6 +++--- recipes-tools/battery-test/battery-test_git.bb | 6 +++--- recipes-tools/libnmapp/libnmapp_git.bb | 8 ++++---- .../nmhw-auto-part/nmhw-auto-part_1.1.0.bb | 6 +++--- recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb | 10 +++++----- recipes-tools/ssf-mgr/ssf-mgr_git.bb | 12 ++++++------ recipes-tools/sys-mon/sys-mon_git.bb | 8 ++++---- .../socket-uart/socket-uart_0.0.1.bb | 6 +++--- .../um-service-cfg/um-service-cfg_0.0.1.bb | 8 ++++---- 56 files changed, 133 insertions(+), 135 deletions(-) delete mode 100644 bbappends/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bbappend diff --git a/backports/networking-layer/recipes-support/vnstat/vnstat_2.6.bb b/backports/networking-layer/recipes-support/vnstat/vnstat_2.6.bb index 03e1dba..de7ac83 100644 --- a/backports/networking-layer/recipes-support/vnstat/vnstat_2.6.bb +++ b/backports/networking-layer/recipes-support/vnstat/vnstat_2.6.bb @@ -1,6 +1,6 @@ DESCRIPTION = "vnStat is a console-based network traffic monitor for Linux and BSD that keeps a log of network traffic for the selected interface(s)." HOMEPAGE = "https://humdi.net/vnstat/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "net" DEPENDS = "gd sqlite3" @@ -13,7 +13,7 @@ inherit autotools pkgconfig systemd EXTRA_OECONF = "--disable-extra-paths" -do_configure_append() { +do_configure:append() { # enable a volatile and persistent path for reading and writing the data base: sed -i 's|ReadWritePaths=\/var\/lib|ReadWritePaths=\/var\/lib \/run\/|g' ${S}/examples/systemd/vnstat.service @@ -25,8 +25,8 @@ do_configure_append() { } -do_install_append() { +do_install:append() { install -Dm644 ${S}/examples/systemd/vnstat.service "${D}${systemd_system_unitdir}/vnstat.service" } -SYSTEMD_SERVICE_${PN} = "vnstat.service" +SYSTEMD_SERVICE:${PN} = "vnstat.service" diff --git a/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb b/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb index 3c99deb..8376c2e 100644 --- a/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb +++ b/backports/openembedded-layer/recipes-extended/ethtool/ethtool_5.13.bb @@ -2,7 +2,7 @@ SUMMARY = "Display or change ethernet card settings" DESCRIPTION = "A small utility for examining and tuning the settings of your ethernet-based network interfaces." HOMEPAGE = "http://www.kernel.org/pub/software/network/ethtool/" SECTION = "console/network" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://ethtool.c;beginline=4;endline=17;md5=c19b30548c582577fc6b443626fc1216" diff --git a/backports/openembedded-layer/recipes-extended/tmate/tmate_2.4.0.bb b/backports/openembedded-layer/recipes-extended/tmate/tmate_2.4.0.bb index 7ae8c51..6dc5c0c 100644 --- a/backports/openembedded-layer/recipes-extended/tmate/tmate_2.4.0.bb +++ b/backports/openembedded-layer/recipes-extended/tmate/tmate_2.4.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f7d9aab84ec6567139a4755c48d147fb" DEPENDS:append = " libevent libssh msgpack-c ncurses" SRC_URI = "\ - git://github.com/tmate-io/tmate.git;protocol=https \ + git://github.com/tmate-io/tmate.git;protocol=https;branch=master \ " SRCREV = "5e00bfa5e137e76c81888727712ced2b3fd99f5b" diff --git a/bbappends/core/recipes-core/base-files/base-files_%.bbappend b/bbappends/core/recipes-core/base-files/base-files_%.bbappend index b7576f7..d60a8ec 100644 --- a/bbappends/core/recipes-core/base-files/base-files_%.bbappend +++ b/bbappends/core/recipes-core/base-files/base-files_%.bbappend @@ -1,8 +1,8 @@ BASEFILESISSUEINSTALL = "do_install_basefilesissue" DISTROVERSION-ISSUE = "\S{PRETTY_NAME}\n" -DISTROVERSION-ISSUE_append= "kernel \\\r\n" -DISTROVERSION-ISSUE_append = "\\\n @ \\\l\n" +DISTROVERSION-ISSUE:append= "kernel \\\r\n" +DISTROVERSION-ISSUE:append = "\\\n @ \\\l\n" #r: kernel version #n: hostname diff --git a/bbappends/core/recipes-core/busybox/busybox_%.bbappend b/bbappends/core/recipes-core/busybox/busybox_%.bbappend index 6cbc9a2..e95d333 100644 --- a/bbappends/core/recipes-core/busybox/busybox_%.bbappend +++ b/bbappends/core/recipes-core/busybox/busybox_%.bbappend @@ -5,7 +5,7 @@ # # More details can be found in the Kernel Dev Manual # http://www.yoctoproject.org/docs/current/kernel-dev/kernel-dev.html#changing-the-configuration -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += " \ file://no_rfkill.cfg \ diff --git a/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend b/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend index d4d0f15..302d6c3 100644 --- a/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend +++ b/bbappends/core/recipes-core/systemd/systemd-conf_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -do_install_append() { +do_install:append() { # Remove default network configurations rm -rf ${D}${systemd_unitdir}/network } diff --git a/bbappends/core/recipes-core/systemd/systemd_%.bbappend b/bbappends/core/recipes-core/systemd/systemd_%.bbappend index 1e5d28d..4b56f3a 100644 --- a/bbappends/core/recipes-core/systemd/systemd_%.bbappend +++ b/bbappends/core/recipes-core/systemd/systemd_%.bbappend @@ -1,8 +1,8 @@ -PACKAGECONFIG_remove = "nss-resolve resolved" -ALTERNATIVE_${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PACKAGECONFIG:remove = "nss-resolve resolved" +ALTERNATIVE:${PN} = "halt reboot shutdown poweroff runlevel ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'resolv-conf', '', d)}" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append = " \ +SRC_URI:append = " \ file://journald.conf \ " @@ -10,9 +10,9 @@ SRC_URI_append = " \ # Having this dependency leads to a rebuild of systemd when os-release is rebuilt, # even when the recommendations are excluded. # It may not be required with future releases of yocto. -RRECOMMENDS_${PN}_remove = "os-release" +RRECOMMENDS:${PN}:remove = "os-release" -do_install_append() { +do_install:append() { # Remove default network configurations rm -rf ${D}${systemd_unitdir}/network diff --git a/bbappends/core/recipes-devtools/python/python3_%.bbappend b/bbappends/core/recipes-devtools/python/python3_%.bbappend index 492ec87..6191fe4 100644 --- a/bbappends/core/recipes-devtools/python/python3_%.bbappend +++ b/bbappends/core/recipes-devtools/python/python3_%.bbappend @@ -4,7 +4,7 @@ clean_pycache(){ find ${PKGD} | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf } -do_install_append(){ +do_install:append(){ cd ${D}${libdir}/python${PYTHON_MAJMIN} rm -rf turtle.py turtledemo/ cd - diff --git a/bbappends/core/recipes-support/curl/curl_%.bbappend b/bbappends/core/recipes-support/curl/curl_%.bbappend index a886dfe..7d464a7 100644 --- a/bbappends/core/recipes-support/curl/curl_%.bbappend +++ b/bbappends/core/recipes-support/curl/curl_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " tftp" +PACKAGECONFIG:append = " tftp" diff --git a/bbappends/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bbappend b/bbappends/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bbappend deleted file mode 100644 index d92bc81..0000000 --- a/bbappends/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.2.bbappend +++ /dev/null @@ -1 +0,0 @@ -SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa" diff --git a/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend b/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend index f17a0de..5baefa2 100644 --- a/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend +++ b/bbappends/networking-layer/recipes-support/chrony/chrony_%.bbappend @@ -1,8 +1,8 @@ # Copyright (C) 2020 Ramon Moesching # Released under the MIT license (see COPYING.MIT for the terms) -FILESEXTRAPATHS_prepend:= "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:= "${THISDIR}/files:" -do_install_append () { +do_install:append () { if ${@bb.utils.contains("MACHINE_FEATURES", "pps", "true", "false", d)}; then sed -i '/^#refclock PPS.*/s/^#//' ${D}/${sysconfdir}/chrony.conf fi @@ -12,7 +12,7 @@ do_install_append () { # thus gpsd daemon needs to start with -n paramteter. # Patching at installation time gpsd configuration file # to apply this parameter -pkg_postinst_${PN}_prepend () { +pkg_postinst:${PN}:prepend () { GPSD_CONF=$D${sysconfdir}/default/gpsd.default diff --git a/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend b/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend index 158d2e7..3a2a68e 100644 --- a/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend +++ b/bbappends/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend @@ -1,8 +1,8 @@ -PACKAGECONFIG_append = " dbus" +PACKAGECONFIG:append = " dbus" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append () { +do_install:append () { install -d ${D}${localstatedir}/lib/misc/ } diff --git a/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend b/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend index c6742be..847d1eb 100644 --- a/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend +++ b/bbappends/openembedded-layer/recipes-extended/haveged/haveged_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend:= "${THISDIR}/patches:" +FILESEXTRAPATHS:prepend:= "${THISDIR}/patches:" -SRC_URI_prepend_mx8 = " file://start-daemon-with-data-arg-16.patch " +SRC_URI:prepend_mx8 = " file://start-daemon-with-data-arg-16.patch " diff --git a/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend b/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend index 6ad2440..75ddd8b 100644 --- a/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend +++ b/bbappends/sota/recipes-core/images/initramfs-ostree-image.bbappend @@ -1,3 +1,3 @@ -ROOTFS_BOOTSTRAP_INSTALL_append = " \ +ROOTFS_BOOTSTRAP_INSTALL:append = " \ packagegroup-nm-wifi-minimal \ " diff --git a/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend b/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend index 2cc2213..33f345e 100644 --- a/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend +++ b/bbappends/sota/recipes-sota/ostree-initrd/ostree-initrd.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://0001-Remove-log-info-from-init.patch" diff --git a/conf/distro/netmodule-linux-minimal.conf b/conf/distro/netmodule-linux-minimal.conf index 4cd3550..5b955ad 100644 --- a/conf/distro/netmodule-linux-minimal.conf +++ b/conf/distro/netmodule-linux-minimal.conf @@ -2,13 +2,12 @@ require netmodule-linux.conf DISTRO = "netmodule-linux-minimal" DISTRO_VARIANT = " for minimal fitImage" -INCLUDE_PYCS_pn-python3 = "0" +INCLUDE_PYCS:pn-python3 = "0" -INHERIT += "reproducible_build_simple" -export SOURCE_DATE_EPOCH ?= "0" -REPRODUCIBLE_TIMESTAMP_ROOTFS = "" +#export SOURCE_DATE_EPOCH ?= "0" +#REPRODUCIBLE_TIMESTAMP_ROOTFS = "" PREFERRED_PROVIDER_virtual/netmodule-image = "netmodule-fitimage" -INITRAMFS_IMAGE_pn-netmodule-fitimage = "netmodule-linux-image-minimal" +INITRAMFS_IMAGE:pn-netmodule-fitimage = "netmodule-linux-image-minimal" IMAGE_FSTYPES = "cpio.gz cpio.gz.u-boot" diff --git a/conf/distro/netmodule-linux-ostree.conf b/conf/distro/netmodule-linux-ostree.conf index a631e51..5840ef3 100644 --- a/conf/distro/netmodule-linux-ostree.conf +++ b/conf/distro/netmodule-linux-ostree.conf @@ -12,7 +12,7 @@ OSTREE_INITRAMFS_FSTYPES = "ext4.gz.u-boot" OSTREE_COMMIT_SUBJECT = "${IMAGE_BASENAME};${DISTRO_VERSION}" # Unneeded tools added by sota class -IMAGE_INSTALL_remove = "aktualizr aktualizr-info" +IMAGE_INSTALL:remove = "aktualizr aktualizr-info" SOTA_CLIENT = " " SOTA_CLIENT_PROV = " " diff --git a/conf/distro/netmodule-linux.conf b/conf/distro/netmodule-linux.conf index 3838a3b..c6a1da4 100644 --- a/conf/distro/netmodule-linux.conf +++ b/conf/distro/netmodule-linux.conf @@ -27,18 +27,18 @@ DISTRO_FEATURES = "bluetooth usbhost pci ipv4 ipv6 wifi multiarch usrmerge" # Adding them to this variable allow us to remove them. DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio gobject-introspection-data ldconfig" -EXTRA_IMAGECMD_append_ext4 = " -O ^64bit" -EXTRA_IMAGECMD_append_ota-ext4 = " -O ^64bit" +EXTRA_IMAGECMD:append_ext4 = " -O ^64bit" +EXTRA_IMAGECMD:append_ota-ext4 = " -O ^64bit" # Packages -PACKAGECONFIG_append_pn-curl = " ssl" -PACKAGECONFIG_remove_pn-curl = "gnutls" +PACKAGECONFIG:append:pn-curl = " ssl" +PACKAGECONFIG:remove:pn-curl = "gnutls" -PACKAGECONFIG_append_pn-libgpiod = " python3" -PACKAGECONFIG_append_pn-networkmanager = " modemmanager" -PACKAGECONFIG_pn-gpsd = "" -PACKAGECONFIG_append_pn-openssl = " cryptodev-linux" +PACKAGECONFIG:append:pn-libgpiod = " python3" +#PACKAGECONFIG:append:pn-networkmanager = " modemmanager" +PACKAGECONFIG:pn-gpsd = "" +PACKAGECONFIG:append:pn-openssl = " cryptodev-linux" # These rules may make gpsd start automatically when detecting a # receiver. We don't want that since gpsd is started by gnss-mgr diff --git a/conf/layer.conf b/conf/layer.conf index 88151f2..a07c752 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -19,4 +19,4 @@ LAYERVERSION_netmodule-distro = "1" LAYERDEPENDS_netmodule-distro = "core" -LAYERSERIES_COMPAT_netmodule-distro = "dunfell" +LAYERSERIES_COMPAT_netmodule-distro = "dunfell kirkstone" diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 9cd4fb4..8e90fa4 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -1,25 +1,25 @@ BB_NUMBER_THREADS ?= "4" PARALLEL_MAKE ?= "-j 4" PACKAGE_CLASSES ?= "package_rpm" -USER_CLASSES ?= "buildstats image-mklibs image-prelink" +USER_CLASSES ?= "buildstats image-prelink" PATCHRESOLVE = "noop" BB_DISKMON_DIRS = "\ STOPTASKS,${TMPDIR},1G,100K \ STOPTASKS,${DL_DIR},1G,100K \ STOPTASKS,${SSTATE_DIR},1G,100K \ STOPTASKS,/tmp,100M,100K \ - ABORT,${TMPDIR},100M,1K \ - ABORT,${DL_DIR},100M,1K \ - ABORT,${SSTATE_DIR},100M,1K \ - ABORT,/tmp,10M,1K" + HALT,${TMPDIR},100M,1K \ + HALT,${DL_DIR},100M,1K \ + HALT,${SSTATE_DIR},100M,1K \ + HALT,/tmp,10M,1K" ASSUME_PROVIDED += "libsdl-native" CONF_VERSION = "1" -EXTRA_IMAGE_FEATURES_append = " debug-tweaks" +EXTRA_IMAGE_FEATURES:append = " debug-tweaks" INHERIT += "rm_work" -ERROR_QA_remove += "version-going-backwards" -WARN_QA_append += "version-going-backwards" +ERROR_QA:remove = "version-going-backwards" +WARN_QA:append = " version-going-backwards" INHERIT += "buildhistory" BUILDHISTORY_COMMIT = "1" diff --git a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb index 42ee086..957f434 100644 --- a/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb +++ b/recipes-benchmarking/benchmarking-cpu/benchmarking-cpu.bb @@ -1,6 +1,6 @@ DESCRIPTION = "CPU Benchmarking bin" HOMEPAGE = "http://www.netmodule.com/" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" PROVIDES = "benchmarking-cpu" @@ -13,7 +13,7 @@ SRC_URI = " \ file://memspeed \ " -FILES_${PN} += "/usr/bin/*" +FILES:${PN} += "/usr/bin/*" S = "${WORKDIR}" diff --git a/recipes-core/images/netmodule-linux-image-dev.bb b/recipes-core/images/netmodule-linux-image-dev.bb index 151a7e0..9ad056f 100644 --- a/recipes-core/images/netmodule-linux-image-dev.bb +++ b/recipes-core/images/netmodule-linux-image-dev.bb @@ -2,7 +2,7 @@ require netmodule-linux-image.bb SUMMARY = "netmodule image for developement only" -IMAGE_FEATURES_append = " \ +IMAGE_FEATURES:append = " \ tools-debug \ " @@ -36,12 +36,12 @@ EASY_EDITOR = " \ nano \ " -BENCH_TOOLS_cortexa9hf-neon_append = " cpuburn-neon " -BENCH_TOOLS_cortexa8hf-neon_append = " cpuburn-neon " +BENCH_TOOLS_cortexa9hf-neon:append = " cpuburn-neon " +BENCH_TOOLS_cortexa8hf-neon:append = " cpuburn-neon " -IMAGE_INSTALL_remove_aarch64 = "benchmarking-cpu" +IMAGE_INSTALL:remove:aarch64 = "benchmarking-cpu" -IMAGE_INSTALL_append = " \ +IMAGE_INSTALL:append = " \ lrzsz \ ${BENCH_TOOLS} \ ${EASY_EDITOR} \ diff --git a/recipes-core/images/netmodule-linux-image.bb b/recipes-core/images/netmodule-linux-image.bb index cd653ad..5b175d2 100644 --- a/recipes-core/images/netmodule-linux-image.bb +++ b/recipes-core/images/netmodule-linux-image.bb @@ -5,7 +5,7 @@ require includes/image-preprocessing.inc SUMMARY = "NetModule Linux Distro Image" PROVIDES += "virtual/netmodule-image" -IMAGE_FEATURES_append = " \ +IMAGE_FEATURES:append = " \ package-management \ " @@ -16,7 +16,7 @@ IMAGE_INSTALL = " \ " -IMAGE_INSTALL_append_sota = " mount-overlay" +IMAGE_INSTALL:append_sota = " mount-overlay" LICENSE = "BSD" diff --git a/recipes-core/packagegroups-features/packagegroup-feature.inc b/recipes-core/packagegroups-features/packagegroup-feature.inc index de28eba..b6a6eac 100644 --- a/recipes-core/packagegroups-features/packagegroup-feature.inc +++ b/recipes-core/packagegroups-features/packagegroup-feature.inc @@ -2,6 +2,6 @@ inherit packagegroup PACKAGES = "${PN}-minimal ${PN}-base ${PN}-extended" -SUMMARY_${PN}-minimal = "Minimal packages for ${PN}" -SUMMARY_${PN}-base = "Base packages for ${PN}" -SUMMARY_${PN}-extended = "Extended packages for ${PN}" +SUMMARY:${PN}-minimal = "Minimal packages for ${PN}" +SUMMARY:${PN}-base = "Base packages for ${PN}" +SUMMARY:${PN}-extended = "Extended packages for ${PN}" diff --git a/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb b/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb index a1f73ee..62d6558 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-bluetooth.bb @@ -5,11 +5,11 @@ require packagegroup-feature.inc PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN}-base = " \ +RDEPENDS:${PN}-base = " \ ${@bb.utils.contains("MACHINE_FEATURES", "tibluetooth", "tibluetooth", "", d)} \ " -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ bluez5-obex \ bluez5-noinst-tools \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-boot-tools.bb b/recipes-core/packagegroups-features/packagegroup-nm-boot-tools.bb index d995c27..e4ef1d0 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-boot-tools.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-boot-tools.bb @@ -5,6 +5,6 @@ require packagegroup-feature.inc PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ ${@bb.utils.contains("MACHINE_FEATURES", "imx-boot", "", "bootloader-config", d)} \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-can.bb b/recipes-core/packagegroups-features/packagegroup-nm-can.bb index c639650..d595022 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-can.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-can.bb @@ -3,10 +3,10 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-base = " \ +RDEPENDS:${PN}-base = " \ can-utils \ " -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ cannelloni \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-fpga.bb b/recipes-core/packagegroups-features/packagegroup-nm-fpga.bb index aca2c12..16def69 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-fpga.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-fpga.bb @@ -3,6 +3,6 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-base = " \ +RDEPENDS:${PN}-base = " \ fpga-image \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-gnss.bb b/recipes-core/packagegroups-features/packagegroup-nm-gnss.bb index 6b585fa..1e30a21 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-gnss.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-gnss.bb @@ -6,7 +6,7 @@ require packagegroup-feature.inc PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ gpsd \ gpsd-conf \ gps-utils \ diff --git a/recipes-core/packagegroups-features/packagegroup-nm-imu.bb b/recipes-core/packagegroups-features/packagegroup-nm-imu.bb index c080716..c9f6158 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-imu.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-imu.bb @@ -3,6 +3,6 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ imu-setup \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-net.bb b/recipes-core/packagegroups-features/packagegroup-nm-net.bb index 2054d9f..5f6f28a 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-net.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-net.bb @@ -4,18 +4,18 @@ LICENSE = "MIT" require packagegroup-feature.inc # less is needed for nmcli to show proper output -RDEPENDS_${PN}-minimal = " \ +RDEPENDS:${PN}-minimal = " \ networkmanager \ less \ " -RDEPENDS_${PN}-base = " \ +RDEPENDS:${PN}-base = " \ iproute2 \ packagegroup-core-ssh-openssh \ openssh-sftp-server \ " -RDEPENDS_${PN}-extended= " \ +RDEPENDS:${PN}-extended= " \ ethtool \ iptables \ iptables-module-ipt-masquerade \ diff --git a/recipes-core/packagegroups-features/packagegroup-nm-spi.bb b/recipes-core/packagegroups-features/packagegroup-nm-spi.bb index 5cb738a..8c5cbbd 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-spi.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-spi.bb @@ -3,6 +3,6 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-base = " \ +RDEPENDS:${PN}-base = " \ spitools \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-time.bb b/recipes-core/packagegroups-features/packagegroup-nm-time.bb index 483d2aa..529951b 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-time.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-time.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ util-linux-rtcwake \ chrony \ chronyc \ diff --git a/recipes-core/packagegroups-features/packagegroup-nm-user-module.bb b/recipes-core/packagegroups-features/packagegroup-nm-user-module.bb index f82bd92..effe1f8 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-user-module.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-user-module.bb @@ -3,6 +3,6 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-base = " \ +RDEPENDS:${PN}-base = " \ socket-uart \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-v2x.bb b/recipes-core/packagegroups-features/packagegroup-nm-v2x.bb index 41653f7..f5cba77 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-v2x.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-v2x.bb @@ -3,6 +3,6 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ v2x-ieee802.11p \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-wakeup-timer.bb b/recipes-core/packagegroups-features/packagegroup-nm-wakeup-timer.bb index 85c59f3..2942a0d 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-wakeup-timer.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-wakeup-timer.bb @@ -3,6 +3,6 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ wakeup-timer \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb b/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb index fd96ce3..00ed1a6 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-wifi.bb @@ -23,13 +23,13 @@ UBLOX_WIFI = " \ " -RDEPENDS_${PN}-minimal = " \ +RDEPENDS:${PN}-minimal = " \ ${@bb.utils.contains("MACHINE_FEATURES", "ti-wifi", "${TI_WIFI}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "ath-wifi", "${ATH_WIFI}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "ublox-wifi", "${UBLOX_WIFI}", "", d)} \ " -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ hostapd \ " diff --git a/recipes-core/packagegroups-features/packagegroup-nm-wwan.bb b/recipes-core/packagegroups-features/packagegroup-nm-wwan.bb index 76aaeee..d9211e4 100644 --- a/recipes-core/packagegroups-features/packagegroup-nm-wwan.bb +++ b/recipes-core/packagegroups-features/packagegroup-nm-wwan.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" require packagegroup-feature.inc -RDEPENDS_${PN}-extended = " \ +RDEPENDS:${PN}-extended = " \ modemmanager \ wwan-config \ " diff --git a/recipes-core/packagegroups-sets/packagegroup-nm-base.bb b/recipes-core/packagegroups-sets/packagegroup-nm-base.bb index 923595c..f67b4dd 100644 --- a/recipes-core/packagegroups-sets/packagegroup-nm-base.bb +++ b/recipes-core/packagegroups-sets/packagegroup-nm-base.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" require packagegroup-nm.inc FEATURE_LEVEL = "base" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-nm-minimal \ bash \ curl \ diff --git a/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb b/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb index db6a6d8..95cf38d 100644 --- a/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb +++ b/recipes-core/packagegroups-sets/packagegroup-nm-extended.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" require packagegroup-nm.inc FEATURE_LEVEL = "extended" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-nm-base \ packagegroup-base \ nmhw-auto-part \ @@ -22,7 +22,7 @@ RDEPENDS_${PN} = " \ " # Hacks for V2X-GNSS-HUB power sequence on HW23 -RDEPENDS_${PN}_append_imx8-nmhw23 = " \ +RDEPENDS:${PN}:append_imx8-nmhw23 = " \ usb-hub-reset \ gnss-init \ " diff --git a/recipes-core/packagegroups-sets/packagegroup-nm-minimal.bb b/recipes-core/packagegroups-sets/packagegroup-nm-minimal.bb index a8c1c03..5ba7036 100644 --- a/recipes-core/packagegroups-sets/packagegroup-nm-minimal.bb +++ b/recipes-core/packagegroups-sets/packagegroup-nm-minimal.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" require packagegroup-nm.inc FEATURE_LEVEL = "minimal" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-core-boot \ util-linux-agetty \ systemd-serialgetty \ diff --git a/recipes-core/packagegroups-sets/packagegroup-nm.inc b/recipes-core/packagegroups-sets/packagegroup-nm.inc index b9da2a6..18b2e8b 100644 --- a/recipes-core/packagegroups-sets/packagegroup-nm.inc +++ b/recipes-core/packagegroups-sets/packagegroup-nm.inc @@ -3,7 +3,7 @@ inherit packagegroup PACKAGE_ARCH = "${MACHINE_ARCH}" # FEATURE_LEVEL must be defined by including file -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:append = " \ \ packagegroup-nm-net-${FEATURE_LEVEL} \ packagegroup-nm-boot-tools-${FEATURE_LEVEL} \ diff --git a/recipes-core/sdk/netmodule-linux-sdk.bb b/recipes-core/sdk/netmodule-linux-sdk.bb index a6278ed..97b0205 100644 --- a/recipes-core/sdk/netmodule-linux-sdk.bb +++ b/recipes-core/sdk/netmodule-linux-sdk.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" inherit populate_sdk -TOOLCHAIN_TARGET_TASK_append = " \ +TOOLCHAIN_TARGET_TASK:append = " \ cpputest-staticdev \ libnmapp-staticdev \ " diff --git a/recipes-devtools/java-se-embedded/java-ejdk_1.8.0.bb b/recipes-devtools/java-se-embedded/java-ejdk_1.8.0.bb index b7d36af..1bd4922 100644 --- a/recipes-devtools/java-se-embedded/java-ejdk_1.8.0.bb +++ b/recipes-devtools/java-se-embedded/java-ejdk_1.8.0.bb @@ -15,7 +15,7 @@ BUILD_NUMBER = "11" JVM_VERSION = "compact1" -FILESEXTRAPATHS_append := ":${THISDIR}/download" +FILESEXTRAPATHS:append := ":${THISDIR}/download" LIC_FILES_CHKSUM = "file://${WORKDIR}/ejdk1.8.0_${PV_UPDATE}/linux_armv6_vfp_hflt/compact1/COPYRIGHT;md5=a762796b2a8989b8952b653a178607a1" LICENSE = "Oracle_Binary_Code_License_Agreement" @@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "5dcc644c999e7109efe46669ac717f3b96f3bbdeac3cb66f072ca4dfbc S = "${WORKDIR}" -FILES_${PN} = "${bindir}/*" +FILES:${PN} = "${bindir}/*" do_install() { install -d ${D}${bindir}/ejdk1.8.0 @@ -39,6 +39,6 @@ do_install() { } -INSANE_SKIP_${PN} += "dev-so already-stripped ldflags file-rdeps " +INSANE_SKIP:${PN} += "dev-so already-stripped ldflags file-rdeps " EXCLUDE_FROM_SHLIBS = "1" diff --git a/recipes-extended/imu-setup/imu-setup_0.0.1.bb b/recipes-extended/imu-setup/imu-setup_0.0.1.bb index d167471..5b1d4d7 100644 --- a/recipes-extended/imu-setup/imu-setup_0.0.1.bb +++ b/recipes-extended/imu-setup/imu-setup_0.0.1.bb @@ -3,9 +3,9 @@ inherit systemd LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" +FILESEXTRAPATHS:prepend := "${THISDIR}/config:" -RDEPENDS_${PN} = "bash" +RDEPENDS:${PN} = "bash" SRC_URI = " \ file://imu-setup.service \ @@ -14,9 +14,9 @@ SRC_URI = " \ file://imu-lsm6ds3.conf \ " -FILES_${PN} = "${systemd_unitdir}/system ${bindir} /etc" +FILES:${PN} = "${systemd_unitdir}/system ${bindir} /etc" -SYSTEMD_SERVICE_${PN} =" \ +SYSTEMD_SERVICE:${PN} =" \ imu-setup.service \ " diff --git a/recipes-extended/mount-overlay/mount-overlay.bb b/recipes-extended/mount-overlay/mount-overlay.bb index 19fd4ad..cb78ddd 100644 --- a/recipes-extended/mount-overlay/mount-overlay.bb +++ b/recipes-extended/mount-overlay/mount-overlay.bb @@ -15,10 +15,10 @@ S = "${WORKDIR}" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" -SYSTEMD_SERVICE_${PN} = "mount-overlay.service" +SYSTEMD_SERVICE:${PN} = "mount-overlay.service" SYSTEMD_AUTO_ENABLE ?= "enable" -FILES_${PN}_append = " \ +FILES:${PN}:append = " \ /lib \ /usr \ " diff --git a/recipes-testing/cpputest/cpputest_git.bb b/recipes-testing/cpputest/cpputest_git.bb index fc2c9c0..4fea952 100644 --- a/recipes-testing/cpputest/cpputest_git.bb +++ b/recipes-testing/cpputest/cpputest_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ce5d5f1fe02bcd1343ced64a06fd4177" inherit autotools -SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https" +SRC_URI = "git://github.com/cpputest/cpputest.git;protocol=https;branch=master" SRCREV = "bbe3801b990d281cf251cc6e6107256808ea6d19" PV = "3.8+git${SRCPV}" @@ -15,6 +15,6 @@ S = "${WORKDIR}/git" # Required to add the libary to the SDK. # ${PN}-dev depends on ${PN} which is empty because # only the static library is built -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-testing/ti-utils/ti-wl18xx-calibrator_git.bb b/recipes-testing/ti-utils/ti-wl18xx-calibrator_git.bb index c53f40f..ccd6bf7 100644 --- a/recipes-testing/ti-utils/ti-wl18xx-calibrator_git.bb +++ b/recipes-testing/ti-utils/ti-wl18xx-calibrator_git.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Configuration utility for TI wireless drivers" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://README;md5=df1ae7fbe1a166f497f944d67efbf088" # Based on TI meta-arago-extras @@ -10,7 +10,7 @@ PV = "R8.7+git${SRCPV}" PR = "r1" SRCREV = "39542357111d1f24e866c2857d561a348c04cce4" -SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git" +SRC_URI = "git://git.ti.com/wilink8-wlan/18xx-ti-utils.git;branch=master" DEPENDS = "libnl" @@ -21,7 +21,7 @@ EXTRA_OEMAKE = "CFLAGS+="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 CC="${CC}" \ NLVER=3" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" # Install calibrator do_install() { diff --git a/recipes-tools/battery-test/battery-test_git.bb b/recipes-tools/battery-test/battery-test_git.bb index bdb4fc8..72a94d6 100644 --- a/recipes-tools/battery-test/battery-test_git.bb +++ b/recipes-tools/battery-test/battery-test_git.bb @@ -2,11 +2,11 @@ SUMMARY = "Battery Test tool" DESCRIPTION = "Read battery state, remaining time and other informations from battery" AUTHOR = "Ramon Mösching (ramon.moesching@netmodule.com)" SECTION = "core" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" PR = "r0" -RDEPENDS_${PN} = "python3-core python3-smbus" +RDEPENDS:${PN} = "python3-core python3-smbus" SRC_URI = "git://git.netmodule.intranet/nm-tools/smart-battery.git;protocol=ssh;user=gitea;branch=master " @@ -14,7 +14,7 @@ SRCREV ?= "7caae36f50ea23f69458fc50887c5ab59b4d48f3" S = "${WORKDIR}/git" -FILES_${PN} = "${bindir}/* batterytest.py " +FILES:${PN} = "${bindir}/* batterytest.py " do_install () { diff --git a/recipes-tools/libnmapp/libnmapp_git.bb b/recipes-tools/libnmapp/libnmapp_git.bb index 79a86af..d8ea779 100644 --- a/recipes-tools/libnmapp/libnmapp_git.bb +++ b/recipes-tools/libnmapp/libnmapp_git.bb @@ -1,6 +1,6 @@ SUMMARY = "NetModule shared library" SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=1f002990697cc3f88357d1c0790d47b2" SRC_URI = "git://gitlab.com/netmodule/tools/libnmapp.git;protocol=ssh;user=git;branch=develop" @@ -10,18 +10,18 @@ PV = "0.0.1+git${SRCPV}" LIB_SHORT_NAME = "nmapp" LIB_PKG_NAME = "libnmapp.a" -DEPENDS_append = " libevent systemd" +DEPENDS:append = " libevent systemd" # Required to add the libary to the SDK. # ${PN}-dev depends on ${PN} which is empty because # only the static library is built -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" S = "${WORKDIR}/git" B = "${S}/build" # build variables for the target (rest is default) -EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'USE_INITSYS_DUMMY=0' 'SYSROOT=${STAGING_DIR_TARGET}'" +EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'USE_INITSYS_DUMMY=0' 'SYSROOT=${STAGING_DIR_TARGET}'" do_install() { install -d ${D}${libdir} diff --git a/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb b/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb index 3bbfa72..edf3d6e 100644 --- a/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb +++ b/recipes-tools/nmhw-auto-part/nmhw-auto-part_1.1.0.bb @@ -1,11 +1,11 @@ SUMMARY = "Adds a script and a systemd service to partition the drives of the system on the first boot." DESCRIPTION = "Adds a script and a systemd service to partition the drives of the system on the first boot." PR = "r1" -LICENSE = "GPLv3+" +LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=2f31b266d3440dd7ee50f92cf67d8e6c" -RDEPENDS_${PN} += "e2fsprogs-resize2fs \ +RDEPENDS:${PN} += "e2fsprogs-resize2fs \ e2fsprogs-mke2fs \ bash \ parted \ @@ -23,6 +23,6 @@ do_install () { install -m 755 nmhw-auto-part ${D}${bindir}/ } -FILES_${PN} = " \ +FILES:${PN} = " \ ${bindir}/nmhw-auto-part \ " diff --git a/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb b/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb index 499e4ed..8edd5d8 100644 --- a/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb +++ b/recipes-tools/nmhw-fwupdate/nmhw-fwupdate.bb @@ -3,10 +3,10 @@ DESCRIPTION = "Generic NetModule update tool for firmware, bootloaders, etc" AUTHOR = "Alexandre Bard" SECTION = "core" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c" -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ wget \ bash \ coreutils \ @@ -14,13 +14,13 @@ RDEPENDS_${PN} = " \ " SRC_URI = " \ - git://gitlab.com/netmodule/tools/nmhw-fwupdate.git;user=git;protocol=ssh; \ + git://gitlab.com/netmodule/tools/nmhw-fwupdate.git;user=git;protocol=ssh;;branch=master \ " SRCREV ?= "68b84ce457e8cd4a59e2f366114edf0098acbe4d" S = "${WORKDIR}/git/src" -FILES_${PN} = " \ +FILES:${PN} = " \ /lib \ /usr \ " diff --git a/recipes-tools/ssf-mgr/ssf-mgr_git.bb b/recipes-tools/ssf-mgr/ssf-mgr_git.bb index 216603c..23af92e 100644 --- a/recipes-tools/ssf-mgr/ssf-mgr_git.bb +++ b/recipes-tools/ssf-mgr/ssf-mgr_git.bb @@ -1,6 +1,6 @@ SUMMARY = "NetModule system-state-framework manager" SECTION = "base" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=6f1c528c9a0010ef398e26c661ff286e" SRC_URI = "git://gitlab.com/netmodule/tools/ssf-mgr.git;protocol=ssh;user=git;branch=develop" @@ -9,24 +9,24 @@ SRCREV ?= "eead025f7135b28cb6e3e1e68bd636e93b74798b" PV = "0.0.1+git${SRCPV}" -DEPENDS_append = " libnmapp" -RDEPENDS_${PN} = " packagegroup-system-state-framework" +DEPENDS:append = " libnmapp" +RDEPENDS:${PN} = " packagegroup-system-state-framework" inherit systemd S = "${WORKDIR}/git" B = "${S}/build" -SYSTEMD_SERVICE_${PN} = "ssf-mgr.service" +SYSTEMD_SERVICE:${PN} = "ssf-mgr.service" -FILES_${PN} += " \ +FILES:${PN} += " \ ${bindir}/ssf-mgr \ ${systemd_system_unitdir}/ssf-mgr.service \ ${sysconfdir}/ssf-mgr/ssf-mgr.conf \ " # build variables for the target (rest is default) -EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" +EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" do_install() { install -d ${D}${bindir} diff --git a/recipes-tools/sys-mon/sys-mon_git.bb b/recipes-tools/sys-mon/sys-mon_git.bb index 5f435dd..d9e6f21 100644 --- a/recipes-tools/sys-mon/sys-mon_git.bb +++ b/recipes-tools/sys-mon/sys-mon_git.bb @@ -9,23 +9,23 @@ SRCREV ?= "dbdbc1e31816239586b4706d962a16feb77bd1cf" PV = "0.0.1+git${SRCPV}" -DEPENDS_append = " libnmapp" +DEPENDS:append = " libnmapp" inherit systemd S = "${WORKDIR}/git" B = "${S}/build" -SYSTEMD_SERVICE_${PN} = "sys-mon.service" +SYSTEMD_SERVICE:${PN} = "sys-mon.service" -FILES_${PN} += " \ +FILES:${PN} += " \ ${bindir}/sys-mon \ ${systemd_system_unitdir}/sys-mon.service \ ${sysconfdir}/sys-mon/sys-mon.conf \ " # build variables for the target (rest is default) -EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" +EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" do_install() { install -d ${D}${bindir} diff --git a/recipes-user-module/socket-uart/socket-uart_0.0.1.bb b/recipes-user-module/socket-uart/socket-uart_0.0.1.bb index 2cb50e7..b39f121 100644 --- a/recipes-user-module/socket-uart/socket-uart_0.0.1.bb +++ b/recipes-user-module/socket-uart/socket-uart_0.0.1.bb @@ -15,16 +15,16 @@ SRC_URI = " \ S = "${WORKDIR}" -RDEPENDS_${PN} = "socat um-service-cfg" +RDEPENDS:${PN} = "socat um-service-cfg" -SYSTEMD_SERVICE_${PN} = " \ +SYSTEMD_SERVICE:${PN} = " \ socket-uart.service \ socket-kline.service \ socket-lin.service \ " -FILES_${PN} = "${systemd_unitdir}/system ${bindir} " +FILES:${PN} = "${systemd_unitdir}/system ${bindir} " do_install() { install -d ${D}${systemd_unitdir}/system diff --git a/recipes-user-module/um-service-cfg/um-service-cfg_0.0.1.bb b/recipes-user-module/um-service-cfg/um-service-cfg_0.0.1.bb index 56b4a95..ce7e635 100644 --- a/recipes-user-module/um-service-cfg/um-service-cfg_0.0.1.bb +++ b/recipes-user-module/um-service-cfg/um-service-cfg_0.0.1.bb @@ -3,10 +3,10 @@ inherit systemd LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -FILESEXTRAPATHS_prepend := "${THISDIR}/config:" +FILESEXTRAPATHS:prepend := "${THISDIR}/config:" ALTERNATIVE_PRIORITY[netcat] = "100" -RDEPENDS_${PN} = "netcat" +RDEPENDS:${PN} = "netcat" SRC_URI = " \ file://um-service-config.service \ @@ -18,9 +18,9 @@ SRC_URI = " \ file://ports-v2 \ " -FILES_${PN} = "${systemd_unitdir}/system ${bindir} /etc/user-module" +FILES:${PN} = "${systemd_unitdir}/system ${bindir} /etc/user-module" -SYSTEMD_SERVICE_${PN} =" \ +SYSTEMD_SERVICE:${PN} =" \ um-service-config.service \ um-rgpio-config.service \ user-module.target \