From c8abfde2d9f3e0f44a1424169715f48d393a494d Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Mon, 31 Oct 2016 14:45:32 +0900 Subject: Moving weston systems, clusters and related strata under weston subdirectory Change-Id: Ia805fcbd11d894eb74b18704b6a7070bcc7dd11a --- clusters/ci.morph | 4 +- clusters/weston-qt5-system-x86_64-deploy.morph | 23 ------- clusters/weston-system-x86_64-generic-deploy.morph | 23 ------- systems/weston-qt5-system-x86_64.morph | 70 ---------------------- systems/weston-system-armv7lhf-jetson.morph | 58 ------------------ systems/weston-system-x86_64-generic.morph | 57 ------------------ .../clusters/weston-qt5-system-x86_64-deploy.morph | 23 +++++++ .../weston-system-x86_64-generic-deploy.morph | 23 +++++++ weston/systems/weston-qt5-system-x86_64.morph | 70 ++++++++++++++++++++++ weston/systems/weston-system-armv7lhf-jetson.morph | 58 ++++++++++++++++++ weston/systems/weston-system-x86_64-generic.morph | 57 ++++++++++++++++++ 11 files changed, 233 insertions(+), 233 deletions(-) delete mode 100644 clusters/weston-qt5-system-x86_64-deploy.morph delete mode 100644 clusters/weston-system-x86_64-generic-deploy.morph delete mode 100644 systems/weston-qt5-system-x86_64.morph delete mode 100644 systems/weston-system-armv7lhf-jetson.morph delete mode 100644 systems/weston-system-x86_64-generic.morph create mode 100644 weston/clusters/weston-qt5-system-x86_64-deploy.morph create mode 100644 weston/clusters/weston-system-x86_64-generic-deploy.morph create mode 100644 weston/systems/weston-qt5-system-x86_64.morph create mode 100644 weston/systems/weston-system-armv7lhf-jetson.morph create mode 100644 weston/systems/weston-system-x86_64-generic.morph diff --git a/clusters/ci.morph b/clusters/ci.morph index c5fcb07b..91df7fab 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -52,7 +52,7 @@ systems: location: xfce-system-x86_64.img DISK_SIZE: 4G KERNEL_ARGS: vga=788 -- morph: systems/weston-system-armv7lhf-jetson.morph +- morph: weston/systems/weston-system-armv7lhf-jetson.morph deploy: weston-system-armv7lhf-jetson: type: extensions/rawdisk @@ -91,7 +91,7 @@ systems: GENIVI_WESTON_BACKEND: drm GENIVI_WESTON_CONFIG: baseline GENIVI_WESTON_AUTOSTART: True -- morph: systems/weston-qt5-system-x86_64.morph +- morph: weston/systems/weston-qt5-system-x86_64.morph deploy: weston-qt5-system-x86_64.morph: type: extensions/rawdisk diff --git a/clusters/weston-qt5-system-x86_64-deploy.morph b/clusters/weston-qt5-system-x86_64-deploy.morph deleted file mode 100644 index fa876dce..00000000 --- a/clusters/weston-qt5-system-x86_64-deploy.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: weston-qt5-system-x86_64-deploy -kind: cluster -description: | - Deploy a stock weston system. - - The resulting image can be copied to a USB and booted from there, - as well as in a virtual machine. - -systems: -- morph: systems/weston-qt5-system-x86_64.morph - deploy: - weston-qt5-system-x86_64: - type: extensions/rawdisk - location: /weston-qt5-system-x86_64.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs: - type: initramfs - location: boot/initramfs.gz diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-x86_64-generic-deploy.morph deleted file mode 100644 index 65e35bd7..00000000 --- a/clusters/weston-system-x86_64-generic-deploy.morph +++ /dev/null @@ -1,23 +0,0 @@ -name: weston-system-x86_64-generic-deploy -kind: cluster -description: | - Deploy a stock weston system. - - The resulting image can be copied to a USB and booted from there, - as well as in a virtual machine. - -systems: -- morph: systems/weston-system-x86_64-generic.morph - deploy: - weston-system-x86_64-generic: - type: extensions/rawdisk - location: /weston-system-x86_64-generic.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs: - type: extensions/initramfs - location: boot/initramfs.gz diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph deleted file mode 100644 index fe426265..00000000 --- a/systems/weston-qt5-system-x86_64.morph +++ /dev/null @@ -1,70 +0,0 @@ -name: weston-qt5-system-x86_64.morph -kind: system -description: A system that is able to build other systems based on the 64-bit x86 - architecture. -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: device-management - morph: strata/device-management.morph -- name: foundation - morph: strata/foundation.morph -- name: bluetooth - morph: strata/bluetooth.morph -- name: sound-server-pulseaudio - morph: strata/sound-server-pulseaudio.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: tools - morph: strata/tools.morph -- name: glib-common - morph: strata/glib-common.morph -- name: pcre-utils - morph: strata/pcre-utils.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: llvm-common - morph: strata/llvm-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: weston-common - morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: qt5-tools - morph: strata/qt5-tools.morph -- name: qt5-tools-qtmultimedia - morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-tools-qtwebengine - morph: strata/qt5-tools-qtwebengine.morph -- name: qt5-tools-qtwayland - morph: strata/qt5-tools-qtwayland.morph -- name: connectivity - morph: strata/connectivity.morph -- name: connman-common - morph: strata/connman-common.morph -- name: icu-common - morph: strata/icu-common.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph deleted file mode 100644 index 61b4d86c..00000000 --- a/systems/weston-system-armv7lhf-jetson.morph +++ /dev/null @@ -1,58 +0,0 @@ -name: weston-system-armv7lhf-jetson -kind: system -description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 - computers. -arch: armv7lhf -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: device-management - morph: strata/device-management.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-jetson - morph: strata/bsp-jetson.morph -- name: connectivity - morph: strata/connectivity.morph -- name: bluetooth - morph: strata/bluetooth.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: llvm-common - morph: strata/llvm-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: sound-server-pulseaudio - morph: strata/sound-server-pulseaudio.morph -- name: weston-common - morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph -- name: glib-common - morph: strata/glib-common.morph -- name: pcre-utils - morph: strata/pcre-utils.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph deleted file mode 100644 index d2ce28e7..00000000 --- a/systems/weston-system-x86_64-generic.morph +++ /dev/null @@ -1,57 +0,0 @@ -name: weston-system-x86_64-generic -kind: system -description: A weston system for a 64-bit x86 system. -arch: x86_64 -strata: -- name: build-essential - morph: strata/build-essential.morph -- name: core - morph: strata/core.morph -- name: coreutils-common - morph: strata/coreutils-common.morph -- name: device-management - morph: strata/device-management.morph -- name: foundation - morph: strata/foundation.morph -- name: bsp-x86_64-generic - morph: strata/bsp-x86_64-generic.morph -- name: connectivity - morph: strata/connectivity.morph -- name: bluetooth - morph: strata/bluetooth.morph -- name: libdrm-common - morph: strata/libdrm-common.morph -- name: multimedia-common - morph: strata/multimedia-common.morph -- name: multimedia-gstreamer - morph: strata/multimedia-gstreamer.morph -- name: wayland-generic - morph: strata/wayland-generic.morph -- name: graphics-common - morph: strata/graphics-common.morph -- name: input-common - morph: strata/input-common.morph -- name: llvm-common - morph: strata/llvm-common.morph -- name: mesa-common - morph: strata/mesa-common.morph -- name: sound-server-pulseaudio - morph: strata/sound-server-pulseaudio.morph -- name: weston-common - morph: strata/weston-common.morph -- name: x-common - morph: strata/x-common.morph -- name: x-generic - morph: strata/x-generic.morph -- name: tools - morph: strata/tools.morph -- name: glib-common - morph: strata/glib-common.morph -- name: pcre-utils - morph: strata/pcre-utils.morph -configuration-extensions: -- extensions/set-hostname -- extensions/add-config-files -- extensions/nfsboot -- extensions/install-files -- extensions/install-essential-files diff --git a/weston/clusters/weston-qt5-system-x86_64-deploy.morph b/weston/clusters/weston-qt5-system-x86_64-deploy.morph new file mode 100644 index 00000000..51fda42b --- /dev/null +++ b/weston/clusters/weston-qt5-system-x86_64-deploy.morph @@ -0,0 +1,23 @@ +name: weston-qt5-system-x86_64-deploy +kind: cluster +description: | + Deploy a stock weston system. + + The resulting image can be copied to a USB and booted from there, + as well as in a virtual machine. + +systems: +- morph: weston/systems/weston-qt5-system-x86_64.morph + deploy: + weston-qt5-system-x86_64: + type: extensions/rawdisk + location: /weston-qt5-system-x86_64.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + initramfs: + type: initramfs + location: boot/initramfs.gz diff --git a/weston/clusters/weston-system-x86_64-generic-deploy.morph b/weston/clusters/weston-system-x86_64-generic-deploy.morph new file mode 100644 index 00000000..2428fddd --- /dev/null +++ b/weston/clusters/weston-system-x86_64-generic-deploy.morph @@ -0,0 +1,23 @@ +name: weston-system-x86_64-generic-deploy +kind: cluster +description: | + Deploy a stock weston system. + + The resulting image can be copied to a USB and booted from there, + as well as in a virtual machine. + +systems: +- morph: weston/systems/weston-system-x86_64-generic.morph + deploy: + weston-system-x86_64-generic: + type: extensions/rawdisk + location: /weston-system-x86_64-generic.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + initramfs: + type: extensions/initramfs + location: boot/initramfs.gz diff --git a/weston/systems/weston-qt5-system-x86_64.morph b/weston/systems/weston-qt5-system-x86_64.morph new file mode 100644 index 00000000..fe426265 --- /dev/null +++ b/weston/systems/weston-qt5-system-x86_64.morph @@ -0,0 +1,70 @@ +name: weston-qt5-system-x86_64.morph +kind: system +description: A system that is able to build other systems based on the 64-bit x86 + architecture. +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: coreutils-common + morph: strata/coreutils-common.morph +- name: device-management + morph: strata/device-management.morph +- name: foundation + morph: strata/foundation.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: bsp-x86_64-generic + morph: strata/bsp-x86_64-generic.morph +- name: tools + morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph +- name: pcre-utils + morph: strata/pcre-utils.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: input-common + morph: strata/input-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: weston-common + morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +- name: x-generic + morph: strata/x-generic.morph +- name: qt5-tools + morph: strata/qt5-tools.morph +- name: qt5-tools-qtmultimedia + morph: strata/qt5-tools-qtmultimedia.morph +- name: qt5-tools-qtwebengine + morph: strata/qt5-tools-qtwebengine.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph +- name: connectivity + morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph +- name: icu-common + morph: strata/icu-common.morph +configuration-extensions: +- extensions/set-hostname +- extensions/add-config-files +- extensions/nfsboot +- extensions/install-files +- extensions/install-essential-files diff --git a/weston/systems/weston-system-armv7lhf-jetson.morph b/weston/systems/weston-system-armv7lhf-jetson.morph new file mode 100644 index 00000000..61b4d86c --- /dev/null +++ b/weston/systems/weston-system-armv7lhf-jetson.morph @@ -0,0 +1,58 @@ +name: weston-system-armv7lhf-jetson +kind: system +description: A weston system for ARMv7 little-endian hard-float NVIDIA Jetson TK1 + computers. +arch: armv7lhf +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: coreutils-common + morph: strata/coreutils-common.morph +- name: device-management + morph: strata/device-management.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph +- name: connectivity + morph: strata/connectivity.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: input-common + morph: strata/input-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph +- name: weston-common + morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +- name: x-generic + morph: strata/x-generic.morph +- name: tools + morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph +- name: pcre-utils + morph: strata/pcre-utils.morph +configuration-extensions: +- extensions/set-hostname +- extensions/add-config-files +- extensions/nfsboot +- extensions/install-files +- extensions/install-essential-files diff --git a/weston/systems/weston-system-x86_64-generic.morph b/weston/systems/weston-system-x86_64-generic.morph new file mode 100644 index 00000000..d2ce28e7 --- /dev/null +++ b/weston/systems/weston-system-x86_64-generic.morph @@ -0,0 +1,57 @@ +name: weston-system-x86_64-generic +kind: system +description: A weston system for a 64-bit x86 system. +arch: x86_64 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: coreutils-common + morph: strata/coreutils-common.morph +- name: device-management + morph: strata/device-management.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-x86_64-generic + morph: strata/bsp-x86_64-generic.morph +- name: connectivity + morph: strata/connectivity.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: input-common + morph: strata/input-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph +- name: weston-common + morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +- name: x-generic + morph: strata/x-generic.morph +- name: tools + morph: strata/tools.morph +- name: glib-common + morph: strata/glib-common.morph +- name: pcre-utils + morph: strata/pcre-utils.morph +configuration-extensions: +- extensions/set-hostname +- extensions/add-config-files +- extensions/nfsboot +- extensions/install-files +- extensions/install-essential-files -- cgit v1.2.1