|
[yocto-autobuilder-helper][dunfell] config.json: Update check-layer to use --no-auto-dependency after yocto-check-layer changes
Steve Sakoman
From: Richard Purdie <richard.purdie@...>
Add layer checks for meta-aws and meta-openembedded while we're at it Signed-off-by: Richard Purdie <richard.purdie@...> (cherry picked from commit fe72e222961d69dcd4d638e7e05b437a65e8f34c) Signed-off-by: Steve Sakoman <steve@...> --- config.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/config.json b/config.json index e22124d..d871349 100644 --- a/config.json +++ b/config.json @@ -771,10 +771,18 @@ } }, "check-layer-nightly" : { - "NEEDREPOS" : ["poky", "meta-intel"], + "NEEDREPOS" : ["poky", "meta-aws", "meta-intel", "meta-openembedded"], "step1" : { + "shortname" : "Test meta-aws YP Compatibility", + "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-aws --dependency ../meta-openembedded/meta-oe ../meta-openembedded/meta-networking ../meta-openembedded/meta-python -n --no-auto-dependency"] + }, + "step2" : { "shortname" : "Test meta-intel YP Compatibility", - "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-intel"] + "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-intel --no-auto-dependency"] + }, + "step3" : { + "shortname" : "Test meta-oe YP Compatibility", + "EXTRACMDS" : ["yocto-check-layer-wrapper ../meta-openembedded --no-auto-dependency"] } }, "meta-mingw" : { -- 2.25.1
|
|
|
|
Minutes: Yocto Project Weekly Triage Meeting 8/5/2021
Trevor Gamblin
Wiki: https://wiki.yoctoproject.org/wiki/Bug_Triage Attendees: Alex, Diane, Joshua, MichaelO, Randy,
Richard, Saul, Stephen, Steve, Tim, Tony, TrevorG ARs: Notes:
- (carried over) Steve
encountered build failures such as the one in https://errors.yoctoproject.org/Errors/Details/593109/
when attempting to run dunfell builds with the PARALLEL_MAKE load
averaging added. WR is testing/investigating on internal
Autobuilder instance
- No Future/3.99 bugs to
triage this week (wow!)
Medium+ 3.4 Unassigned Enhancements/Bugs: 80 (No
change) AB-INT Bugs: 46
(No change)
|
|
|
|
Re: (Go) Library for configuring Yocto based boxes?
Nicolas Jeker
On Wed, 2021-08-04 at 09:13 +0000, Christofer Dutz wrote:
Hi,In this case you should probably ask your vendor how they set up networking and why they installed both. It's possible that your vendor configured something different than the defaults, hard to tell without knowing more. By default the names "Wired connection X" are given by NetworkManager, without any user configuration. I guess NetworkManager is currently managing your connections. I started out with systemd-networkd and later replaced it with NetworkManager because I wanted to use a 4G modem with ModemManager, which wasn't well supported by systemd-networkd back then. As long as you only use Ethernet and Wi-Fi, systemd-networkd should work fine. Chris
|
|
|
|
[meta-cgl][PATCH 6/6] crmsh: upgrade 4.2.0 -> 4.3.1
Yi Zhao
Signed-off-by: Yi Zhao <yi.zhao@...>
--- .../recipes-cgl/crmsh/{crmsh_4.20.bb => crmsh_4.3.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-cgl-common/recipes-cgl/crmsh/{crmsh_4.20.bb => crmsh_4.3.1.bb} (92%) diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb similarity index 92% rename from meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb rename to meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb index ac97e25..75e720b 100644 --- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb +++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.3.1.bb @@ -10,14 +10,14 @@ DEPENDS = "asciidoc-native \ docbook-xsl-stylesheets-native \ libxslt-native \ " -RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash" +RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash python3-doctest" S = "${WORKDIR}/git" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ file://tweaks_for_build.patch \ " -SRCREV = "d10d2fbdd1b357500387bebb432c68e88748526b" +SRCREV = "00ec69054edecd068deda54c6184c0385d90ebd2" inherit autotools-brokensep setuptools3 -- 2.25.1
|
|
|
|
[meta-cgl][PATCH 5/6] README: update
Yi Zhao
Remove mata-qt3 layer dependency since is is obsolete.
Signed-off-by: Yi Zhao <yi.zhao@...> --- README | 7 ------- cgl-init-build-env | 2 +- meta-cgl-common/README | 7 ------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/README b/README index 0117c1e..bb2e0e7 100644 --- a/README +++ b/README @@ -18,9 +18,6 @@ This layer depends on: layers: meta-openstack branch: master - URI: git://git.yoctoproject.org/meta-qt3 - branch: master - URI: git://git.yoctoproject.org/meta-selinux branch: master @@ -86,7 +83,6 @@ other layers needed. Adapt the below list to proper format. meta meta-cgl/meta-cgl-common - meta-qt3 meta-openembedded/meta-networking meta-openembedded/meta-filesystems meta-openembedded/meta-oe @@ -99,9 +95,6 @@ other layers needed. Adapt the below list to proper format. meta-security meta-cloud-services/meta-openstack -A BBMASK definition is required because of some recipes duplicate existance: - BBMASK = "meta-openembedded/meta-oe/recipes-support/multipath-tools" - Now there is available the "cgl-init-build-env" script which could be used to automize the above mentione information: ./scripts/cgl-checkout -b master -l meta-fsl-ppc diff --git a/cgl-init-build-env b/cgl-init-build-env index e04846e..acf459d 100755 --- a/cgl-init-build-env +++ b/cgl-init-build-env @@ -28,7 +28,7 @@ unset OPTION NUM_CORES=$(grep -c processor /proc/cpuinfo || echo 2) BUILD_PATH="build" -METALAYERS="meta-cgl/meta-cgl-common,meta-qt3,meta-selinux,meta-security,meta-virtualization" +METALAYERS="meta-cgl/meta-cgl-common,meta-selinux,meta-security,meta-virtualization" function usage() { cat <<EOF diff --git a/meta-cgl-common/README b/meta-cgl-common/README index ec6e8ba..2928890 100644 --- a/meta-cgl-common/README +++ b/meta-cgl-common/README @@ -18,9 +18,6 @@ This layer depends on: layers: meta-openstack branch: master - URI: git://git.yoctoproject.org/meta-qt3 - branch: master - URI: git://git.yoctoproject.org/meta-selinux branch: master @@ -86,7 +83,6 @@ other layers needed. Adapt the below list to proper format. meta meta-cgl/meta-cgl-common - meta-qt3 meta-openembedded/meta-networking meta-openembedded/meta-filesystems meta-openembedded/meta-oe @@ -99,9 +95,6 @@ other layers needed. Adapt the below list to proper format. meta-security meta-cloud-services/meta-openstack -A BBMASK definition is required because of some recipes duplicate existance: - BBMASK = "meta-openembedded/meta-oe/recipes-support/multipath-tools" - II. Misc ======== -- 2.25.1
|
|
|
|
[meta-cgl][PATCH 4/6] cgl_common_security_flags.inc: remove SECURITY_LDFLAGS override for audit
Yi Zhao
Compiling audit with -fstack-protector-strong works well now, so the
override doesn't necessary anymore. Signed-off-by: Yi Zhao <yi.zhao@...> --- .../conf/distro/include/cgl_common_security_flags.inc | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc b/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc index 126352b..ef3f296 100644 --- a/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc +++ b/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc @@ -1,5 +1,3 @@ -SECURITY_LDFLAGS:remove:pn-audit = "-fstack-protector-strong" - SECURITY_CFLAGS:pn-ocfs2-tools = "${SECURITY_NOPIE_CFLAGS}" SECURITY_LDFLAGS:pn-ocfs2-tools = "" -- 2.25.1
|
|
|
|
[meta-cgl][PATCH 1/6] meta-cgl: convert to new override syntax
Yi Zhao
This is the result of automated script conversion:
poky/scripts/contrib/convert-overrides.py meta-cgl Converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Yi Zhao <yi.zhao@...> --- .../include/cgl_common_security_flags.inc | 6 +- meta-cgl-common/conf/distro/poky-cgl.conf | 2 +- .../cluster-glue/cluster-glue_1.0.12.bb | 64 +++++++++---------- .../resource-agents_4.5.0.bb | 38 +++++------ .../recipes-cgl/cluster/cluster_3.2.0.bb | 4 +- .../recipes-cgl/crmsh/crmsh_4.20.bb | 4 +- .../recipes-cgl/heartbeat/heartbeat_3.0.6.bb | 18 +++--- .../ocfs2-tools/ocfs2-tools_1.8.6.bb | 18 +++--- .../recipes-cgl/pacemaker/pacemaker_2.0.5.bb | 38 +++++------ .../recipes-cgl/racoon2/racoon2_202003018.bb | 22 +++---- .../recipes-cgl/ucarp/ucarp_1.5.2.bb | 8 +-- .../recipes-core/images/core-image-cgl.bb | 12 ++-- .../initrdscripts/initramfs-cgl-boot_1.0.bb | 4 +- .../packagegroup-cgl-applications.bb | 16 ++--- .../packagegroups/packagegroup-cgl-kernel.bb | 4 +- .../packagegroup-cgl-middleware.bb | 4 +- .../packagegroup-cgl-swdevtools.bb | 6 +- .../packagegroups/packagegroup-cgl.bb | 4 +- .../recipes-kernel/linux/cgl-common.inc | 4 +- .../perl/libmailtools-perl_2.21.bb | 2 +- .../recipes-perl/perl/libsocket6-perl_0.29.bb | 2 +- .../perl/libtest-pod-perl_1.52.bb | 2 +- .../recipes-perl/perl/libwww-perl_6.43.bb | 2 +- 23 files changed, 142 insertions(+), 142 deletions(-) diff --git a/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc b/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc index a2f9857..126352b 100644 --- a/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc +++ b/meta-cgl-common/conf/distro/include/cgl_common_security_flags.inc @@ -1,5 +1,5 @@ -SECURITY_LDFLAGS_remove_pn-audit = "-fstack-protector-strong" +SECURITY_LDFLAGS:remove:pn-audit = "-fstack-protector-strong" -SECURITY_CFLAGS_pn-ocfs2-tools = "${SECURITY_NOPIE_CFLAGS}" -SECURITY_LDFLAGS_pn-ocfs2-tools = "" +SECURITY_CFLAGS:pn-ocfs2-tools = "${SECURITY_NOPIE_CFLAGS}" +SECURITY_LDFLAGS:pn-ocfs2-tools = "" diff --git a/meta-cgl-common/conf/distro/poky-cgl.conf b/meta-cgl-common/conf/distro/poky-cgl.conf index 269ce49..10feab9 100644 --- a/meta-cgl-common/conf/distro/poky-cgl.conf +++ b/meta-cgl-common/conf/distro/poky-cgl.conf @@ -3,7 +3,7 @@ require conf/distro/poky-lsb.conf DISTRO = "poky-cgl" DISTROOVERRIDES .= ":poky-cgl" -DISTRO_FEATURES_append = " selinux ptest argp ext2 xattr nfs pci ipv4 ipv6" +DISTRO_FEATURES:append = " selinux ptest argp ext2 xattr nfs pci ipv4 ipv6" PREFERRED_PROVIDER_virtual/refpolicy="refpolicy-targeted" diff --git a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb index af2342f..9221f06 100644 --- a/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb +++ b/meta-cgl-common/recipes-cgl/cluster-glue/cluster-glue_1.0.12.bb @@ -18,13 +18,13 @@ SRC_URI = " \ file://volatiles \ file://tmpfiles \ " -SRC_URI_append_libc-uclibc = " file://kill-stack-protector.patch" +SRC_URI:append_libc-uclibc = " file://kill-stack-protector.patch" SRCREV = "fd5a3befacd23d056a72cacd2b8ad6bba498e56b" inherit autotools useradd pkgconfig systemd multilib_script multilib_header -SYSTEMD_SERVICE_${PN} = "logd.service" +SYSTEMD_SERVICE:${PN} = "logd.service" SYSTEMD_AUTO_ENABLE = "disable" HA_USER = "hacluster" @@ -47,18 +47,18 @@ CACHED_CONFIGUREVARS="ac_cv_path_XML2CONFIG=0 \ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \ +USERADD_PARAM:${PN} = "--home-dir=${localstatedir}/lib/heartbeat/cores/${HA_USER} \ -g ${HA_GROUP} -r -s ${sbindir}/nologin -c 'cluster user' ${HA_USER} \ " -GROUPADD_PARAM_${PN} = "-r ${HA_GROUP}" +GROUPADD_PARAM:${PN} = "-r ${HA_GROUP}" MULTILIB_SCRIPTS = "${PN}:${sbindir}/cibsecret" -do_configure_prepend() { +do_configure:prepend() { ln -sf ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml2/libxml ${PKG_CONFIG_SYSROOT_DIR}/usr/include/libxml } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/04_cluster-glue install -d ${D}${sysconfdir}/tmpfiles.d @@ -67,7 +67,7 @@ do_install_append() { oe_multilib_header heartbeat/glue_config.h } -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ]; then if type systemd-tmpfiles >/dev/null; then systemd-tmpfiles --create @@ -99,7 +99,7 @@ PACKAGES =+ "\ ${PN}-plugin-compress-staticdev \ " -FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\ +FILES:${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/cluster-glue/*sh ${datadir}/cluster-glue/*pl\ ${libdir}/heartbeat/transient-test.sh \ ${libdir}/heartbeat/logtest \ ${libdir}/heartbeat/ipctransientserver \ @@ -111,40 +111,40 @@ FILES_${PN} = "${sysconfdir} /var ${libdir}/lib*.so.* ${sbindir} ${datadir}/clus ${systemd_unitdir} \ " -FILES_${PN}-dbg += "${libdir}/heartbeat/.debug/ \ +FILES:${PN}-dbg += "${libdir}/heartbeat/.debug/ \ ${sbindir}/.debug/ \ ${libdir}/.debug/ \ " -FILES_${PN}-plugin-compress = "${libdir}/heartbeat/plugins/compress/*.so" -FILES_${PN}-plugin-compress-staticdev = "${libdir}/heartbeat/plugins/compress/*.*a" -FILES_${PN}-plugin-compress-dbg = "${libdir}/heartbeat/plugins/compress/.debug/" +FILES:${PN}-plugin-compress = "${libdir}/heartbeat/plugins/compress/*.so" +FILES:${PN}-plugin-compress-staticdev = "${libdir}/heartbeat/plugins/compress/*.*a" +FILES:${PN}-plugin-compress-dbg = "${libdir}/heartbeat/plugins/compress/.debug/" -FILES_${PN}-plugin-test = "${libdir}/heartbeat/plugins/test/test.so" -FILES_${PN}-plugin-test-staticdev = "${libdir}/heartbeat/plugins/test/test.*a" -FILES_${PN}-plugin-test-dbg = "${libdir}/heartbeat/plugins/test/.debug/" -FILES_${PN}-plugin-stonith2 = " \ +FILES:${PN}-plugin-test = "${libdir}/heartbeat/plugins/test/test.so" +FILES:${PN}-plugin-test-staticdev = "${libdir}/heartbeat/plugins/test/test.*a" +FILES:${PN}-plugin-test-dbg = "${libdir}/heartbeat/plugins/test/.debug/" +FILES:${PN}-plugin-stonith2 = " \ ${libdir}/stonith/plugins/xen0-ha-dom0-stonith-helper \ ${libdir}/stonith/plugins/stonith2/*.so \ " -FILES_${PN}-plugin-stonith2-ribcl = "${libdir}/stonith/plugins/stonith2/ribcl.py" +FILES:${PN}-plugin-stonith2-ribcl = "${libdir}/stonith/plugins/stonith2/ribcl.py" -FILES_${PN}-plugin-stonith2-dbg = "${libdir}/stonith/plugins/stonith2/.debug/" -FILES_${PN}-plugin-stonith2-staticdev = "${libdir}/stonith/plugins/stonith2/*.*a" +FILES:${PN}-plugin-stonith2-dbg = "${libdir}/stonith/plugins/stonith2/.debug/" +FILES:${PN}-plugin-stonith2-staticdev = "${libdir}/stonith/plugins/stonith2/*.*a" -FILES_${PN}-plugin-stonith-external = "${libdir}/stonith/plugins/external/" -FILES_${PN}-plugin-raexec = "${libdir}/heartbeat/plugins/RAExec/*.so" -FILES_${PN}-plugin-raexec-staticdev = "${libdir}/heartbeat/plugins/RAExec/*.*a" -FILES_${PN}-plugin-raexec-dbg = "${libdir}/heartbeat/plugins/RAExec/.debug/" +FILES:${PN}-plugin-stonith-external = "${libdir}/stonith/plugins/external/" +FILES:${PN}-plugin-raexec = "${libdir}/heartbeat/plugins/RAExec/*.so" +FILES:${PN}-plugin-raexec-staticdev = "${libdir}/heartbeat/plugins/RAExec/*.*a" +FILES:${PN}-plugin-raexec-dbg = "${libdir}/heartbeat/plugins/RAExec/.debug/" -FILES_${PN}-plugin-interfacemgr = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.so" -FILES_${PN}-plugin-interfacemgr-staticdev = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.*a" -FILES_${PN}-plugin-interfacemgr-dbg = "${libdir}/heartbeat/plugins/InterfaceMgr/.debug/" +FILES:${PN}-plugin-interfacemgr = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.so" +FILES:${PN}-plugin-interfacemgr-staticdev = "${libdir}/heartbeat/plugins/InterfaceMgr/generic.*a" +FILES:${PN}-plugin-interfacemgr-dbg = "${libdir}/heartbeat/plugins/InterfaceMgr/.debug/" -FILES_${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/" +FILES:${PN}-lrmtest = "${datadir}/cluster-glue/lrmtest/" -RDEPENDS_${PN} += "perl" -RDEPENDS_${PN}-plugin-stonith2 += "bash" -RDEPENDS_${PN}-plugin-stonith-external += "bash python3-core perl" -RDEPENDS_${PN}-plugin-stonith2-ribcl += "python3-core" -RDEPENDS_${PN}-lrmtest += "${VIRTUAL-RUNTIME_getopt} ${PN}-plugin-raexec" +RDEPENDS:${PN} += "perl" +RDEPENDS:${PN}-plugin-stonith2 += "bash" +RDEPENDS:${PN}-plugin-stonith-external += "bash python3-core perl" +RDEPENDS:${PN}-plugin-stonith2-ribcl += "python3-core" +RDEPENDS:${PN}-lrmtest += "${VIRTUAL-RUNTIME_getopt} ${PN}-plugin-raexec" diff --git a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb index cc3ce89..bd906b2 100644 --- a/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb +++ b/meta-cgl-common/recipes-cgl/cluster-resource-agents/resource-agents_4.5.0.bb @@ -5,14 +5,14 @@ rgmanager service managers." HOMEPAGE = "http://sources.redhat.com/cluster/wiki/" LICENSE = "GPLv2+ & LGPLv2+ & GPLv3" -LICENSE_${PN} = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-dev = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-staticdev = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-dbg = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-doc = "GPLv2+ & LGPLv2+" -LICENSE_${PN}-extra = "GPLv3" -LICENSE_${PN}-extra-dbg = "GPLv3" -LICENSE_ldirectord = "GPLv2+" +LICENSE:${PN} = "GPLv2+ & LGPLv2+" +LICENSE:${PN}-dev = "GPLv2+ & LGPLv2+" +LICENSE:${PN}-staticdev = "GPLv2+ & LGPLv2+" +LICENSE:${PN}-dbg = "GPLv2+ & LGPLv2+" +LICENSE:${PN}-doc = "GPLv2+ & LGPLv2+" +LICENSE:${PN}-extra = "GPLv3" +LICENSE:${PN}-extra-dbg = "GPLv3" +LICENSE:ldirectord = "GPLv2+" SRC_URI = "git://github.com/ClusterLabs/resource-agents \ file://01-disable-doc-build.patch \ @@ -37,7 +37,7 @@ DEPENDS = "cluster-glue" # ip.sh requires: ethtool iproute2 iputils-arping # fs.sh requires: e2fsprogs-e2fsck util-linux quota # netfs.sh requires: procps util-linux nfs-utils -RDEPENDS_${PN} += "bash perl lvm2 \ +RDEPENDS:${PN} += "bash perl lvm2 \ ethtool iproute2 iputils-arping \ e2fsprogs-e2fsck util-linux quota \ procps nfs-utils \ @@ -56,31 +56,31 @@ CACHED_CONFIGUREVARS += " \ EXTRA_OECONF += "--disable-fatal-warnings \ --with-rsctmpdir=/var/run/heartbeat/rsctmp" -do_install_append() { +do_install:append() { rm -rf "${D}${localstatedir}/run" rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" } # tickle_tcp is published under GPLv3, we just split it into ${PN}-extra, # and it's required by portblock, so move portblock into ${PN}-extra together. -PACKAGES_prepend = "${PN}-extra ${PN}-extra-dbg ldirectord " +PACKAGES:prepend = "${PN}-extra ${PN}-extra-dbg ldirectord " NOAUTOPACKAGEDEBUG = "1" -FILES_${PN}-extra = "${libexecdir}/heartbeat/tickle_tcp \ +FILES:${PN}-extra = "${libexecdir}/heartbeat/tickle_tcp \ ${libdir}/ocf/resource.d/heartbeat/portblock \ ${datadir}/resource-agents/ocft/configs/portblock \ " -FILES_${PN}-extra-dbg = "${libexecdir}/heartbeat/.debug/tickle_tcp" +FILES:${PN}-extra-dbg = "${libexecdir}/heartbeat/.debug/tickle_tcp" -FILES_ldirectord = " \ +FILES:ldirectord = " \ ${sbindir}/ldirectord \ ${sysconfdir}/ha.d/resource.d/ldirectord \ ${sysconfdir}/init.d/ldirectord \ ${sysconfdir}/logrotate.d/ldirectord \ ${libdir}/ocf/resource.d/heartbeat/ldirectord \ " -FILES_ldirectord-doc = "${mandir}/man8/ldirectord.8*" +FILES:ldirectord-doc = "${mandir}/man8/ldirectord.8*" -RDEPENDS_ldirectord += " \ +RDEPENDS:ldirectord += " \ ipvsadm \ libdbi-perl \ libdigest-hmac-perl \ @@ -102,9 +102,9 @@ RDEPENDS_ldirectord += " \ " SYSTEMD_PACKAGES = "ldirectord" -SYSTEMD_SERVICE_ldirectord += "ldirectord.service" +SYSTEMD_SERVICE:ldirectord += "ldirectord.service" -FILES_${PN} += "${datadir}/cluster/* \ +FILES:${PN} += "${datadir}/cluster/* \ ${libdir}/ocf/resource.d/heartbeat/ \ ${libdir}/ocf/lib/heartbeat/* \ ${libdir}/ocf/resource.d/redhat \ @@ -112,6 +112,6 @@ FILES_${PN} += "${datadir}/cluster/* \ ${systemd_unitdir}/system \ " -FILES_${PN}-dbg += "${libdir}/ocf/resource.d/heartbeat/.debug \ +FILES:${PN}-dbg += "${libdir}/ocf/resource.d/heartbeat/.debug \ ${sbindir}/.debug \ ${libexecdir}/heartbeat/.debug " diff --git a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb index 34076d3..edaeb8b 100644 --- a/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb +++ b/meta-cgl-common/recipes-cgl/cluster/cluster_3.2.0.bb @@ -17,9 +17,9 @@ PR = "r1" DEPENDS = "corosync dbus openldap libxml2 ncurses perl zlib" -FILES_${PN} += "/lib/udev/rules.d/51-dlm.rules \ +FILES:${PN} += "/lib/udev/rules.d/51-dlm.rules \ ${localstatedir}/run " -FILES_${PN}-doc += "/usr/share/man3/* /usr/share/man8/*" +FILES:${PN}-doc += "/usr/share/man3/* /usr/share/man8/*" do_configure () { CFLAGS="${TARGET_CFLAGS}" \ diff --git a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb index 830802d..ac97e25 100644 --- a/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb +++ b/meta-cgl-common/recipes-cgl/crmsh/crmsh_4.20.bb @@ -10,7 +10,7 @@ DEPENDS = "asciidoc-native \ docbook-xsl-stylesheets-native \ libxslt-native \ " -RDEPENDS_${PN} = "pacemaker python3-lxml python3-parallax gawk bash" +RDEPENDS:${PN} = "pacemaker python3-lxml python3-parallax gawk bash" S = "${WORKDIR}/git" SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ @@ -28,4 +28,4 @@ export BUILD_SYS # network accesses for the dtd and stylesheets export SGML_CATALOG_FILES = "${STAGING_DATADIR_NATIVE}/xml/docbook/xsl-stylesheets/catalog.xml" -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}/${BPN}" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/${BPN}" diff --git a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb index 5031c64..b5dfad0 100644 --- a/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb +++ b/meta-cgl-common/recipes-cgl/heartbeat/heartbeat_3.0.6.bb @@ -40,7 +40,7 @@ SRC_URI[md5sum] = "101c8f507b1f407468d5ef15ae6719da" SRC_URI[sha256sum] = "851d2add2c129fef9fede764fec80229e1f6e7295e0e979950d10258648b462c" S = "${WORKDIR}/Heartbeat-3-0-958e11be8686" DEPENDS = "cluster-glue corosync gnutls libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool" -RDEPENDS_${PN} += "python" +RDEPENDS:${PN} += "python" inherit autotools-brokensep pkgconfig useradd EXTRA_OECONF = " \ STAGING_DIR_TARGET=${STAGING_DIR_TARGET} \ @@ -48,7 +48,7 @@ EXTRA_OECONF = " \ --disable-static \ " SOURCE1 = "heartbeat/init.d/heartbeat" -CFLAGS_append += "-DGLIB_COMPILATION" +CFLAGS:append = " -DGLIB_COMPILATION" do_configure() { ./bootstrap @@ -70,12 +70,12 @@ do_configure() { fi oe_runconf ${EXTRA_OECONF} } -do_compile_prepend() { +do_compile:prepend() { sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${HOST_PREFIX}libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${HOST_PREFIX}libtool make clean } -do_install_append () { +do_install:append () { sed -i -e 's,/usr/lib/,${libdir}/,' ${WORKDIR}/heartbeat.service if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then install -d ${D}${libexecdir} @@ -101,22 +101,22 @@ do_install() { } inherit systemd -SYSTEMD_SERVICE_${PN} = "heartbeat.service" +SYSTEMD_SERVICE:${PN} = "heartbeat.service" USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "-r haclient" -USERADD_PARAM_${PN} = " \ +GROUPADD_PARAM:${PN} = "-r haclient" +USERADD_PARAM:${PN} = " \ -r -g haclient -d /var/lib/heartbeat/cores/hacluster -M \ -s /sbin/nologin -c \"heartbeat user\" hacluster \ " -FILES_${PN}-dbg += " \ +FILES:${PN}-dbg += " \ ${libdir}/heartbeat/plugins/quorum/.debug \ ${libdir}/heartbeat/plugins/HBauth/.debug \ ${libdir}/heartbeat/plugins/tiebreaker/.debug \ ${libdir}/heartbeat/plugins/HBcomm/.debug \ ${libdir}/heartbeat/plugins/HBcompress/.debug \ " -FILES_${PN} += " \ +FILES:${PN} += " \ run/heartbeat/ccm \ run/heartbeat/dopd \ ${libdir}/tmpfiles.d \ diff --git a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb index 81e6c2e..fa38006 100644 --- a/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb +++ b/meta-cgl-common/recipes-cgl/ocfs2-tools/ocfs2-tools_1.8.6.bb @@ -35,13 +35,13 @@ DEPENDS = "corosync pacemaker \ # lsbinitscripts are needed to replace /etc/init.d/functions supplied by initscripts (systemv) # They are not the same code! # -RDEPENDS_${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0" +RDEPENDS:${PN} = "bash coreutils net-tools module-init-tools e2fsprogs glib-2.0" -ASNEEDED_pn-${PN} = "" +ASNEEDED:pn-${PN} = "" PARALLEL_MAKE = "" -INSANE_SKIP_${PN} = "unsafe-references-in-binaries" -CFLAGS_append += "-DGLIB_COMPILATION" -CPPFLAGS_append += "-DGLIB_COMPILATION" +INSANE_SKIP:${PN} = "unsafe-references-in-binaries" +CFLAGS:append = " -DGLIB_COMPILATION" +CPPFLAGS:append = " -DGLIB_COMPILATION" EXTRA_OECONF = " \ --enable-ocfs2console=no \ @@ -50,7 +50,7 @@ EXTRA_OECONF = " \ --with-root-prefix=${root_prefix} \ " -do_configure_prepend () { +do_configure:prepend () { # fix here or EXTRA_OECONF sed -i -e '/^PYTHON_INCLUDES="-I/c\ PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \ @@ -65,16 +65,16 @@ PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \ } -do_compile_prepend() { +do_compile:prepend() { for m in `find . -name "Makefile"` ; do sed -i -e "s@-I/usr/include@-I${STAGING_DIR_TARGET}/usr/include@g" $m done } -SYSTEMD_SERVICE_${PN} = "o2cb.service ocfs2.service" +SYSTEMD_SERVICE:${PN} = "o2cb.service ocfs2.service" SYSTEMD_AUTO_ENABLE = "disable" -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${S}/vendor/common/o2cb.init ${D}${sysconfdir}/init.d/o2cb install -m 0755 ${S}/vendor/common/ocfs2.init ${D}${sysconfdir}/init.d/ocfs2 diff --git a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb index 6cfa057..c86c282 100644 --- a/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb +++ b/meta-cgl-common/recipes-cgl/pacemaker/pacemaker_2.0.5.bb @@ -22,7 +22,7 @@ SRC_URI = "git://github.com/ClusterLabs/${BPN}.git \ CFLAGS += "-I${STAGING_INCDIR}/heartbeat" CPPFLAGS +="-I${STAGING_INCDIR}/heartbeat" -SRC_URI_append_libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch" +SRC_URI:append:libc-musl = "file://0001-pacemaker-fix-compile-error-of-musl-libc.patch" SRCREV = "ba59be71228fed04f78ab374dfac748d314d0e89" @@ -49,7 +49,7 @@ EXTRA_OECONF += "STAGING_INCDIR=${STAGING_INCDIR} \ CACHED_CONFIGUREVARS += " \ ac_cv_path_BASH_PATH=/bin/bash \ " -do_configure_prepend() { +do_configure:prepend() { # remove buildpath placeh="abs_top_builddir abs_top_srcdir" for ph in $placeh @@ -62,7 +62,7 @@ do_configure_prepend() { done } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/default install -d ${D}${sysconfdir}/default/volatiles install -m 0644 ${WORKDIR}/volatiles ${D}${sysconfdir}/default/volatiles/06_${BPN} @@ -86,11 +86,11 @@ do_install_append() { done } -PACKAGES_prepend = "${PN}-cli-utils ${PN}-libs ${PN}-cluster-libs ${PN}-remote " +PACKAGES:prepend = "${PN}-cli-utils ${PN}-libs ${PN}-cluster-libs ${PN}-remote " -FILES_${PN}-cli-utils = "${sbindir}/crm* ${sbindir}/iso8601" -RDEPENDS_${PN}-cli-utils += "libqb bash" -FILES_${PN}-libs = "${libdir}/libcib.so.* \ +FILES:${PN}-cli-utils = "${sbindir}/crm* ${sbindir}/iso8601" +RDEPENDS:${PN}-cli-utils += "libqb bash" +FILES:${PN}-libs = "${libdir}/libcib.so.* \ ${libdir}/liblrmd.so.* \ ${libdir}/libcrmservice.so.* \ ${libdir}/libcrmcommon.so.* \ @@ -100,29 +100,29 @@ FILES_${PN}-libs = "${libdir}/libcib.so.* \ ${libdir}/libstonithd.so.* \ ${libdir}/libtransitioner.so.* \ " -RDEPENDS_${PN}-libs += "libqb dbus-lib" -FILES_${PN}-cluster-libs = "${libdir}/libcrmcluster.so.*" -RDEPENDS_${PN}-cluster-libs += "libqb" -FILES_${PN}-remote = "${sysconfdir}/init.d/pacemaker_remote \ +RDEPENDS:${PN}-libs += "libqb dbus-lib" +FILES:${PN}-cluster-libs = "${libdir}/libcrmcluster.so.*" +RDEPENDS:${PN}-cluster-libs += "libqb" +FILES:${PN}-remote = "${sysconfdir}/init.d/pacemaker_remote \ ${sbindir}/pacemaker_remoted \ ${libdir}/ocf/resource.d/pacemaker/remote \ " -RDEPENDS_${PN}-remote += "libqb bash" -FILES_${PN} += " ${datadir}/snmp \ +RDEPENDS:${PN}-remote += "libqb bash" +FILES:${PN} += " ${datadir}/snmp \ ${libdir}/corosync/lcrso/pacemaker.lcrso \ ${libdir}/${PYTHON_DIR}/dist-packages/cts/ \ ${libdir}/ocf/resource.d/ \ ${libdir}/${PYTHON_DIR}/site-packages/cts/ \ " -FILES_${PN}-dbg += "${libdir}/corosync/lcrso/.debug" -RDEPENDS_${PN} = "bash python3-core perl libqb ${PN}-cli-utils" +FILES:${PN}-dbg += "${libdir}/corosync/lcrso/.debug" +RDEPENDS:${PN} = "bash python3-core perl libqb ${PN}-cli-utils" SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_PACKAGES += "${PN}-remote" -SYSTEMD_SERVICE_${PN} += "pacemaker.service crm_mon.service" -SYSTEMD_SERVICE_${PN}-remote += "pacemaker_remote.service" +SYSTEMD_SERVICE:${PN} += "pacemaker.service crm_mon.service" +SYSTEMD_SERVICE:${PN}-remote += "pacemaker_remote.service" USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "-r -g haclient -s ${base_sbindir}/nologin hacluster" -GROUPADD_PARAM_${PN} = "-r haclient" +USERADD_PARAM:${PN} = "-r -g haclient -s ${base_sbindir}/nologin hacluster" +GROUPADD_PARAM:${PN} = "-r haclient" diff --git a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb index 56dabfb..4c7c080 100644 --- a/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb +++ b/meta-cgl-common/recipes-cgl/racoon2/racoon2_202003018.bb @@ -8,7 +8,7 @@ FreeBSD, NetBSD, Linux, and Mac OS X." HOMEPAGE = "http://ftp.racoon2.wide.ad.jp/pub/racoon2/" DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'krb5', '', d)} libpcap openssl bison flex-native util-linux bison-native" -RDEPENDS_${PN} += "perl" +RDEPENDS:${PN} += "perl" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=99a60756441098855c538fe86f859afe" @@ -49,11 +49,11 @@ EXTRA_OECONF += "--sysconfdir=${sysconfdir}/${BPN} \ --with-kernel-build-dir=${STAGING_INCDIR}" CLEANBROKEN = "1" -do_configure_prepend () { +do_configure:prepend () { mkdir -p lib/m4 spmd/m4 iked/m4 kinkd/m4 } -do_install_append() { +do_install:append() { install -d -m 0755 ${D}${sysconfdir}/init.d/ cp -rfa ${D}${sysconfdir}/${BPN}/init.d/* ${D}${sysconfdir}/init.d/ @@ -80,19 +80,19 @@ do_install_append() { } INITSCRIPT_PACKAGES = "${PN} ${PN}-iked ${PN}-${@bb.utils.contains('DISTRO_FEATURES', 'krb5', 'kinkd', '', d)}" -INITSCRIPT_NAME_${PN} = "spmd" -INITSCRIPT_PARAMS_${PN} = "remove" -INITSCRIPT_NAME_${PN}-iked = "iked" -INITSCRIPT_PARAMS_${PN}-iked = "remove" -INITSCRIPT_NAME_${PN}-kinkd = "kinkd" -INITSCRIPT_PARAMS_${PN}-kinkd= "remove" +INITSCRIPT_NAME:${PN} = "spmd" +INITSCRIPT_PARAMS:${PN} = "remove" +INITSCRIPT_NAME:${PN}-iked = "iked" +INITSCRIPT_PARAMS:${PN}-iked = "remove" +INITSCRIPT_NAME:${PN}-kinkd = "kinkd" +INITSCRIPT_PARAMS:${PN}-kinkd= "remove" SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "spmd.service iked.service" +SYSTEMD_SERVICE:${PN} = "spmd.service iked.service" SYSTEMD_AUTO_ENABLE = "disable" -pkg_postinst_${PN} () { +pkg_postinst:${PN} () { if [ -z "$D" ]; then if [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then ${sysconfdir}/init.d/populate-volatile.sh update diff --git a/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb b/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb index 6776735..4109276 100644 --- a/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb +++ b/meta-cgl-common/recipes-cgl/ucarp/ucarp_1.5.2.bb @@ -32,19 +32,19 @@ SRC_URI[sha256sum] = "f3cc77e28481fd04f62bb3d4bc03104a97dd316c80c0ed04ad7be24b54 inherit autotools gettext systemd DEPENDS = "libpcap" -RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','initscripts-functions','',d)}" +RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','initscripts-functions','',d)}" -SYSTEMD_SERVICE_${PN} = "ucarp.service" +SYSTEMD_SERVICE:${PN} = "ucarp.service" SYSTEMD_AUTO_ENABLE = "disable" export FETCHCMD_wget = "/usr/bin/env wget --secure-protocol=TLSv1_2 -t 2 -T 30 --passive-ftp --no-check-certificate" EXTRA_OECONF += "--sysconfdir=${sysconfdir}/${BPN}" # fix the perms for config.rpath -do_configure_prepend() { +do_configure:prepend() { chmod 755 ${S}/config.rpath } -do_install_append() { +do_install:append() { sed -i -e 's#\(UPSCRIPT=\).*#\1${libexecdir}/vip-up.sh#' \ -e 's#\(DOWNSCRIPT=\).*#\1${libexecdir}/vip-down.sh#' ${WORKDIR}/ucarp.init diff --git a/meta-cgl-common/recipes-core/images/core-image-cgl.bb b/meta-cgl-common/recipes-core/images/core-image-cgl.bb index 4a7d4f7..1c5ed7b 100644 --- a/meta-cgl-common/recipes-core/images/core-image-cgl.bb +++ b/meta-cgl-common/recipes-core/images/core-image-cgl.bb @@ -10,11 +10,11 @@ python () { } VALGRIND ?= "" -VALGRIND_powerpc ?= "valgrind" +VALGRIND:powerpc ?= "valgrind" VALGRIND_e500v2 ?= "" -VALGRIND_x86 ?= "valgrind" -VALGRIND_x86_64 ?= "valgrind" -VALGRIND_armv7a ?= "valgrind" +VALGRIND:x86 ?= "valgrind" +VALGRIND:x86_64 ?= "valgrind" +VALGRIND:armv7a ?= "valgrind" # Include modules in rootfs IMAGE_INSTALL += "\ @@ -30,7 +30,7 @@ IMAGE_INSTALL += "\ IMAGE_FSTYPES += " ext3.gz" # kexec-tools doesn't work on Mips -KEXECTOOLS_mips ?= "" -KEXECTOOLS_mipsel ?= "" +KEXECTOOLS:mips ?= "" +KEXECTOOLS:mipsel ?= "" IMAGE_FEATURES += "tools-debug tools-profile" diff --git a/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb b/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb index 8b1768a..e022ad4 100644 --- a/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb +++ b/meta-cgl-common/recipes-core/initrdscripts/initramfs-cgl-boot_1.0.bb @@ -10,6 +10,6 @@ do_install() { inherit allarch -RDEPENDS_${PN} += "multipath-tools kpartx iscsi-initiator-utils" +RDEPENDS:${PN} += "multipath-tools kpartx iscsi-initiator-utils" -FILES_${PN} += " /init " +FILES:${PN} += " /init " diff --git a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-applications.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-applications.bb index 6b7a630..69fdb58 100644 --- a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-applications.bb +++ b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-applications.bb @@ -24,7 +24,7 @@ LM_SENSORS = " \ lmsensors-config-fancontrol \ " -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ lvm2 \ ${LM_SENSORS} \ bc \ @@ -55,15 +55,15 @@ LTTNG ?= "\ lttng-modules \ lttng-ust \ " -LTTNG_armv6 ?= "" +LTTNG:armv6 ?= "" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" -RDEPENDS_${PN}_append_qemux86 = " valgrind lttng-ust" -RDEPENDS_${PN}_append_qemux86-64 = " ${LTTNGUST}" -RDEPENDS_${PN}_append_qemuppc = " ${LTTNGUST}" -RDEPENDS_${PN}_append_qemuarm = " ${LTTNGUST}" -RDEPENDS_${PN}_append_powerpc = " ${LTTNGUST}" +RDEPENDS:${PN}:append:qemux86 = " valgrind lttng-ust" +RDEPENDS:${PN}:append:qemux86-64 = " ${LTTNGUST}" +RDEPENDS:${PN}:append:qemuppc = " ${LTTNGUST}" +RDEPENDS:${PN}:append:qemuarm = " ${LTTNGUST}" +RDEPENDS:${PN}:append:powerpc = " ${LTTNGUST}" -RRECOMMENDS_${PN} = "" +RRECOMMENDS:${PN} = "" diff --git a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-kernel.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-kernel.bb index bff7c4c..c6a4aa7 100644 --- a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-kernel.bb +++ b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-kernel.bb @@ -10,9 +10,9 @@ inherit packagegroup PACKAGES = "packagegroup-cgl-kernel" -RDEPENDS_packagegroup-cgl-kernel = " \ +RDEPENDS:packagegroup-cgl-kernel = " \ ltp \ kernel-modules \ " -RRECOMMENDS_packagegroup-cgl-kernel = "" +RRECOMMENDS:packagegroup-cgl-kernel = "" diff --git a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb index 4fa7d48..4c70a84 100644 --- a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb +++ b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb @@ -22,7 +22,7 @@ MULTIPATH_TOOLS = " \ kpartx \ " -RDEPENDS_packagegroup-cgl-middleware = "\ +RDEPENDS:packagegroup-cgl-middleware = "\ net-snmp-server \ net-snmp-client \ net-snmp-libs \ @@ -53,4 +53,4 @@ RDEPENDS_packagegroup-cgl-middleware = "\ dmidecode \ " -RRECOMMENDS_packagegroup-cgl-middleware = "" +RRECOMMENDS:packagegroup-cgl-middleware = "" diff --git a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-swdevtools.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-swdevtools.bb index 9f9ae03..7a54f73 100644 --- a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-swdevtools.bb +++ b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-swdevtools.bb @@ -10,9 +10,9 @@ inherit packagegroup PACKAGES = "packagegroup-cgl-swdevtools" NUMACTL = "numactl" -NUMACTL_arm = "" +NUMACTL:arm = "" -RDEPENDS_packagegroup-cgl-swdevtools = " \ +RDEPENDS:packagegroup-cgl-swdevtools = " \ libuio \ libcap-ng \ libwww-perl \ @@ -23,4 +23,4 @@ RDEPENDS_packagegroup-cgl-swdevtools = " \ ${NUMACTL} \ " -RRECOMMENDS_packagegroup-cgl-swdevtools = "" +RRECOMMENDS:packagegroup-cgl-swdevtools = "" diff --git a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl.bb index c2f6669..3450183 100644 --- a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl.bb +++ b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl.bb @@ -9,11 +9,11 @@ inherit packagegroup PACKAGES = "packagegroup-cgl" -RDEPENDS_${PN} = "\ +RDEPENDS:${PN} = "\ packagegroup-cgl-kernel \ packagegroup-cgl-swdevtools \ packagegroup-cgl-middleware \ packagegroup-cgl-applications \ " -RRECOMMENDS_${PN} = "" +RRECOMMENDS:${PN} = "" diff --git a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc index 1c93d7d..8f38e97 100644 --- a/meta-cgl-common/recipes-kernel/linux/cgl-common.inc +++ b/meta-cgl-common/recipes-kernel/linux/cgl-common.inc @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI_append_poky-cgl = " file://cfg/00001-systemtap.cfg \ +SRC_URI:append:poky-cgl = " file://cfg/00001-systemtap.cfg \ file://cfg/00002-oprofile.cfg \ file://cfg/00003-lttng.cfg \ file://cfg/00004-kgdb.cfg \ diff --git a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb index 8bbbde5..f30e466 100644 --- a/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb +++ b/meta-cgl-common/recipes-perl/perl/libmailtools-perl_2.21.bb @@ -7,7 +7,7 @@ DEPENDS = " \ libtest-pod-perl-native \ libtimedate-perl-native \ " -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libtest-pod-perl \ libtimedate-perl \ perl-module-io-handle \ diff --git a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb index 0d133c6..bbeab8e 100644 --- a/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb +++ b/meta-cgl-common/recipes-perl/perl/libsocket6-perl_0.29.bb @@ -17,7 +17,7 @@ SRC_URI[socket6-perl-0.29.sha256sum] = "468915fa3a04dcf6574fc957eff495915e245694 S = "${WORKDIR}/Socket6-${PV}" -do_configure_prepend () { +do_configure:prepend () { mkdir -p m4 autoreconf -Wcross --verbose --install --force || oefatal "autoreconf execution failed." sed -i 's:\./configure\(.[^-]\):./configure --build=${BUILD_SYS} --host=${HOST_SYS} --target=${TARGET_SYS} --prefix=${prefix} --exec_prefix=${exec_prefix} --bindir=${bindir} --sbindir=${sbindir} --libexecdir=${libexecdir} --datadir=${datadir} --sysconfdir=${sysconfdir} --sharedstatedir=${sharedstatedir} --localstatedir=${localstatedir} --libdir=${libdir} --includedir=${includedir} --oldincludedir=${oldincludedir} --infodir=${infodir} --mandir=${mandir}\1:' Makefile.PL diff --git a/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb b/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb index ff5538e..c9f455a 100644 --- a/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb +++ b/meta-cgl-common/recipes-perl/perl/libtest-pod-perl_1.52.bb @@ -4,7 +4,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://README;beginline=26;md5=ea81140c3f3b2937c6490fc732471cd0" HOMEPAGE = "https://github.com/perl-pod/test-pod/" BBCLASSEXTEND = "native" -RDEPENDS_${PN} += " perl-module-test-more \ +RDEPENDS:${PN} += " perl-module-test-more \ perl-module-file-spec \ perl-module-pod-simple \ perl-module-test-builder-tester \ diff --git a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb index 07fadb7..b7acf19 100644 --- a/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb +++ b/meta-cgl-common/recipes-perl/perl/libwww-perl_6.43.bb @@ -4,7 +4,7 @@ SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0+" LIC_FILES_CHKSUM = "file://LICENSE;md5=225d44a95fa3addb1da6d91187ab189f" DEPENDS = "liburi-perl-native libhtml-parser-perl-native libhtml-tagset-perl-native" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ libhtml-parser-perl \ libhtml-tagset-perl \ liburi-perl \ -- 2.25.1
|
|
|
|
[meta-cgl][PATCH 3/6] packagegroup-cgl-middleware: replace dhcp-client/dhcp-server with dhcpcd/kea
Yi Zhao
The dhcp had been removed for oe-core. Replace it with dhcpcd/kea.
Signed-off-by: Yi Zhao <yi.zhao@...> --- .../packagegroups/packagegroup-cgl-middleware.bb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb index 4c70a84..8a9cfc0 100644 --- a/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb +++ b/meta-cgl-common/recipes-core/packagegroups/packagegroup-cgl-middleware.bb @@ -10,11 +10,8 @@ inherit packagegroup PACKAGES = "packagegroup-cgl-middleware" DHCP = " \ - dhcp-server \ - dhcp-server-config \ - dhcp-client \ - dhcp-relay \ - dhcp-omshell \ + dhcpcd \ + kea \ " MULTIPATH_TOOLS = " \ @@ -41,7 +38,7 @@ RDEPENDS:packagegroup-cgl-middleware = "\ strongswan \ vlan \ corosync \ - ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "iscsi-initiator-utils", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "iscsi-initiator-utils", "", d)} \ openipmi \ openhpi \ pacemaker \ -- 2.25.1
|
|
|
|
[meta-cgl][PATCH 2/6] layer.conf: add honister to LAYERSERIES_COMPAT
Yi Zhao
Drop other releases since they are not compatible anymore.
Signed-off-by: Yi Zhao <yi.zhao@...> --- meta-cgl-common/conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-cgl-common/conf/layer.conf b/meta-cgl-common/conf/layer.conf index 56ddbb9..edc7cfa 100644 --- a/meta-cgl-common/conf/layer.conf +++ b/meta-cgl-common/conf/layer.conf @@ -11,6 +11,6 @@ BBFILE_PRIORITY_cgl-common = "7" LAYERDEPENDS_cgl-common = "core openembedded-layer networking-layer perl-layer filesystems-layer security selinux" -LAYERSERIES_COMPAT_cgl-common = "warrior zeus dunfell gatesgarth hardknott" +LAYERSERIES_COMPAT_cgl-common = "honister" require conf/distro/include/cgl_common_security_flags.inc -- 2.25.1
|
|
|
|
Re: cross compile python
#raspberrypi
On 8/4/21 1:17 AM, yasminebenghozzi6@... wrote:
Hello everyone,Sure, you will have to write a recipe to package your python script. you can use devtool if your scripts are in a git repo then it can generate a template recipe for you which you can use as baseline for your recipe. Or you can look at any python module recipe and model your recipe based on that. Once you have it done then you have to add your package to image which you can do via local.conf by adding IMAGE_INSTALL_append = " your-package" which should build your python package and also bring in all python infra to run it on target. Thank you very much
|
|
|
|
On 7/26/21 7:07 AM, Mitch Gaines wrote:
So, that is something I already have. What I really need are the systemd header files in order to build my recipe. Looks like the log output didn't format well. Let me re-post that below with some better formatting and you'll see what I'm referring to. How can I get those header files to build with my project? I thought just adding it as a DEPENDS would do it, but that doesn't seem to be the case.Please post full compiler cmdline, it will show what all include paths are specified. If systemd is added to DEPENDS and also ensure you are using systemd for init system as well. Search for sd-daemon.h in /home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/ I wonder if it got staged into recipe specific sysroot or not. ^~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[1]: *** [Makefile:93: build/file-name.o] Error 1 make[1]: Leaving directory '/home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/git/src/core' make: *** [Makefile:72: some-recipe] Error 2 WARNING: exit code 1 from a shell command. ERROR: Logfile of failure stored in: /home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/temp/log.do_compile.13271 Log data follows: | DEBUG: Executing shell function do_compile | NOTE: make -j 24 my-project | make[1]: Entering directory '/home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/git/src/core' | CC my-file.c | ../my-file.c:6:10: fatal error: systemd/sd-daemon.h: No such file or directory | 6 | #include <systemd/sd-daemon.h> | | ^~~~~~~~~~~~~~~~~~~~~ | compilation terminated. | make[1]: *** [Makefile:93: build/my-file.o] Error 1 | make[1]: Leaving directory '/home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/git/src/core' | make: *** [Makefile:72: my-project] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Execution of '/home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/temp/run.do_compile.13271' failed with exit code 1: | make[1]: Entering directory '/home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/git/src/core' | CC my-file.c | ../my-file.c:6:10: fatal error: systemd/sd-daemon.h: No such file or directory | 6 | #include <systemd/sd-daemon.h> | | ^~~~~~~~~~~~~~~~~~~~~ | compilation terminated. | make[1]: *** [Makefile:93: build/my-file.o] Error 1 | make[1]: Leaving directory '/home/mitch/bin/yocto/project-name/build/tmp/work/armv7vet2hf-neon-poky-linux-gnueabi/recipe-name/1.0+gitAUTOINC+...-r0/git/src/core' | make: *** [Makefile:72: my-recipe] Error 2 | WARNING: exit code 1 from a shell command. | ERROR: Task (/home/mitch/bin/yocto/project-name/layers/meta-project/recipes-main/my-recipe/my-recipe_git.bb:do_compile) failed with exit code '1' NOTE: Tasks Summary: Attempted 2166 tasks of which 2163 didn't need to be rerun and 1 failed.|
|
|
|
|
Re: [meta-rockchip][PATCH 1/2] layer.conf: update layer compatibility for honister
Trevor Woerner
On Wed, Aug 4, 2021 at 1:50 PM Trevor Woerner <twoerner@...> wrote: Add honister, remove hardknott. applied to meta-rockchip, master
|
|
|
|
Re: [meta-rockchip][PATCH 2/2] switch to the new bitbake OVERRIDE syntax
Trevor Woerner
On Wed, Aug 4, 2021 at 1:50 PM Trevor Woerner <twoerner@...> wrote: With bitbake commit 7dcf317cc141dc980634f8c18bfa84f83e57206a applied to meta-rockchip, master
|
|
|
|
[meta-zephyr][PATCH v2 2/2] layer.conf: add honister to LAYERSERIES_COMPAT
Naveen Saini
Signed-off-by: Naveen Saini <naveen.kumar.saini@...>
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 8e6b15d..5f13c27 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -15,4 +15,4 @@ LAYERVERSION_zephyr = "1" LAYERDEPENDS_zephyr = "core meta-python" -LAYERSERIES_COMPAT_zephyr = "dunfell gatesgarth hardknott" +LAYERSERIES_COMPAT_zephyr = "dunfell gatesgarth hardknott honister" -- 2.17.1
|
|
|
|
[meta-zephyr][PATCH v2 1/2] Convert to new override syntax
Naveen Saini
Use the convert-overrides.py to convert to new syntax and fixed
some additional changes manually. Signed-off-by: Naveen Saini <naveen.kumar.saini@...> --- classes/zephyr.bbclass | 2 +- conf/machine/96b-avenger96.conf | 2 +- conf/machine/96b-nitrogen.conf | 2 +- conf/machine/arduino-nano-33-ble.conf | 2 +- conf/machine/include/tune-arc.inc | 2 +- conf/machine/include/tune-cortexm0.inc | 8 ++++---- conf/machine/include/tune-cortexm3.inc | 10 +++++----- conf/machine/include/tune-cortexm4.inc | 10 +++++----- conf/machine/include/tune-iamcu.inc | 4 ++-- conf/machine/include/tune-nios2.inc | 4 ++-- conf/machine/intel-x86-64.conf | 2 +- conf/machine/nrf52840dk-nrf52840.conf | 2 +- conf/machine/qemu-cortex-m3.conf | 2 +- conf/machine/qemu-nios2.conf | 2 +- conf/machine/qemu-x86.conf | 6 +++--- recipes-core/newlib/newlib_%.bbappend | 10 +++++----- recipes-devtools-arc/binutils/binutils-2.26arc.inc | 4 ++-- .../binutils/binutils-cross-canadian_2.26arc.bb | 2 +- .../binutils/binutils-cross_2.26arc.bb | 4 ++-- recipes-devtools-arc/gcc/gcc-6.x.arc.inc | 4 ++-- .../gcc/gcc-cross-canadian_6.x.arc.bb | 8 ++++---- recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb | 8 ++++---- recipes-devtools-arc/gcc/libgcc_6.x.arc.bb | 6 +++--- recipes-devtools/gcc/gcc-cross_6.%.bbappend | 2 +- recipes-devtools/gcc/libgcc_6.%.bbappend | 4 ++-- recipes-devtools/qemu/qemu_%.bbappend | 6 +++--- recipes-kernel/zephyr-kernel/zephyr-coap-client.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-coap-server.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-echo-client.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-http-client.bb | 2 +- .../zephyr-kernel/zephyr-kernel-common.inc | 14 +++++++------- .../zephyr-kernel/zephyr-kernel-src-2.5.0.inc | 2 +- .../zephyr-kernel/zephyr-kernel-src-2.6.0.inc | 2 +- recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb | 2 +- recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc | 2 +- .../zephyr-kernel/zephyr-kernel-test.inc | 12 ++++++------ .../zephyr-kernel/zephyr-mqtt-publisher.bb | 2 +- .../zephyr-kernel/zephyr-openthread-echo-client.bb | 4 ++-- .../zephyr-kernel/zephyr-peripheral-esp.bb | 2 +- .../zephyr-kernel/zephyr-peripheral-hr.bb | 2 +- .../zephyr-kernel/zephyr-websocket-client.bb | 2 +- 41 files changed, 86 insertions(+), 86 deletions(-) diff --git a/classes/zephyr.bbclass b/classes/zephyr.bbclass index 6fceb04..e1d3185 100644 --- a/classes/zephyr.bbclass +++ b/classes/zephyr.bbclass @@ -48,7 +48,7 @@ do_menuconfig[nostamp] = "1" do_menuconfig[dirs] = "${B}" addtask menuconfig after do_configure -python do_devshell_prepend () { +python do_devshell:prepend () { # Most likely we need to manually edit prj.conf... os.chdir(d.getVar('ZEPHYR_SRC_DIR', True)) } diff --git a/conf/machine/96b-avenger96.conf b/conf/machine/96b-avenger96.conf index 7bcfb4a..ae6f972 100644 --- a/conf/machine/96b-avenger96.conf +++ b/conf/machine/96b-avenger96.conf @@ -5,4 +5,4 @@ require conf/machine/include/stm32mp1-cortex-m4.inc -ARCH_96b-avenger96 = "arm" +ARCH:96b-avenger96 = "arm" diff --git a/conf/machine/96b-nitrogen.conf b/conf/machine/96b-nitrogen.conf index 48f2041..affe9eb 100644 --- a/conf/machine/96b-nitrogen.conf +++ b/conf/machine/96b-nitrogen.conf @@ -5,4 +5,4 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd" -ARCH_96b-nitrogen = "arm" +ARCH:96b-nitrogen = "arm" diff --git a/conf/machine/arduino-nano-33-ble.conf b/conf/machine/arduino-nano-33-ble.conf index 18ba056..ebf4155 100644 --- a/conf/machine/arduino-nano-33-ble.conf +++ b/conf/machine/arduino-nano-33-ble.conf @@ -5,5 +5,5 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-bossac" -ARCH_arduino-nano-33-ble = "arm" +ARCH:arduino-nano-33-ble = "arm" diff --git a/conf/machine/include/tune-arc.inc b/conf/machine/include/tune-arc.inc index ff841e7..7db88ef 100644 --- a/conf/machine/include/tune-arc.inc +++ b/conf/machine/include/tune-arc.inc @@ -2,7 +2,7 @@ DEFAULTTUNE ?= "arc" TUNE_ARCH = "arc" TUNE_PKGARCH = "arc" -TUNE_FEATURES_tune-arc = "littleendian" +TUNE_FEATURES:tune-arc = "littleendian" TUNE_CCARGS = "" TUNEVALID[littleendian] = "Little endian mode" diff --git a/conf/machine/include/tune-cortexm0.inc b/conf/machine/include/tune-cortexm0.inc index d4f95e4..5067eb2 100644 --- a/conf/machine/include/tune-cortexm0.inc +++ b/conf/machine/include/tune-cortexm0.inc @@ -22,10 +22,10 @@ TUNEVALID[armv6m] = "Enable Cortex-M0 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv6m', ' -march=armv6-m', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv6m', 'armv6m:', '' ,d)}" -ARMPKGARCH_tune-cortexm0 = "cortexm0" -TUNE_FEATURES_tune-cortexm0 = "${TUNE_FEATURES_tune-armv6} cortexm0" +ARMPKGARCH:tune-cortexm0 = "cortexm0" +TUNE_FEATURES:tune-cortexm0 = "${TUNE_FEATURES:tune-armv6} cortexm0" -PACKAGE_EXTRA_ARCHS_tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS_tune-armv6m} cortexm0-vfp" +PACKAGE_EXTRA_ARCHS:tune-cortexm0 = "${PACKAGE_EXTRA_ARCHS:tune-armv6m} cortexm0-vfp" -TUNE_FEATURES_tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft" +TUNE_FEATURES:tune-cortexm0 = "armv6m vfp cortexm0 thumb no-thumb-interwork soft" diff --git a/conf/machine/include/tune-cortexm3.inc b/conf/machine/include/tune-cortexm3.inc index 3fba827..404e2b7 100644 --- a/conf/machine/include/tune-cortexm3.inc +++ b/conf/machine/include/tune-cortexm3.inc @@ -10,12 +10,12 @@ TUNEVALID[armv7m] = "Enable Cortex-M3 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7-m', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}" -TUNE_PKGARCH_tune-cortexm3 = "cortexm3" +TUNE_PKGARCH:tune-cortexm3 = "cortexm3" -ARMPKGARCH_tune-cortexm3 = "armv7m" -PACKAGE_EXTRA_ARCHS_tune-cortexm3 ="cortexm3" +ARMPKGARCH:tune-cortexm3 = "armv7m" +PACKAGE_EXTRA_ARCHS:tune-cortexm3 ="cortexm3" -TUNE_FEATURES_tune-cortexm3 = "armv7m vfp cortexm3" -PACKAGE_EXTRA_ARCHS_tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp" +TUNE_FEATURES:tune-cortexm3 = "armv7m vfp cortexm3" +PACKAGE_EXTRA_ARCHS:tune-cortexm3 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp" TUNE_CCARGS_MFLOAT = "soft" diff --git a/conf/machine/include/tune-cortexm4.inc b/conf/machine/include/tune-cortexm4.inc index a823b6b..b3092d8 100644 --- a/conf/machine/include/tune-cortexm4.inc +++ b/conf/machine/include/tune-cortexm4.inc @@ -10,10 +10,10 @@ TUNEVALID[armv7m] = "Enable Cortex-M4 specific processor optimizations" TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', ' -march=armv7e-m', '', d)}" MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7m', 'armv7m:', '' ,d)}" -TUNE_PKGARCH_tune-cortexm4 = "cortexm4" +TUNE_PKGARCH:tune-cortexm4 = "cortexm4" -ARMPKGARCH_tune-cortexm4 = "armv7m" -PACKAGE_EXTRA_ARCHS_tune-cortexm4 ="cortexm4" +ARMPKGARCH:tune-cortexm4 = "armv7m" +PACKAGE_EXTRA_ARCHS:tune-cortexm4 ="cortexm4" -TUNE_FEATURES_tune-cortexm4 = "armv7m vfp cortexm4" -PACKAGE_EXTRA_ARCHS_tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS_tune-armv7at} armv7m-vfp armv7m" +TUNE_FEATURES:tune-cortexm4 = "armv7m vfp cortexm4" +PACKAGE_EXTRA_ARCHS:tune-cortexm4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7at} armv7m-vfp armv7m" diff --git a/conf/machine/include/tune-iamcu.inc b/conf/machine/include/tune-iamcu.inc index 20a93a6..827d39b 100644 --- a/conf/machine/include/tune-iamcu.inc +++ b/conf/machine/include/tune-iamcu.inc @@ -3,9 +3,9 @@ DEFAULTTUNE ?= "iamcu" TARGET_OS_iamcu = "elfiamcu" TARGET_ARCH = "i586" -TUNE_FEATURES_tune-iamcu = "iamcu" +TUNE_FEATURES:tune-iamcu = "iamcu" TUNE_CCARGS = "-miamcu -m32" TUNE_ARCH = "i586" TUNEVALID[iamcu] = "Intel MCU" -PACKAGE_EXTRA_ARCHS_tune-iamcu = "iamcu" +PACKAGE_EXTRA_ARCHS:tune-iamcu = "iamcu" diff --git a/conf/machine/include/tune-nios2.inc b/conf/machine/include/tune-nios2.inc index e8662eb..391727e 100644 --- a/conf/machine/include/tune-nios2.inc +++ b/conf/machine/include/tune-nios2.inc @@ -4,9 +4,9 @@ DEFAULTTUNE ?= "nios2" TUNE_ARCH = "nios2" TUNE_PKGARCH = "nios2" -TUNE_FEATURES_tune-nios2 = "nios2" +TUNE_FEATURES:tune-nios2 = "nios2" TUNE_CCARGS = "" TUNEVALID[nios2] = "Altera Nios2" -PACKAGE_EXTRA_ARCHS_tune-nios2 = "nios2" +PACKAGE_EXTRA_ARCHS:tune-nios2 = "nios2" diff --git a/conf/machine/intel-x86-64.conf b/conf/machine/intel-x86-64.conf index 2935cff..74e8f6e 100644 --- a/conf/machine/intel-x86-64.conf +++ b/conf/machine/intel-x86-64.conf @@ -4,7 +4,7 @@ require conf/machine/include/tune-corei7-common.inc -ARCH_intel-x86-64 = "x86" +ARCH:intel-x86-64 = "x86" # Supported Boards: # ZEPHYR_BOARD ?= "acrn" diff --git a/conf/machine/nrf52840dk-nrf52840.conf b/conf/machine/nrf52840dk-nrf52840.conf index c5be5db..258aa7a 100644 --- a/conf/machine/nrf52840dk-nrf52840.conf +++ b/conf/machine/nrf52840dk-nrf52840.conf @@ -5,4 +5,4 @@ require conf/machine/include/nrf52.inc ZEPHYR_INHERIT_CLASSES += "zephyr-flash-pyocd" -ARCH_nrf52840dk-nrf52840 = "arm" +ARCH:nrf52840dk-nrf52840 = "arm" diff --git a/conf/machine/qemu-cortex-m3.conf b/conf/machine/qemu-cortex-m3.conf index 3a50796..835a775 100644 --- a/conf/machine/qemu-cortex-m3.conf +++ b/conf/machine/qemu-cortex-m3.conf @@ -14,4 +14,4 @@ QB_OPT_APPEND = "-nographic -vga none" QB_CPU = "-cpu cortex-m3" QB_RNG = "" -ARCH_qemu-cortex-m3 = "arm" +ARCH:qemu-cortex-m3 = "arm" diff --git a/conf/machine/qemu-nios2.conf b/conf/machine/qemu-nios2.conf index ab8b366..de20320 100644 --- a/conf/machine/qemu-nios2.conf +++ b/conf/machine/qemu-nios2.conf @@ -13,4 +13,4 @@ QB_MACHINE = "-machine altera_10m50_zephyr" QB_OPT_APPEND = "-nographic" QB_CPU = "-cpu nios2" -ARCH_qemu-nios2 = "nios2" +ARCH:qemu-nios2 = "nios2" diff --git a/conf/machine/qemu-x86.conf b/conf/machine/qemu-x86.conf index 85b3f0d..31ce80d 100644 --- a/conf/machine/qemu-x86.conf +++ b/conf/machine/qemu-x86.conf @@ -11,7 +11,7 @@ ZEPHYR_INHERIT_CLASSES += "zephyr-qemuboot" QB_SYSTEM_NAME = "qemu-system-i386" QB_MACHINE = "-machine type=pc-q35-2.10" QB_OPT_APPEND = "-nographic -no-acpi" -QB_CPU_x86 = "-cpu qemu32,+nx,+pae" -QB_CPU_KVM_x86 = "-cpu kvm32" +QB_CPU:x86 = "-cpu qemu32,+nx,+pae" +QB_CPU_KVM:x86 = "-cpu kvm32" -ARCH_qemu-x86 = "x86" +ARCH:qemu-x86 = "x86" diff --git a/recipes-core/newlib/newlib_%.bbappend b/recipes-core/newlib/newlib_%.bbappend index 37ff961..dfecb99 100644 --- a/recipes-core/newlib/newlib_%.bbappend +++ b/recipes-core/newlib/newlib_%.bbappend @@ -3,7 +3,7 @@ # ARC specific # ######################################################################## -LIC_FILES_CHKSUM_arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ +LIC_FILES_CHKSUM:arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ @@ -12,11 +12,11 @@ LIC_FILES_CHKSUM_arc = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0" #Tag arc-2016.03 -SRCREV_arc = "e4da0f88abe8dd2a0b947bcf7cb8b3736ab94f33" -SRC_URI_arc = "git://github.com/foss-for-synopsys-dwc-arc-processors/newlib.git;branch=arc-2.3" -S_arc = "${WORKDIR}/git" +SRCREV:arc = "e4da0f88abe8dd2a0b947bcf7cb8b3736ab94f33" +SRC_URI:arc = "git://github.com/foss-for-synopsys-dwc-arc-processors/newlib.git;branch=arc-2.3" +S:arc = "${WORKDIR}/git" # ERROR: QA Issue: Architecture did not match (195 to 93) -INSANE_SKIP_${PN}_arc += " arch " +INSANE_SKIP:${PN}:arc += " arch " diff --git a/recipes-devtools-arc/binutils/binutils-2.26arc.inc b/recipes-devtools-arc/binutils/binutils-2.26arc.inc index c0c575b..bfe0960 100644 --- a/recipes-devtools-arc/binutils/binutils-2.26arc.inc +++ b/recipes-devtools-arc/binutils/binutils-2.26arc.inc @@ -26,12 +26,12 @@ SRC_URI = "\ S = "${WORKDIR}/git" -do_configure_prepend () { +do_configure:prepend () { rm -rf ${S}/gdb ${S}/libdecnumber ${S}/readline ${S}/sim } CONFIG_SHELL = "/bin/bash" -sysroot_stage_all_append() { +sysroot_stage_all:append() { sysroot_stage_dir ${D}${exec_prefix}/extlib ${SYSROOT_DESTDIR}${exec_prefix}/extlib } diff --git a/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb b/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb index 24f35fe..88f0ad7 100644 --- a/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb +++ b/recipes-devtools-arc/binutils/binutils-cross-canadian_2.26arc.bb @@ -2,6 +2,6 @@ require recipes-devtools/binutils/binutils.inc require recipes-devtools-arc/binutils/binutils-2.26arc.inc require recipes-devtools/binutils/binutils-cross-canadian.inc -do_install_append () { +do_install:append () { rm -f ${D}/${libdir}/../lib/libiberty* } diff --git a/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb b/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb index ab266dc..3d94fea 100644 --- a/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb +++ b/recipes-devtools-arc/binutils/binutils-cross_2.26arc.bb @@ -2,7 +2,7 @@ require recipes-devtools/binutils/binutils.inc require binutils-2.26arc.inc require recipes-devtools/binutils/binutils-cross.inc -SRC_URI_remove = "file://no-tooldirpaths.patch" -SRC_URI_remove = "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" +SRC_URI:remove = "file://no-tooldirpaths.patch" +SRC_URI:remove = "file://0002-binutils-cross-Do-not-generate-linker-script-directo.patch" #COMPATIBLE_MACHINE = "arc" diff --git a/recipes-devtools-arc/gcc/gcc-6.x.arc.inc b/recipes-devtools-arc/gcc/gcc-6.x.arc.inc index 6324c50..5b3772e 100644 --- a/recipes-devtools-arc/gcc/gcc-6.x.arc.inc +++ b/recipes-devtools-arc/gcc/gcc-6.x.arc.inc @@ -73,9 +73,9 @@ EXTRA_OECONF_INTERMEDIATE = "\ --disable-libssp \ " -EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float " +EXTRA_OECONF:append:libc-uclibc = " --disable-decimal-float " -EXTRA_OECONF_append_arc = ' --with-pkgversion="ARCompact/ARCv2 ISA elf32 toolchain ${SRCREV}"' +EXTRA_OECONF:append:arc = ' --with-pkgversion="ARCompact/ARCv2 ISA elf32 toolchain ${SRCREV}"' EXTRA_OECONF_PATHS = "\ --with-gxx-include-dir=${STAGING_DIR_TARGET}${target_includedir}/c++/${BINV} \ diff --git a/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb b/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb index 39f837f..bc4a3b3 100644 --- a/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb +++ b/recipes-devtools-arc/gcc/gcc-cross-canadian_6.x.arc.bb @@ -1,8 +1,8 @@ require recipes-devtools-arc/gcc/gcc-${PV}.inc require recipes-devtools/gcc/gcc-cross-canadian.inc -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" -EXTRA_OECONF_append_libc-baremetal = " --enable-plugin " +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove:libc-baremetal = "--with-build-sysroot=${STAGING_DIR_TARGET}" +EXTRA_OECONF:append:libc-baremetal = " --enable-plugin " diff --git a/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb b/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb index 911a640..6cf71c6 100644 --- a/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb +++ b/recipes-devtools-arc/gcc/gcc-cross_6.x.arc .bb @@ -1,10 +1,10 @@ require recipes-devtools-arc/gcc/gcc-6.x.arc.inc require recipes-devtools/gcc/gcc-cross.inc -DEPENDS_remove_libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc" -EXTRA_OECONF_append_libc-baremetal = " --without-headers" -EXTRA_OECONF_remove_libc-baremetal = "--with-sysroot=/not/exist" -EXTRA_OECONF_remove_libc-baremetal = "--enable-threads=posix" +DEPENDS:remove:libc-baremetal := "virtual/${TARGET_PREFIX}libc-for-gcc" +EXTRA_OECONF:append:libc-baremetal = " --without-headers" +EXTRA_OECONF:remove:libc-baremetal = "--with-sysroot=/not/exist" +EXTRA_OECONF:remove:libc-baremetal = "--enable-threads=posix" #COMPATIBLE_MACHINE = "arc" diff --git a/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb b/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb index 4cc4833..2ad8d34 100644 --- a/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb +++ b/recipes-devtools-arc/gcc/libgcc_6.x.arc.bb @@ -4,11 +4,11 @@ require recipes-devtools/gcc/libgcc.inc INHIBIT_PACKAGE_DEBUG_SPLIT = "1" #COMPATIBLE_MACHINE = "arc" -EXTRA_OECONF_append_arc = " --disable-multilib" +EXTRA_OECONF:append:arc = " --disable-multilib" #EXTRA_OECONF_append_arc = " --enable-multilib" # ERROR: QA Issue: Architecture did not match (195 to 93) -INSANE_SKIP_${PN}-dev += "arch" +INSANE_SKIP:${PN}-dev += "arch" # ERROR: QA Issue: non -staticdev package contains static .a library -INSANE_SKIP_${PN}-dev += "staticdev" +INSANE_SKIP:${PN}-dev += "staticdev" diff --git a/recipes-devtools/gcc/gcc-cross_6.%.bbappend b/recipes-devtools/gcc/gcc-cross_6.%.bbappend index 0bf8c24..2b2c713 100644 --- a/recipes-devtools/gcc/gcc-cross_6.%.bbappend +++ b/recipes-devtools/gcc/gcc-cross_6.%.bbappend @@ -1 +1 @@ -EXTRA_OECONF_append_armv7m = " --with-arch=armv7-m --with-mode=thumb " +EXTRA_OECONF:append:armv7m = " --with-arch=armv7-m --with-mode=thumb " diff --git a/recipes-devtools/gcc/libgcc_6.%.bbappend b/recipes-devtools/gcc/libgcc_6.%.bbappend index 5c3fd1f..80bb46c 100644 --- a/recipes-devtools/gcc/libgcc_6.%.bbappend +++ b/recipes-devtools/gcc/libgcc_6.%.bbappend @@ -1,3 +1,3 @@ -EXTRA_OECONF_remove = "--enable_multilib" -EXTRA_OECONF_append = " --disable-multilib" +EXTRA_OECONF:remove = "--enable_multilib" +EXTRA_OECONF:append = " --disable-multilib" diff --git a/recipes-devtools/qemu/qemu_%.bbappend b/recipes-devtools/qemu/qemu_%.bbappend index 9f5a981..4f8cc05 100644 --- a/recipes-devtools/qemu/qemu_%.bbappend +++ b/recipes-devtools/qemu/qemu_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" QEMU_TARGETS = "" @@ -6,8 +6,8 @@ QEMU_TARGETS = "" # file://nios2-add-support.patch \ # " -EXTRA_OECONF_remove = "--target-list" +EXTRA_OECONF:remove = "--target-list" #QEMUS_BUILT = "arm-softmmu i386-softmmu nios2-softmmu" QEMUS_BUILT = "arm-softmmu i386-softmmu" -EXTRA_OECONF_append = " --target-list="${QEMUS_BUILT}"" +EXTRA_OECONF:append = " --target-list="${QEMUS_BUILT}"" diff --git a/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb b/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb index 4140c0f..1c79dbe 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb b/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb index f7d75c0..7100f96 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_server" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb b/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb index c17e1e7..e7fcaab 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-http-client.bb b/recipes-kernel/zephyr-kernel/zephyr-http-client.bb index cf3c322..d06ad37 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-http-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-http-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/http_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc index 7d44b97..5ae7504 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-common.inc @@ -27,19 +27,19 @@ EXTRA_OECMAKE = "\ " ZEPHYR_MODULES = "" -ZEPHYR_MODULES_append_arm = "\;${S}/modules/cmsis" -ZEPHYR_MODULES_append_nordic = "\;${S}/modules/hal/nordic" -ZEPHYR_MODULES_append_stm32 = "\;${S}/modules/hal/stm32" -ZEPHYR_MODULES_append_openamp = "\;${S}/modules/lib/open-amp\;${S}/modules/hal/libmetal" +ZEPHYR_MODULES:append:arm = "\;${S}/modules/cmsis" +ZEPHYR_MODULES:append:nordic = "\;${S}/modules/hal/nordic" +ZEPHYR_MODULES:append:stm32 = "\;${S}/modules/hal/stm32" +ZEPHYR_MODULES:append:openamp = "\;${S}/modules/lib/open-amp\;${S}/modules/hal/libmetal" -EXTRA_OECMAKE_append = " -DZEPHYR_MODULES=${ZEPHYR_MODULES}" +EXTRA_OECMAKE:append = " -DZEPHYR_MODULES=${ZEPHYR_MODULES}" export ZEPHYR_BASE="${S}" DEPENDS += "gperf-native python3-pyelftools-native python3-pyyaml-native python3-pykwalify-native" CROSS_COMPILE = "${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}" -DEPENDS_append_qemuall = " qemu-native qemu-helper-native" +DEPENDS:append:qemuall = " qemu-native qemu-helper-native" # The makefiles are explicit about the flags they want, so don't unset # them so zephyr flags actually get used. @@ -61,7 +61,7 @@ OE_TERMINAL_EXPORTS += "ZEPHYR_GCC_VARIANT" IMAGE_FSTYPES = "elf bin" -do_configure_prepend() { +do_configure:prepend() { # Zephyr expects CPPFLAGS as cmake argument as and ignores env variables. unset CPPFLAGS } diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc index 35bafdf..be75362 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.5.0.inc @@ -12,6 +12,6 @@ SRCREV_mbedtls = "24d84ecff195fb15c889d9046e44e4804d626c67" ZEPHYR_BRANCH = "main" PV = "2.5.0+git${SRCPV}" -SRC_URI_append = " file://0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch \ +SRC_URI:append = " file://0001-zephyr-2.5.0-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ " diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc index 091c057..63665bf 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src-2.6.0.inc @@ -12,7 +12,7 @@ SRCREV_mbedtls = "5765cb7f75a9973ae9232d438e361a9d7bbc49e7" ZEPHYR_BRANCH = "v2.6-branch" PV = "2.6.0+git${SRCPV}" -SRC_URI_append = " file://0001-cmake-add-yocto-toolchain.patch \ +SRC_URI:append = " file://0001-cmake-add-yocto-toolchain.patch \ file://0001-x86-fix-efi-binary-generation-issue-in-cross-compila.patch \ file://arduino-nano-33-ble-storage-partition.patch \ " diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb index 210cfa7..92d277d 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.bb @@ -14,6 +14,6 @@ do_install () { } PACKAGES = "${PN}" -FILES_${PN} = "/usr/src/zephyr" +FILES:${PN} = "/usr/src/zephyr" SYSROOT_DIRS += "/usr/src/zephyr" diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc index a0004ed..950966e 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-src.inc @@ -6,7 +6,7 @@ inherit cmake # This file might be included from other places (like other layers) and not # having an explicit path to the patches directory, will make bitbake fail to # find the patch(es) in SRC_URI. -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI = "\ git://github.com/zephyrproject-rtos/zephyr.git;protocol=https;branch=${ZEPHYR_BRANCH};name=default \ diff --git a/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc b/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc index 78747f9..f970225 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc +++ b/recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc @@ -1,21 +1,21 @@ -ZEPHYRTESTS_remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \ +ZEPHYRTESTS:remove = "fifo fpu_sharing lifo mbox mem_heap mem_pool \ mem_protect mem_slab msgq mutex pipe profiling sched semaphore \ stack threads tickless timer workq" # Exclude tests which does not build for various reasons -ZEPHYRTESTS_remove = "gen_isr_table spinlock smp mp" +ZEPHYRTESTS:remove = "gen_isr_table spinlock smp mp" # test_context will fail because QEMU for ARM does not emulate CortexM3 BASEPRI register -#ZEPHYRTESTS_remove_arm += "" +#ZEPHYRTESTS:remove:arm += "" # test_critical never finishes in an unpatched QEMU either -#ZEPHYRTESTS_remove_arm += "" +#ZEPHYRTESTS:remove:arm += "" #Remove ARM specific tests -#ZEPHYRTESTS_remove_x86 += "" +#ZEPHYRTESTS:remove:x86 += "" #Remove tests not intended for Nios2 -#ZEPHYRTESTS_remove_nios2 += "" +#ZEPHYRTESTS:remove:nios2 += "" # List of all available kernel tests ZEPHYRTESTS = " \ diff --git a/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb b/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb index b4e3067..02b3c16 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/mqtt_publisher" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" diff --git a/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb b/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb index 49f5565..88922b8 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb @@ -2,8 +2,8 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/openthread" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/openthread" EXTRA_OECMAKE += "-DOVERLAY_CONFIG=overlay-ot.conf" diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb index 8be90d1..045ea36 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_esp" -ZEPHYR_MODULES_append = "\;${S}/modules/crypto/tinycrypt" +ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt" diff --git a/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb b/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb index e6ef7b8..64fd0ec 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_hr" -ZEPHYR_MODULES_append = "\;${S}/modules/crypto/tinycrypt" +ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt" diff --git a/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb b/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb index 428f75e..85f2cda 100644 --- a/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb +++ b/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb @@ -2,4 +2,4 @@ include zephyr-sample.inc ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/websocket_client" -ZEPHYR_MODULES_append = "\;${S}/modules/lib/mbedtls" +ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls" -- 2.17.1
|
|
|
|
Re: [meta-rockchip][PATCH v2 1/2] layer: Convert to new override syntax
On 8/4/21 10:53 AM, Trevor Woerner wrote:
There are still some cases which are being missed. For example, this patchsounds good.
|
|
|
|
Yocto Technical Team Minutes, Engineering Sync, for August 3 2021
Trevor Woerner
Yocto Technical Team Minutes, Engineering Sync, for August 3 2021
archive: https://docs.google.com/document/d/1ly8nyhO14kDNnFcW2QskANXW3ZT7QwKC5wWVDg9dDH4/edit == disclaimer == Best efforts are made to ensure the below is accurate and valid. However, errors sometimes happen. If any errors or omissions are found, please feel free to reply to this email with any corrections. == attendees == Trevor Woerner, Stephen Jolley, Richard Elberger, Saul Wold, Scott Murray, Steve Sakoman, Tim Orling, Trevor Gamblin, Armin Kuster, Richard Purdie, Joshua Watt, Michael Halstead, Jan-Simon Möller, Rob Woolley, Denys Dmytriyenko, Tony Tascioglu, Randy MacLeod, Michael Opdenacker, Philip Balister == project status == - 3.4 m2 (honister) released - 3.3.2 (hardknott) through QA, pending release approval - 3.1.10 (dunfell) in QA - new syntax change is in, all layers need to update to new syntax - older releases of bitbake support the new syntax too (includes dunfell) - layer compatibility updated to honister - fix to bitbake’s datastore pending - prserv rewrite still ongoing - some AB-INT issues - multiconfig still not 100% == discussion == RP: big change to override syntax. fallout period ongoing RP: subtle datastore bug in bitbake fixed (identified by Ross last year). there might be some fallout. if you have a variable that isn’t assigned a default value (or anything) but does have a conditional override (e.g. _append) then it changes the value from “” to None. one such case was found in all of oe-core (DRIDRIVERS in mesa), but others might exist in other layers JPEW: so now only the new override syntax is valid in master? RP: yes. i added some checks in bitbake so it will now error if it finds _append, _prepend, _remove. this doesn’t catch all instances of old syntax, obviously, but it’s a good basic check ScottM: will the syntax changes be backported in oe-core? RP: there are no plans to do it in oe-core ScottM: it would help with cherry-picking RP: there are other incompatible changes that would make it hard/impossible to backport the override syntax change to older branches TrevorW: i’ve noticed a couple examples of overrides that don’t seem to work when updated to the new syntax. in conf/layer.conf BBFILE_PATTERN_<layer> aren’t overrides? RP: no. the things in conf/layer.conf aren’t overrides. also IMAGE_TYPEDEP isn’t (…yet). there’s a chance we might reconsider some TrevorW: and SRCREV_<name>? RP: yes. SRCREV_<name> is not, but SRCREV_pn-${PN} is an override Elberger: is there a list? RP: i have a list… in my head, there’s things in the manual, but we should probably add more notes. we should add it to the migration guide Elberger: it would be nice to make it consistent RP: this is the first step, i think there will be follow-on steps. we changed tune variables into overrides for example, but they’re not always overrides TrevorW: these inconsistencies are a great reason to do the syntax change TimO: this change provided a nice to opportunity learn more deeply about overrides and override syntax MO: nice that the project isn’t mired in the past, it is able to make such changes RP: i’ve added a MAINTAINERS.md file in oe-core. it doesn’t give exclusive ownership over an area of the project; i will, for example, apply patches that i think are okay if maintainer feedback isn’t forthcoming. we’re basically trying to document tribal knowledge; wanting to document the list of people who are knowledgeable in various areas. we’re also trying to encourage people to take ownership in various areas. this list shouldn’t describe any changes to what people already know. ScottM: (re: prserv) am now able to reproduce some of the bugs that have been reported by others and that we’ve seen on the AB. i have ruled out a bunch of stuff. the issues seem to start at python 3.8 (rather than 3.9 as we were expecting) JPEW: is it still related to exiting? ScottM: that still happens, but this is something else. after the prexport.bbclass cases run other things are stuck waiting. it looks like a message might be getting dropped JPEW: how large is the message? ScottM: that’s what i thought too. but they’re not very large. maybe 100 bytes? hash + prnumber + packaging. there’s probably more than 1 bug at play. looking through Paul’s stuff there’s also a case where something gets shut down, but other things are left waiting for it to shut down RP: (to the OE board) were there any discussions to promote OE membership (the oe tsc election is coming up) Denys: we discussed this at our last meeting Philip: we need to figure out how to recruit members, we’re looking for people active in the community. we would like to get feedback on how to attract more members. RP: it’s not obvious that OE has a membership, or what its benefits might be. i don’t think people who are new to the project know about OE, what it is, why to join, how to join Denys: we used to have developer meetings (OEDEM/OEDAM) but we don’t have that now, those would include general assemblies. Philip: if you want to become a member send an email including a bio and reason why you want to join to board@... and we can vote on it RP: maybe a reminder to various mailing lists would be good too ScottM: do we have a booth at ELC? TrevorW: check with David Reyna, i think he’s working on getting one MO: is it okay to update the docs with the new override updates? RP: yes. i had said “hold off” a week ago, but now that’s it’s in we should go ahead with the changes to the main yocto docs
|
|
|
|
Yocto Technical Team Minutes, Engineering Sync, for July 27 2021
Trevor Woerner
Yocto Technical Team Minutes, Engineering Sync, for July 27 2021
archive: https://docs.google.com/document/d/1ly8nyhO14kDNnFcW2QskANXW3ZT7QwKC5wWVDg9dDH4/edit == disclaimer == Best efforts are made to ensure the below is accurate and valid. However, errors sometimes happen. If any errors or omissions are found, please feel free to reply to this email with any corrections. == attendees == Trevor Woerner, Stephen Jolley, Scott Murray, Bruce Ashfield, Joshua Watt, Armin Kuster, Steve Sakoman, Randy MacLeod, Michael Opdenacker, Paul Barker, Michael Halstead, Richard Purdie, Tim Orling, Alejandro Hernandez, Denys Dmytriyenko, Tony Tascioglu, Trevor Gamblin == project status == - 3.4 m2 built but QA issues - 3.3.2 is being built - new override syntax added, conversions can start - proposal to add lz4c, zstd, and pzstd to host commands - prserv rewrite making process but still issues with asyncio - AB-INT issues - multiconfig needs simpler test cases to track down issues == discussion == RP: the override syntax change was merged; nobody seemed to notice. layers need to start doing the conversions; there are conversion scripts but they’re a bit too overzealous (doing conversions where they’re not needed) MO: could we just search+replace? RP: it’s hard to programmatically determine what is an override and what isn’t. an underscore is an accepted symbol in many areas and is also an override qualifier. i have a whole bunch of stuff working, but it’s hard to find things that aren’t found/converted by the script. i hope layers will be converted quickly (layers outside of core) TrevorW: what’s the script name and where do we find it? RP: in master-next scripts/contrib/convert-overrides.py. i’ve put comments in to help, there are some changes that are needed (e.g. removing hard-coded paths). also ARCH overrides are particularly hard to do, so i’ve mostly done them by hand PaulB: will the new syntax be backported to dunfell and hardknott? RP: dunfell onwards <various>: good! Armin: layers need to be fixed up in dunfell RP: only if you’re trying to make your dunfell branch work with master PaulB: what happens if you mix and match RP: it will error out and not parse, the colon was not a legal character previously so it will fail PaulB: noisy errors are the best RP: m2 now in QA. there is an issue with systemtap not working on Intel. no details from the QA team to figure out what went wrong. also there is a runtime issue on beaglebone-yocto to do with the keyboard. there’s a backlog building up for QA (3.3.2 and 3.1.10). we’re a bit down on AB power ScottM: are there bugzilla entries for those two? RP: yes. odd that the systemtap issue didn’t pop up on the AB PaulB: it looks like a 64 vs 32 bit issue. the register names indicate 64-bit but it’s pulling in a 32-bit header? RP: hmm. that looks like that’s the case ScottM: there should be a new rev of prserv patch later today PaulB: mixin layers. is that the way to go or do we want 1 layer? RP: i prefer mixins, then we can distribute maintainership more easily. adding mixin layers can get messy, which is good since i’d rather have users have to think about what they’re mixing in PaulB: if the mixins are orthnogonal then they should work easily together RP: yes, if they’re orthogonal, but how do you ensure that? TimO: any news on a next yocto conference/devday? TrevorW: plans are in the works PaulB: is there a place with a list of YP-related talks at elc? TrevorW: not that i know of PaulB: i’ll put the list together on the wiki and post to irc https://wiki.yoctoproject.org/wiki/Embedded_Linux_Conference_2021 RP: and mailing list too please TimO: some of us have started posting our links to irc RP: JPEW will be giving a presentation at an LF security supply-chain event. this will be good to help advocacy https://events.linuxfoundation.org/supply-chain-town-hall/ JPEW: i’ll be discussing reproducible builds and sw build materials (aug 18) RP: it would be nice if you could add cve tracking too JPEW: SS can help RP: we have pretty graphs TrevorW: the advocacy people have been wondering if YP should advertise at Embedded World ScottM: ask J-SM i think he has attended (as a part of the AGL) MO: and/or we could give YP-related talks
|
|
|
|
Re: [meta-rockchip][PATCH v2 1/2] layer: Convert to new override syntax
Trevor Woerner
There are still some cases which are being missed. For example, this patch
doesn't build successfully for marsboard-rk3066, rock2-square, and tinker-board. I had been working on a similar patch yesterday as well which I had been build-testing and run-testing when your patches came in ;-) I've added your SOB to them since they're so similar.
|
|
|
|
[meta-rockchip][PATCH 2/2] switch to the new bitbake OVERRIDE syntax
Trevor Woerner
With bitbake commit 7dcf317cc141dc980634f8c18bfa84f83e57206a
("bitbake: Switch to using new override syntax"), applied on Aug 2, 2021, the OVERRIDE separator is now a colon instead of an underscore. Therefore all builds performed with a bitbake before this change must use a meta-rockchip commit before this one, and any builds performed with a bitbake after this change must use a meta-rockchip starting from this commit onwards. Build-tested for all meta-rockchip MACHINEs. Run tested on: - tinker-board - nanopi-m4-2gb - rock64 - rock-pi-4b - rock-pi-e The tinker-board and rock-pi-e work fine. The rest of the boards seem to have a, hopefully unrelated, issue running a 5.13-yocto-standard kernel. However, all boards work with the 5.10-yocto-standard kernel. Signed-off-by: Trevor Woerner <twoerner@...> Signed-off-by: Khem Raj <raj.khem@...> --- classes/rockchip-gpt-img.bbclass | 6 ++-- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- conf/machine/include/rockchip-defaults.inc | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- conf/machine/rock-pi-e.conf | 4 +-- .../recipes-qt/qt5/qtbase_%.bbappend | 10 +++---- .../trusted-firmware-a_%.bbappend | 8 +++--- recipes-bsp/u-boot/u-boot%.bbappend | 10 +++---- recipes-graphics/mesa/mesa_%.bbappend | 4 +-- recipes-kernel/linux/linux-yocto%.bbappend | 28 +++++++++---------- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 +-- 13 files changed, 42 insertions(+), 42 deletions(-) diff --git a/classes/rockchip-gpt-img.bbclass b/classes/rockchip-gpt-img.bbclass index 3ee46c8..434c100 100644 --- a/classes/rockchip-gpt-img.bbclass +++ b/classes/rockchip-gpt-img.bbclass @@ -37,10 +37,10 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ virtual/kernel:do_deploy \ virtual/bootloader:do_deploy" -PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" -PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image" +PER_CHIP_IMG_GENERATION_COMMAND:rk3288 = "generate_rk3288_loader1_image" +PER_CHIP_IMG_GENERATION_COMMAND:rock2-square = "generate_rock2_loader1_image" -IMAGE_CMD_rockchip-gpt-img () { +IMAGE_CMD:rockchip-gpt-img () { # Change to image directory cd ${DEPLOY_DIR_IMAGE} diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 6b5f70a..017f9d7 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -12,5 +12,5 @@ SERIAL_CONSOLES = "115200;ttyS2" KBUILD_DEFCONFIG ?= "multi_v7_defconfig" KERNEL_IMAGETYPE = "zImage" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" UBOOT_SUFFIX ?= "bin" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index 70261a0..70189f1 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 3fc712f..4149092 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -20,4 +20,4 @@ TFA_BUILD_TARGET = "bl31" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" +PREFERRED_PROVIDER:virtual/bootloader ?= "u-boot" diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index 905b2a6..455cca8 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig" # xserver -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER:virtual/xserver = "xserver-xorg" XSERVER = " \ xserver-xorg \ xserver-xorg-utils \ diff --git a/conf/machine/include/rockchip-wic.inc b/conf/machine/include/rockchip-wic.inc index 61d9f3d..b5939f7 100644 --- a/conf/machine/include/rockchip-wic.inc +++ b/conf/machine/include/rockchip-wic.inc @@ -23,7 +23,7 @@ RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" # boot device (sd-card/emmc) RK_BOOT_DEVICE ??= "mmcblk0" -WICVARS_append = " \ +WICVARS:append = " \ RK_BOOT_DEVICE \ RK_CONSOLE_BAUD \ RK_CONSOLE_DEVICE \ diff --git a/conf/machine/rock-pi-e.conf b/conf/machine/rock-pi-e.conf index 9cd3ed4..7f49c9f 100644 --- a/conf/machine/rock-pi-e.conf +++ b/conf/machine/rock-pi-e.conf @@ -7,9 +7,9 @@ require conf/machine/include/rk3328.inc MACHINEOVERRIDES =. "rock-pi-e:" -PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" +PREFERRED_PROVIDER:virtual/kernel = "linux-yocto-dev" KERNEL_DEVICETREE = "rockchip/rk3328-rock-pi-e.dtb" MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot" +PREFERRED_PROVIDER:virtual/bootloader = "u-boot" UBOOT_MACHINE = "rock-pi-e-rk3328_defconfig" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index a977229..0ced545 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -1,9 +1,9 @@ -PACKAGECONFIG_GL_rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ +PACKAGECONFIG_GL:rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rk3399 = " kms gbm" +PACKAGECONFIG_GL:append:rk3399 = " kms gbm" -PACKAGECONFIG_FONTS_rk3399 = "fontconfig" +PACKAGECONFIG_FONTS:rk3399 = "fontconfig" -PACKAGECONFIG_append_rk3399 = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rk3399 = "tests" +PACKAGECONFIG:append:rk3399 = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove:rk3399 = "tests" diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend index c90673e..f7777a7 100644 --- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend @@ -1,11 +1,11 @@ # Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC # toolchain -DEPENDS_append_rk3399 = " virtual/arm-none-eabi-gcc-native" +DEPENDS:append:rk3399 = " virtual/arm-none-eabi-gcc-native" -COMPATIBLE_MACHINE_append_rk3399 = "|rk3399" -COMPATIBLE_MACHINE_append_rk3328 = "|rk3328" +COMPATIBLE_MACHINE:append:rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append:rk3328 = "|rk3328" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://serial-console-baudrate.patch \ file://0001-Fix-build-with-gcc-11.patch \ diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend index 95c019d..7916e45 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -1,4 +1,4 @@ -do_compile_append_rock2-square () { +do_compile:append:rock2-square () { # copy to default search path if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then cp ${B}/spl/${SPL_BINARY} ${B} @@ -7,10 +7,10 @@ do_compile_append_rock2-square () { ATF_DEPENDS ??= "" -EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" -EXTRA_OEMAKE_append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -ATF_DEPENDS_rk3328 = " virtual/trusted-firmware-a:do_deploy" +EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" +ATF_DEPENDS:rk3399 = " virtual/trusted-firmware-a:do_deploy" +EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +ATF_DEPENDS:rk3328 = " virtual/trusted-firmware-a:do_deploy" do_compile[depends] .= "${ATF_DEPENDS}" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 3e8711c..b9089c9 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rk3288 = " kmsro panfrost" -PACKAGECONFIG_append_rk3399 = " kmsro panfrost" +PACKAGECONFIG:append:rk3288 = " kmsro panfrost" +PACKAGECONFIG:append:rk3399 = " kmsro panfrost" diff --git a/recipes-kernel/linux/linux-yocto%.bbappend b/recipes-kernel/linux/linux-yocto%.bbappend index c2fe9ad..cf63a30 100644 --- a/recipes-kernel/linux/linux-yocto%.bbappend +++ b/recipes-kernel/linux/linux-yocto%.bbappend @@ -1,17 +1,17 @@ -COMPATIBLE_MACHINE_marsboard-rk3066 = "marsboard-rk3066" -COMPATIBLE_MACHINE_rock2-square = "rock2-square" -COMPATIBLE_MACHINE_radxarock = "radxarock" -COMPATIBLE_MACHINE_firefly-rk3288 = "firefly-rk3288" -COMPATIBLE_MACHINE_vyasa-rk3288 = "vyasa-rk3288" -COMPATIBLE_MACHINE_tinker-board = "tinker-board" -COMPATIBLE_MACHINE_tinker-board-s = "tinker-board-s" -COMPATIBLE_MACHINE_rock-pi-4 = "rock-pi-4" -COMPATIBLE_MACHINE_nanopi-m4 = "nanopi-m4" -COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" -COMPATIBLE_MACHINE_rock64 = "rock64" -COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" +COMPATIBLE_MACHINE:marsboard-rk3066 = "marsboard-rk3066" +COMPATIBLE_MACHINE:rock2-square = "rock2-square" +COMPATIBLE_MACHINE:radxarock = "radxarock" +COMPATIBLE_MACHINE:firefly-rk3288 = "firefly-rk3288" +COMPATIBLE_MACHINE:vyasa-rk3288 = "vyasa-rk3288" +COMPATIBLE_MACHINE:tinker-board = "tinker-board" +COMPATIBLE_MACHINE:tinker-board-s = "tinker-board-s" +COMPATIBLE_MACHINE:rock-pi-4 = "rock-pi-4" +COMPATIBLE_MACHINE:nanopi-m4 = "nanopi-m4" +COMPATIBLE_MACHINE:nanopi-m4-2gb = "nanopi-m4-2gb" +COMPATIBLE_MACHINE:rock64 = "rock64" +COMPATIBLE_MACHINE:rock-pi-e = "rock-pi-e" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # indeed applicable to all rk3328 boards -SRC_URI_append_rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" +SRC_URI:append:rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" diff --git a/recipes-kernel/linux/linux-yocto_5.4.bbappend b/recipes-kernel/linux/linux-yocto_5.4.bbappend index e832529..31f118e 100644 --- a/recipes-kernel/linux/linux-yocto_5.4.bbappend +++ b/recipes-kernel/linux/linux-yocto_5.4.bbappend @@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # tinker-board and tinker-board-s. rk3288 covers both -SRC_URI_append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" +SRC_URI:append:rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" -- 2.30.0.rc0
|
|
|