Separate out IVI specific functionality

We are now utilising Apertis for non-IVI related uses. There are a large
number of packages install, which will not be of interest to users in
these other areas. Start separating out the some components so that
more targeted images can be produced with a common core.

For now we will be forking these files. The separation intends to make it
easier for derivatives of these files to stay in sync with core changes.

Signed-off-by: Martyn Welch <martyn@welchs.me.uk>

Differential Revision: https://phabricator.apertis.org/D7799

apertis-image-sdk.yaml

@@ -9,6 +9,7 @@
 {{ $cmdline := or .cmdline "console=tty0 console=ttyS0,115200n8 rootwait ro quiet splash plymouth.ignore-serial-consoles" }}
 
 {{ $size := or .size "20G" }}
+{{ $ivitools := or .ivitools "enabled" }}
 
 architecture: {{ $architecture }}
 
@@ -81,10 +82,12 @@ actions:
     description: Cleanup /var/lib
     script: scripts/remove_var_lib_parts.binary
 
+  {{ if eq $ivitools "enabled" }}
   - action: run
     description: Fetch sample app bundle sources
     chroot: true
     script: scripts/clone-sample-repos.chroot
+  {{ end }}
 
   # For VirtualBox
   - action: run

apertis-ospack.yaml

@@ -5,6 +5,7 @@
 {{- $timestamp := or .timestamp "00000000.0" -}}
 {{- $ospack := or .ospack (printf "ospack_%s-%s-%s_%s.tar.gz" $suite $architecture $type $timestamp) -}}
 {{- $demopack := or .demopack "disabled" -}}
+{{- $ivitools := or .ivitools "enabled" -}}
 
 architecture: {{ $architecture }}
 
@@ -74,12 +75,14 @@ actions:
       - apparmor
       - chaiwala-apparmor-profiles
 
+  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "Application framework packages"
     packages:
       - canterbury-core
       - newport
       - ribchester-core
+  {{ end }}
 
   - action: apt
     description: "Test environment packages"
@@ -90,6 +93,7 @@ actions:
       - vim.tiny
 
   {{- if eq $type "target" "development" "sdk" }}
+  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "HMI packages"
     packages:
@@ -102,6 +106,7 @@ actions:
       - mildenhall-settings
       - mildenhall-statusbar
       - xwayland
+  {{ end }}
 
   - action: apt
     description: "Target packages"
@@ -116,29 +121,21 @@ actions:
       - apt-utils
       - auditd
       - avahi-daemon
-      - barkway
-      - beckfoot
       - bluez
       - bluez-obexd
       - btrfs-tools
       - busybox-initramfs
       - bzip2
       - ca-certificates
-      - canterbury
       - chaiwala-apparmor-profiles
       - chaiwala-user-session-wayland
       - connman
       - debconf-i18n
-      - didcot
-      - dlt-daemon
       - dosfstools
       - evolution-data-server
       - file
       - fonts-dejavu-extra
-      - frome
-      - geoclue
       - gnupg
-      - grilo-plugins-0.2
       - gstreamer1.0-clutter-3.0
       - gstreamer1.0-plugins-good
       - gstreamer1.0-pulseaudio
@@ -161,27 +158,19 @@ actions:
       - mutter
       - net-tools
       - netbase
-      - newport
-      - ofono
       - openssh-client
       - openssh-server
       - pacrunner
       - plymouth
       - plymouth-themes
       - policykit-1
-      - prestwood
       - pulseaudio
       - pulseaudio-module-bluetooth
       - pulseaudio-module-x11
       - pulseaudio-utils
-      - rhosydd
-      - ribchester
-      - shapwick
       - sudo
-      - syncevolution
       - systemd-sysv
       - tcmmd
-      - tinwell
       - tracker
       - tracker-miner-fs
       - tumbler
@@ -194,6 +183,28 @@ actions:
       - xauth
       - xdg-user-dirs
       - xwayland
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Target packages (CM)"
+    packages:
+      - barkway
+      - beckfoot
+      - canterbury
+      - didcot
+      - dlt-daemon
+      - frome
+      - geoclue
+      - grilo-plugins-0.2
+      - newport
+      - ofono
+      - prestwood
+      - rhosydd
+      - ribchester
+      - shapwick
+      - syncevolution
+      - tinwell
+  {{ end }}
   {{- end -}}
 
   {{- if eq $type "development" "sdk" }}
