Merge branch 'master' of gitlab.apertis.org:infrastructure/apertis-image-recipes

Jenkinsfile

@@ -36,13 +36,13 @@ def architectures = [
         boards: ['uefi'],
         types: [
             minimal: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
             ],
             target: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
@@ -54,7 +54,7 @@ def architectures = [
                 ostree: false,
             ],
             sdk: [
-                args: '--scratchsize 10G',
+                args: "-t demopack:${demopack} -t sampleappscheckout:enabled --scratchsize 10G",
                 boards: [ 'sdk' ],
                 image: true,
                 sysroot: false,
@@ -80,13 +80,13 @@ def architectures = [
         boards: ['uboot'],
         types: [
             minimal: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
             ],
             target: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true,
@@ -103,7 +103,7 @@ def architectures = [
         boards: ['uboot', 'mx6qsabrelite'],
         types: [
             minimal: [
-                args: '',
+                args: "-t demopack:${demopack}",
                 image: true,
                 sysroot: false,
                 ostree: true
@@ -310,7 +310,6 @@ def buildImage(architecture, type, board, debosarguments = "") {
             -t suite:$release \
             -t timestamp:${PIPELINE_VERSION} \
             -t image:${image_name} \
-            -t demopack:${demopack} \
             ${WORKSPACE}/${osname}-image-${board}.yaml""")
     }
 }
@@ -332,7 +331,6 @@ def buildOStreeImage(architecture, type, board, debosarguments = "") {
             -t suite:$release \
             -t ospack:ospack_${release}-${architecture}-${type}_${PIPELINE_VERSION} \
             -t image:${image_name} \
-            -t demopack:${demopack} \
             -t message:${release}-${type}-${architecture}-${board}_${PIPELINE_VERSION} \
             -t ostree:${repo} \
             ${WORKSPACE}/apertis-ostree-image-${board}.yaml;""")

apertis-image-sdk.yaml

@@ -12,7 +12,7 @@
 {{ $demopack := or .demopack "disabled" }}
 
 {{ $size := or .size "20G" }}
-{{ $ivitools := or .ivitools "enabled" }}
+{{ $sampleappscheckout := or .sampleappscheckout "disabled" }}
 {{ $devroot := or .devroot "enabled" }}
 {{ $devroot_arch := or .devroot_arch "armhf" }}
 {{ $devpack := or .devpack (printf "ospack_%s-%s-%s_%s" $suite $devroot_arch "devroot" $timestamp) }}
@@ -96,7 +96,7 @@ actions:
     description: Cleanup /var/lib
     script: scripts/remove_var_lib_parts.sh
 
-  {{ if eq $ivitools "enabled" }}
+  {{ if eq $sampleappscheckout "enabled" }}
   - action: run
     description: Fetch sample app bundle sources
     chroot: true

apertis-ospack-basesdk.yaml

@@ -429,7 +429,6 @@ actions:
       - rtkit
       - ruby
       - screen
-      - seed-doc
       - splint
       - splint-doc-html
       - strace

overlays/sdk-desktop-icon-devhelp/etc/lightdm/lightdm.conf.d/autologin.conf

-[Seat:*]
-user-session=xfce
-autologin-user=user
-autologin-user-timeout=0

overlays/sdk-desktop-icon-devhelp/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-desktop" version="1.0">
-  <property name="backdrop" type="empty">
-    <property name="screen0" type="empty">
-      <property name="monitor0" type="empty">
-        <property name="image-path" type="empty"/>
-        <property name="image-show" type="empty"/>
-        <property name="color1" type="empty"/>
-        <property name="workspace0" type="empty">
-          <property name="color-style" type="int" value="0"/>
-          <property name="color1" type="array">
-            <value type="uint" value="58136"/>
-            <value type="uint" value="58136"/>
-            <value type="uint" value="58136"/>
-            <value type="uint" value="65535"/>
-          </property>
-          <property name="image-style" type="int" value="5"/>
-          <property name="last-image" type="string" value="/usr/share/sac-sdk/wallpapers/apertis-desktop.png"/>
-        </property>
-      </property>
-    </property>
-  </property>
-</channel>
-

overlays/sdk-desktop-icon-devhelp/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml

-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xsettings" version="1.0">
-  <property name="Net" type="empty">
-    <property name="ThemeName" type="string" value="Xfce-4.6"/>
-  </property>
-</channel>

overlays/sdk-desktop-icon-devhelp/etc/skel/Desktop/eclipse.desktop

-[Desktop Entry]
-Type=Application
-Name=Eclipse
-Comment=Eclipse Integrated Development Environment
-Icon=eclipse
-Exec=eclipse
-Terminal=false
-Categories=Development;IDE;Java;

overlays/sdk-desktop-icon-devhelp/lib/systemd/system/opt-sysroot.mount

-[Unit]
-Description=Mount points for sysroots
-Before=local-fs.target
-
-[Mount]
-What=/home/sysroot
-Where=/opt/sysroot
-Type=none
-Options=rbind
-
-[Install]
-WantedBy=default.target