mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-27 07:57:27 +00:00
Code Issues Projects Releases Wiki Activity

ostree: Fix comments for configuration/ptest

Browse Source 
The comments and recipe had diverged, bring them back into line. Update
the instructions on how to get ptest to pass.

Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Alex Kiernan
2023-01-02 22:42:33 +00:00
committed by Khem Raj
parent 5548aaad17
commit f3b1b4bbd6
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-extended/ostree/ostree_2022.7.bb
+17 -8
View File
@@ -39,7 +39,9 @@ BUILD_OPTIMIZATION:remove = "-Og"
BUILD_OPTIMIZATION:append = " -O2" BUILD_OPTIMIZATION:append = " -O2"
# Package configuration - match ostree defaults, but without rofiles-fuse # Package configuration - match ostree defaults, but without rofiles-fuse
# otherwise we introduce a dependendency on meta-filesystems # otherwise we introduce a dependendency on meta-filesystems and swap
# soup for curl to avoid bringing in deprecated libsoup2 (though
# to run ptest requires that you have soup).
PACKAGECONFIG ??= " \ PACKAGECONFIG ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd libmount', '', d)} \
@@ -48,7 +50,7 @@ PACKAGECONFIG ??= " \
curl \ curl \
" "
# We include soup because ostree can't (currently) be built without # We include curl because ostree can't (currently) be built without
# soup or curl - https://github.com/ostreedev/ostree/issues/1897 # soup or curl - https://github.com/ostreedev/ostree/issues/1897
PACKAGECONFIG:class-native ??= " \ PACKAGECONFIG:class-native ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \
@@ -175,13 +177,20 @@ RDEPENDS:${PN}:class-target = " \
# #
# Note that to get ptest to pass you also need: # Note that to get ptest to pass you also need:
# #
# xattr in DISTRO_FEATURES # xattr in DISTRO_FEATURES (default)
# static ostree-prepare-root (PACKAGECONFIG:append:pn-ostree = " static") # static ostree-prepare-root
# meta-python in your layers # ostree-trivial-httpd (requires soup - note soup and curl can coexist)
# overlayfs in your kernel (KERNEL_EXTRA_FEATURES += "features/overlayfs/overlayfs.scc") # overlayfs in your kernel
# busybox built statically # busybox built statically
# /var/tmp as a real filesystem (not a tmpfs) # C.UTF-8 locale available
# Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") # Sufficient disk space/RAM (e.g. core-image-sato-sdk)
#
# Something like this in your local.conf:
#
# PACKAGECONFIG:append:pn-ostree = " static soup"
# KERNEL_EXTRA_FEATURES:append = " features/overlayfs/overlayfs.scc"
# TARGET_CFLAGS:append:pn-busybox = " -static"
# IMAGE_LINGUAS:append:libc-glibc = " c"
# #
RDEPENDS:${PN}-ptest += " \ RDEPENDS:${PN}-ptest += " \
attr \ attr \