Delete genivi-staging and reorder morph contents

1 files changed, 101 insertions, 101 deletions

diff --git a/x-x86_64-generic.morph b/x-x86_64-generic.morph
index d5f2e0b5..6ec5c724 100644
--- a/x-x86_64-generic.morph
+++ b/x-x86_64-generic.morph
@@ -1,98 +1,93 @@
-name: x-x86_64-generic
-kind: stratum
 build-depends:
 - morph: core
-  repo: baserock:baserock/morphs
   ref: master
-- morph: foundation
   repo: baserock:baserock/morphs
+- morph: foundation
   ref: master
-- morph: genivi-foundation
   repo: baserock:baserock/morphs
+- morph: genivi-foundation
   ref: master
-- morph: x-common
   repo: baserock:baserock/morphs
+- morph: x-common
   ref: master
+  repo: baserock:baserock/morphs
 chunks:
-- name: mesa-x
-  repo: upstream:mesa
+- build-depends: []
+  name: mesa-x
   ref: baserock/genivi/morph
-  build-depends: []
-- name: xorg-lib-libxkbfile
+  repo: upstream:mesa
+- build-depends: []
+  name: xorg-lib-libxkbfile
+  ref: baserock/morph
   repo: upstream:xorg-lib-libxkbfile
+- build-depends: []
+  name: pixman
   ref: baserock/morph
-  build-depends: []
-- name: pixman
   repo: upstream:pixman
+- build-depends: []
+  name: xorg-font-util
   ref: baserock/morph
-  build-depends: []
-- name: xorg-font-util
   repo: upstream:xorg-font-util
+- build-depends:
+  - xorg-font-util
+  name: xorg-lib-libfontenc
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libfontenc
   repo: upstream:xorg-lib-libfontenc
+- build-depends: []
+  name: freetype2
   ref: baserock/morph
-  build-depends:
-  - xorg-font-util
-- name: freetype2
   repo: upstream:freetype2
+- build-depends:
+  - freetype2
+  name: fontconfig
   ref: baserock/morph
-  build-depends: []
-- name: fontconfig
   repo: upstream:fontconfig
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - freetype2
-- name: xorg-lib-libXfont
+  - xorg-lib-libfontenc
+  name: xorg-lib-libXfont
+  ref: baserock/morph
   repo: upstream:xorg-lib-libXfont
+- build-depends: []
+  name: freefont-otf
   ref: baserock/morph
-  build-depends:
-  - freetype2
-  - xorg-lib-libfontenc
-- name: freefont-otf
   repo: upstream:freefont-otf
+- build-depends: []
+  name: xorg-lib-libICE
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libICE
   repo: upstream:xorg-lib-libICE
-  ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libSM
-  repo: upstream:xorg-lib-libSM
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - xorg-lib-libICE
-- name: xorg-lib-libXt
-  repo: upstream:xorg-lib-libXt
+  name: xorg-lib-libSM
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libSM
+- build-depends:
   - xorg-lib-libSM
-- name: xorg-lib-libXmu
-  repo: upstream:xorg-lib-libXmu
+  name: xorg-lib-libXt
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXt
+- build-depends:
   - xorg-lib-libXt
-- name: xorg-lib-libXpm
-  repo: upstream:xorg-lib-libXpm
+  name: xorg-lib-libXmu
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXmu
+- build-depends:
   - xorg-lib-libXt
-- name: xorg-lib-libXaw
-  repo: upstream:xorg-lib-libXaw
+  name: xorg-lib-libXpm
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-lib-libXpm
+- build-depends:
   - xorg-lib-libXmu
   - xorg-lib-libXpm
   - xorg-lib-libXt
-- name: libsha1
-  repo: upstream:libsha1
+  name: xorg-lib-libXaw
   ref: baserock/morph
-  build-depends: []
-- name: xserver
-  repo: upstream:xserver
+  repo: upstream:xorg-lib-libXaw
+- build-depends: []
+  name: libsha1
   ref: baserock/morph
-  build-depends:
+  repo: upstream:libsha1
+- build-depends:
   - libsha1
   - mesa-x
   - pixman
@@ -104,81 +99,86 @@ chunks:
   - xorg-lib-libXt
   - xorg-lib-libfontenc
   - xorg-lib-libxkbfile
-- name: xorg-driver-xf86-video-cirrus
-  repo: upstream:xorg-driver-xf86-video-cirrus
+  name: xserver
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xserver
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-video-fbdev
-  repo: upstream:xorg-driver-xf86-video-fbdev
+  name: xorg-driver-xf86-video-cirrus
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-cirrus
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-video-vesa
-  repo: upstream:xorg-driver-xf86-video-vesa
+  name: xorg-driver-xf86-video-fbdev
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-fbdev
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-evdev
-  repo: upstream:xorg-driver-xf86-input-evdev
+  name: xorg-driver-xf86-video-vesa
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-video-vesa
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-keyboard
-  repo: upstream:xorg-driver-xf86-input-keyboard
+  name: xorg-driver-xf86-input-evdev
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-evdev
+- build-depends:
   - xserver
-- name: xorg-driver-xf86-input-mouse
-  repo: upstream:xorg-driver-xf86-input-mouse
+  name: xorg-driver-xf86-input-keyboard
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-keyboard
+- build-depends:
   - xserver
-- name: xorg-app-xkbcomp
-  repo: upstream:xorg-app-xkbcomp
+  name: xorg-driver-xf86-input-mouse
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-driver-xf86-input-mouse
+- build-depends:
   - xorg-lib-libxkbfile
-- name: xkeyboard-config
-  repo: upstream:xkeyboard-config
+  name: xorg-app-xkbcomp
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-app-xkbcomp
+- build-depends:
   - xorg-app-xkbcomp
-- name: xorg-app-xinit
-  repo: upstream:xorg-app-xinit
+  name: xkeyboard-config
   ref: baserock/morph
-  build-depends: []
-- name: xorg-lib-libXft
-  repo: upstream:xorg-lib-libXft
+  repo: upstream:xkeyboard-config
+- build-depends: []
+  name: xorg-app-xinit
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xorg-app-xinit
+- build-depends:
   - fontconfig
   - freetype2
-- name: xcb-util
+  name: xorg-lib-libXft
+  ref: baserock/morph
+  repo: upstream:xorg-lib-libXft
+- build-depends: []
+  name: xcb-util
+  ref: baserock/morph
   repo: upstream:xcb-util
+- build-depends: []
+  name: util-wm
   ref: baserock/morph
-  build-depends: []
-- name: util-wm
   repo: upstream:util-wm
+- build-depends: []
+  name: util-keysyms
   ref: baserock/morph
-  build-depends: []
-- name: util-keysyms
   repo: upstream:util-keysyms
-  ref: baserock/morph
-  build-depends: []
-- name: util-image
-  repo: upstream:util-image
-  ref: baserock/morph
-  build-depends:
+- build-depends:
   - xcb-util
-- name: xterm
-  repo: upstream:xterm
+  name: util-image
   ref: baserock/morph
-  build-depends:
+  repo: upstream:util-image
+- build-depends:
   - xorg-lib-libXaw
   - xorg-lib-libxkbfile
-- name: xorg-app-xauth
-  repo: upstream:xorg-app-xauth
+  name: xterm
   ref: baserock/morph
-  build-depends:
+  repo: upstream:xterm
+- build-depends:
   - xorg-lib-libXmu
+  name: xorg-app-xauth
+  ref: baserock/morph
+  repo: upstream:xorg-app-xauth
+kind: stratum
+name: x-x86_64-generic