diff options
51 files changed, 219 insertions, 355 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 44adc1fb..8115c309 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -10,10 +10,16 @@ chunks: ref: f3a3a63d5b5abced8f75731d7b995606933c6e33 unpetrify-ref: v1.4 build-depends: [] +- name: readline6 + repo: upstream:readline + ref: 7628b745a813aac53586b640da056a975f1c443e + unpetrify-ref: readline-6.3 + build-depends: [] - name: NetworkManager morph: strata/NetworkManager-common/NetworkManager.morph repo: upstream:NetworkManager - ref: 6eb82acd6dce882f4b91aafcf68dd9e143ce34e2 - unpetrify-ref: 0.9.10 + ref: acdaf78a068b6c65ba799a7098b867953db4801c + unpetrify-ref: 1.0.0 build-depends: - libndp + - readline6 diff --git a/strata/NetworkManager-common/NetworkManager.morph b/strata/NetworkManager-common/NetworkManager.morph index 9840dfa4..553c979b 100644 --- a/strata/NetworkManager-common/NetworkManager.morph +++ b/strata/NetworkManager-common/NetworkManager.morph @@ -2,4 +2,4 @@ name: NetworkManager kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp +- ./autogen.sh --prefix="$PREFIX" --with-session-tracking=systemd --disable-ppp --enable-more-warnings=yes diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 0c67ee5c..e4dc0e68 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -77,8 +77,8 @@ chunks: - name: json-c morph: strata/audio-bluetooth/json-c.morph repo: upstream:json-c - ref: 60a5f3dedc879db3e5dacdd3b7e3e543c2e1bae7 - unpetrify-ref: baserock/morph + ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 + unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch build-depends: [] - name: libsndfile morph: strata/audio-bluetooth/libsndfile.morph @@ -89,8 +89,8 @@ chunks: - name: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio - ref: e1b44688c0db505f70761fe76b4fed2ca6924a09 - unpetrify-ref: baserock/morph + ref: 34862dbd43079d19faff31fa9ba996acc874d586 + unpetrify-ref: v5.99.3 build-depends: - libsndfile - libatomic_ops diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph index 117f3396..fa183fcb 100644 --- a/strata/audio-bluetooth/pulseaudio.morph +++ b/strata/audio-bluetooth/pulseaudio.morph @@ -4,10 +4,8 @@ description: PulseAudio System build-system: autotools configure-commands: - ./autogen.sh -- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple +- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple --with-systemduserunitdir=/lib/systemd/system install-commands: - make DESTDIR="$DESTDIR" install -- mkdir -p "$DESTDIR/lib/systemd/system" -- install -m755 pulseaudio.service "$DESTDIR/lib/systemd/system" - mkdir -p "$DESTDIR/etc/systemd/system/multi-user.target.wants" - ln -s /lib/systemd/system/pulseaudio.service "$DESTDIR/etc/systemd/system/multi-user.target.wants/pulseaudio.service" diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 1611dbe8..ae2d24b6 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -322,11 +322,11 @@ chunks: - stage2-reset-specs - glibc -- name: m4 - morph: strata/build-essential/m4.morph - repo: upstream:m4 - ref: cfbd353f3a2dc517992bcdc747281a22feb0c4db - unpetrify-ref: baserock/build-essential +- name: m4-tarball + morph: strata/build-essential/m4-tarball.morph + repo: upstream:m4-tarball + ref: 23c11479b3ad787adc7a651ee0c4347839e47723 + unpetrify-ref: m4-1.4.17 build-depends: - stage2-binutils - stage2-busybox @@ -354,7 +354,7 @@ chunks: - stage2-reset-specs - glibc - zlib - - m4 + - m4-tarball artifacts: gcc-libs: build-essential-minimal diff --git a/strata/core/autoconf.morph b/strata/build-essential/m4-tarball.morph index 046bfc40..e460a9dc 100644 --- a/strata/core/autoconf.morph +++ b/strata/build-essential/m4-tarball.morph @@ -1,4 +1,4 @@ -name: autoconf +name: m4-tarball kind: chunk build-system: autotools configure-commands: diff --git a/strata/core.morph b/strata/core.morph index 87033546..a1abf369 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -7,8 +7,8 @@ build-depends: chunks: - name: sqlite3 repo: upstream:sqlite3 - ref: f6c2a9fe49d20654c2c41844d056033692a223b7 - unpetrify-ref: baserock/morph + ref: 24adc227bc29cd17e39df097fbca389c7724cd14 + unpetrify-ref: sqlite-autoconf-3080801 build-depends: [] - name: cmake morph: strata/core/cmake.morph @@ -22,11 +22,11 @@ chunks: ref: 51871d08a48ff781186f7a7b22ec69a1db38eb4c unpetrify-ref: baserock/build-essential build-depends: [] -- name: gettext - morph: strata/core/gettext.morph - repo: upstream:gettext - ref: 3898e324f07c05404b63d71f0e519f352fb1e072 - unpetrify-ref: baserock/build-essential +- name: gettext-tarball + morph: strata/core/gettext-tarball.morph + repo: upstream:gettext-tarball + ref: 482840e61f86ca321838a91e902c41d40c098bbb + unpetrify-ref: gettext-0.19.4 build-depends: [] - name: mini-utils morph: strata/core/mini-utils.morph @@ -47,12 +47,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - gdbm -- name: pkg-config - morph: strata/core/pkg-config.morph - repo: upstream:pkg-config - ref: 67a702a15cf88e270539484929ffa1f42b90c728 - unpetrify-ref: baserock/build-essential - build-depends: [] - name: texinfo-tarball morph: strata/core/texinfo-tarball.morph repo: upstream:texinfo-tarball @@ -60,20 +54,20 @@ chunks: unpetrify-ref: baserock/morph build-depends: - ncurses -- name: autoconf - morph: strata/core/autoconf.morph - repo: upstream:autoconf - ref: cffdb90be331111ce3fbe4a32320181ec2b92652 - unpetrify-ref: baserock/build-essential +- name: autoconf-tarball + morph: strata/core/autoconf-tarball.morph + repo: upstream:autoconf-tarball + ref: 55d1d2c339bc5f935f6d8d702e98b7bd5d968e9d + unpetrify-ref: autoconf-2.69 build-depends: - perl - name: automake morph: strata/core/automake.morph repo: upstream:automake - ref: ba4b42faff673e3e5265416dff09e59affc688fb - unpetrify-ref: v1.14.1 + ref: db43dd473361d90d8b00362cfef5bac8e722000d + unpetrify-ref: v1.15 build-depends: - - autoconf + - autoconf-tarball - perl - texinfo-tarball - name: bash @@ -117,11 +111,11 @@ chunks: - sqlite3 - ncurses - readline -- name: libtool - morph: strata/core/libtool.morph - repo: upstream:libtool - ref: d388b7f2dc628b22006025d01179bc09b8aabe81 - unpetrify-ref: baserock/build-essential +- name: libtool-tarball + morph: strata/core/libtool-tarball.morph + repo: upstream:libtool-tarball + ref: f7bbc21981ffdbbe2d4435556e3ead0828dce160 + unpetrify-ref: libtool-2.4.5 build-depends: - bash - name: gtk-doc-stub @@ -129,28 +123,27 @@ chunks: ref: 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - - libtool + - libtool-tarball - name: xz - morph: strata/core/xz.morph repo: upstream:xz - ref: 581deedf9d1eadcd84c4fcd23b9fdfe2dde18cc2 - unpetrify-ref: baserock/morph + ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a + unpetrify-ref: v5.2.0 build-depends: - - autoconf + - autoconf-tarball - automake - - gettext - - libtool + - gettext-tarball + - libtool-tarball - name: libxml2 repo: upstream:libxml2 ref: ee8f1d4cda8dc1a6f2c515fe234f7bc89cdc9f80 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - cpython - - libtool + - libtool-tarball - xz - name: ca-certificates morph: strata/core/ca-certificates.morph @@ -166,9 +159,9 @@ chunks: ref: 202aa9f7758636730299b86715d924f54468a908 unpetrify-ref: curl-7_38_0 build-depends: - - autoconf + - autoconf-tarball - automake - - libtool + - libtool-tarball - openssl-new - ca-certificates - name: libexpat @@ -177,9 +170,9 @@ chunks: ref: 97678ab13f6d29878997256b6ae1ded679ae5c5c unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - - libtool + - libtool-tarball - name: XML-Parser repo: upstream:XML-Parser ref: e1a3ec157140a699e3020836475a0df622f70f1b @@ -194,10 +187,10 @@ chunks: ref: 49c3e926349e964b311b46251bb2b97d3d669855 unpetrify-ref: v2.1.3 build-depends: - - autoconf + - autoconf-tarball - cpython - curl - - gettext + - gettext-tarball - libexpat - openssl-new - name: help2man @@ -206,7 +199,7 @@ chunks: ref: 0191a5f61525f8deea2ae8bdfea88190d85b6a71 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - name: bison morph: strata/core/bison.morph @@ -214,11 +207,11 @@ chunks: ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 unpetrify-ref: baserock/v3.0.2 build-depends: - - autoconf + - autoconf-tarball - automake - bash - flex - - gettext + - gettext-tarball - git - help2man - mini-utils @@ -234,20 +227,29 @@ chunks: unpetrify-ref: baserock/morph build-depends: - XML-Parser - - autoconf + - autoconf-tarball - automake - perl +- name: pkg-config + morph: strata/core/pkg-config.morph + repo: upstream:pkg-config + ref: 74ceac54ef6f9247c00f08eecd8cca811a3c5934 + unpetrify-ref: pkg-config-0.28 + build-depends: + - autoconf-tarball + - automake + - libtool-tarball - name: util-linux morph: strata/core/util-linux.morph repo: upstream:util-linux ref: c5c1033c5c7deda8abe3448ec81bbb33c72219e0 unpetrify-ref: baserock/morph build-depends: - - autoconf + - autoconf-tarball - automake - - gettext + - gettext-tarball - git - - libtool + - libtool-tarball - pkg-config - name: nano repo: upstream:nano-tarball @@ -282,10 +284,10 @@ chunks: ref: 4f5000a45963c2cc2a403ad23e459f20296b29c2 unpetrify-ref: baserock/4.2 build-depends: - - autoconf + - autoconf-tarball - automake - - gettext - - libtool + - gettext-tarball + - libtool-tarball - bison - name: patch morph: strata/core/patch.morph diff --git a/strata/core/libtool.morph b/strata/core/autoconf-tarball.morph index f311281d..fbdc5768 100644 --- a/strata/core/libtool.morph +++ b/strata/core/autoconf-tarball.morph @@ -1,6 +1,5 @@ -name: libtool +name: autoconf-tarball kind: chunk -max-jobs: 1 build-system: autotools configure-commands: - ./configure --prefix="$PREFIX" diff --git a/strata/build-essential/m4.morph b/strata/core/gettext-tarball.morph index b76afbe4..4983b484 100644 --- a/strata/build-essential/m4.morph +++ b/strata/core/gettext-tarball.morph @@ -1,5 +1,5 @@ -name: m4 +name: gettext-tarball kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --disable-nls +- ./configure --prefix="$PREFIX" diff --git a/strata/core/gettext.morph b/strata/core/gettext.morph deleted file mode 100644 index 3e2c56b5..00000000 --- a/strata/core/gettext.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: gettext -kind: chunk -max-jobs: 1 -configure-commands: -- ./configure --prefix=/usr -build-commands: -- make EXAMPLESPOFILES= -install-commands: -- make EXAMPLESPOFILES= DESTDIR="$DESTDIR" install diff --git a/strata/core/libtool-tarball.morph b/strata/core/libtool-tarball.morph new file mode 100644 index 00000000..65a3edbc --- /dev/null +++ b/strata/core/libtool-tarball.morph @@ -0,0 +1,5 @@ +name: libtool-tarball +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" diff --git a/strata/core/pkg-config.morph b/strata/core/pkg-config.morph index 090a65e5..ed35a2ac 100644 --- a/strata/core/pkg-config.morph +++ b/strata/core/pkg-config.morph @@ -2,4 +2,4 @@ name: pkg-config kind: chunk build-system: autotools configure-commands: -- ./configure --prefix="$PREFIX" --with-internal-glib +- ./autogen.sh --prefix="$PREFIX" --with-internal-glib diff --git a/strata/core/xz.morph b/strata/core/xz.morph deleted file mode 100644 index 8165abdc..00000000 --- a/strata/core/xz.morph +++ /dev/null @@ -1,3 +0,0 @@ -name: xz -kind: chunk -build-system: autotools diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 845e7fab..541b4f7a 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -28,7 +28,6 @@ chunks: build-depends: - bullet3 - fribidi - - luajit2 - name: elementary morph: strata/enlightenment/elementary.morph repo: upstream:enlightenment/elementary diff --git a/strata/foundation.morph b/strata/foundation.morph index 10111805..e3bebe05 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -22,6 +22,12 @@ chunks: ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 unpetrify-ref: v18 build-depends: [] +- name: time-zone-database + morph: strata/foundation/time-zone-database.morph + repo: upstream:tz + ref: a0782484f101ac55c916568bc1c490d7761fc904 + unpetrify-ref: 2015a + build-depends: [] - name: libcap2 morph: strata/foundation/libcap2.morph repo: upstream:libcap2 @@ -35,23 +41,12 @@ chunks: ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph build-depends: [] -- name: libusbx - repo: upstream:libusbx - ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834 - unpetrify-ref: baserock/morph - build-depends: [] - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 unpetrify-ref: baserock/morph build-depends: [] -- name: usbutils - repo: upstream:usbutils - ref: 410f1474af0ddb391bc6ec391777f116eee31569 - unpetrify-ref: baserock/morph - build-depends: - - libusbx - name: glib repo: upstream:glib ref: 4125415e7f4d1213fc7122beac0d91af08e37b28 @@ -78,6 +73,11 @@ chunks: ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 build-depends: - libgpg-error +- name: linux-pam + repo: upstream:linux-pam + ref: b1521c97e73b10469f7b34c0571d51c647eca83c + unpetrify-ref: Linux-PAM-1.1.8 + build-depends: [] - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd @@ -89,6 +89,19 @@ chunks: - kmod - libcap2 - libgcrypt + - linux-pam +- name: libusb + repo: upstream:libusb + ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 + unpetrify-ref: v1.0.19 + build-depends: + - systemd +- name: usbutils + repo: upstream:usbutils + ref: c37f146eb2c6642c600f1b025a6d56996b0697ff + unpetrify-ref: baserock/v008 + build-depends: + - libusb - name: lzo morph: strata/foundation/lzo.morph repo: upstream:lzo @@ -98,8 +111,8 @@ chunks: - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: 13ee8f62d4aa3360adb6956fb30da0c858928fa2 - unpetrify-ref: baserock/genivi/morph + ref: 4163109fd5bfe67973262610dd95ae60888c92e9 + unpetrify-ref: fuse_2_9_bugfix build-depends: [] - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph diff --git a/strata/foundation/time-zone-database.morph b/strata/foundation/time-zone-database.morph new file mode 100644 index 00000000..c3c89bcf --- /dev/null +++ b/strata/foundation/time-zone-database.morph @@ -0,0 +1,10 @@ +name: time-zone-database +kind: chunk +description: | + Time zone database. +build-system: manual +install-commands: +# ETCDIR is actually where the 'tzselect', 'zdump' and 'zic' commands get +# installed. Note that tzselect from this chunk will overlap with and override +# the tzselect binary from GLIBC. +- make TOPDIR="$PREFIX" ETCDIR="$PREFIX/bin" TZDIR="$PREFIX/share/zoneinfo" DESTDIR="$DESTDIR" install diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index b187df8f..9fc05b7c 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -2,6 +2,7 @@ name: graphics-common kind: stratum build-depends: - morph: strata/mesa-common.morph +- morph: strata/x-common.morph chunks: - name: pixman repo: upstream:pixman diff --git a/strata/input-common.morph b/strata/input-common.morph index 533eff22..dad71041 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -22,8 +22,8 @@ chunks: build-depends: [] - name: libinput repo: upstream:libinput - ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f - unpetrify-ref: 0.7.0 + ref: fd8a29fb692404ace405631012d0b708362b1fa0 + unpetrify-ref: 0.9.0 build-depends: - mtdev - libevdev diff --git a/strata/lorry.morph b/strata/lorry.morph index 364f8f87..17f845cf 100644 --- a/strata/lorry.morph +++ b/strata/lorry.morph @@ -114,7 +114,7 @@ chunks: - name: lorry morph: strata/lorry/lorry.morph repo: baserock:baserock/lorry - ref: c972012707f6555de6cf636d8eb5e2bf6e8ebf87 + ref: 4fcff82742ce3325a860c060b597ff281872c594 unpetrify-ref: master build-depends: - bzr-tarball diff --git a/strata/openstack-clients.morph b/strata/openstack-clients.morph index 616a8762..c4775219 100644 --- a/strata/openstack-clients.morph +++ b/strata/openstack-clients.morph @@ -2,6 +2,7 @@ name: openstack-clients kind: stratum description: A stratum with OpenStack clients, for OpenStack deployments. build-depends: +- morph: strata/python-core.morph - morph: strata/tools.morph chunks: - name: jsonschema @@ -33,11 +34,6 @@ chunks: ref: 941133673e5a0003cd5ce1b6db2a51cf3307d9c1 unpetrify-ref: baserock/morph build-depends: [] -- name: pbr - repo: upstream:pbr - ref: 510ee9e9dcb94c5884c215fa3535a1f77f3d2a51 - unpetrify-ref: baserock/morph - build-depends: [] - name: argparse repo: upstream:argparse ref: c9b3f9b32949cb7dd798e7d1aedbeeef064aa4b1 @@ -85,7 +81,6 @@ chunks: ref: 21cc66a850c5ea1d2ffffb655da0c452b919ed3b unpetrify-ref: baserock/morph build-depends: - - pbr - pyiso8601 - python-prettytable - python-requests @@ -98,7 +93,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-prettytable - - pbr - argparse - pyopenssl - python-keystoneclient @@ -109,7 +103,6 @@ chunks: unpetrify-ref: baserock/morph build-depends: - python-prettytable - - pbr - argparse - pyiso8601 - python-requests diff --git a/strata/python-core.morph b/strata/python-core.morph new file mode 100644 index 00000000..a76262f4 --- /dev/null +++ b/strata/python-core.morph @@ -0,0 +1,17 @@ +name: python-core +kind: stratum +description: Core python packages +build-depends: +- morph: strata/core.morph +chunks: +- name: pip + repo: upstream:pip + ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 + unpetrify-ref: baserock/master + build-depends: [] +- name: pbr + repo: upstream:pbr + ref: aef4f7ef4faec987d553d1ca40b55951235af0b1 + unpetrify-ref: 0.10.7 + build-depends: + - pip diff --git a/strata/python-tools.morph b/strata/python-tools.morph index 0a707bc6..d1ce912d 100644 --- a/strata/python-tools.morph +++ b/strata/python-tools.morph @@ -5,8 +5,8 @@ useful python tools that we don't want to include in core." build-depends: - morph: strata/core.morph chunks: -- name: pip - repo: upstream:pip - ref: ea680f204fb0e48789710c22c8f597a9bf01bc16 - unpetrify-ref: baserock/master +- name: virtualenv + repo: upstream:python-packages/virtualenv + ref: 9205ff46a67130e8835f14bb4f802fd59e7dcf2c + unpetrify-ref: 12.0.5 build-depends: [] diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 0d877a62..066f62a0 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -8,6 +8,6 @@ chunks: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph repo: upstream:qt-creator - ref: v3.2.1 - unpetrify-ref: baserock/morph/2.7 + ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 + unpetrify-ref: baserock/3.3.0 build-depends: [] diff --git a/strata/tools.morph b/strata/tools.morph index fea33132..4d8c3f44 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -49,12 +49,18 @@ chunks: ref: ad232c6aa0c2a07830d61dc4b9912478634b23b5 unpetrify-ref: baserock/morph build-depends: [] -- name: vala - morph: strata/tools/vala.morph +- name: vala-bootstrap + morph: strata/tools/vala-bootstrap.morph repo: upstream:vala ref: 4e4a02c03445336237b36723b23a91670ef7621b unpetrify-ref: baserock/bootstrap build-depends: [] +- name: vala + repo: upstream:vala + ref: 682eba5880fbd76402dec10118883da913a7b255 + unpetrify-ref: 0.26.2 + build-depends: + - vala-bootstrap - name: u-boot morph: strata/tools/u-boot.morph repo: upstream:u-boot diff --git a/strata/tools/vala.morph b/strata/tools/vala-bootstrap.morph index dcac5d49..c09299f6 100644 --- a/strata/tools/vala.morph +++ b/strata/tools/vala-bootstrap.morph @@ -1,4 +1,4 @@ -name: vala +name: vala-bootstrap kind: chunk build-system: autotools configure-commands: diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 890489dc..164db34b 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -13,7 +13,7 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: 339e83aa579569711cd14623ca4b2db46256b766 - unpetrify-ref: 1.6.0 + ref: 52d971c924d0147d6949096c9cf001d75828a054 + unpetrify-ref: 1.6.93 build-depends: - libxkbcommon diff --git a/strata/weston-common.morph b/strata/weston-common.morph index 1d5b015c..f79510c8 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -7,15 +7,9 @@ build-depends: - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: -- name: linux-pam - repo: upstream:linux-pam - ref: b1521c97e73b10469f7b34c0571d51c647eca83c - unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston - ref: 463b914d4f1efbf5de6d1f45e9037b88a1eb107f - unpetrify-ref: baserock/weston-1.6.0/tegra - build-depends: - - linux-pam + ref: 06315ce5b9569e02ec4e7d322d933bc247620aff + unpetrify-ref: baserock/weston-1.6.93/tegra + build-depends: [] diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph index 2efd662e..c49b8d5b 100644 --- a/strata/weston-common/weston.morph +++ b/strata/weston-common/weston.morph @@ -4,6 +4,4 @@ build-system: autotools configure-commands: - | ./autogen.sh --prefix="$PREFIX" \ - --disable-xwayland \ - --disable-x11-compositor \ --enable-demo-clients-install diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index d47d0ac4..ce403b6b 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -7,18 +7,12 @@ build-depends: - morph: strata/libdrm-common.morph - morph: strata/wayland-generic.morph chunks: -- name: linux-pam - repo: upstream:linux-pam - ref: b1521c97e73b10469f7b34c0571d51c647eca83c - unpetrify-ref: Linux-PAM-1.1.8 - build-depends: [] - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6 unpetrify-ref: baserock/genivi/1.3.0 - build-depends: - - linux-pam + build-depends: [] - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension diff --git a/strata/x-common.morph b/strata/x-common.morph index 8c0bba1d..8191b30f 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -98,21 +98,11 @@ chunks: ref: f805b328b2195de384c0fb6b82ef5f88c179b2c0 unpetrify-ref: baserock/morph build-depends: [] -- name: xorg-proto-xf86dgaproto - repo: upstream:xorg-proto-xf86dgaproto - ref: c52b205c3175309be7952774668c87dd2d5ce30e - unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-xf86driproto repo: upstream:xorg-proto-xf86driproto ref: cb03b8d49bf063860859c1ed8bcecd055551e93a unpetrify-ref: baserock/morph build-depends: [] -- name: xorg-proto-xf86vidmodeproto - repo: upstream:xorg-proto-xf86vidmodeproto - ref: 15c05b263eb6cc0eaa7ab49c39fe489613d6d796 - unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-proto-x11proto repo: upstream:xorg-proto-x11proto ref: 03cbbf6c3e811c026c86e3a60d2f9af56606e155 @@ -165,13 +155,10 @@ chunks: unpetrify-ref: libX11-1.6.2 build-depends: - xcb-libxcb - - xorg-lib-libXau - xorg-lib-libxtrans - - xorg-proto-bigreqsproto - xorg-proto-inputproto - xorg-proto-kbproto - xorg-proto-x11proto - - xorg-proto-xcmiscproto - xorg-proto-xextproto - xorg-proto-xf86bigfontproto - name: xorg-lib-libXext @@ -193,12 +180,6 @@ chunks: - xorg-proto-inputproto - xorg-proto-x11proto - xorg-proto-xextproto -- name: xorg-util-makedepend - repo: upstream:xorg-util-makedepend - ref: 87fd28cd5a5acfe6e91c97c4af0a469e1e86cbd5 - unpetrify-ref: baserock/morph - build-depends: - - xorg-proto-x11proto - name: xorg-lib-libXfixes repo: upstream:xorg-lib-libXfixes ref: 0cb446962381f750e05d97bfb974ca1e32481d5d @@ -206,14 +187,6 @@ chunks: build-depends: - xorg-lib-libXext - xorg-proto-fixesproto -- name: xorg-lib-libXcomposite - repo: upstream:xorg-lib-libXcomposite - ref: eda48b1bedaa344ada8e13930c9ab3058b836190 - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libX11 - - xorg-lib-libXfixes - - xorg-proto-compositeproto - name: xorg-lib-libXrender repo: upstream:xorg-lib-libXrender ref: 1af52cb334377611233d7dc156bc1e6f7923756d @@ -232,24 +205,6 @@ chunks: - xorg-proto-randrproto - xorg-proto-renderproto - xorg-proto-xextproto -- name: xorg-lib-libXinerama - repo: upstream:xorg-lib-libXinerama - ref: 470b9356af961ff7d3968b164aa73872b49a5dcc - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libX11 - - xorg-lib-libXext - - xorg-proto-xextproto - - xorg-proto-xineramaproto -- name: xorg-lib-libdmx - repo: upstream:xorg-lib-libdmx - ref: 9f470c92bc2d194c8abb9154f42864e6c82f43ef - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libX11 - - xorg-lib-libXext - - xorg-proto-dmxproto - - xorg-proto-xextproto - name: xorg-lib-libXtst repo: upstream:xorg-lib-libXtst ref: 2aafac9474a0a0a0c39797862f823255918cf368 @@ -261,15 +216,6 @@ chunks: - xorg-proto-inputproto - xorg-proto-recordproto - xorg-proto-xextproto -- name: xorg-lib-libXRes - repo: upstream:xorg-lib-libXRes - ref: 83e7693515369d57dcd11c2bb1f03563f51bc500 - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libX11 - - xorg-lib-libXext - - xorg-proto-resourceproto - - xorg-proto-xextproto - name: xorg-lib-libXdamage repo: upstream:xorg-lib-libXdamage ref: 0d35761dc39409b70e04dd0786aef6537f92976a @@ -287,26 +233,3 @@ chunks: - xorg-proto-fixesproto - xorg-lib-libXau - xorg-lib-libX11 -- name: xorg-proto-printproto - repo: upstream:xorg-proto-printproto - ref: cca2ca69d2a6b4b133dba69d5330499fbfe88257 - unpetrify-ref: baserock/morph - build-depends: [] -- name: xorg-lib-libXp - repo: upstream:xorg-lib-libXp - ref: 41aab7d289aba2aaf3839e96d0c9e2f15ede4bd1 - unpetrify-ref: baserock/morph - build-depends: - - xorg-proto-printproto - - xorg-proto-xextproto - - xorg-lib-libXext - - xorg-lib-libX11 -- name: xorg-lib-libXScrnSaver - repo: upstream:xorg-lib-libXScrnSaver - ref: f388a2ff259ee1c1c6058762e900bb29550e8246 - unpetrify-ref: baserock/morph - build-depends: - - xorg-proto-scrnsaverproto - - xorg-proto-xextproto - - xorg-lib-libXext - - xorg-lib-libX11 diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 84f685b0..572932b4 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -3,9 +3,15 @@ kind: stratum build-depends: - morph: strata/foundation.morph - morph: strata/libdrm-common.morph +- morph: strata/mesa-common.morph - morph: strata/x-common.morph - morph: strata/graphics-common.morph chunks: +- name: libepoxy + repo: upstream:libepoxy + ref: 7422de5b4be7b19d789136b3bb5f932de42db27c + unpetrify-ref: v1.2 + build-depends: [] - name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile ref: 7381c2f9013ef7784c78091fa671e652a62ca706 @@ -28,153 +34,19 @@ chunks: unpetrify-ref: libXfont-1.5.0 build-depends: - 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 morph: strata/x-generic/xserver.morph repo: upstream:xserver ref: 4393c7f1ba6140a02232f04fbb434a80d663a99d unpetrify-ref: xorg-server-1.16.2 build-depends: - - libsha1 + - libepoxy - 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: 214f9b5306d833e2787c75fe41dfdc9228fcb738 - unpetrify-ref: libXft-2.3.2 - build-depends: [] -- 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 - morph: strata/x-generic/util-keysyms.morph - 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/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph index f8495057..ca678331 100644 --- a/strata/x-generic/xserver.morph +++ b/strata/x-generic/xserver.morph @@ -2,4 +2,12 @@ name: xserver kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --with-sha1=libsha1 --disable-glx +- | + ./autogen.sh --prefix="$PREFIX" \ + --disable-glx \ + --disable-xorg \ + --disable-xvfb \ + --disable-xnest \ + --disable-xquartz \ + --disable-xwin \ + --enable-xwayland diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 509bd383..b03d1653 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -36,8 +36,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph -- name: python-tools - morph: strata/python-tools.morph +- name: python-core + morph: strata/python-core.morph - name: chef morph: strata/chef.morph configuration-extensions: diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 305f7a22..de474c87 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -27,6 +27,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 427dbb3f..2cce69d3 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -30,6 +30,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 1529522c..38806421 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -30,6 +30,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index 0f6aef58..c47be836 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -30,6 +30,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index 2b43bf65..64d75350 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -21,6 +21,8 @@ strata: morph: strata/openstack-clients.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 2e342fc3..3a84d178 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -24,6 +24,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index c50468a9..2e4b83bd 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -27,6 +27,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 4bae3ac8..17f8bcbb 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -31,6 +31,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index e542f067..c09caf96 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -31,6 +31,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index cda52c36..ffa9edd4 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -31,6 +31,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index c4918572..9e575d5d 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -25,6 +25,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index a53a6a56..d92da0fd 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -28,6 +28,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index 83e55316..3578c221 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -29,6 +29,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index 3ad441ca..b53d6d93 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -32,6 +32,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index 569a00d8..aa8d6a1c 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -29,6 +29,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 32ddfc56..c071b3ea 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -32,6 +32,8 @@ strata: morph: strata/baserock-import.morph - name: nfs morph: strata/nfs.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index 7ffddc02..c104b29b 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -30,6 +30,8 @@ strata: morph: strata/lorry.morph - name: baserock-import morph: strata/baserock-import.morph +- name: python-core + morph: strata/python-core.morph - name: python-tools morph: strata/python-tools.morph - name: devtools diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index 491a34bc..b84eaeb5 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -33,6 +33,10 @@ strata: morph: strata/mesa-common.morph - name: weston-common morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +- name: x-generic + morph: strata/x-generic.morph configuration-extensions: - set-hostname - add-config-files |