Including crosswalk in arm64 images

During developement stage of arm64 building process,
adding crosswalk to images was not efficient. Thus now
that arm64 building process is landing, the images must
include crosswalk.

The MinimalX11 and MinimalWayland platforms are not
more used after that modification.

Change-Id: If45aedadbf67d245e70e92c05f1d99c9cb2b9f42
Signed-off-by: José Bollo <jose.bollo@open.eurogiciel.org>

diff --git a/common.yaml b/common.yaml
index d85d095..e2e69e7 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -45,35 +45,6 @@ Installer:
     BootloaderAppend: "rw vga=current quiet splash rootwait rootfstype=ext4 plymouth.enable=0"
     Repos: []
 
-MinimalWayland:
-    Part: common-mbr
-    UserGroups: "audio,video"
-    Groups:
-        - Generic Wayland
-        - Common Wayland
-        - Generic Middleware
-        - Common Middleware
-        - Generic Applications
-        - Generic Bluetooth
-        - Generic Multimedia
-        - Generic Desktop Applications
-        - Common Desktop Applications
-        - Generic Qt5
-        - Common Qt5
-    PostScripts:
-        - generic-wayland
-        - common-wayland
-        - generic-middleware
-        - common-middleware
-        - generic-applications
-        - generic-bluetooth
-        - generic-multimedia
-        - generic-desktop-applications
-        - common-desktop-applications
-        - generic-qt5
-        - common-qt5
-    Repos: []
-
 Boot-Odroidu3:
     Part: common-mbr-boot
     Desktop: None
@@ -125,35 +96,6 @@ Wayland:
         - common-qt5
     Repos: []
 
-MinimalX11:
-    Part: common-mbr
-    UserGroups: "audio,video"
-    Groups:
-        - Generic X11
-        - Common X11
-        - Generic Middleware
-        - Common Middleware
-        - Generic Applications
-        - Generic Bluetooth
-        - Generic Multimedia
-        - Generic Desktop Applications
-        - Common Desktop Applications
-        - Generic Qt5
-        - Common Qt5
-    PostScripts:
-        - generic-x11
-        - common-x11
-        - generic-middleware
-        - common-middleware
-        - generic-applications
-        - generic-bluetooth
-        - generic-multimedia
-        - generic-desktop-applications
-        - common-desktop-applications
-        - generic-qt5
-        - common-qt5
-    Repos: []
-
 X11:
     Part: common-mbr
     UserGroups: "audio,video"

diff --git a/ks/common-wayland-3parts-arm64.yaml b/ks/common-wayland-3parts-arm64.yaml
index 237096e..ee7be18 100644 (file)
--- a/ks/common-wayland-3parts-arm64.yaml
+++ b/ks/common-wayland-3parts-arm64.yaml
@@ -2,7 +2,7 @@ Name: common-wayland-3parts-arm64
 Architecture: aarch64
 Schedule: "*"
 Active: True
-Platform: MinimalWayland
+Platform: Wayland
 Part: common-mbr-3parts
 Mic2Options: -f loop --pack-to=@NAME@.tar.gz
 FileName: common-wayland-3parts-arm64

diff --git a/ks/common-x11-3parts-arm64.yaml b/ks/common-x11-3parts-arm64.yaml
index a60d4e0..650fccc 100644 (file)
--- a/ks/common-x11-3parts-arm64.yaml
+++ b/ks/common-x11-3parts-arm64.yaml
@@ -2,7 +2,7 @@ Name: common-x11-3parts-arm64
 Architecture: aarch64
 Schedule: "*"
 Active: True
-Platform: MinimalX11
+Platform: X11
 Part: common-mbr-3parts
 Mic2Options: -f loop --pack-to=@NAME@.tar.gz
 FileName: common-x11-3parts-arm64