@@ -215,10 +226,12 @@ actions:
     chroot: true
     command: chmod a+x /usr/share/lxc/templates/lxc-apertis-ostree
 
+  {{ if eq $ivitools "enabled" }}
   - action: apt
     description: "Development HMI packages"
     packages:
       - mildenhall-dev
+  {{ end }}
 
   - action: apt
     description: "Development packages"
@@ -227,13 +240,10 @@ actions:
       - automake
       - autopoint
       - autotools-dev
-      - barkway-dev
       - bash
-      - beckfoot-dev
       - bison
       - build-essential
       - bustle-pcap
-      - canterbury-dev
       - chrpath
       - clutter-1.0-tests
       - cmake
@@ -245,13 +255,10 @@ actions:
       - evolution-data-server-dev
       - fakeroot
       - flex
-      - folks-tools
-      - frome
       - gawk
       - gcc
       - gdb
       - gdbserver
-      - geoclue-2.0
       - gir1.2-secret-1
       - git
       - gperf
@@ -261,28 +268,16 @@ actions:
       - less
       - libasound2-dev
       - libbluetooth-dev
-      - libchamplain-0.12-dev
-      - libclapton-dev
       - libclutter-1.0-dev
       - libclutter-gst-3.0-dev
       - libclutter-gtk-1.0-dev
       - libcogl-dev
       - libcurl4-nss-dev
-      - libdidcot-0-dev
       - libenchant-dev
       - libffi-dev
-      - libfolks-dbg
-      - libfolks-dev
-      - libfolks-eds-dbg
-      - libfolks-eds-dev
-      - libfolks-telepathy-dbg
-      - libfolks-telepathy-dev
-      - libfrome-0-dev
-      - libgeoclue-dev
       - libgirepository1.0-dev
       - libglib2.0-dev
       - libgnomevfs2-dev
-      - libgrassmoor-dev
       - libgstreamer-plugins-base1.0-dev
       - libgstreamer1.0-dev
       - libgtk2.0-dev
@@ -293,7 +288,6 @@ actions:
       - libicu-dev
       - libjpeg-dev
       - libjsoncpp1
-      - liblightwood-dev
       - libmrss0-dev
       - libmutter-dev
       - libmx-2.0-0-dev
@@ -303,16 +297,11 @@ actions:
       - libpoppler-glib-dev
       - libproxy-dev
       - libpulse-dev
-      - libseaton-dev
       - libsecret-1-0
       - libsecret-1-dev
       - libsecret-common
       - libsoup2.4-dev
       - libsqlite3-dev
-      - libtelepathy-farstream-dev
-      - libtelepathy-glib-dev
-      - libtelepathy-glib0-dbg
-      - libthornbury-dev
       - libtool
       - libtracker-control-1.0-dev
       - libtracker-miner-1.0-dev
@@ -326,25 +315,55 @@ actions:
       - linux-headers-generic
       - lsb-release
       - ltrace
-      - newport-dev
       - openssh-client
       - openssh-server
       - pavucontrol
       - pkg-config
-      - prestwood-dev
       - python-pkg-resources
       - python-ply
-      - ribchester-dev
       - ruby
-      - shapwick-dev
       - slimit
       - strace
       - symlinks
       - syncevolution-dbg
-      - tinwell-dev
       - valgrind
       - wget
       - xinput
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "Development packages (CM)"
+    packages:
+      - barkway-dev
+      - beckfoot-dev
+      - canterbury-dev
+      - folks-tools
+      - frome
+      - geoclue-2.0
+      - libchamplain-0.12-dev
+      - libclapton-dev
+      - libdidcot-0-dev
+      - libfolks-dbg
+      - libfolks-dev
+      - libfolks-eds-dbg
+      - libfolks-eds-dev
+      - libfolks-telepathy-dbg
+      - libfolks-telepathy-dev
+      - libfrome-0-dev
+      - libgeoclue-dev
+      - libgrassmoor-dev
+      - liblightwood-dev
+      - libseaton-dev
+      - libtelepathy-farstream-dev
+      - libtelepathy-glib-dev
+      - libtelepathy-glib0-dbg
+      - libthornbury-dev
+      - newport-dev
+      - prestwood-dev
+      - ribchester-dev
+      - shapwick-dev
+      - tinwell-dev
+  {{ end }}
   {{- end }}
 
   {{- if eq $type "sdk" }}
