From 90b1bdee61c6d06ebb14a47102c000ffbbbcd2dc Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Mon, 30 Sep 2013 15:56:41 +0000 Subject: Delete genivi-staging and reorder morph contents --- x-armv7-versatile.morph | 176 ++++++++++++++++++++++++------------------------ 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'x-armv7-versatile.morph') diff --git a/x-armv7-versatile.morph b/x-armv7-versatile.morph index 98c06bc..555e01d 100644 --- a/x-armv7-versatile.morph +++ b/x-armv7-versatile.morph @@ -1,94 +1,89 @@ -name: x-armv7-versatile -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/baseline-armv7-versatile - 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 - ref: baserock/morph - build-depends: [] -- name: fontconfig - repo: upstream:fontconfig - ref: baserock/morph - build-depends: +- build-depends: - freetype2 -- name: xorg-lib-libXfont - repo: upstream:xorg-lib-libXfont + name: fontconfig ref: baserock/morph - build-depends: + repo: upstream:fontconfig +- build-depends: - freetype2 - xorg-lib-libfontenc -- name: xorg-lib-libICE - repo: upstream:xorg-lib-libICE + name: xorg-lib-libXfont ref: baserock/morph - build-depends: [] -- name: xorg-lib-libSM - repo: upstream:xorg-lib-libSM + repo: upstream:xorg-lib-libXfont +- build-depends: [] + name: xorg-lib-libICE ref: baserock/morph - build-depends: + repo: upstream:xorg-lib-libICE +- 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 @@ -100,63 +95,68 @@ 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 - repo: upstream:xcb-util + name: xorg-lib-libXft ref: baserock/morph - build-depends: [] -- name: xterm - repo: upstream:xterm + repo: upstream:xorg-lib-libXft +- build-depends: [] + name: xcb-util ref: baserock/morph - build-depends: + repo: upstream:xcb-util +- build-depends: - xorg-lib-libXaw - xorg-lib-libxkbfile + name: xterm + ref: baserock/morph + repo: upstream:xterm +kind: stratum +name: x-armv7-versatile -- cgit v1.2.1