summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-11-26 18:33:56 (GMT)
committerJavier Jardón <jjardon@gnome.org>2014-11-26 18:34:14 (GMT)
commitf53634d0e39c233fd0f65cfa04782c64252b897b (patch)
tree9d9eff7c8c8495afee44f4fd4c75170df03929a5
parent8bb1b9322486be1e7554964b2fd572ab92431ff5 (diff)
parent5e4c1e4d7f83c87deb5ea2552b5090637204f0cb (diff)
downloaddefinitions-f53634d0e39c233fd0f65cfa04782c64252b897b.tar.gz
Merge branch 'baserock/jjardon/weston'
Reviewed-by: Richard Maw <richard.maw@codethink.co.uk> Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
-rw-r--r--clusters/weston-system-x86_64-generic-deploy.morph12
-rw-r--r--strata/input-common.morph4
-rw-r--r--strata/wayland-generic.morph5
-rw-r--r--strata/wayland-generic/libxkbcommon.morph5
-rw-r--r--strata/weston-common.morph21
-rw-r--r--strata/weston-common/weston.morph9
-rw-r--r--systems/weston-system-x86_64-generic.morph40
7 files changed, 92 insertions, 4 deletions
diff --git a/clusters/weston-system-x86_64-generic-deploy.morph b/clusters/weston-system-x86_64-generic-deploy.morph
new file mode 100644
index 0000000..ac63a93
--- /dev/null
+++ b/clusters/weston-system-x86_64-generic-deploy.morph
@@ -0,0 +1,12 @@
+name: release
+kind: cluster
+description: |
+ Deploy a stock weston system.
+systems:
+- morph: systems/weston-system-x86_64-generic.morph
+ deploy:
+ weston-system-x86_64-generic:
+ type: rawdisk
+ location: /weston-system-x86_64-generic.img
+ DISK_SIZE: 4G
+ KERNEL_ARGS: vga=788
diff --git a/strata/input-common.morph b/strata/input-common.morph
index 0e9d25e..233bff2 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -22,8 +22,8 @@ chunks:
build-depends: []
- name: libinput
repo: upstream:libinput
- ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d
- unpetrify-ref: 0.5.0
+ ref: 224f1d823b2d44aa5193d5b997d73e4322c50f41
+ unpetrify-ref: 0.6.0
build-depends:
- mtdev
- libevdev
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 628ff2a..890489d 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -5,9 +5,10 @@ build-depends:
- morph: strata/xorg-util-macros-common.morph
chunks:
- name: libxkbcommon
+ morph: strata/wayland-generic/libxkbcommon.morph
repo: upstream:xorg-lib-libxkbcommon
- ref: b721254769212d671a4729f1c88b059979b80efc
- unpetrify-ref: baserock/genivi/baseline
+ ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28
+ unpetrify-ref: xkbcommon-0.5.0
build-depends: []
- name: wayland
morph: strata/wayland-generic/wayland.morph
diff --git a/strata/wayland-generic/libxkbcommon.morph b/strata/wayland-generic/libxkbcommon.morph
new file mode 100644
index 0000000..04048ab
--- /dev/null
+++ b/strata/wayland-generic/libxkbcommon.morph
@@ -0,0 +1,5 @@
+name: libxkbcommon
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --disable-x11
diff --git a/strata/weston-common.morph b/strata/weston-common.morph
new file mode 100644
index 0000000..1d5b015
--- /dev/null
+++ b/strata/weston-common.morph
@@ -0,0 +1,21 @@
+name: weston-common
+kind: stratum
+build-depends:
+- morph: strata/graphics-common.morph
+- morph: strata/input-common.morph
+- morph: strata/mesa-common.morph
+- morph: strata/libdrm-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: linux-pam
+ repo: upstream:linux-pam
+ ref: b1521c97e73b10469f7b34c0571d51c647eca83c
+ unpetrify-ref: Linux-PAM-1.1.8
+ build-depends: []
+- name: weston
+ morph: strata/weston-common/weston.morph
+ repo: upstream:weston
+ ref: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f
+ unpetrify-ref: baserock/weston-1.6.0/tegra
+ build-depends:
+ - linux-pam
diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph
new file mode 100644
index 0000000..2efd662
--- /dev/null
+++ b/strata/weston-common/weston.morph
@@ -0,0 +1,9 @@
+name: weston
+kind: chunk
+build-system: autotools
+configure-commands:
+- |
+ ./autogen.sh --prefix="$PREFIX" \
+ --disable-xwayland \
+ --disable-x11-compositor \
+ --enable-demo-clients-install
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
new file mode 100644
index 0000000..491a34b
--- /dev/null
+++ b/systems/weston-system-x86_64-generic.morph
@@ -0,0 +1,40 @@
+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: foundation
+ morph: strata/foundation.morph
+- name: bsp-x86_64-generic
+ morph: strata/bsp-x86_64-generic.morph
+- name: connectivity
+ morph: strata/connectivity.morph
+- name: audio-bluetooth
+ morph: strata/audio-bluetooth.morph
+- name: libdrm-common
+ morph: strata/libdrm-common.morph
+- name: multimedia
+ morph: strata/multimedia.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
+configuration-extensions:
+- set-hostname
+- add-config-files
+- nfsboot
+- install-files