diff options
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/build-essential.morph | 6 | ||||
| -rw-r--r-- | strata/docutils.morph | 2 | ||||
| -rw-r--r-- | strata/genivi-demo-platform-libs.morph | 1 | ||||
| -rw-r--r-- | strata/genivi-demo-platform.morph | 1 | ||||
| -rw-r--r-- | strata/gnome.morph | 26 | ||||
| -rw-r--r-- | strata/input-common.morph | 2 | ||||
| -rw-r--r-- | strata/input-genivi.morph | 3 | ||||
| -rw-r--r-- | strata/qt5-tools.morph | 1 |
8 files changed, 25 insertions, 17 deletions
diff --git a/strata/build-essential.morph b/strata/build-essential.morph index 78063ce4..11cdf59b 100644 --- a/strata/build-essential.morph +++ b/strata/build-essential.morph @@ -270,6 +270,9 @@ chunks: ref: 50893291621658f355bc5b4d450a8d06a563053d unpetrify-ref: v1.2.8 build-system: autotools + artifacts: + zlib-libs: build-essential-minimal + build-depends: - stage2-binutils - stage2-busybox @@ -281,9 +284,6 @@ chunks: - stage2-make - stage2-reset-specs - glibc - artifacts: - zlib-libs: build-essential-minimal - - name: binutils morph: strata/build-essential/binutils.morph repo: upstream:binutils-tarball diff --git a/strata/docutils.morph b/strata/docutils.morph index 4329bb42..c36ae8ee 100644 --- a/strata/docutils.morph +++ b/strata/docutils.morph @@ -15,6 +15,7 @@ chunks: ref: c8f0ce32a8075e9ab21e5cf734fb96195455264d unpetrify-ref: docbook-xml-4.5 build-depends: + # This is a little awkward, we don't really build-depend on xml-catalog, # but if we don't include it as a build dependency # then we won't have the existing xml catalog in our staging area @@ -31,6 +32,7 @@ chunks: ref: 802da9dd5d4bc18f46a916eedc0c5c1980a15e59 unpetrify-ref: docbook-xsl-1.78.1 build-depends: + # Same issue as above, except this time we don't want to overwrite # the catalog that now contains the XML DTDs. - docbook-xml diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph index 07af27f4..e0df3d29 100644 --- a/strata/genivi-demo-platform-libs.morph +++ b/strata/genivi-demo-platform-libs.morph @@ -21,3 +21,4 @@ chunks: repo: upstream:dbus-python ref: d0d5b5be685dc4c16b21c54335becc87ca4d6f58 unpetrify-ref: dbus-python-1.2.0 + build-system: autotools diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 2abea75e..ab92a00f 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -37,6 +37,7 @@ chunks: - name: audiomanagerdemo repo: upstream:genivi/audiomanagerdemo ref: master + build-system: qmake - name: genivi-demo-platform-hmi morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph repo: upstream:genivi/genivi-demo-platform-hmi diff --git a/strata/gnome.morph b/strata/gnome.morph index 792a0953..fd5267b5 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -52,17 +52,17 @@ chunks: repo: upstream:yelp-xsl ref: 2dcf168dde754d18152b008473269a803d6e650b unpetrify-ref: master + build-system: autotools build-depends: - itstool - build-system: autotools - name: yelp-tools repo: upstream:yelp-tools ref: 6df6bf24e385bbc1ac0b800be8a6e878f18a775c unpetrify-ref: master + build-system: autotools build-depends: - itstool - yelp-xsl - build-system: autotools - name: iso-codes repo: upstream:iso-codes ref: 18ac112b4b84c8f03743565fde3512a637820761 @@ -72,11 +72,11 @@ chunks: repo: upstream:gnome/gnome-desktop ref: 1dbe40fac0e9924552ce2692ec141e86ce3d5633 unpetrify-ref: master + build-system: autotools build-depends: - gsettings-desktop-schemas - iso-codes - yelp-tools - build-system: autotools - name: libnotify repo: upstream:gnome/libnotify ref: 2f2c5649ef210b1dffeb46cddf062d20e1518ccf @@ -133,18 +133,18 @@ chunks: repo: upstream:colord ref: e68f251b753297fcd1fc2bb7356588945bd3e69b unpetrify-ref: baserock/gnome + build-system: autotools build-depends: - gusb - lcms2 - polkit - build-system: autotools - name: geocode-glib repo: upstream:gnome/geocode-glib ref: a3e183e40053b4bd0fd0b25a070f60597270397a unpetrify-ref: master + build-system: autotools build-depends: - json-glib - build-system: autotools - name: libmbim repo: upstream:libmbim ref: 6cf74ebfae1dccf807bb34d88f2cd024d4b14da7 @@ -159,11 +159,11 @@ chunks: repo: upstream:ModemManager ref: 0ca68657fbcd5bace3d303a0babe2da292784385 unpetrify-ref: master + build-system: autotools build-depends: - libmbim - libqmi - polkit - build-system: autotools - name: geoclue morph: strata/gnome/geoclue.morph repo: upstream:geoclue @@ -176,9 +176,9 @@ chunks: repo: upstream:gnome/libgweather ref: 5b8aed611f24d03434eed35e438cea213b894b7c unpetrify-ref: master + build-system: autotools build-depends: - geocode-glib - build-system: autotools - name: gnome-settings-daemon morph: strata/gnome/gnome-settings-daemon.morph repo: upstream:gnome-settings-daemon @@ -200,9 +200,9 @@ chunks: repo: upstream:zenity ref: d7135db2bdfdca812c0165f90e4611af9c7c6a50 unpetrify-ref: master + build-system: autotools build-depends: - yelp-tools - build-system: autotools - name: mozjs24 morph: strata/gnome/mozjs24.morph repo: upstream:mozilla/mozjs24 @@ -212,9 +212,9 @@ chunks: repo: upstream:gjs ref: 5d480f519e2b7e95cf1fad2f9f1a8e798fd5fe49 unpetrify-ref: master + build-system: autotools build-depends: - mozjs24 - build-system: autotools - name: telepathy-glib morph: strata/gnome/telepathy-glib.morph repo: upstream:telepathy-glib @@ -241,9 +241,9 @@ chunks: repo: upstream:gnome/gcr ref: 1cce27499bcac6072e4ee516eaa1546eac56d687 unpetrify-ref: master + build-system: autotools build-depends: - p11-kit - build-system: autotools - name: libxkbcommon-x11 repo: upstream:xorg-lib-libxkbcommon ref: c43c3c866eb9d52cd8f61e75cbef1c30d07f3a28 @@ -253,6 +253,7 @@ chunks: repo: upstream:mutter ref: 35729e8659cc99f45d3564c33d44a475f20d0060 unpetrify-ref: 3.18.0 + build-system: autotools build-depends: - clutter - cogl @@ -263,14 +264,13 @@ chunks: - startup-notification - upower - zenity - build-system: autotools - name: libxklavier repo: upstream:libxklavier ref: 65c132a65e90a42e898f07243ef544109ada53c9 unpetrify-ref: master + build-system: autotools build-depends: - iso-codes - build-system: autotools - name: m4-common repo: upstream:m4-common ref: 4b704704f5e826b73b79ccfddaf215a510c104c4 @@ -280,9 +280,9 @@ chunks: repo: upstream:gnome/libgee ref: 4301ab58efc217409c588a5527f68990b4e3d220 unpetrify-ref: master + build-system: autotools build-depends: - m4-common - build-system: autotools - name: caribou morph: strata/gnome/caribou.morph repo: upstream:caribou diff --git a/strata/input-common.morph b/strata/input-common.morph index c2ac35d7..9e484c63 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -34,4 +34,4 @@ chunks: morph: strata/input-common/libxkbcommon-no-x11.morph unpetrify-ref: xkbcommon-0.5.0 build-depends: - - xkeyboard-config + - xkeyboard-config diff --git a/strata/input-genivi.morph b/strata/input-genivi.morph index 7aa6f942..41caf7cb 100644 --- a/strata/input-genivi.morph +++ b/strata/input-genivi.morph @@ -8,6 +8,7 @@ chunks: repo: upstream:mtdev-git ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: v1.1.5 + build-system: autotools - name: xkeyboard-config morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config @@ -17,10 +18,12 @@ chunks: repo: upstream:libevdev ref: 7ac00d7e920c56bb8617403699030a5300bfae1c unpetrify-ref: libevdev-1.3.2 + build-system: autotools - name: libinput@genivi repo: upstream:libinput ref: 06e2f522a4ab5ea0a1de68cce1b5f9fff568ed4f unpetrify-ref: 0.7.0 + build-system: autotools build-depends: - mtdev - libevdev diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index cb9c7c70..b0ac0ba3 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -138,5 +138,6 @@ chunks: - name: qtwayland repo: upstream:qt5/qtwayland ref: baserock/genivi-5.4.0-wip + build-system: qmake build-depends: - qtbase |