From ff99eacaf084447664d9d1a0b19d9fbc672a5a5f Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Tue, 23 Jan 2024 12:40:55 -0500 Subject: [PATCH 1/2] Correct virtual usage in RPROVIDES Bitbake has correctly started to warn about this. https: //docs.yoctoproject.org/dev-manual/new-recipe.html#using-virtual-providers Signed-off-by: Justin Bronder --- .../openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb | 2 +- .../openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb | 2 +- recipes-init/openrc/openrc_0.51.bb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb b/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb index fb81386..5c58f43 100644 --- a/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb +++ b/recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://inittab.in" S = "${WORKDIR}" -RPROVIDES:${PN} = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'busybox', 'virtual/openrc-inittab', '', d)}" +RPROVIDES:${PN} = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'busybox', 'virtual-openrc-inittab', '', d)}" INHIBIT_DEFAULT_DEPS = "1" diff --git a/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb b/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb index 900da2c..a7ff028 100644 --- a/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb +++ b/recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://inittab.in" S = "${WORKDIR}" -RPROVIDES:${PN} = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'virtual/openrc-inittab', '', d)}" +RPROVIDES:${PN} = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'sysvinit', 'virtual-openrc-inittab', '', d)}" INHIBIT_DEFAULT_DEPS = "1" diff --git a/recipes-init/openrc/openrc_0.51.bb b/recipes-init/openrc/openrc_0.51.bb index b741f17..242532c 100644 --- a/recipes-init/openrc/openrc_0.51.bb +++ b/recipes-init/openrc/openrc_0.51.bb @@ -91,7 +91,7 @@ PACKAGES =+ "${PN}-init" RDEPENDS:${PN} = " \ kbd \ - ${@bb.utils.contains('DISTRO_FEATURES', 'openrc', 'virtual/openrc-inittab', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'openrc', 'virtual-openrc-inittab', '', d)} \ procps-sysctl \ ${VIRTUAL-RUNTIME_init_manager} \ util-linux-fsck \ @@ -108,7 +108,7 @@ RCONFLICTS:${PN}-init = " \ " RPROVIDES:${PN}-init = " \ - ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', d.expand('${PN}-init'), 'virtual/openrc-inittab', '', d)} \ + ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', d.expand('${PN}-init'), 'virtual-openrc-inittab', '', d)} \ " FILES:${PN}-doc:append = " ${datadir}/${BPN}/support" From 1b5f3fca3b94a3f1ef65dcc93daf78fbedbe5f60 Mon Sep 17 00:00:00 2001 From: Justin Bronder Date: Tue, 23 Jan 2024 12:45:30 -0500 Subject: [PATCH 2/2] github: update yocto sstate url Signed-off-by: Justin Bronder --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 867db06..15db648 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: echo 'INHERIT += "rm_work"' >> conf/local.conf echo 'DISTRO_FEATURES:remove = "alsa bluetooth usbgadget zeroconf 3g nfc x11 opengl ptest wayland vulkan gobject-introspection-data"' >> conf/local.conf echo 'BB_SIGNATURE_HANDLER = "OEEquivHash"' >> conf/local.conf - echo 'SSTATE_MIRRORS += "file://.* http://sstate.yoctoproject.org/all/PATH;downloadfilename=PATH"' >> conf/local.conf + echo 'SSTATE_MIRRORS += "file://.* http://cdn.jsdelivr.net/yocto/sstate/all/PATH;downloadfilename=PATH"' >> conf/local.conf echo 'BB_HASHSERVE = "auto"' >> conf/local.conf echo 'BB_HASHSERVE_UPSTREAM = "hashserv.yocto.io:8687"' >> conf/local.conf echo 'BB_DISKMON_DIRS = "STOPTASKS,${TMPDIR},100M,10K HALT,${TMPDIR},50M,5k"' >> conf/local.conf