diff --git a/meta-oniro-core/recipes-core/sysota/sysota_git.bb b/meta-oniro-core/recipes-core/sysota/sysota_git.bb index 7f529e9269a2e049215b283c5e3139574e334760..b0bfb59a0f4abc70ba795cea82eebcada26829d4 100644 --- a/meta-oniro-core/recipes-core/sysota/sysota_git.bb +++ b/meta-oniro-core/recipes-core/sysota/sysota_git.bb @@ -6,11 +6,9 @@ DESCRIPTION = "Robust, unattended update system for Linux gateways" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSES/Apache-2.0.txt;md5=c846ebb396f8b174b10ded4771514fcc" -SRC_URI = "git://booting.oniroproject.org/distro/components/sysota.git;protocol=https;branch=main" -SRC_URI_append = " \ - file://sysotad.conf \ - " - +SRC_URI = "git://booting.oniroproject.org/distro/components/sysota.git;protocol=https;branch=main \ + file://sysotad.conf \ +" SRCREV = "3cb40a1392fd2b849db711c6a9a050d00bad8c93" S = "${WORKDIR}/git" @@ -27,7 +25,7 @@ S = "${WORKDIR}/git" # # To avoid compiling the code twice a trick is employed. We know go-mod.bbclass # has already compiled the project and has stashed the binary into -# ${B}/${GO_BUILD_BINDIR}. In do_compile_append() we move those binaries over +# ${B}/${GO_BUILD_BINDIR}. In do_compile:append() we move those binaries over # to where the project makefile would have built them. In addition we pass # Go.Cmd=/bin/false to make sure that make does not attempt to compile anything # successfully for the second time. @@ -44,7 +42,7 @@ EXTRA_OEMAKE += "-I${RECIPE_SYSROOT_NATIVE}/usr/include" do_configure[cleandirs] =+ "${B}/make-build" -do_configure_append() { +do_configure:append() { # Note that path ${S}/src/${GO_IMPORT} is hard-coded in go.bbclass. # Depending on what The SRC_URI points to we may be building from a git @@ -68,7 +66,7 @@ do_configure_append() { --sysconfdir=${sysconfdir} } -do_compile_append() { +do_compile:append() { # See the "trick" paragraph above. If additional binaries are added to the # package, they should be moved as well. mkdir -p ${B}/make-build/cmd/sysotad @@ -78,7 +76,7 @@ do_compile_append() { oe_runmake -C ${B}/make-build --warn-undefined-variables Go.Cmd=/bin/false } -do_install_append() { +do_install:append() { oe_runmake -C ${B}/make-build --warn-undefined-variables install DESTDIR=${D} # Install the built-in configuration file. @@ -89,25 +87,25 @@ do_install_append() { # Include D-Bus configuration files in the primary package. Those contain bus # policy for talking to SystemOTA as well as the D-Bus activation service file # (not to be confused with the systemd service unit). -FILES_${PN} += "${datadir}/dbus-1" +FILES:${PN} += "${datadir}/dbus-1" # Include the built-in configuration file. -FILES_${PN} += "${libdir}/sysota/sysotad.conf" +FILES:${PN} += "${libdir}/sysota/sysotad.conf" # SystemOTA depends on RAUC and unsquashfs and mksquashfs (for tests). -RDEPENDS_${PN} += "squashfs-tools rauc" +RDEPENDS:${PN} += "squashfs-tools rauc" # SystemOTA test scripts technically depend on Bash for spread integration. -RDEPENDS_${PN}-dev += "bash" +RDEPENDS:${PN}-dev += "bash" # SystemOTA heavily depends on Systemd. Individual portions are implemented as # systemd services. REQUIRED_DISTRO_FEATURES = "systemd" -SYSTEMD_SERVICE_${PN} = "sysotad.service" +SYSTEMD_SERVICE:${PN} = "sysotad.service" # Specific MACHINE configurations have sysotad.conf which provides the right # settings, like the boot loader type. -FILESEXTRAPATHS_prepend_raspberrypi4-64 := "${THISDIR}/files/raspberrypi4:" +FILESEXTRAPATHS:prepend:raspberrypi4-64 := "${THISDIR}/files/raspberrypi4:" # Make the SystemOTA package machine-specific. This lets us put the specific # configuration file, which encodes boot loader type, into it safely.