Staged to master-next. These two Bruce guys should talk once and a while, that'd help not have duplicates in the recipe!
Bruce In message: [meta-virtualization][PATCH] crun: fix REQUIRED_DISTRO_FEATURES on 02/04/2023 Martin Jansa wrote: > * features_check was inherit twice and REQUIRED_DISTRO_FEATURES > was set twice as well but both with ?= so the 2nd one was ignored > > * seccomp was added in: > commit b8f2edd39af6b7ac4461158b0d0382e88e93d6f1 > Author: Bruce Ashfield <[email protected]> > Date: Wed Jun 30 11:22:42 2021 -0400 > Subject: crun: add seccomp distro features check > > but there was already systemd from: > > commit 144d1ae8973e8c67709d7b544dc53b80bf924754 > Author: Bruce Ashfield <[email protected]> > Date: Fri Apr 23 10:32:24 2021 -0400 > Subject: crun: use REQUIRED_DISTRO_FEATURES to indicate systemd dependency > > Signed-off-by: Martin Jansa <[email protected]> > --- > recipes-containers/crun/crun_git.bb | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/recipes-containers/crun/crun_git.bb > b/recipes-containers/crun/crun_git.bb > index 7db609e..15c18a1 100644 > --- a/recipes-containers/crun/crun_git.bb > +++ b/recipes-containers/crun/crun_git.bb > @@ -20,14 +20,12 @@ SRC_URI = > "git://github.com/containers/crun.git;branch=main;name=crun;protocol=h > PV = "1.8.1+git${SRCREV_crun}" > S = "${WORKDIR}/git" > > -REQUIRED_DISTRO_FEATURES ?= "systemd" > +REQUIRED_DISTRO_FEATURES ?= "systemd seccomp" > > inherit autotools-brokensep pkgconfig features_check > > PACKAGECONFIG ??= "" > > -inherit features_check > -REQUIRED_DISTRO_FEATURES ?= "seccomp" > > DEPENDS = "yajl libcap go-md2man-native m4-native" > # TODO: is there a packageconfig to turn this off ? > -- > 2.40.0 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7986): https://lists.yoctoproject.org/g/meta-virtualization/message/7986 Mute This Topic: https://lists.yoctoproject.org/mt/98004497/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
