MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

crun: fix REQUIRED_DISTRO_FEATURES

Browse Source 
* 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 b8f2edd39a
  Author: Bruce Ashfield <bruce.ashfield@gmail.com>
  Date:   Wed Jun 30 11:22:42 2021 -0400
  Subject: crun: add seccomp distro features check

  but there was already systemd from:

  commit 144d1ae897
  Author: Bruce Ashfield <bruce.ashfield@gmail.com>
  Date:   Fri Apr 23 10:32:24 2021 -0400
  Subject: crun: use REQUIRED_DISTRO_FEATURES to indicate systemd dependency

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Martin Jansa 2023-04-02 00:10:27 +02:00 committed by Bruce Ashfield
parent f964138a21
commit 31e8dc838b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-containers/crun/crun_git.bb
View File

@ -20,14 +20,12 @@ SRC_URI = "git://github.com/containers/crun.git;branch=main;name=crun;protocol=h
PV = "1.8.3+git${SRCREV_crun}" PV = "1.8.3+git${SRCREV_crun}"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
REQUIRED_DISTRO_FEATURES ?= "systemd" REQUIRED_DISTRO_FEATURES ?= "systemd seccomp"
inherit autotools-brokensep pkgconfig features_check inherit autotools-brokensep pkgconfig features_check
PACKAGECONFIG ??= "" PACKAGECONFIG ??= ""
inherit features_check
REQUIRED_DISTRO_FEATURES ?= "seccomp"
DEPENDS = "yajl libcap go-md2man-native m4-native" DEPENDS = "yajl libcap go-md2man-native m4-native"
# TODO: is there a packageconfig to turn this off ? # TODO: is there a packageconfig to turn this off ?