diff options
author | James Thomas <james.thomas@codethink.co.uk> | 2014-10-10 14:18:48 -0500 |
---|---|---|
committer | James Thomas <james.thomas@codethink.co.uk> | 2014-10-10 14:18:48 -0500 |
commit | 27e95cdd98062f2464b2a7f372402f75aab7f497 (patch) | |
tree | 40392dd0904db08fd8f65e0a4a7d56e80c2d33d9 | |
parent | 3ad91daa7755610c265549787a7f1abcfa1f1626 (diff) | |
parent | 87a29dcd897ae8f51826eef62eb3c17a069b3ec2 (diff) | |
download | definitions-27e95cdd98062f2464b2a7f372402f75aab7f497.tar.gz |
Merge branch 'jjardon/systemd' into jjardon/gnome
-rw-r--r-- | strata/foundation.morph | 37 | ||||
-rw-r--r-- | strata/foundation/coreutils.morph | 9 | ||||
-rw-r--r-- | strata/foundation/systemd.morph | 4 | ||||
-rw-r--r-- | strata/genivi.morph | 6 | ||||
-rw-r--r-- | strata/input-common.morph | 2 | ||||
-rw-r--r-- | strata/libdrm-common.morph | 17 | ||||
-rw-r--r-- | strata/libdrm-common/drm.morph (renamed from strata/x-common/drm.morph) | 0 | ||||
-rw-r--r-- | strata/mesa-common.morph | 2 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 5 | ||||
-rw-r--r-- | strata/tools/coreutils.morph | 9 | ||||
-rw-r--r-- | strata/wayland-generic.morph | 2 | ||||
-rw-r--r-- | strata/weston-genivi.morph | 2 | ||||
-rw-r--r-- | strata/x-common.morph | 132 | ||||
-rw-r--r-- | strata/x-generic.morph | 2 | ||||
-rw-r--r-- | strata/xorg-util-macros-common.morph | 16 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-versatile.morph | 4 | ||||
-rw-r--r-- | systems/genivi-baseline-system-x86_64-generic.morph | 4 |
17 files changed, 114 insertions, 139 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph index 967928a4..c62d5ab2 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -19,8 +19,7 @@ chunks: - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod - ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4 - unpetrify-ref: baserock/morph + ref: v18 build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph @@ -71,16 +70,40 @@ chunks: unpetrify-ref: baserock/genivi/dbus-1.8.8 build-depends: - glib +- name: libgpg-error + repo: upstream:libgpg-error + ref: baserock/gnome + build-depends: [] +- name: libgcrypt + repo: upstream:libgcrypt + ref: baserock/gnome + build-depends: + - libgpg-error +- name: patch + morph: strata/foundation/patch.morph + repo: upstream:patch + ref: 9a16dcb97aac1a26af4372d95bd62b84f3f1264a + unpetrify-ref: baserock/morph + build-depends: [] +- name: coreutils + morph: strata/foundation/coreutils.morph + repo: upstream:coreutils + ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 + unpetrify-ref: baserock/8.23 + build-depends: + - patch - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: a77af3ec96015b2382ea31020d0a14b482d10a76 - unpetrify-ref: baserock/morph + ref: 5d0ae62c665262c4c55536457e84e278c252cc0b + unpetrify-ref: v216 build-depends: - dbus-pre + - coreutils - gobject-introspection - kmod - libcap2 + - libgcrypt - pciutils - usbutils - name: lzo @@ -122,12 +145,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - groff -- name: patch - morph: strata/foundation/patch.morph - repo: upstream:patch - ref: 9a16dcb97aac1a26af4372d95bd62b84f3f1264a - unpetrify-ref: baserock/morph - build-depends: [] - name: tbdiff morph: strata/foundation/tbdiff.morph repo: baserock:baserock/tbdiff diff --git a/strata/foundation/coreutils.morph b/strata/foundation/coreutils.morph new file mode 100644 index 00000000..479e9925 --- /dev/null +++ b/strata/foundation/coreutils.morph @@ -0,0 +1,9 @@ +name: coreutils +kind: chunk +build-system: autotools +configure-commands: +- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf +- bash bootstrap --skip-po +- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls +install-commands: +- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 2a1933d7..471252ec 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -4,9 +4,7 @@ max-jobs: 1 build-system: autotools configure-commands: - sh autogen.sh -- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc - --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix= - --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware +- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc --localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix= --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware --disable-resolved install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR"/sbin diff --git a/strata/genivi.morph b/strata/genivi.morph index b75861ca..33beb69a 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -12,8 +12,7 @@ chunks: - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller - ref: c78fddaddc24a2c49f5ef18896c93403575295ae - unpetrify-ref: baserock/morph + ref: baserock/systemd_v216 build-depends: - DLT-daemon - name: googletest @@ -65,8 +64,7 @@ chunks: - itzam-tarball - name: node-state-manager repo: upstream:node-state-manager - ref: dd4a86b9459537d2e85489b36abf80f34d12f098 - unpetrify-ref: baserock/genivi/baseline + ref: baserock/systemd_v216 build-depends: - DLT-daemon - persistence-client-library diff --git a/strata/input-common.morph b/strata/input-common.morph index d7c4727a..0e9d25e6 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -2,7 +2,7 @@ name: input-common kind: stratum build-depends: - morph: strata/foundation.morph -- morph: strata/x-common.morph +- morph: strata/xorg-util-macros-common.morph chunks: - name: mtdev repo: upstream:mtdev-git diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph new file mode 100644 index 00000000..37bff746 --- /dev/null +++ b/strata/libdrm-common.morph @@ -0,0 +1,17 @@ +name: libdrm-common +kind: stratum +build-depends: +- morph: strata/xorg-util-macros-common.morph +chunks: +- name: xorg-lib-libpciaccess + repo: upstream:xorg-lib-libpciaccess + ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f + unpetrify-ref: baserock/morph + build-depends: [] +- name: drm + repo: upstream:drm + morph: strata/libdrm-common/drm.morph + ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b + unpetrify-ref: baserock/jetson/drm + build-depends: + - xorg-lib-libpciaccess diff --git a/strata/x-common/drm.morph b/strata/libdrm-common/drm.morph index 8f5b88e2..8f5b88e2 100644 --- a/strata/x-common/drm.morph +++ b/strata/libdrm-common/drm.morph diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index d4c23bcd..e2548e7d 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -2,7 +2,7 @@ name: mesa-common kind: stratum build-depends: - morph: strata/llvm-common.morph -- morph: strata/x-common.morph +- morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: - name: mesa diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 9a528cbe..00b4c9c8 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -9,7 +9,7 @@ configure-commands: x86_32|x64_64) DRIDRIVERS=intel,i915,i965,swrast GALLIUMDRIVERS=swrast - EGLPLATFORMS=x11,wayland,drm + EGLPLATFORMS=wayland,drm ;; armv7lhf) DRIDRIVERS=nouveau,swrast @@ -20,12 +20,13 @@ configure-commands: *) DRIDRIVERS=swrast GALLIUMDRIVERS=swrast - EGLPLATFORMS=x11,wayland,drm + EGLPLATFORMS=wayland,drm ;; esac ./autogen.sh --prefix="$PREFIX" \ --enable-gles2 \ --with-egl-platforms="$EGLPLATFORMS" \ + --disable-glx \ --enable-gbm \ --enable-shared-glapi \ --with-gallium-drivers="$GALLIUMDRIVERS" \ diff --git a/strata/tools/coreutils.morph b/strata/tools/coreutils.morph deleted file mode 100644 index 820a4eed..00000000 --- a/strata/tools/coreutils.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: coreutils -kind: chunk -build-system: autotools -configure-commands: -- sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf -- bash bootstrap --skip-po -- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix="$PREFIX" --disable-nls --enable-no-install-program='[,base64,basename,cat,chcon,chgrp,chmod,chown,chroot,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,env,expand,expr,false,fold,ginstall,groups,head,hostid,id,kill,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nice,nohup,od,printenv,printf,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,sleep,sort,split,stat,stty,sum,sync,tac,tail,tee,test,timeout,touch,tr,true,tty,uname,unexpand,uniq,unlink,uptime,users,wc,who,whoami,yes' -install-commands: -- make INSTALL_PROGRAM=install DESTDIR="$DESTDIR" install diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 1913fe91..2e3ad90f 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -2,7 +2,7 @@ name: wayland-generic kind: stratum build-depends: - morph: strata/foundation.morph -- morph: strata/x-common.morph +- morph: strata/xorg-util-macros-common.morph chunks: - name: libxkbcommon repo: upstream:xorg-lib-libxkbcommon diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index a84c9aa9..dd4d5b9b 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -4,7 +4,7 @@ build-depends: - morph: strata/graphics-common.morph - morph: strata/input-common.morph - morph: strata/mesa-common.morph -- morph: strata/x-common.morph +- morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: - name: linux-pam diff --git a/strata/x-common.morph b/strata/x-common.morph index bb0affe9..f842c7a9 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -1,207 +1,164 @@ name: x-common kind: stratum build-depends: -- morph: strata/core.morph +- morph: strata/xorg-util-macros-common.morph chunks: -- name: xorg-util-macros - repo: upstream:xorg-util-macros - ref: 9a54b858601bd305de2737b06e609084a2a114c2 - unpetrify-ref: util-macros-1.19.0 - build-depends: [] - name: xorg-proto-bigreqsproto repo: upstream:xorg-proto-bigreqsproto ref: d6ed3e927a756900ad4c9fd7235f8f7f34f376db unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-compositeproto repo: upstream:xorg-proto-compositeproto ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-damageproto repo: upstream:xorg-proto-damageproto ref: 015b980e5091492dbe681af59569768ba89fbfe0 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-dmxproto repo: upstream:xorg-proto-dmxproto ref: 395f6fcc0a5635907b5e45829e86b29431316184 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-fixesproto repo: upstream:xorg-proto-fixesproto ref: b6c6bc2aa4b83f8763c75c90e6671052272a2af2 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-fontsproto repo: upstream:xorg-proto-fontsproto ref: 81e4d4ec53f1f3848ff269fe476c3a1d35d93aef unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-glproto repo: upstream:xorg-proto-glproto ref: 8e3407e02980d088e20041e79bdcdd3737e7827e unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-inputproto repo: upstream:xorg-proto-inputproto ref: f8428123019e7357891bbfc0aef21dbb4d0db10f unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-kbproto repo: upstream:xorg-proto-kbproto ref: f7022f5775350dce3348b7151845a32390e98791 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xineramaproto repo: upstream:xorg-proto-xineramaproto ref: 4e77b45e0d6b42a448dab2ec316eeb5c490ecfed unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-randrproto repo: upstream:xorg-proto-randrproto ref: ca7cc541c2e43e6c784df19b4583ac35829d2f72 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-recordproto repo: upstream:xorg-proto-recordproto ref: 0fd4f8e57c1e637b2aaaaa0f539ddbac8cc50575 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-renderproto repo: upstream:xorg-proto-renderproto ref: 935f5ec95a3718c184ff685f5b79b467483b7844 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-resourceproto repo: upstream:xorg-proto-resourceproto ref: ada91f54c98b5a61d3e116fca6bf239a8604730f unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-scrnsaverproto repo: upstream:xorg-proto-scrnsaverproto ref: 614532026e8ec7496216316fb584d6f2af6a7f7b unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-videoproto repo: upstream:xorg-proto-videoproto ref: e42cf822e230cff5c6550ca2c050dfa27d2c9611 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xcmiscproto repo: upstream:xorg-proto-xcmiscproto ref: 83549077a3c2140b9862709004cd873f1c55e395 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xextproto repo: upstream:xorg-proto-xextproto ref: f27fcc99d1cf935cc289933326f7d3baacd5107a unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xf86bigfontproto repo: upstream:xorg-proto-xf86bigfontproto ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xf86dgaproto repo: upstream:xorg-proto-xf86dgaproto ref: c52b205c3175309be7952774668c87dd2d5ce30e unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xf86driproto repo: upstream:xorg-proto-xf86driproto ref: cb03b8d49bf063860859c1ed8bcecd055551e93a unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-xf86vidmodeproto repo: upstream:xorg-proto-xf86vidmodeproto ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-x11proto repo: upstream:xorg-proto-x11proto ref: f8c43d587e43fee2c22bd7b5f35a9d4dc8bdb580 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-dri2proto repo: upstream:xorg-proto-dri2proto ref: ead89ad84877551cc15d26b95cb19a3e205df71f unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-dri3proto repo: upstream:xorg-proto-dri3proto ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-proto-presentproto repo: upstream:xorg-proto-presentproto ref: ef84007fc4a23d3897b4776906139de9d0698c2a - build-depends: - - xorg-util-macros -- name: xcb-pthread-stubs - repo: upstream:xcb-pthread-stubs - ref: 431d2c0be218d878b9dd3862e4232243c599df4b - unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xcb-proto repo: upstream:xcb-proto ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 unpetrify-ref: "1.11" - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-lib-libxshmfence repo: upstream:xorg-lib-libxshmfence ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 build-depends: - xorg-proto-x11proto - - xorg-util-macros - name: xorg-lib-libXau repo: upstream:xorg-lib-libXau ref: 1a8a1b2c68967b48c07b56142799b1020f017027 unpetrify-ref: baserock/morph build-depends: - xorg-proto-x11proto - - xorg-util-macros - name: xcb-libxcb repo: upstream:xcb-libxcb ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a unpetrify-ref: "1.11" build-depends: - xcb-proto - - xcb-pthread-stubs - xorg-lib-libXau - - xorg-util-macros - name: xorg-lib-libxtrans repo: upstream:xorg-lib-libxtrans ref: bd53f4c8543faf910a7a151241ee07661b4d57ad unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-lib-libX11 repo: upstream:xorg-lib-libX11 ref: cb107760df33ffc8630677e66e2e50aa37950a5c @@ -217,21 +174,6 @@ chunks: - xorg-proto-xcmiscproto - xorg-proto-xextproto - xorg-proto-xf86bigfontproto - - xorg-util-macros -- name: xorg-lib-libpciaccess - repo: upstream:xorg-lib-libpciaccess - ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f - unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros -- name: drm - morph: strata/x-common/drm.morph - repo: upstream:drm - ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b - unpetrify-ref: baserock/jetson/drm - build-depends: - - xcb-pthread-stubs - - xorg-lib-libpciaccess - name: xorg-lib-libXext repo: upstream:xorg-lib-libXext ref: 8eee1236041d46a21faba32e0d27c26985267d89 @@ -241,7 +183,6 @@ chunks: - xorg-lib-libXau - xorg-proto-x11proto - xorg-proto-xextproto - - xorg-util-macros - name: xorg-lib-libXi repo: upstream:xorg-lib-libXi ref: 9b26b81477cf3486e5aa0ef8d81af68a0f04df1b @@ -252,14 +193,12 @@ chunks: - xorg-proto-inputproto - xorg-proto-x11proto - xorg-proto-xextproto - - xorg-util-macros - name: xorg-util-makedepend repo: upstream:xorg-util-makedepend ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5 unpetrify-ref: baserock/morph build-depends: - xorg-proto-x11proto - - xorg-util-macros - name: xorg-lib-libXfixes repo: upstream:xorg-lib-libXfixes ref: 73a0fbb479f5b7806a3dd0741be55c9abda76220 @@ -267,7 +206,6 @@ chunks: build-depends: - xorg-lib-libXext - xorg-proto-fixesproto - - xorg-util-macros - name: xorg-lib-libXcomposite repo: upstream:xorg-lib-libXcomposite ref: eda48b1bedaa344ada8e13930c9ab3058b836190 @@ -276,7 +214,6 @@ chunks: - xorg-lib-libX11 - xorg-lib-libXfixes - xorg-proto-compositeproto - - xorg-util-macros - name: xorg-lib-libXrender repo: upstream:xorg-lib-libXrender ref: 1af52cb334377611233d7dc156bc1e6f7923756d @@ -284,7 +221,6 @@ chunks: build-depends: - xorg-lib-libX11 - xorg-proto-renderproto - - xorg-util-macros - name: xorg-lib-libXrandr repo: upstream:xorg-lib-libXrandr ref: 99a63d10cbbab7d69a52d25d78795a3278506ea9 @@ -296,7 +232,6 @@ chunks: - xorg-proto-randrproto - xorg-proto-renderproto - xorg-proto-xextproto - - xorg-util-macros - name: xorg-lib-libXinerama repo: upstream:xorg-lib-libXinerama ref: 470b9356af961ff7d3968b164aa73872b49a5dcc @@ -306,7 +241,6 @@ chunks: - xorg-lib-libXext - xorg-proto-xextproto - xorg-proto-xineramaproto - - xorg-util-macros - name: xorg-lib-libdmx repo: upstream:xorg-lib-libdmx ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef @@ -316,7 +250,6 @@ chunks: - xorg-lib-libXext - xorg-proto-dmxproto - xorg-proto-xextproto - - xorg-util-macros - name: xorg-lib-libXtst repo: upstream:xorg-lib-libXtst ref: 2aafac9474a0a0a0c39797862f823255918cf368 @@ -328,7 +261,6 @@ chunks: - xorg-proto-inputproto - xorg-proto-recordproto - xorg-proto-xextproto - - xorg-util-macros - name: xorg-lib-libXRes repo: upstream:xorg-lib-libXRes ref: 83e7693515369d57dcd11c2bb1f03563f51bc500 @@ -338,7 +270,6 @@ chunks: - xorg-lib-libXext - xorg-proto-resourceproto - xorg-proto-xextproto - - xorg-util-macros - name: xorg-lib-libXdamage repo: upstream:xorg-lib-libXdamage ref: 0d35761dc39409b70e04dd0786aef6537f92976a @@ -346,13 +277,11 @@ chunks: build-depends: - xorg-lib-libXfixes - xorg-proto-damageproto - - xorg-util-macros - name: xorg-lib-libXcursor repo: upstream:xorg-lib-libXcursor ref: 1b98fd6a2e8c00a563187849a585e68c7344468b unpetrify-ref: baserock/morph build-depends: - - xorg-util-macros - xorg-lib-libXrender - xorg-lib-libXfixes - xorg-proto-fixesproto @@ -362,8 +291,7 @@ chunks: repo: upstream:xorg-proto-printproto ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257 unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros + build-depends: [] - name: xorg-lib-libXp repo: upstream:xorg-lib-libXp ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1 diff --git a/strata/x-generic.morph b/strata/x-generic.morph index b30b2a9a..af42c55e 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -2,7 +2,7 @@ name: x-generic kind: stratum build-depends: - morph: strata/foundation.morph -- morph: strata/mesa-common.morph +- morph: strata/libdrm-common.morph - morph: strata/x-common.morph - morph: strata/graphics-common.morph chunks: diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph new file mode 100644 index 00000000..b8e67888 --- /dev/null +++ b/strata/xorg-util-macros-common.morph @@ -0,0 +1,16 @@ +name: xorg-util-macros-common +kind: stratum +build-depends: +- morph: strata/core.morph +chunks: +- name: xorg-util-macros + repo: upstream:xorg-util-macros + ref: 9a54b858601bd305de2737b06e609084a2a114c2 + unpetrify-ref: util-macros-1.19.0 + build-depends: [] +- name: xcb-pthread-stubs + repo: upstream:xcb-pthread-stubs + ref: 431d2c0be218d878b9dd3862e4232243c599df4b + unpetrify-ref: baserock/morph + build-depends: + - xorg-util-macros diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index bffcb2e7..52f04234 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,8 +19,8 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: x-common - morph: strata/x-common.morph +- name: libdrm-common + morph: strata/libdrm-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index e7a37ff9..a5646a63 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,8 +19,8 @@ strata: morph: strata/connman-common.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: x-common - morph: strata/x-common.morph +- name: libdrm-common + morph: strata/libdrm-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi |