Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct virtual usage in RPROVIDES #35

Merged
merged 2 commits into from
Jan 23, 2024
Merged

Correct virtual usage in RPROVIDES #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff99eac
Correct virtual usage in RPROVIDES
jsbronder Jan 23, 2024
1b5f3fc
github: update yocto sstate url
jsbronder Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion recipes-init/openrc-inittab-busybox/openrc-inittab-busybox_1.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion recipes-init/openrc-inittab-sysvinit/openrc-inittab-sysvinit_1.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions recipes-init/openrc/openrc_0.51.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"
Expand Down
Loading