Skip to content

Commit 1bbb060

Browse files
authored
Define a DISTRO with all DISTRO_FEATURES defined (qualcomm-linux#156)
Introduce the qcom-distro-catchall distribution, which enables all supported DISTRO_FEATURES in a single build. This variant is useful for validating combinations such as SELinux and SOTA together, and for exercising full-feature configurations in CI. The KVM DISTRO_FEATURE is intentionally excluded because KVM and Gunyah cannot coexist in the same build.
2 parents 6b4b8b8 + 396f0bb commit 1bbb060

File tree

9 files changed

+44
-39
lines changed

9 files changed

+44
-39
lines changed

conf/distro/include/qcom-base.inc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
DISTRO_NAME = "QCOM Reference Distro with Wayland"
2+
13
DISTRO_VERSION = "2.0"
24

35
# SDK variables.
@@ -13,11 +15,18 @@ DISTROOVERRIDES =. "${@ 'qcom-distro:' if d.getVar('DISTRO') != 'qcom-distro' el
1315
DISTRO_FEATURES:append = " \
1416
bluetooth \
1517
efi \
18+
glvnd \
19+
opencl \
20+
opengl \
1621
overlayfs \
1722
pam \
1823
pni-names \
1924
ptest \
25+
virtualization \
26+
vulkan \
27+
wayland \
2028
wifi \
29+
x11 \
2130
"
2231

2332
# Use systemd init manager for system initialization.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
DISTRO_FEATURES:append = " \
2+
kvm \
3+
"
4+
5+
DISTRO_NAME:append = " (KVM-enabled)"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
DISTRO_FEATURES:append = " selinux"
2+
DISTRO_FEATURES_FILTER_NATIVE:append = " selinux"
3+
DISTRO_FEATURES_FILTER_NATIVESDK:append = " selinux"
4+
5+
DISTRO_EXTRA_RDEPENDS:append = " packagegroup-core-selinux"
6+
7+
IMAGE_CLASSES += "selinux-image"
8+
9+
DISTRO_NAME:append = " (SELinux-enabled)"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
require conf/distro/sota.conf.inc
2+
3+
INITRAMFS_IMAGE = "initramfs-ostree-image"
4+
5+
DISTRO_NAME:append = " (OTA-enabled)"
6+
7+
# Generate an OSTree repository tarball during image build
8+
BUILD_OSTREE_REPO_TARBALL = "1"
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
require conf/distro/include/qcom-base.inc
2+
3+
#SELinux
4+
require conf/distro/include/qcom-distro-selinux.inc
5+
6+
#SOTA
7+
require conf/distro/include/qcom-distro-sota.inc

conf/distro/qcom-distro-kvm.conf

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
require conf/distro/qcom-distro.conf
2-
3-
DISTRO_FEATURES:append = " \
4-
kvm \
5-
"
6-
7-
DISTRO_NAME:append = " (KVM-enabled)"
1+
require conf/distro/include/qcom-base.inc
2+
require conf/distro/include/qcom-distro-kvm.inc
Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
require conf/distro/qcom-distro.conf
2-
3-
DISTRO_FEATURES:append = " selinux"
4-
DISTRO_FEATURES_FILTER_NATIVE:append = " selinux"
5-
DISTRO_FEATURES_FILTER_NATIVESDK:append = " selinux"
6-
7-
DISTRO_EXTRA_RDEPENDS:append = " packagegroup-core-selinux"
8-
9-
IMAGE_CLASSES += "selinux-image"
10-
11-
DISTRO_NAME:append = " (SELinux-enabled)"
1+
require conf/distro/include/qcom-base.inc
2+
require conf/distro/include/qcom-distro-selinux.inc

conf/distro/qcom-distro-sota.conf

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,2 @@
1-
require conf/distro/qcom-distro.conf
2-
require conf/distro/sota.conf.inc
3-
4-
INITRAMFS_IMAGE = "initramfs-ostree-image"
5-
6-
DISTRO_NAME:append = " (OTA-enabled)"
7-
8-
# Generate an OSTree repository tarball during image build
9-
BUILD_OSTREE_REPO_TARBALL = "1"
1+
require conf/distro/include/qcom-base.inc
2+
require conf/distro/include/qcom-distro-sota.inc

conf/distro/qcom-distro.conf

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
11
require conf/distro/include/qcom-base.inc
2-
3-
DISTRO_NAME = "QCOM Reference Distro with Wayland"
4-
5-
DISTRO_FEATURES:append = " \
6-
glvnd \
7-
opencl \
8-
opengl \
9-
virtualization \
10-
vulkan \
11-
wayland \
12-
x11 \
13-
"

0 commit comments

Comments
 (0)