@@ -364,17 +383,12 @@ actions:
       - apt
       - apt-transport-https
       - apt-utils
-      - apertis-eclipse-plugins
       - auditd
       - automake
       - autopoint
       - autotools-dev
       - avahi-daemon
-      - barkway-dev
-      - barkway-doc
       - bash
-      - beckfoot-dev
-      - beckfoot-doc
       - bison
       - blueman
       - bluez
@@ -387,8 +401,6 @@ actions:
       - busybox-initramfs
       - bzip2
       - ca-certificates
-      - canterbury
-      - canterbury-dev
       - ccache
       - chaiwala-apparmor-profiles
       - chaiwala-sdk-default-settings
@@ -408,14 +420,7 @@ actions:
       - devscripts
       - dh-autoreconf
       - dh-exec
-      - didcot
-      - didcot-doc
-      - dlt-daemon
       - dosfstools
-      - eclipse
-      - eclipse-cdt
-      - eclipse-cdt-launch-remote
-      - eclipse-rcp
       - evince
       - evolution-data-server
       - evolution-data-server-dbg
@@ -425,8 +430,6 @@ actions:
       - file
       - firefox
       - flex
-      - folks-tools
-      - frome
       - g++-aarch64-linux-gnu
       - g++-arm-linux-gnueabihf
       - gawk
@@ -437,7 +440,6 @@ actions:
       - gdb-doc
       - gdb-multiarch
       - gdbserver
-      - geoclue
       - gettext-doc
       - gir1.2-secret-1
       - git
@@ -447,7 +449,6 @@ actions:
       - gnome-icon-theme-full
       - gnupg
       - gperf
-      - grilo-plugins-0.2
       - gstreamer1.0-clutter-3.0
       - gstreamer1.0-doc
       - gstreamer1.0-plugins-good
@@ -468,10 +469,6 @@ actions:
       - libasound2-dev
       - libbluetooth-dev
       - libcairo2-doc
-      - libchamplain-0.12-dev
-      - libchamplain-doc
-      - libclapton-dev
-      - libclapton-doc
       - libclutter-1.0-dev
       - libclutter-1.0-doc
       - libclutter-gst-3.0-dev
@@ -481,25 +478,12 @@ actions:
       - libcogl-dev
       - libcogl-doc
       - libcurl4-nss-dev
-      - libdidcot-0-dev
       - libenchant-dev
       - libffi-dev
-      - libfolks-dbg
-      - libfolks-dev
-      - libfolks-eds-dbg
-      - libfolks-eds-dev
-      - libfolks-eds25
-      - libfolks-telepathy-dbg
-      - libfolks-telepathy-dev
-      - libfolks-telepathy25
       - libgdata-doc
-      - libgeoclue-dev
       - libgirepository1.0-dev
       - libglib2.0-dev
       - libgnomevfs2-dev
-      - libgrassmoor-dev
-      - libgrassmoor-doc
-      - libgrilo-0.2-doc
       - libgstreamer-plugins-base1.0-dev
       - libgstreamer1.0-dev
       - libgupnp-1.0-4
@@ -509,8 +493,6 @@ actions:
       - libicu-dev
       - libjpeg-dev
       - libjson-glib-doc
-      - liblightwood-dev
-      - liblightwood-doc
       - liblockfile-bin
       - libmrss0-dev
       - libmutter-dev
@@ -523,21 +505,12 @@ actions:
       - libproxy-dev
       - libproxy1-pacrunner
       - libpulse-dev
-      - libseaton-dev
-      - libseaton-doc
       - libsecret-1-0
       - libsecret-1-dev
       - libsecret-common
       - libsoup2.4-dev
       - libsoup2.4-doc
       - libsqlite3-dev
-      - libtelepathy-farstream-dev
-      - libtelepathy-glib-dev
-      - libtelepathy-glib-doc
-      - libtelepathy-glib0-dbg
-      - libtelepathy-logger-doc
-      - libthornbury-dev
-      - libthornbury-doc
       - libtool
       - libtracker-control-1.0-dev
       - libtracker-control-doc
