As the X morphlogies no longer carry significant variation, and maintaining syncronisation becomes a frustrating manual exercise, they are consolidated, based on the x86_64 X, which seems most current. --- devel-system-armv7-highbank.morph | 2 +- devel-system-armv7-versatile.morph | 2 +- devel-system-armv7-wandboard.morph | 2 +- devel-system-armv7b-highbank.morph | 2 +- devel-system-armv7lhf-highbank.morph | 2 +- devel-system-ppc64-generic.morph | 2 +- devel-system-x86_32-generic.morph | 2 +- devel-system-x86_64-generic.morph | 2 +- devel-system-x86_64-vagrant.morph | 2 +- enlightenment.morph | 2 +- genivi-x-armv7-versatile.morph | 2 +- genivi-x-ppc64-generic.morph | 2 +- genivi-x-x86_64-generic.morph | 2 +- gitlab-ci-runner.morph | 2 +- gtk2.morph | 2 +- nodejs-system-x86_64.morph | 2 +- qt4-devel-system-x86_64-generic.morph | 2 +- qt4-tools.morph | 2 +- qt5-devel-system-x86_64-generic.morph | 2 +- qt5-tools.morph | 2 +- virtualbox-guest-x86_64.morph | 2 +- x-armv7-versatile.morph | 179 ----------------------------- x-generic.morph | 206 ++++++++++++++++++++++++++++++++++ x-ppc64-generic.morph | 206 ---------------------------------- x-x86_64-generic.morph | 206 ---------------------------------- xfce-system.morph | 2 +- xfce.morph | 4 +- 27 files changed, 230 insertions(+), 615 deletions(-) delete mode 100644 x-armv7-versatile.morph create mode 100644 x-generic.morph delete mode 100644 x-ppc64-generic.morph delete mode 100644 x-x86_64-generic.morph diff --git a/devel-system-armv7-highbank.morph b/devel-system-armv7-highbank.morph index adeb07b..b9d4058 100644 --- a/devel-system-armv7-highbank.morph +++ b/devel-system-armv7-highbank.morph @@ -18,7 +18,7 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-armv7-versatile +- morph: x-generic - morph: multimedia - morph: genivi - morph: genivi-x-armv7-versatile diff --git a/devel-system-armv7-versatile.morph b/devel-system-armv7-versatile.morph index e4cf3d5..98445bb 100644 --- a/devel-system-armv7-versatile.morph +++ b/devel-system-armv7-versatile.morph @@ -18,7 +18,7 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-armv7-versatile +- morph: x-generic - morph: multimedia - morph: genivi - morph: genivi-x-armv7-versatile diff --git a/devel-system-armv7-wandboard.morph b/devel-system-armv7-wandboard.morph index 2d75882..349d166 100644 --- a/devel-system-armv7-wandboard.morph +++ b/devel-system-armv7-wandboard.morph @@ -17,7 +17,7 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-armv7-versatile +- morph: x-generic - morph: multimedia - morph: genivi - morph: genivi-x-armv7-versatile diff --git a/devel-system-armv7b-highbank.morph b/devel-system-armv7b-highbank.morph index 1a120e1..66b1a81 100644 --- a/devel-system-armv7b-highbank.morph +++ b/devel-system-armv7b-highbank.morph @@ -18,7 +18,7 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-armv7-versatile +- morph: x-generic - morph: multimedia - morph: genivi - morph: genivi-x-armv7-versatile diff --git a/devel-system-armv7lhf-highbank.morph b/devel-system-armv7lhf-highbank.morph index d357f48..4c00e6f 100644 --- a/devel-system-armv7lhf-highbank.morph +++ b/devel-system-armv7lhf-highbank.morph @@ -18,7 +18,7 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-armv7-versatile +- morph: x-generic - morph: multimedia - morph: genivi - morph: genivi-x-armv7-versatile diff --git a/devel-system-ppc64-generic.morph b/devel-system-ppc64-generic.morph index 1297acb..312fd6f 100644 --- a/devel-system-ppc64-generic.morph +++ b/devel-system-ppc64-generic.morph @@ -18,7 +18,7 @@ strata: - morph: connectivity - morph: audio-bluetooth - morph: x-common -- morph: x-ppc64-generic +- morph: x-generic - morph: multimedia - morph: genivi - morph: genivi-x-ppc64-generic diff --git a/devel-system-x86_32-generic.morph b/devel-system-x86_32-generic.morph index 42d363b..e7f3466 100644 --- a/devel-system-x86_32-generic.morph +++ b/devel-system-x86_32-generic.morph @@ -18,7 +18,7 @@ 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 diff --git a/devel-system-x86_64-generic.morph b/devel-system-x86_64-generic.morph index 7048df5..fadda48 100644 --- a/devel-system-x86_64-generic.morph +++ b/devel-system-x86_64-generic.morph @@ -18,7 +18,7 @@ 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 diff --git a/devel-system-x86_64-vagrant.morph b/devel-system-x86_64-vagrant.morph index a346ad2..db5ada4 100644 --- a/devel-system-x86_64-vagrant.morph +++ b/devel-system-x86_64-vagrant.morph @@ -19,7 +19,7 @@ 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 diff --git a/enlightenment.morph b/enlightenment.morph index d5ab533..752dd68 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 index cd308bb..3fa43e9 100644 --- a/genivi-x-armv7-versatile.morph +++ b/genivi-x-armv7-versatile.morph @@ -3,7 +3,7 @@ kind: stratum description: Software components designed by genivi, for genivi. build-depends: - morph: genivi -- morph: x-armv7-versatile +- morph: x-generic chunks: - name: layer_management repo: upstream:layer_management diff --git a/genivi-x-ppc64-generic.morph b/genivi-x-ppc64-generic.morph index 9843341..1b84525 100644 --- a/genivi-x-ppc64-generic.morph +++ b/genivi-x-ppc64-generic.morph @@ -3,7 +3,7 @@ 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 index 45929b1..c9dd30c 100644 --- a/genivi-x-x86_64-generic.morph +++ b/genivi-x-x86_64-generic.morph @@ -3,7 +3,7 @@ kind: stratum description: Software components designed by genivi, for genivi. build-depends: - morph: genivi -- morph: x-x86_64-generic +- morph: x-generic chunks: - name: layer_management repo: upstream:layer_management diff --git a/gitlab-ci-runner.morph b/gitlab-ci-runner.morph index 9845dcc..65cde1f 100644 --- a/gitlab-ci-runner.morph +++ b/gitlab-ci-runner.morph @@ -18,7 +18,7 @@ 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 diff --git a/gtk2.morph b/gtk2.morph index 82afb7e..01eef81 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 0018fbd..35ad292 100644 --- a/nodejs-system-x86_64.morph +++ b/nodejs-system-x86_64.morph @@ -18,7 +18,7 @@ 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 diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph index 7a45c0f..c62363e 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 3c14828..6dfc9b8 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 2c75333..e717571 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 39a8264..26e5755 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 4babc6d..49df240 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 3fcf1ea..0000000 --- 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-generic.morph b/x-generic.morph new file mode 100644 index 0000000..142e743 --- /dev/null +++ b/x-generic.morph @@ -0,0 +1,206 @@ +name: x-generic +kind: stratum +build-depends: +- morph: x-common +chunks: +- name: mesa-x + repo: upstream:mesa + ref: f64dd91f4f2a2591e66b38fdfdfa83077f8221ab + unpetrify-ref: baserock/genivi/morph + 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/x-ppc64-generic.morph b/x-ppc64-generic.morph deleted file mode 100644 index ee24f56..0000000 --- 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/x-x86_64-generic.morph b/x-x86_64-generic.morph deleted file mode 100644 index c19356c..0000000 --- a/x-x86_64-generic.morph +++ /dev/null @@ -1,206 +0,0 @@ -name: x-x86_64-generic -kind: stratum -build-depends: -- morph: x-common -chunks: -- name: mesa-x - repo: upstream:mesa - ref: f64dd91f4f2a2591e66b38fdfdfa83077f8221ab - unpetrify-ref: baserock/genivi/morph - 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 b2fd7d2..b771d5e 100644 --- a/xfce-system.morph +++ b/xfce-system.morph @@ -17,7 +17,7 @@ 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 diff --git a/xfce.morph b/xfce.morph index 1e7a1f4..e3dcb8e 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 -- 1.8.4