summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-25 13:24:54 +0000
committerLars Wirzenius <lars.wirzenius@codethink.co.uk>2014-07-25 13:24:54 +0000
commit3d31fe6b117341e61552480aa45af75fffe9d937 (patch)
tree47b1f4aa2041d5badb0d86082df4754205dfe5bb
parent56308755c59d8cde87526016bbdec885627e2169 (diff)
parent4c5e2ceda0622069d683da84a071a3150c8f180f (diff)
downloaddefinitions-3d31fe6b117341e61552480aa45af75fffe9d937.tar.gz
Merge branch 'baserock/liw/x-consolidation'
This merges changes from Emmet Hikory and Michael Drake to consolidate X strata so they're easier to work with.
-rw-r--r--devel-system-x86_64-vagrant.morph4
-rw-r--r--enlightenment.morph2
-rw-r--r--genivi-x-armv7-versatile.morph12
-rw-r--r--genivi-x-generic.morph (renamed from genivi-x-ppc64-generic.morph)4
-rw-r--r--genivi-x-x86_64-generic.morph12
-rw-r--r--gitlab-ci-runner.morph4
-rw-r--r--gtk2.morph2
-rw-r--r--nodejs-system-x86_64.morph4
-rw-r--r--qt4-devel-system-x86_64-generic.morph2
-rw-r--r--qt4-tools.morph2
-rw-r--r--qt5-devel-system-x86_64-generic.morph2
-rw-r--r--qt5-tools.morph2
-rw-r--r--virtualbox-guest-x86_64.morph2
-rw-r--r--x-armv7-versatile.morph179
-rw-r--r--x-generic.morph (renamed from x-x86_64-generic.morph)4
-rw-r--r--x-ppc64-generic.morph206
-rw-r--r--xfce-system.morph4
-rw-r--r--xfce.morph4
18 files changed, 21 insertions, 430 deletions
diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph
index a346ad2d..ccd6164f 100644
--- a/devel-system-x86_64-vagrant.morph
+++ b/devel-system-x86_64-vagrant.morph
@@ -19,10 +19,10 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
- morph: tools
- morph: virtualization
- morph: openstack-clients
diff --git a/enlightenment.morph b/enlightenment.morph
index d5ab5330..752dd68d 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Enlightenment Desktop and Window Manager
build-depends:
- morph: tools
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: lua
- morph: audio-bluetooth
- morph: multimedia-gstreamer-0.10
diff --git a/genivi-x-armv7-versatile.morph b/genivi-x-armv7-versatile.morph
deleted file mode 100644
index cd308bb8..00000000
--- a/genivi-x-armv7-versatile.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: genivi-x-armv7-versatile
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: genivi
-- morph: x-armv7-versatile
-chunks:
-- name: layer_management
- repo: upstream:layer_management
- ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
diff --git a/genivi-x-ppc64-generic.morph b/genivi-x-generic.morph
index 9843341b..9ebea3e2 100644
--- a/genivi-x-ppc64-generic.morph
+++ b/genivi-x-generic.morph
@@ -1,9 +1,9 @@
-name: genivi-x-ppc64-generic
+name: genivi-x-generic
kind: stratum
description: Software components designed by genivi, for genivi.
build-depends:
- morph: genivi
-- morph: x-ppc64-generic
+- morph: x-generic
chunks:
- name: layer_management
repo: upstream:layer_management
diff --git a/genivi-x-x86_64-generic.morph b/genivi-x-x86_64-generic.morph
deleted file mode 100644
index 45929b17..00000000
--- a/genivi-x-x86_64-generic.morph
+++ /dev/null
@@ -1,12 +0,0 @@
-name: genivi-x-x86_64-generic
-kind: stratum
-description: Software components designed by genivi, for genivi.
-build-depends:
-- morph: genivi
-- morph: x-x86_64-generic
-chunks:
-- name: layer_management
- repo: upstream:layer_management
- ref: 206d6709d0a3b3932a02b30ccacaa02b3eab8493
- unpetrify-ref: baserock/genivi/baseline
- build-depends: []
diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph
index 9845dcce..5399307a 100644
--- a/gitlab-ci-runner.morph
+++ b/gitlab-ci-runner.morph
@@ -18,10 +18,10 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
- morph: tools
- morph: virtualization
- morph: openstack-clients
diff --git a/gtk2.morph b/gtk2.morph
index 82afb7e6..01eef819 100644
--- a/gtk2.morph
+++ b/gtk2.morph
@@ -4,7 +4,7 @@ description: the gtk2 stratum
build-depends:
- morph: genivi-foundation
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: shared-mime-info
repo: upstream:shared-mime-info
diff --git a/nodejs-system-x86_64.morph b/nodejs-system-x86_64.morph
index 0018fbdf..ade66f7e 100644
--- a/nodejs-system-x86_64.morph
+++ b/nodejs-system-x86_64.morph
@@ -18,10 +18,10 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
- morph: tools
- morph: virtualization
- morph: openstack-clients
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 7a45c0fe..c62363e7 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: bsp-x86_64-generic
- morph: tools
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: qt4-tools
- morph: qt4-sdk
- morph: lua
diff --git a/qt4-tools.morph b/qt4-tools.morph
index 3c148283..6dfc9b87 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Qt4 Development Libraries and Tools
build-depends:
- morph: tools
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia-gstreamer-0.10
chunks:
- name: icu
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 2c75333f..e7175718 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
- morph: bsp-x86_64-generic
- morph: tools
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: qt5-tools
- morph: qt5-sdk
- morph: lua
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 39a8264b..26e57550 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -3,7 +3,7 @@ kind: stratum
description: Qt5 Development Libraries and Tools
build-depends:
- morph: tools
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia-gstreamer-0.10
chunks:
- name: icu
diff --git a/virtualbox-guest-x86_64.morph b/virtualbox-guest-x86_64.morph
index 4babc6da..49df2405 100644
--- a/virtualbox-guest-x86_64.morph
+++ b/virtualbox-guest-x86_64.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: tools
- morph: bsp-x86_64-generic
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: yasm
repo: upstream:yasm
diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph
deleted file mode 100644
index 3fcf1ea5..00000000
--- a/x-armv7-versatile.morph
+++ /dev/null
@@ -1,179 +0,0 @@
-name: x-armv7-versatile
-kind: stratum
-build-depends:
-- morph: x-common
-chunks:
-- name: mesa-x
- repo: upstream:mesa
- ref: e96f3daac78e3971e4500a31e72c0a7e5845c3d1
- unpetrify-ref: baserock/genivi/baseline-armv7-versatile
- build-depends: []
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-font-util
- repo: upstream:xorg-font-util
- ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libfontenc
- repo: upstream:xorg-lib-libfontenc
- ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-font-util
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: xorg-lib-libXfont
- repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
- - xorg-lib-libfontenc
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xserver
- repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
- build-depends:
- - libsha1
- - mesa-x
- - pixman
- - xorg-font-util
- - xorg-lib-libXaw
- - xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: c5e760a239afc62a1c75e0509868e35957c8df52
- unpetrify-ref: baserock/morph
- build-depends:
- - fontconfig
- - freetype2
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
diff --git a/x-x86_64-generic.morph b/x-generic.morph
index c19356c7..8309a88e 100644
--- a/x-x86_64-generic.morph
+++ b/x-generic.morph
@@ -1,11 +1,11 @@
-name: x-x86_64-generic
+name: x-generic
kind: stratum
build-depends:
- morph: x-common
chunks:
- name: mesa-x
repo: upstream:mesa
- ref: f64dd91f4f2a2591e66b38fdfdfa83077f8221ab
+ ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c
unpetrify-ref: baserock/genivi/morph
build-depends: []
- name: xorg-lib-libxkbfile
diff --git a/x-ppc64-generic.morph b/x-ppc64-generic.morph
deleted file mode 100644
index ee24f566..00000000
--- a/x-ppc64-generic.morph
+++ /dev/null
@@ -1,206 +0,0 @@
-name: x-ppc64-generic
-kind: stratum
-build-depends:
-- morph: x-common
-chunks:
-- name: mesa-x
- repo: upstream:mesa
- ref: e96f3daac78e3971e4500a31e72c0a7e5845c3d1
- unpetrify-ref: baserock/genivi/baseline-armv7-versatile
- build-depends: []
-- name: xorg-lib-libxkbfile
- repo: upstream:xorg-lib-libxkbfile
- ref: 7381c2f9013ef7784c78091fa671e652a62ca706
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-font-util
- repo: upstream:xorg-font-util
- ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libfontenc
- repo: upstream:xorg-lib-libfontenc
- ref: f5d1208172e965fdd7fae8927bd3e29b3cc3a975
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-font-util
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: xorg-lib-libXfont
- repo: upstream:xorg-lib-libXfont
- ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
- - xorg-lib-libfontenc
-- name: freefont-otf
- repo: upstream:freefont-otf
- ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libICE
- repo: upstream:xorg-lib-libICE
- ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libSM
- repo: upstream:xorg-lib-libSM
- ref: 77ddd273239a629eeed7bd1d5b4509b1bd6d4e37
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libICE
-- name: xorg-lib-libXt
- repo: upstream:xorg-lib-libXt
- ref: ead50a9a274aa96bef94e57c4625be8e9288af4e
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libSM
-- name: xorg-lib-libXmu
- repo: upstream:xorg-lib-libXmu
- ref: 474d22468c90f99104873b4c5fd7b0f0d2cbf823
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXpm
- repo: upstream:xorg-lib-libXpm
- ref: 81608285e11f2455800001a965dfece878861162
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXt
-- name: xorg-lib-libXaw
- repo: upstream:xorg-lib-libXaw
- ref: a5630e166921b5b5322b30fb152df01bb6536e42
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
-- name: libsha1
- repo: upstream:libsha1
- ref: 17173732b9f1b2d4142de27913250b4563db2436
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xserver
- repo: upstream:xserver
- ref: b7cbfa882778cf8857577e0da77aa9295f072db3
- unpetrify-ref: baserock/morph
- build-depends:
- - libsha1
- - mesa-x
- - pixman
- - xorg-font-util
- - xorg-lib-libXaw
- - xorg-lib-libXfont
- - xorg-lib-libXmu
- - xorg-lib-libXpm
- - xorg-lib-libXt
- - xorg-lib-libfontenc
- - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
- repo: upstream:xorg-driver-xf86-video-cirrus
- ref: 6504929481eab616f064b5d661a057de74b8b488
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-fbdev
- repo: upstream:xorg-driver-xf86-video-fbdev
- ref: ac293412a01d87f87eb61f4adb9db7486a75d3fc
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-video-vesa
- repo: upstream:xorg-driver-xf86-video-vesa
- ref: 29a149544e2120a582043738d5b09dd80e896345
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-evdev
- repo: upstream:xorg-driver-xf86-input-evdev
- ref: 2b8b0df62ec554952784f2820fb4143c495232b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-keyboard
- repo: upstream:xorg-driver-xf86-input-keyboard
- ref: 4a954bc6a8fbc4aa50dfcabec011274252713204
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-driver-xf86-input-mouse
- repo: upstream:xorg-driver-xf86-input-mouse
- ref: 585f4030d77accf2a4ba115729ca08da82217863
- unpetrify-ref: baserock/morph
- build-depends:
- - xserver
-- name: xorg-app-xkbcomp
- repo: upstream:xorg-app-xkbcomp
- ref: 705b9bbb426410f9510601c7010da51184919b36
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libxkbfile
-- name: xkeyboard-config
- repo: upstream:xkeyboard-config
- ref: b4be67b48fb11989f1824dd0b1c8c399430162b0
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-app-xkbcomp
-- name: xorg-app-xinit
- repo: upstream:xorg-app-xinit
- ref: 4e85bce64acef1fa0ddff04d59737444e942ff12
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: xorg-lib-libXft
- repo: upstream:xorg-lib-libXft
- ref: c5e760a239afc62a1c75e0509868e35957c8df52
- unpetrify-ref: baserock/morph
- build-depends:
- - fontconfig
- - freetype2
-- name: xcb-util
- repo: upstream:xcb-util
- ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-wm
- repo: upstream:util-wm
- ref: 18bde07dc7cb44617c0d159ccd9ef640804296e3
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-keysyms
- repo: upstream:util-keysyms
- ref: 0be179eff4eadb99ee303891d1c29c4e4dd6fbab
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: util-image
- repo: upstream:util-image
- ref: 66b0caa72eb5011d89d0346424ea40b9e8e93816
- unpetrify-ref: baserock/morph
- build-depends:
- - xcb-util
-- name: xterm
- repo: upstream:xterm
- ref: 7fc0a9529babac61d9a0b30e6ddb3c79e44af0e5
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXaw
- - xorg-lib-libxkbfile
-- name: xorg-app-xauth
- repo: upstream:xorg-app-xauth
- ref: 6dda11c17f2fdc47d43f269dccee98ec66cc8c4b
- unpetrify-ref: baserock/morph
- build-depends:
- - xorg-lib-libXmu
diff --git a/xfce-system.morph b/xfce-system.morph
index b2fd7d2e..475aca6a 100644
--- a/xfce-system.morph
+++ b/xfce-system.morph
@@ -17,10 +17,10 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
+- morph: x-generic
- morph: multimedia
- morph: genivi
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
- morph: gtk2
- morph: tools
- morph: xfce
diff --git a/xfce.morph b/xfce.morph
index 1e7a1f41..e3dcb8ee 100644
--- a/xfce.morph
+++ b/xfce.morph
@@ -2,9 +2,9 @@ name: xfce
kind: stratum
description: xfce stratum
build-depends:
-- morph: genivi-x-x86_64-generic
+- morph: genivi-x-generic
- morph: gtk2
-- morph: x-x86_64-generic
+- morph: x-generic
chunks:
- name: xfce-dev-tools
repo: upstream:xfce/xfce4-dev-tools