@@ -545,9 +518,6 @@ actions:
       - libtracker-miner-doc
       - libtracker-sparql-1.0-dev
       - libtracker-sparql-doc
-      - libtraprain-0-doc
-      - libtraprain-client-0-0
-      - libtraprain-client-0-dev
       - libwebkit-clutter-dev
       - libwebp-dev
       - libwebsockets-dev
@@ -567,14 +537,12 @@ actions:
       - ltrace
       - lzma
       - mawk
+      - mousepad
       - murrine-themes
       - mutter
       - net-tools
       - netbase
-      - newport-dev
-      - newport-doc
       - nodm
-      - ofono
       - openssh-client
       - openssh-server
       - osc
@@ -587,8 +555,6 @@ actions:
       - plymouth
       - plymouth-themes
       - policykit-1
-      - prestwood-dev
-      - prestwood-doc
       - pristine-tar
       - pulseaudio
       - pulseaudio-module-bluetooth
@@ -597,15 +563,10 @@ actions:
       - python-gobject
       - python3-debian
       - qemu-user-static
-      - rhosydd
-      - ribchester-dev
-      - ribchester-doc
       - rtkit
       - ruby
       - screen
       - seed-doc
-      - shapwick-dev
-      - shapwick-doc
       - splint
       - splint-doc-html
       - strace
@@ -621,11 +582,8 @@ actions:
       - tar
       - tartan
       - tcmmd
-      - tinwell-dev
-      - tinwell-doc
       - tracker
       - tracker-miner-fs
-      - traprain-mock-service
       - tumbler
       - tumbler-plugins-extra
       - udev
@@ -639,6 +597,7 @@ actions:
       - xauth
       - xdg-user-dirs
       - xfce4
+      - xfce4-terminal
       - xinput
       - xserver-xephyr
       - xserver-xorg
@@ -646,9 +605,77 @@ actions:
       - xserver-xorg-video-fbdev
       - xserver-xorg-video-intel
       - xserver-xorg-video-vesa
-      - xterm
       - yelp
       - yelp-tools
+
+  {{ if eq $ivitools "enabled" }}
+  - action: apt
+    description: "SDK packages (CM)"
+    packages:
+      - apertis-eclipse-plugins
+      - barkway-dev
+      - barkway-doc
+      - beckfoot-dev
+      - beckfoot-doc
+      - canterbury
+      - canterbury-dev
+      - didcot
+      - didcot-doc
+      - dlt-daemon
+      - eclipse
+      - eclipse-cdt
+      - eclipse-cdt-launch-remote
+      - eclipse-rcp
+      - folks-tools
+      - frome
+      - geoclue
+      - grilo-plugins-0.2
+      - libchamplain-0.12-dev
+      - libchamplain-doc
+      - libclapton-dev
+      - libclapton-doc
+      - libdidcot-0-dev
+      - libfolks-dbg
+      - libfolks-dev
+      - libfolks-eds-dbg
+      - libfolks-eds-dev
+      - libfolks-eds25
+      - libfolks-telepathy-dbg
+      - libfolks-telepathy-dev
+      - libfolks-telepathy25
+      - libgeoclue-dev
+      - libgrassmoor-dev
+      - libgrassmoor-doc
+      - libgrilo-0.2-doc
+      - liblightwood-dev
+      - liblightwood-doc
+      - libseaton-dev
+      - libseaton-doc
+      - libtelepathy-farstream-dev
+      - libtelepathy-glib-dev
+      - libtelepathy-glib-doc
+      - libtelepathy-glib0-dbg
+      - libtelepathy-logger-doc
+      - libthornbury-dev
+      - libthornbury-doc
+      - libtraprain-0-doc
+      - libtraprain-client-0-0
+      - libtraprain-client-0-dev
+      - newport-dev
+      - newport-doc
+      - ofono
+      - prestwood-dev
+      - prestwood-doc
+      - rhosydd
+      - ribchester-dev
+      - ribchester-doc
+      - shapwick-dev
+      - shapwick-doc
+      - tinwell-dev
+      - tinwell-doc
+      - traprain-mock-service
+  {{ end }}
+
   {{- end }}
 
   - action: overlay