From d876cfc5bfafa516dee55d04b50b319a22165640 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 28 Jul 2021 14:22:43 -0400 Subject: global: overrides syntax conversion OEcore/bitbake are moving to use the clearer ":" as an overrides separator. This is pass one of updating the meta-virt recipes to use that syntax. This has only been minimally build/runtime tested, more changes will be required for missed overrides, or incorrect conversions Note: A recent bitbake is required: commit 75fad23fc06c008a03414a1fc288a8614c6af9ca Author: Richard Purdie Date: Sun Jul 18 12:59:15 2021 +0100 bitbake: data_smart/parse: Allow ':' characters in variable/function names It is becomming increasingly clear we need to find a way to show what is/is not an override in our syntax. We need to do this in a way which is clear to users, readable and in a way we can transition to. The most effective way I've found to this is to use the ":" charater to directly replace "_" where an override is being specified. This includes "append", "prepend" and "remove" which are effectively special override directives. This patch simply adds the character to the parser so bitbake accepts the value but maps it back to "_" internally so there is no behaviour change. This change is simple enough it could potentially be backported to older version of bitbake meaning layers using the new syntax/markup could work with older releases. Even if other no other changes are accepted at this time and we don't backport, it does set us on a path where at some point in future we could require a more explict syntax. I've tested this patch by converting oe-core/meta-yocto to the new syntax for overrides (9000+ changes) and then seeing that builds continue to work with this patch. (Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284) Signed-off-by: Richard Purdie Signed-off-by: Bruce Ashfield --- recipes-devtools/go/compose-file_git.bb | 4 ++-- recipes-devtools/go/go-build_git.bb | 4 ++-- recipes-devtools/go/go-capability_git.bb | 2 +- recipes-devtools/go/go-cli_git.bb | 2 +- recipes-devtools/go/go-connections_git.bb | 2 +- recipes-devtools/go/go-context_git.bb | 2 +- recipes-devtools/go/go-dbus_git.bb | 2 +- recipes-devtools/go/go-distribution_git.bb | 2 +- recipes-devtools/go/go-fsnotify_git.bb | 2 +- recipes-devtools/go/go-libtrust_git.bb | 2 +- recipes-devtools/go/go-logrus_git.bb | 2 +- recipes-devtools/go/go-md2man_git.bb | 2 +- recipes-devtools/go/go-metalinter_git.bb | 2 +- recipes-devtools/go/go-mux_git.bb | 2 +- recipes-devtools/go/go-patricia_git.bb | 2 +- recipes-devtools/go/go-pty_git.bb | 2 +- recipes-devtools/go/go-systemd_git.bb | 4 ++-- recipes-devtools/go/grpc-go_git.bb | 2 +- recipes-devtools/go/notary_git.bb | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) (limited to 'recipes-devtools/go') diff --git a/recipes-devtools/go/compose-file_git.bb b/recipes-devtools/go/compose-file_git.bb index bcf8c3d2..e93cba3b 100644 --- a/recipes-devtools/go/compose-file_git.bb +++ b/recipes-devtools/go/compose-file_git.bb @@ -36,6 +36,6 @@ go_compose_file_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" -CLEANBROKEN = "1" \ No newline at end of file +CLEANBROKEN = "1" diff --git a/recipes-devtools/go/go-build_git.bb b/recipes-devtools/go/go-build_git.bb index 64a1c95b..ff675c4f 100644 --- a/recipes-devtools/go/go-build_git.bb +++ b/recipes-devtools/go/go-build_git.bb @@ -26,7 +26,7 @@ inherit pkgconfig GO_IMPORT = "import" inherit go -RDEPENDS_${PN}-dev = "bash" +RDEPENDS:${PN}-dev = "bash" do_compile() { @@ -55,4 +55,4 @@ do_install() { install -m 755 ${B}/src/import/gobuild/serial_fd_handler ${D}${datadir}/runX/ } -FILES_${PN} += "${datadir}/runX/*" +FILES:${PN} += "${datadir}/runX/*" diff --git a/recipes-devtools/go/go-capability_git.bb b/recipes-devtools/go/go-capability_git.bb index 8524af62..25b7bebb 100644 --- a/recipes-devtools/go/go-capability_git.bb +++ b/recipes-devtools/go/go-capability_git.bb @@ -26,4 +26,4 @@ go_capability_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-cli_git.bb b/recipes-devtools/go/go-cli_git.bb index 434594c9..01487e15 100644 --- a/recipes-devtools/go/go-cli_git.bb +++ b/recipes-devtools/go/go-cli_git.bb @@ -26,4 +26,4 @@ go_cli_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-connections_git.bb b/recipes-devtools/go/go-connections_git.bb index 5d071b0a..529b99c4 100644 --- a/recipes-devtools/go/go-connections_git.bb +++ b/recipes-devtools/go/go-connections_git.bb @@ -36,4 +36,4 @@ go_connections_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-context_git.bb b/recipes-devtools/go/go-context_git.bb index 15f6a8dd..da9093dd 100644 --- a/recipes-devtools/go/go-context_git.bb +++ b/recipes-devtools/go/go-context_git.bb @@ -25,4 +25,4 @@ go_context_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-dbus_git.bb b/recipes-devtools/go/go-dbus_git.bb index 23908619..e17151d3 100644 --- a/recipes-devtools/go/go-dbus_git.bb +++ b/recipes-devtools/go/go-dbus_git.bb @@ -26,4 +26,4 @@ go_dbus_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-distribution_git.bb b/recipes-devtools/go/go-distribution_git.bb index 9e3f2093..f481d617 100644 --- a/recipes-devtools/go/go-distribution_git.bb +++ b/recipes-devtools/go/go-distribution_git.bb @@ -36,4 +36,4 @@ go_distribution_digeset_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-fsnotify_git.bb b/recipes-devtools/go/go-fsnotify_git.bb index 0826aa7f..3f533aa9 100644 --- a/recipes-devtools/go/go-fsnotify_git.bb +++ b/recipes-devtools/go/go-fsnotify_git.bb @@ -26,4 +26,4 @@ go_fsnotify_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-libtrust_git.bb b/recipes-devtools/go/go-libtrust_git.bb index 55659464..448a68b6 100644 --- a/recipes-devtools/go/go-libtrust_git.bb +++ b/recipes-devtools/go/go-libtrust_git.bb @@ -26,4 +26,4 @@ go_libtrust_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-logrus_git.bb b/recipes-devtools/go/go-logrus_git.bb index aa89033e..97e1a35c 100644 --- a/recipes-devtools/go/go-logrus_git.bb +++ b/recipes-devtools/go/go-logrus_git.bb @@ -26,4 +26,4 @@ go_logrus_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-md2man_git.bb b/recipes-devtools/go/go-md2man_git.bb index a1fcbe9b..a62f4832 100644 --- a/recipes-devtools/go/go-md2man_git.bb +++ b/recipes-devtools/go/go-md2man_git.bb @@ -18,6 +18,6 @@ S = "${WORKDIR}/git" inherit go -do_compile_prepend() { +do_compile:prepend() { export GO111MODULE=off } diff --git a/recipes-devtools/go/go-metalinter_git.bb b/recipes-devtools/go/go-metalinter_git.bb index 668b431a..50402e39 100644 --- a/recipes-devtools/go/go-metalinter_git.bb +++ b/recipes-devtools/go/go-metalinter_git.bb @@ -21,4 +21,4 @@ do_install() { cp -r ${S}/* ${D}${prefix}/local/go/src/${PKG_NAME}/ } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-mux_git.bb b/recipes-devtools/go/go-mux_git.bb index 7a2025a0..b5a78d9b 100644 --- a/recipes-devtools/go/go-mux_git.bb +++ b/recipes-devtools/go/go-mux_git.bb @@ -25,4 +25,4 @@ go_mux_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-patricia_git.bb b/recipes-devtools/go/go-patricia_git.bb index 8c1e10d9..4e546abc 100644 --- a/recipes-devtools/go/go-patricia_git.bb +++ b/recipes-devtools/go/go-patricia_git.bb @@ -26,4 +26,4 @@ go_patricia_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-pty_git.bb b/recipes-devtools/go/go-pty_git.bb index 02cef69e..f6eeaa29 100644 --- a/recipes-devtools/go/go-pty_git.bb +++ b/recipes-devtools/go/go-pty_git.bb @@ -25,4 +25,4 @@ go_pty_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/go-systemd_git.bb b/recipes-devtools/go/go-systemd_git.bb index c21a0f96..130ef8bf 100644 --- a/recipes-devtools/go/go-systemd_git.bb +++ b/recipes-devtools/go/go-systemd_git.bb @@ -12,7 +12,7 @@ SRC_URI = "git://${PKG_NAME}.git;branch=main" SRCREV = "b4a58d95188dd092ae20072bac14cece0e67c388" PV = "4+git${SRCPV}" -RDEPENDS_${PN} += "bash" +RDEPENDS:${PN} += "bash" S = "${WORKDIR}/git" @@ -28,4 +28,4 @@ go_systemd_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" diff --git a/recipes-devtools/go/grpc-go_git.bb b/recipes-devtools/go/grpc-go_git.bb index 48c42499..09a43dcf 100644 --- a/recipes-devtools/go/grpc-go_git.bb +++ b/recipes-devtools/go/grpc-go_git.bb @@ -36,6 +36,6 @@ go_grpc_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += " \ +FILES:${PN} += " \ ${prefix}/local/go/src/${PKG_NAME}/* \ " diff --git a/recipes-devtools/go/notary_git.bb b/recipes-devtools/go/notary_git.bb index 9cfb46ea..105a4cb8 100644 --- a/recipes-devtools/go/notary_git.bb +++ b/recipes-devtools/go/notary_git.bb @@ -36,4 +36,4 @@ go_notary_sysroot_preprocess () { cp -r ${D}${prefix}/local/go/src/${PKG_NAME} ${SYSROOT_DESTDIR}${prefix}/local/go/src/$(dirname ${PKG_NAME}) } -FILES_${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" +FILES:${PN} += "${prefix}/local/go/src/${PKG_NAME}/*" -- cgit v1.2.3-54-g00ecf