From d3be0f884804c89fce2adf02fb4cf1ea31f3e715 Mon Sep 17 00:00:00 2001
From: Emanuele Aina <emanuele.aina@collabora.com>
Date: Fri, 23 Nov 2018 17:29:49 +0100
Subject: [PATCH] ospack: Split up all the $arch-$platform overlays
The `$arch-$platform` overlay mechanism was a relic of the old
`cb_build` pipeline. Split it up into semantic overlays and include them
only where appropriate.
Signed-off-by: Emanuele Aina <emanuele.aina@collabora.com>
---
apertis-ospack-basesdk.yaml | 5 ++++-
apertis-ospack-devroot.yaml | 9 ---------
apertis-ospack-minimal.yaml | 13 ++++++++++---
apertis-ospack-sdk.yaml | 5 ++++-
apertis-ospack-sysroot.yaml | 9 ---------
apertis-ospack-target.yaml | 10 +++++++---
overlays/amd64-devroot/.gitignore | 0
overlays/amd64-minimal/.gitignore | 0
overlays/amd64-sysroot/.gitignore | 0
overlays/amd64-target/.gitignore | 0
overlays/arch-devroot/.gitignore | 0
overlays/arch-sysroot/.gitignore | 0
overlays/arch-target/.gitignore | 0
overlays/arm64-devroot/.gitignore | 0
overlays/arm64-minimal/.gitignore | 0
overlays/arm64-platform/.gitignore | 0
overlays/arm64-sysroot/.gitignore | 0
overlays/arm64-target/.gitignore | 0
overlays/armhf-devroot/.gitignore | 0
overlays/armhf-minimal/.gitignore | 0
overlays/armhf-sysroot/.gitignore | 0
overlays/armhf-target/.gitignore | 0
.../usr/share/initramfs-tools/modules.d/i915 | 0
.../usr/share/initramfs-tools/modules.d/uvcvideo | 0
.../etc/initramfs-tools/conf.d/modules | 0
.../usr/share/initramfs-tools/modules.d/fs | 0
.../usr/share/initramfs-tools/modules.d/sdhci | 0
.../etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions | 0
.../polkit-1/rules.d/60-apertis-minimal-user.rules | 0
.../daemon.conf.d/fix-alternate-sample-rate.conf | 0
.../etc/modprobe.d/apertis-blacklist-vboxvideo.conf | 0
.../system/graphical.target.wants/vboxvideo.service | 0
.../lib/systemd/system/vboxvideo.service | 0
33 files changed, 25 insertions(+), 26 deletions(-)
delete mode 100644 overlays/amd64-devroot/.gitignore
delete mode 100644 overlays/amd64-minimal/.gitignore
delete mode 100644 overlays/amd64-sysroot/.gitignore
delete mode 100644 overlays/amd64-target/.gitignore
delete mode 100644 overlays/arch-devroot/.gitignore
delete mode 100644 overlays/arch-sysroot/.gitignore
delete mode 100644 overlays/arch-target/.gitignore
delete mode 100644 overlays/arm64-devroot/.gitignore
delete mode 100644 overlays/arm64-minimal/.gitignore
delete mode 100644 overlays/arm64-platform/.gitignore
delete mode 100644 overlays/arm64-sysroot/.gitignore
delete mode 100644 overlays/arm64-target/.gitignore
delete mode 100644 overlays/armhf-devroot/.gitignore
delete mode 100644 overlays/armhf-minimal/.gitignore
delete mode 100644 overlays/armhf-sysroot/.gitignore
delete mode 100644 overlays/armhf-target/.gitignore
rename overlays/{amd64-platform => initramfs-modules-amd64}/usr/share/initramfs-tools/modules.d/i915 (100%)
rename overlays/{amd64-platform => initramfs-modules-amd64}/usr/share/initramfs-tools/modules.d/uvcvideo (100%)
rename overlays/{armhf-platform => initramfs-modules-imx6}/etc/initramfs-tools/conf.d/modules (100%)
rename overlays/{armhf-platform => initramfs-modules-imx6}/usr/share/initramfs-tools/modules.d/fs (100%)
rename overlays/{armhf-platform => initramfs-modules-imx6}/usr/share/initramfs-tools/modules.d/sdhci (100%)
rename overlays/{arch-minimal => minimal-dpkg-exclusions}/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions (100%)
rename overlays/{arch-minimal => minimal-ribchester-polkit-rules}/etc/polkit-1/rules.d/60-apertis-minimal-user.rules (100%)
rename overlays/{armhf-target => pulseaudio-alternate-sample-rate-imx6}/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf (100%)
rename overlays/{amd64-platform => sdk-vboxvideo-workaround}/etc/modprobe.d/apertis-blacklist-vboxvideo.conf (100%)
rename overlays/{amd64-platform => sdk-vboxvideo-workaround}/lib/systemd/system/graphical.target.wants/vboxvideo.service (100%)
rename overlays/{amd64-platform => sdk-vboxvideo-workaround}/lib/systemd/system/vboxvideo.service (100%)
diff --git a/apertis-ospack-basesdk.yaml b/apertis-ospack-basesdk.yaml
index 113261a..8eef874 100644
--- a/apertis-ospack-basesdk.yaml
+++ b/apertis-ospack-basesdk.yaml
@@ -489,7 +489,10 @@ actions:
source: overlays/supported-locales
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-amd64
+
+ - action: overlay
+ source: overlays/sdk-vboxvideo-workaround
- action: overlay
source: overlays/sdk-lightdm-autologin
diff --git a/apertis-ospack-devroot.yaml b/apertis-ospack-devroot.yaml
index 31c3575..7b23a7f 100644
--- a/apertis-ospack-devroot.yaml
+++ b/apertis-ospack-devroot.yaml
@@ -385,15 +385,6 @@ actions:
- action: overlay
source: overlays/default-locale-c-utf8
- - action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
-
- - action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
-
- - action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
-
- action: run
chroot: true
script: scripts/add-xdg-user-metadata.sh
diff --git a/apertis-ospack-minimal.yaml b/apertis-ospack-minimal.yaml
index 58dd370..6954500 100644
--- a/apertis-ospack-minimal.yaml
+++ b/apertis-ospack-minimal.yaml
@@ -84,14 +84,21 @@ actions:
- action: overlay
source: overlays/default-locale-c-utf8
+{{ if eq $architecture "amd64" }}
- action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
+ source: overlays/initramfs-modules-amd64
+{{ end }}
+{{ if eq $architecture "armhf" }}
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-imx6
+{{ end }}
- action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
+ source: overlays/minimal-dpkg-exclusions
+
+ - action: overlay
+ source: overlays/minimal-ribchester-polkit-rules
- action: run
chroot: true
diff --git a/apertis-ospack-sdk.yaml b/apertis-ospack-sdk.yaml
index bb8bca0..45c88af 100644
--- a/apertis-ospack-sdk.yaml
+++ b/apertis-ospack-sdk.yaml
@@ -682,7 +682,10 @@ actions:
source: overlays/supported-locales
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-amd64
+
+ - action: overlay
+ source: overlays/sdk-vboxvideo-workaround
- action: overlay
source: overlays/sdk-lightdm-autologin
diff --git a/apertis-ospack-sysroot.yaml b/apertis-ospack-sysroot.yaml
index 154fcc1..96e64f2 100644
--- a/apertis-ospack-sysroot.yaml
+++ b/apertis-ospack-sysroot.yaml
@@ -379,15 +379,6 @@ actions:
- action: overlay
source: overlays/default-locale-c-utf8
- - action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
-
- - action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
-
- - action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
-
- action: run
chroot: true
script: scripts/add-xdg-user-metadata.sh
diff --git a/apertis-ospack-target.yaml b/apertis-ospack-target.yaml
index 0101c5b..af396f2 100644
--- a/apertis-ospack-target.yaml
+++ b/apertis-ospack-target.yaml
@@ -212,14 +212,18 @@ actions:
- action: overlay
source: overlays/supported-locales
+{{ if eq $architecture "amd64" }}
- action: overlay
- source: {{ printf "overlays/arch-%s" $type }}
+ source: overlays/initramfs-modules-amd64
+{{ end }}
+{{ if eq $architecture "armhf" }}
- action: overlay
- source: {{ printf "overlays/%s-platform" $architecture }}
+ source: overlays/initramfs-modules-imx6
- action: overlay
- source: {{ printf "overlays/%s-%s" $architecture $type }}
+ source: overlays/pulseaudio-alternate-sample-rate-imx6
+{{ end }}
- action: run
chroot: true
diff --git a/overlays/amd64-devroot/.gitignore b/overlays/amd64-devroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/amd64-minimal/.gitignore b/overlays/amd64-minimal/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/amd64-sysroot/.gitignore b/overlays/amd64-sysroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/amd64-target/.gitignore b/overlays/amd64-target/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arch-devroot/.gitignore b/overlays/arch-devroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arch-sysroot/.gitignore b/overlays/arch-sysroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arch-target/.gitignore b/overlays/arch-target/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arm64-devroot/.gitignore b/overlays/arm64-devroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arm64-minimal/.gitignore b/overlays/arm64-minimal/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arm64-platform/.gitignore b/overlays/arm64-platform/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arm64-sysroot/.gitignore b/overlays/arm64-sysroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/arm64-target/.gitignore b/overlays/arm64-target/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/armhf-devroot/.gitignore b/overlays/armhf-devroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/armhf-minimal/.gitignore b/overlays/armhf-minimal/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/armhf-sysroot/.gitignore b/overlays/armhf-sysroot/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/armhf-target/.gitignore b/overlays/armhf-target/.gitignore
deleted file mode 100644
index e69de29..0000000
diff --git a/overlays/amd64-platform/usr/share/initramfs-tools/modules.d/i915 b/overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/i915
similarity index 100%
rename from overlays/amd64-platform/usr/share/initramfs-tools/modules.d/i915
rename to overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/i915
diff --git a/overlays/amd64-platform/usr/share/initramfs-tools/modules.d/uvcvideo b/overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/uvcvideo
similarity index 100%
rename from overlays/amd64-platform/usr/share/initramfs-tools/modules.d/uvcvideo
rename to overlays/initramfs-modules-amd64/usr/share/initramfs-tools/modules.d/uvcvideo
diff --git a/overlays/armhf-platform/etc/initramfs-tools/conf.d/modules b/overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
similarity index 100%
rename from overlays/armhf-platform/etc/initramfs-tools/conf.d/modules
rename to overlays/initramfs-modules-imx6/etc/initramfs-tools/conf.d/modules
diff --git a/overlays/armhf-platform/usr/share/initramfs-tools/modules.d/fs b/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
similarity index 100%
rename from overlays/armhf-platform/usr/share/initramfs-tools/modules.d/fs
rename to overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/fs
diff --git a/overlays/armhf-platform/usr/share/initramfs-tools/modules.d/sdhci b/overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
similarity index 100%
rename from overlays/armhf-platform/usr/share/initramfs-tools/modules.d/sdhci
rename to overlays/initramfs-modules-imx6/usr/share/initramfs-tools/modules.d/sdhci
diff --git a/overlays/arch-minimal/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions b/overlays/minimal-dpkg-exclusions/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions
similarity index 100%
rename from overlays/arch-minimal/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions
rename to overlays/minimal-dpkg-exclusions/etc/dpkg/dpkg.cfg.d/apertis-minimal-exclusions
diff --git a/overlays/arch-minimal/etc/polkit-1/rules.d/60-apertis-minimal-user.rules b/overlays/minimal-ribchester-polkit-rules/etc/polkit-1/rules.d/60-apertis-minimal-user.rules
similarity index 100%
rename from overlays/arch-minimal/etc/polkit-1/rules.d/60-apertis-minimal-user.rules
rename to overlays/minimal-ribchester-polkit-rules/etc/polkit-1/rules.d/60-apertis-minimal-user.rules
diff --git a/overlays/armhf-target/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf b/overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
similarity index 100%
rename from overlays/armhf-target/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
rename to overlays/pulseaudio-alternate-sample-rate-imx6/etc/pulse/daemon.conf.d/fix-alternate-sample-rate.conf
diff --git a/overlays/amd64-platform/etc/modprobe.d/apertis-blacklist-vboxvideo.conf b/overlays/sdk-vboxvideo-workaround/etc/modprobe.d/apertis-blacklist-vboxvideo.conf
similarity index 100%
rename from overlays/amd64-platform/etc/modprobe.d/apertis-blacklist-vboxvideo.conf
rename to overlays/sdk-vboxvideo-workaround/etc/modprobe.d/apertis-blacklist-vboxvideo.conf
diff --git a/overlays/amd64-platform/lib/systemd/system/graphical.target.wants/vboxvideo.service b/overlays/sdk-vboxvideo-workaround/lib/systemd/system/graphical.target.wants/vboxvideo.service
similarity index 100%
rename from overlays/amd64-platform/lib/systemd/system/graphical.target.wants/vboxvideo.service
rename to overlays/sdk-vboxvideo-workaround/lib/systemd/system/graphical.target.wants/vboxvideo.service
diff --git a/overlays/amd64-platform/lib/systemd/system/vboxvideo.service b/overlays/sdk-vboxvideo-workaround/lib/systemd/system/vboxvideo.service
similarity index 100%
rename from overlays/amd64-platform/lib/systemd/system/vboxvideo.service
rename to overlays/sdk-vboxvideo-workaround/lib/systemd/system/vboxvideo.service
--
GitLab