From e7c059379f91256acb44755b14a8a62cb6fecb79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 8 Jan 2016 14:31:54 +0000 Subject: clusters/ci.morph: Add minimal-system-x86_64-generic To avoid break it as happenned several times in the past Change-Id: I2dc2a94b573f3901c4fa4d3bd79dcb6dcdd6f2b7 --- clusters/ci.morph | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/clusters/ci.morph b/clusters/ci.morph index 95d6d0f7..a7469512 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -6,6 +6,13 @@ description: | This cluster morph is for use by the Mason Continuous Delivery pipeline during development. systems: +- morph: systems/minimal-system-x86_64-generic.morph + deploy: + minimal-system-x86_64-generic: + type: extensions/rawdisk + location: minimal-system-x86_64-generic.img + DISK_SIZE: 512M + INIT_SYSTEM: busybox - morph: systems/devel-system-x86_64-generic.morph deploy: devel-system-x86_64-generic: -- cgit v1.2.1 From 2948184569398e0dc19ac8c3782b765822edc0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 5 Jan 2016 17:41:09 +0000 Subject: Move less from devtools to coreutils-common So we can use the real less instead the one provided by busybox Change-Id: Id57519986212ceda1ac4e635208b6d2f9da1c143 --- strata/coreutils-common.morph | 5 +++++ strata/devtools.morph | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 2ad2d866..8acb41a8 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -38,3 +38,8 @@ chunks: repo: upstream:findutils ref: ee6b25541336f9d74624ca814538ddc8c67f0732 unpetrify-ref: baserock/v4.5.14 +- name: less + repo: upstream:less + ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 + unpetrify-ref: baserock/morph + build-system: autotools diff --git a/strata/devtools.morph b/strata/devtools.morph index ae50096b..9f5f7932 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -30,11 +30,6 @@ chunks: repo: upstream:screen ref: 7dd4a9e5f385c96a77e8ee5c977a1dde4c0ff467 unpetrify-ref: baserock/morph -- name: less - repo: upstream:less - ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 - unpetrify-ref: baserock/morph - build-system: autotools - name: git-review repo: upstream:git-review ref: 79262a52301c146a6b60d09a828661a83a5f5ba7 -- cgit v1.2.1 From 942a12a6c1957855d99b6369989369a63c1e9789 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 1 Mar 2016 16:19:36 +0000 Subject: Update licensecheck.py and strip-gplv3.configure Change-Id: I3149413c2126194c538105d26b93fde9a8298ed0 --- extensions/strip-gplv3.configure | 4 +++- scripts/licensecheck.py | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extensions/strip-gplv3.configure b/extensions/strip-gplv3.configure index bf28223d..2dac0907 100755 --- a/extensions/strip-gplv3.configure +++ b/extensions/strip-gplv3.configure @@ -32,6 +32,7 @@ import writeexts class StripGPLv3ConfigureExtension(writeexts.Extension): gplv3_chunks = [ ['autoconf', ''], + ['autoconf-tarball', ''], ['automake', ''], ['bash', ''], ['binutils', ''], @@ -42,10 +43,11 @@ class StripGPLv3ConfigureExtension(writeexts.Extension): ['gawk', ''], ['gcc', r'^.*lib.*\.so(\.\d+)*$'], ['gdbm', ''], - ['gettext', ''], + ['gettext-tarball', ''], ['gperf', ''], ['groff', ''], ['libtool', r'^.*lib.*\.so(\.\d+)*$'], + ['libtool-tarball', r'^.*lib.*\.so(\.\d+)*$'], ['m4', ''], ['make', ''], ['nano', ''], diff --git a/scripts/licensecheck.py b/scripts/licensecheck.py index c5f72f07..4b255dcc 100755 --- a/scripts/licensecheck.py +++ b/scripts/licensecheck.py @@ -27,6 +27,7 @@ import yaml gpl3_chunks = ("autoconf", + "autoconf-tarball", "automake", "bash", "binutils", @@ -37,10 +38,11 @@ gpl3_chunks = ("autoconf", "gawk", "gcc", "gdbm", - "gettext", + "gettext-tarball", "gperf", "groff", "libtool", + "libtool-tarball", "m4-tarball", "make", "nano", -- cgit v1.2.1 From ebc2d75da576116da795b99d6d3d9e3b89ba29ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 30 Oct 2015 10:32:56 +0000 Subject: Add gnome-system-armv7lhf-jetson-deploy cluster Change-Id: I702950579be18ca807cc480610bfa73c2a8d58ba --- clusters/gnome-system-armv7lhf-jetson-deploy.morph | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 clusters/gnome-system-armv7lhf-jetson-deploy.morph diff --git a/clusters/gnome-system-armv7lhf-jetson-deploy.morph b/clusters/gnome-system-armv7lhf-jetson-deploy.morph new file mode 100644 index 00000000..c74f1209 --- /dev/null +++ b/clusters/gnome-system-armv7lhf-jetson-deploy.morph @@ -0,0 +1,17 @@ +name: gnome-system-armv7lhf-jetson-deploy +kind: cluster +description: Deploy a GNOME system. +systems: +- morph: systems/gnome-system-armv7lhf-jetson.morph + deploy: + gnome-system-armv7lhf-jetson: + type: extensions/rawdisk + location: gnome-system-armv7lhf-jetson.img + DISK_SIZE: 7G + BOOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 -- cgit v1.2.1 From 52a0fde6b6f5da9a9b686afe2640ca82ef4e70d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 1 Mar 2016 19:07:41 +0000 Subject: strata/foundation: Update libgcrypt to 1.5.5 Minor upgrade (we currently use 1.5.4) to fix: - CVE-2015-7511 - CVE-2014-3591 Change-Id: Idf138a5e8369fcb23f136c56e0eee500f6b9969f --- strata/foundation.morph | 5 +++-- strata/foundation/libgcrypt.morph | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 strata/foundation/libgcrypt.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index be983cca..b9fb8583 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -40,9 +40,10 @@ chunks: ref: d77c33ae608d67086ea057cca5ddee99a7202f8b unpetrify-ref: libgpg-error-1.19 - name: libgcrypt + morph: strata/foundation/libgcrypt.morph repo: upstream:libgcrypt - ref: 412eed473b557ed2172d81d76fa1e1f53c973a67 - build-system: autotools + ref: e74d6f537498fea347b6073ba90c55d2693c4696 + unpetrify-ref: baserock/libgcrypt-1.5.5 build-depends: - libgpg-error - name: systemd diff --git a/strata/foundation/libgcrypt.morph b/strata/foundation/libgcrypt.morph new file mode 100644 index 00000000..78018a48 --- /dev/null +++ b/strata/foundation/libgcrypt.morph @@ -0,0 +1,5 @@ +name: libgcrypt +kind: chunk +build-system: autotools +pre-configure-commands: +- autoreconf -fi -- cgit v1.2.1 From 0c12d7f38acd3f4f59374e3db3373b7dbc997116 Mon Sep 17 00:00:00 2001 From: Daniel Firth Date: Thu, 25 Feb 2016 20:30:36 +0000 Subject: Add elixir Change-Id: I5d2ff541f3a1960a4cfcd34d02bf40a684eb0f0b --- strata/elixir.morph | 11 +++++++++++ strata/elixir/elixir.morph | 6 ++++++ strata/erlang.morph | 4 ++-- systems/devel-system-x86_64-generic.morph | 4 ++++ 4 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 strata/elixir.morph create mode 100644 strata/elixir/elixir.morph diff --git a/strata/elixir.morph b/strata/elixir.morph new file mode 100644 index 00000000..dd46ed64 --- /dev/null +++ b/strata/elixir.morph @@ -0,0 +1,11 @@ +name: elixir +kind: stratum +description: stratum for elixir +build-depends: +- morph: strata/erlang.morph +chunks: +- name: elixir + morph: strata/elixir/elixir.morph + repo: upstream:elixir + ref: 737ac62926db7a692e2fe67c27b696cfd0866674 + unpetrify-ref: v1.2.3 diff --git a/strata/elixir/elixir.morph b/strata/elixir/elixir.morph new file mode 100644 index 00000000..1efbea87 --- /dev/null +++ b/strata/elixir/elixir.morph @@ -0,0 +1,6 @@ +name: elixir +kind: chunk +build-commands: +- make clean +install-commands: +- make install diff --git a/strata/erlang.morph b/strata/erlang.morph index 5eae200b..8f92dadb 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -7,8 +7,8 @@ chunks: - name: erlang morph: strata/erlang/erlang.morph repo: upstream:erlang - ref: 9417f044ee3c291c2ea343c203aebdcc40597226 - unpetrify-ref: OTP-17.3.4 + ref: d646221c59fbf57d5beac913248b46f5dbebfbe7 + unpetrify-ref: OTP-18.2.4 - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 1dde180f..9cd0242a 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -64,6 +64,10 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: erlang + morph: strata/erlang.morph +- name: elixir + morph: strata/elixir.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files -- cgit v1.2.1 From 39e2deeb186916a583717f5c2b6e6d04d9434954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 2 Mar 2016 07:47:57 +0000 Subject: strata/core.morph: Upgrade libxml2 to v2.9.3 This release fixes: CVE-2013-2877 CVE-2014-0191 CVE-2014-3660 CVE-2015-1819 CVE-2015-5312 CVE-2015-7497 CVE-2015-7498 CVE-2015-7499 CVE-2015-7500 CVE-2015-7941 CVE-2015-7942 CVE-2015-8035 CVE-2015-8242 Change-Id: I0b156764126261b9c02f27f561ec646527fee49d --- strata/core.morph | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 55525d91..9553fec1 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -332,15 +332,16 @@ chunks: - file - name: libxml2 repo: upstream:libxml2 - ref: f4e5a6994ed230dfa3fb5b5c3fd94c4993ef1ba7 - unpetrify-ref: v2.9.1 + ref: 6657afe83a38278f124ace71dc85f60420beb2d5 + unpetrify-ref: v2.9.3 build-system: autotools build-depends: - autoconf - automake - file - - python3 - libtool + - pkg-config + - python3 - xz - name: libxslt repo: upstream:libxslt -- cgit v1.2.1 From 5237522fdab17e776e0b1f48709622e96ed4611e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 2 Mar 2016 08:59:09 +0000 Subject: strata/python2-core.morph: Upgrade libxml2-python2 to v2.9.3 This release fixes: CVE-2013-2877 CVE-2014-0191 CVE-2014-3660 CVE-2015-1819 CVE-2015-5312 CVE-2015-7497 CVE-2015-7498 CVE-2015-7499 CVE-2015-7500 CVE-2015-7941 CVE-2015-7942 CVE-2015-8035 CVE-2015-8242 This completes commit 39e2deeb186916a583717f5c2b6e6d04d9434954 Change-Id: I24048cac5bb852b2e1556c6398ec535cc9ddd606 --- strata/python2-core.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/python2-core.morph b/strata/python2-core.morph index 7e6b6310..aa6fe2e5 100644 --- a/strata/python2-core.morph +++ b/strata/python2-core.morph @@ -91,8 +91,8 @@ chunks: - name: libxml2-python2 repo: upstream:libxml2 - ref: f4e5a6994ed230dfa3fb5b5c3fd94c4993ef1ba7 - unpetrify-ref: v2.9.1 + ref: 6657afe83a38278f124ace71dc85f60420beb2d5 + unpetrify-ref: v2.9.3 build-system: autotools build-depends: - python2 -- cgit v1.2.1 From 3e83dc8c8ed281c795bb94c73076480a2d33531f Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 1 Mar 2016 21:04:49 +0000 Subject: Enable 'hosts' extension in build systems Change-Id: I7addcd79ffe6389556302e82ad00fd7706d99640 --- systems/build-system-armv5l-openbmc-aspeed.morph | 1 + systems/build-system-armv7l-altera-socfpga-devkit.morph | 1 + systems/build-system-armv7lhf-highbank.morph | 1 + systems/build-system-armv7lhf-jetson.morph | 1 + systems/build-system-armv7lhf-rootfs.morph | 1 + systems/build-system-armv8b64.morph | 1 + systems/build-system-armv8l64.morph | 1 + systems/build-system-ppc64.morph | 1 + systems/build-system-x86_32-chroot.morph | 1 + systems/build-system-x86_32.morph | 1 + systems/build-system-x86_64-chroot.morph | 1 + systems/build-system-x86_64.morph | 1 + 12 files changed, 12 insertions(+) diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph index 699f8b7e..0ceb975e 100644 --- a/systems/build-system-armv5l-openbmc-aspeed.morph +++ b/systems/build-system-armv5l-openbmc-aspeed.morph @@ -42,3 +42,4 @@ configuration-extensions: - extensions/install-files - extensions/fstab - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph index 813392cb..f1e89121 100644 --- a/systems/build-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/build-system-armv7l-altera-socfpga-devkit.morph @@ -46,3 +46,4 @@ configuration-extensions: - extensions/fstab - extensions/mason - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 752655af..737c2dc4 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -56,3 +56,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index 928d4c9f..ba8665e2 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -54,3 +54,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-armv7lhf-rootfs.morph b/systems/build-system-armv7lhf-rootfs.morph index 0cdfc804..0d331f4b 100644 --- a/systems/build-system-armv7lhf-rootfs.morph +++ b/systems/build-system-armv7lhf-rootfs.morph @@ -52,3 +52,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index 75864921..df24d98e 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -56,3 +56,4 @@ configuration-extensions: - extensions/cloud-init - extensions/moonshot-kernel - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index da6e45a1..83e6b3ed 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -56,3 +56,4 @@ configuration-extensions: - extensions/cloud-init - extensions/moonshot-kernel - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 0e8bcfc1..20703ad7 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -54,3 +54,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index ba2d6b04..0edb4460 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -54,3 +54,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 61d339da..00645b58 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -54,3 +54,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 48463cd2..68ae7dac 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -54,3 +54,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 0abf5925..6e6bb512 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -54,3 +54,4 @@ configuration-extensions: - extensions/mason - extensions/cloud-init - extensions/install-essential-files +- extensions/hosts -- cgit v1.2.1 From 583e1f7c0dde3c2553135dc460ee9eca5bb62065 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 2 Mar 2016 09:42:53 +0000 Subject: Update to latest Morph New version includes some fixes for UnicodeDecodeError's using distbuild. It also includes some Warnings and Errors when there is a component name mismatch. Full list of changes: 7067e40 Fix copyright year of morphlib/morphloader.py 472dbbb Error when different names in system/strata c1aa6a4 Warning when different names in strata/chunks fb6dd95 Validate empty configure/build/test/install commands 7e15ed7 Avoid stack overflow in cachekeycomputer bda9fe5 Avoid UnicodeDecodeError when writing to log files c03b9c7 deploy: Fix an unlikely crash at deploy-time Change-Id: I1b61af0a53e4f0af9fbed39fda7e12b12f0e009c --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 25983404..6dd1633e 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -37,7 +37,7 @@ chunks: build-system: python-distutils - name: morph repo: baserock:baserock/morph - ref: 535443bcfa78568ecdd091a57e4aff64bfbf9638 + ref: 7067e405a7dad7976a9b7d61ed67fb8bb5042d3c unpetrify-ref: master build-system: python-distutils build-depends: -- cgit v1.2.1 From e72af94e2d938d8b839155859029c7cba65fc4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 19 Oct 2015 09:03:26 +0100 Subject: clusters/release.morph: Only generate build systems These systems are enough to build any other system using baserock. Other project can have different scheludes, and it doesnt scale that baserock build all the possible systems as part of its release process Other system can still being tested as part of our CIAT process, of course Change-Id: I1d4ed907a0eccbe85bdfd2804f2cb9154f881fdf --- clusters/release-genivi-baseline.morph | 41 ++++++++++++++++++++++++++++++++++ clusters/release.morph | 35 ----------------------------- 2 files changed, 41 insertions(+), 35 deletions(-) create mode 100644 clusters/release-genivi-baseline.morph diff --git a/clusters/release-genivi-baseline.morph b/clusters/release-genivi-baseline.morph new file mode 100644 index 00000000..f7e07042 --- /dev/null +++ b/clusters/release-genivi-baseline.morph @@ -0,0 +1,41 @@ +name: release-genivi-baseline +kind: cluster +description: | + Deploy GENIVI Baseline systems +systems: +- morph: systems/genivi-baseline-system-x86_64-generic.morph + deploy: + genivi-baseline-system-x86_64-generic: + type: extensions/rawdisk + location: genivi-baseline-system-x86_64-generic.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + HOSTNAME: genivi-baseline-system-x86-64-generic + GENIVI_WESTON_BACKEND: fbdev + GENIVI_WESTON_CONFIG: baseline + GENIVI_WESTON_AUTOSTART: False + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + initramfs-genivi-baseline-system-x86_64-generic: + type: extensions/initramfs + location: boot/initramfs.gz +- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph + deploy: + genivi-baseline-system-armv7lhf-jetson: + type: extensions/rawdisk + location: genivi-baseline-system-armv7lhf-jetson.img + DISK_SIZE: 4G + BOOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 + HOSTNAME: genivi-baseline-system-armv7lhf-jetson + GENIVI_WESTON_BACKEND: drm + GENIVI_WESTON_CONFIG: baseline + GENIVI_WESTON_AUTOSTART: False + diff --git a/clusters/release.morph b/clusters/release.morph index dfba8ec0..fe07665f 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -60,38 +60,3 @@ systems: KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 HOSTNAME: build-system-armv7lhf-jetson -- morph: systems/genivi-baseline-system-x86_64-generic.morph - deploy: - genivi-baseline-system-x86_64-generic: - type: extensions/rawdisk - location: genivi-baseline-system-x86_64-generic.img - DISK_SIZE: 4G - KERNEL_ARGS: vga=788 - INITRAMFS_PATH: boot/initramfs.gz - HOSTNAME: genivi-baseline-system-x86-64-generic - GENIVI_WESTON_BACKEND: fbdev - GENIVI_WESTON_CONFIG: baseline - GENIVI_WESTON_AUTOSTART: False - subsystems: - - morph: systems/initramfs-x86_64.morph - deploy: - initramfs-genivi-baseline-system-x86_64-generic: - type: extensions/initramfs - location: boot/initramfs.gz -- morph: systems/genivi-baseline-system-armv7lhf-jetson.morph - deploy: - genivi-baseline-system-armv7lhf-jetson: - type: extensions/rawdisk - location: genivi-baseline-system-armv7lhf-jetson.img - DISK_SIZE: 4G - BOOT_DEVICE: /dev/mmcblk0p1 - ROOT_DEVICE: /dev/mmcblk0p2 - DTB_PATH: boot/tegra124-jetson-tk1.dtb - BOOTLOADER_CONFIG_FORMAT: extlinux - BOOTLOADER_INSTALL: none - KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 - nouveau.pstate=1 - HOSTNAME: genivi-baseline-system-armv7lhf-jetson - GENIVI_WESTON_BACKEND: drm - GENIVI_WESTON_CONFIG: baseline - GENIVI_WESTON_AUTOSTART: False -- cgit v1.2.1 From 175a1605727a9a3c25ed2e2ca56d9256fd395429 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 2 Mar 2016 17:49:44 +0000 Subject: foundation: Add python-systemd Change-Id: I1d11d7b5ea5cb339648467adecc8b5f152f9bc28 --- strata/foundation.morph | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/strata/foundation.morph b/strata/foundation.morph index b9fb8583..fcb57dbb 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -110,3 +110,10 @@ chunks: repo: upstream:rsync ref: 7cb0de6326c915a72253fd103dae93308031ec3f unpetrify-ref: v3.1.1 +- name: python-systemd + build-system: python3-distutils + repo: upstream:python-packages/python-systemd + ref: 8ccd64789ab030b76a99b578b5b1e9812b7a8cd8 + unpetrify-ref: v231 + build-depends: + - systemd -- cgit v1.2.1 From ca999848622886afff8e08a02974433afbb1b2c8 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 2 Mar 2016 17:51:14 +0000 Subject: Add fail2ban-common stratum Change-Id: I32d996d8ce2c29d705ee8d35d83c141b044245bd --- strata/fail2ban-common.morph | 14 ++++++++++++++ strata/fail2ban-common/fail2ban.morph | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 strata/fail2ban-common.morph create mode 100644 strata/fail2ban-common/fail2ban.morph diff --git a/strata/fail2ban-common.morph b/strata/fail2ban-common.morph new file mode 100644 index 00000000..a6d1b175 --- /dev/null +++ b/strata/fail2ban-common.morph @@ -0,0 +1,14 @@ +name: fail2ban-common +kind: stratum +description: | + This stratum only installs fail2ban. You will need to + configure it afterwards. It's recommended to include + iptables in the system too. +build-depends: +- morph: strata/core.morph +chunks: +- name: fail2ban + morph: strata/fail2ban-common/fail2ban.morph + repo: upstream:fail2ban + ref: 70ba5cb0054f0869930b8cd2dc1bb836653dd289 + unpetrify-ref: "0.9.3" diff --git a/strata/fail2ban-common/fail2ban.morph b/strata/fail2ban-common/fail2ban.morph new file mode 100644 index 00000000..2f267a5a --- /dev/null +++ b/strata/fail2ban-common/fail2ban.morph @@ -0,0 +1,6 @@ +name: fail2ban +kind: chunk +build-system: python3-distutils +post-install-commands: +- install -D -m 640 files/fail2ban.service "$DESTDIR"/"$PREFIX"/lib/systemd/system/fail2ban.service +- install -D -m 640 files/fail2ban-tmpfiles.conf "$DESTDIR"/"$PREFIX"/lib/tmpfiles.d/fail2ban.conf -- cgit v1.2.1 From e3c469b927812a26b26416b7d030dbdc8c7a2788 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 3 Mar 2016 10:45:35 +0000 Subject: Add fail2ban and connectivity to Trove system This will allow users configure fail2ban, using iptables as a banning method. Change-Id: I6e055990790eacc5c7254eab35eb7fd261ea2065 --- systems/trove-system-x86_64.morph | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/systems/trove-system-x86_64.morph b/systems/trove-system-x86_64.morph index 43fd19fa..09838777 100644 --- a/systems/trove-system-x86_64.morph +++ b/systems/trove-system-x86_64.morph @@ -51,6 +51,10 @@ strata: morph: strata/cloudinit-support.morph - name: devtools morph: strata/devtools.morph +- name: fail2ban-common + morph: strata/fail2ban-common.morph +- name: connectivity + morph: strata/connectivity.morph configuration-extensions: - extensions/set-hostname - extensions/trove -- cgit v1.2.1 From a6652bf61c4f4042e1d001ed9715b0857dbc792f Mon Sep 17 00:00:00 2001 From: Dan Firth Date: Thu, 3 Mar 2016 10:55:16 +0000 Subject: Add jq to coreutils-common Change-Id: Ibde8bf70de200a2f7cab22317e8d1257f2b5159b --- strata/coreutils-common.morph | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 8acb41a8..088276c5 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -43,3 +43,8 @@ chunks: ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 unpetrify-ref: baserock/morph build-system: autotools +- name: jq + repo: upstream:jq + ref: a5b5cbefb83935ce95ec62b9cadc8ec73026d33a + unpetrify-ref: jq-1.5 + build-system: autotools -- cgit v1.2.1 From f94f0330eb1d4011868910a0f7234559e48ceff7 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 4 Mar 2016 12:32:17 +0000 Subject: Add small python library for common(ish) code in scripts/ Change-Id: I74ab24ecdcda1c358a2c187f89685bdd8f949c55 --- scripts/check-unpetrify-refs.py | 32 ++++++---------------------- scripts/licensecheck.py | 19 +++++------------ scripts/organize-morphologies.py | 15 ++------------ scripts/scriptslib.py | 45 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 53 deletions(-) create mode 100644 scripts/scriptslib.py diff --git a/scripts/check-unpetrify-refs.py b/scripts/check-unpetrify-refs.py index 27792c4a..36eaa2d7 100755 --- a/scripts/check-unpetrify-refs.py +++ b/scripts/check-unpetrify-refs.py @@ -17,9 +17,10 @@ import os import sys import glob -import yaml import subprocess +import scriptslib + ''' Script for checking unpetrify-refs in strata. @@ -32,13 +33,6 @@ a missing or non-existent unpetrify-ref and if it fails to check the remote strata_dir = "strata" trove_host = "git.baserock.org" -aliases = { - 'baserock:': 'git://%(trove)s/baserock/', - 'freedesktop:': 'git://anongit.freedesktop.org/', - 'github:': 'git://github.com/', - 'gnome:': 'git://git.gnome.org/', - 'upstream:': 'git://%(trove)s/delta/' -} def ref_exists(remote, ref): output = subprocess.check_output( @@ -46,43 +40,29 @@ def ref_exists(remote, ref): stderr=subprocess.STDOUT).strip() return True if output else False -def get_repo_url(repo): - remote = repo[:repo.find(':') + 1] - return repo.replace(remote, aliases[remote]) - -def definitions_root(): - return subprocess.check_output( - ["git", "rev-parse", "--show-toplevel"]).strip() - -def load_yaml_file(yaml_file): - with open(yaml_file, 'r') as f: - return yaml.safe_load(f) - def main(args): - global trove_host, aliases + global trove_host opt = next(((i, j.split('=')[1]) for i, j in enumerate(args) if j.startswith("--trove-host=")), None) if opt: trove_host = opt[1] del args[opt[0]] - aliases = {k: v % {'trove': trove_host} for k, v in aliases.iteritems()} - if args: strata = args else: - strata_path = os.path.join(definitions_root(), strata_dir) + strata_path = os.path.join(scriptslib.definitions_root(), strata_dir) strata = glob.glob("%s/*.morph" % strata_path) for stratum in strata: path = os.path.relpath(stratum) - morphology = load_yaml_file(stratum) + morphology = scriptslib.load_yaml_file(stratum) for chunk in morphology['chunks']: unpetrify_ref = chunk.get("unpetrify-ref") if not unpetrify_ref: print ("%s: '%s' has no unpetrify-ref!" % (path, chunk['name'])) continue - remote = get_repo_url(chunk['repo']) + remote = scriptslib.parse_repo_alias(chunk['repo'], trove_host) try: if not ref_exists(remote, unpetrify_ref): print ("%s: unpetrify-ref for '%s' is not present on the " diff --git a/scripts/licensecheck.py b/scripts/licensecheck.py index 4b255dcc..59125ea1 100755 --- a/scripts/licensecheck.py +++ b/scripts/licensecheck.py @@ -23,7 +23,8 @@ import string import subprocess import sys import tempfile -import yaml + +import scriptslib gpl3_chunks = ("autoconf", @@ -51,16 +52,6 @@ gpl3_chunks = ("autoconf", "texinfo-tarball") -def definitions_root(): - return subprocess.check_output( - ["git", "rev-parse", "--show-toplevel"]).strip() - - -def load_yaml_file(yaml_file): - with open(yaml_file, 'r') as f: - return yaml.safe_load(f) - - def license_file_name(repo_name, sha, licenses_dir): license_file = os.path.join(licenses_dir, repo_name + '-' + sha) return license_file @@ -126,7 +117,7 @@ def check_repo_if_needed(name, repo, ref, repos_dir, licenses_dir): def check_stratum(stratum_file, repos_dir, licenses_dir): - stratum = load_yaml_file(stratum_file) + stratum = scriptslib.load_yaml_file(stratum_file) license_files = [] for chunk in stratum['chunks']: @@ -154,11 +145,11 @@ def main(): args = parser.parse_args() - system = load_yaml_file(args.system) + system = scriptslib.load_yaml_file(args.system) license_files = [] for stratum in system['strata']: stratum_file = stratum['morph'] - stratum_path = os.path.join(definitions_root(), stratum_file) + stratum_path = os.path.join(scriptslib.definitions_root(), stratum_file) license_files.extend(check_stratum(stratum_path, args.repos_dir, args.licenses_dir)) for chunk_repo, chunk_license in license_files: diff --git a/scripts/organize-morphologies.py b/scripts/organize-morphologies.py index abc8c739..3072c8f8 100755 --- a/scripts/organize-morphologies.py +++ b/scripts/organize-morphologies.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (C) 2014 Codethink Limited +# Copyright (C) 2014-2016 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -42,17 +42,6 @@ which has been moved. ''' -# NOTE: The following reimplements part of morphlib's remote repo cache stuff -def parse_repo_alias(repo): - domain, path = repo.split(':') - if domain == 'baserock': - repo = 'ssh://git@git.baserock.org/baserock/%s' % path - elif domain == 'upstream': - repo = 'ssh://git@git.baserock.org/delta/%s' % path - else: - raise Exception("I don't know how to parse the repo-alias \"%s\"" % repo) - return repo - def make_request(path): server_url = 'http://git.baserock.org:8080/' url = urlparse.urljoin(server_url, '/1.0/%s' % path) @@ -206,7 +195,7 @@ def download_chunks(morph, loader): else: raise err ref = chunk['ref'] - repo = parse_repo_alias(chunk['repo']) + repo = scriptslib.parse_repo_alias(chunk['repo']) try: print "\nDownloading %s from %s into %s" %(name, repo, chunk['morph']) chunk_str = cat_file(repo, ref, name) diff --git a/scripts/scriptslib.py b/scripts/scriptslib.py new file mode 100644 index 00000000..68470c28 --- /dev/null +++ b/scripts/scriptslib.py @@ -0,0 +1,45 @@ +# Copyright (C) 2016 Codethink Limited +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +# Small library of useful things for the scripts that live here. + +import yaml +import subprocess + + +aliases = { + 'baserock:': 'git://%(trove)s/baserock/', + 'freedesktop:': 'git://anongit.freedesktop.org/', + 'github:': 'git://github.com/', + 'gnome:': 'git://git.gnome.org/', + 'upstream:': 'git://%(trove)s/delta/' +} + +def parse_repo_alias(repo, trove_host='git.baserock.org'): + global aliases + remote = repo[:repo.find(':') + 1] + aliases = {k: v % {'trove': trove_host} for k, v in aliases.iteritems()} + try: + return repo.replace(remote, aliases[remote]) + except KeyError as e: + raise Exception("Unknown repo-alias \"%s\"" % repo) + +def definitions_root(): + return subprocess.check_output( + ["git", "rev-parse", "--show-toplevel"]).strip() + +def load_yaml_file(yaml_file): + with open(yaml_file, 'r') as f: + return yaml.safe_load(f) -- cgit v1.2.1 From f7f583f0c5ed026086a71d603b5e208364db03e5 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 4 Mar 2016 12:44:34 +0000 Subject: Make use of argparse in check-unpetrify-refs.py Change-Id: I60f8e45073b1268b31d4654b2ab8b6342fa1d6e1 --- scripts/check-unpetrify-refs.py | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/scripts/check-unpetrify-refs.py b/scripts/check-unpetrify-refs.py index 36eaa2d7..c70b680d 100755 --- a/scripts/check-unpetrify-refs.py +++ b/scripts/check-unpetrify-refs.py @@ -15,8 +15,8 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. import os -import sys import glob +import argparse import subprocess import scriptslib @@ -32,7 +32,6 @@ a missing or non-existent unpetrify-ref and if it fails to check the remote ''' strata_dir = "strata" -trove_host = "git.baserock.org" def ref_exists(remote, ref): output = subprocess.check_output( @@ -40,15 +39,17 @@ def ref_exists(remote, ref): stderr=subprocess.STDOUT).strip() return True if output else False -def main(args): - global trove_host - opt = next(((i, j.split('=')[1]) for i, j in enumerate(args) - if j.startswith("--trove-host=")), None) - if opt: - trove_host = opt[1] - del args[opt[0]] - if args: - strata = args +def main(): + parser = argparse.ArgumentParser( + description="Sanity checks unpetrify-refs in Baserock strata") + parser.add_argument("--trove-host", default="git.baserock.org", + help="Trove host to map repo aliases to") + parser.add_argument("strata", nargs="*", metavar="STRATA", + help="The strata to check (checks all by default)") + args = parser.parse_args() + + if args.strata: + strata = args.strata else: strata_path = os.path.join(scriptslib.definitions_root(), strata_dir) strata = glob.glob("%s/*.morph" % strata_path) @@ -62,7 +63,7 @@ def main(args): print ("%s: '%s' has no unpetrify-ref!" % (path, chunk['name'])) continue - remote = scriptslib.parse_repo_alias(chunk['repo'], trove_host) + remote = scriptslib.parse_repo_alias(chunk['repo'], args.trove_host) try: if not ref_exists(remote, unpetrify_ref): print ("%s: unpetrify-ref for '%s' is not present on the " @@ -72,4 +73,4 @@ def main(args): (path, remote, chunk['name'], e.output.strip())) if __name__ == "__main__": - main(sys.argv[1:]) + main() -- cgit v1.2.1 From 75cbcbe0ab505b13efefbf93dbc1f6f57f24c427 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 7 Mar 2016 16:32:24 +0000 Subject: cloud-init.configure: Fix use of MORPH_LOG_FD MORPH_LOG_FD exists so that deployment extensions can write detailed log info to a file. This extension doesn't output much detailed log info, but some of the Python ones do & it's really useful for debugging. With Morph, this extension seems to have been writing logs to a file named '3' rather than to the actual deployment log. With YBD, this extension crashed because MORPH_LOG_FD was unset. Extra logs will now go to stdout when deploying with YBD. Change-Id: I46ead092d0e071970e355c8539823836f28dd97b --- extensions/cloud-init.configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/extensions/cloud-init.configure b/extensions/cloud-init.configure index aa83e0e2..3bcc0909 100755 --- a/extensions/cloud-init.configure +++ b/extensions/cloud-init.configure @@ -22,6 +22,12 @@ set -e ROOT="$1" +# Write detailed logs to a special log file if set, otherwise everything +# goes to stdout. +if [ -z "$MORPH_LOG_FD" ]; then + MORPH_LOG_FD=1 +fi + ########################################################################## set -e @@ -56,7 +62,7 @@ for service_name in $cloud_init_services; do echo "Failed to configure cloud-init." exit 1 else - echo Enabling systemd service "$service_name" >"$MORPH_LOG_FD" + echo Enabling systemd service "$service_name" >&"$MORPH_LOG_FD" ln -sf "/$services_folder/$service_name" \ "$ROOT/etc/systemd/system/multi-user.target.wants/$service_name" fi -- cgit v1.2.1 From fdb8ee8bca04ca04b57433af6a445ea8d304257b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 9 Mar 2016 11:53:31 +0000 Subject: strata/core: no need to run bootstrap in a separate step This is already done in DEFAULT 'configure-commands' Change-Id: I43b29165a42c9951c17647dbba935135dae6f633 --- strata/core.morph | 2 +- strata/core/libtool.morph | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 strata/core/libtool.morph diff --git a/strata/core.morph b/strata/core.morph index 9553fec1..b025e579 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -220,10 +220,10 @@ chunks: - gettext-tarball - libtool-tarball - name: libtool - morph: strata/core/libtool.morph repo: upstream:libtool ref: 5e11a17c39a2a976a09c33a568431a9f7ad00d48 unpetrify-ref: baserock/v2.4.6 + build-system: autotools build-depends: - autoconf - automake diff --git a/strata/core/libtool.morph b/strata/core/libtool.morph deleted file mode 100644 index 04263ac9..00000000 --- a/strata/core/libtool.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: libtool -kind: chunk -build-system: autotools -pre-configure-commands: -- ./bootstrap -- cgit v1.2.1 From f913c9cceb1e4e4377e45c0514cd1d472bd60995 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 9 Mar 2016 18:37:51 +0000 Subject: Upgrade bluez to 5.37 including GENIVI service plugin Service API patches come from: - https://github.com/Vudentz/BlueZ/tree/service_api Also remove not used configure options, this warning was showing up in the build log: configure: WARNING: unrecognized options: --enable-alsa, --with-telephony The dependency on alsa-lib is also not needed. Change-Id: Ia53daaad69d9b20450d8881cbe3ca3fc6c5663bb --- strata/audio-bluetooth.morph | 5 ++--- strata/audio-bluetooth/bluez.morph | 10 ++++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 6bd8ce66..5c1ae7a7 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -34,11 +34,10 @@ chunks: - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez - ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6 - unpetrify-ref: baserock/v5.17-patched + ref: 5eb47745978925e451523c8e8cb2ad6a53ed3863 + unpetrify-ref: baserock/5.37+service-api build-depends: - libical - - alsa-lib - name: dbus-glib repo: upstream:dbus-glib ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.morph index f27fcf1c..e7208da7 100644 --- a/strata/audio-bluetooth/bluez.morph +++ b/strata/audio-bluetooth/bluez.morph @@ -4,8 +4,14 @@ description: Bluetooth protocol stack for Linux build-system: autotools configure-commands: - autoreconf -ivf -- ./configure --prefix="$PREFIX" --enable-tools --enable-test --enable-alsa --enable-library - --with-telephony=ofono --sysconfdir=/etc --localstatedir=/var --libexecdir=/lib +- ./configure --prefix="$PREFIX" + --enable-tools + --enable-service + --enable-test + --enable-library + --sysconfdir=/etc + --localstatedir=/var + --libexecdir=/lib install-commands: - make DESTDIR="$DESTDIR" install - mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants" -- cgit v1.2.1 From 328ca9c61c618c197594f6871101694302e18e86 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:33:07 +0000 Subject: Upgrade alsa-lib and alsa-utils to v1.0.29 Change-Id: Ie0ee82cb27a5036980fdd96897e7e58e43718c50 --- strata/audio-bluetooth.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 5c1ae7a7..32676382 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -12,18 +12,18 @@ chunks: build-system: autotools - name: alsa-lib repo: upstream:alsa-lib - ref: 9cfd1faa27511edbb8bebbab85030125f33590ae + ref: 16c956e598a2b22459538ec7eb46b7a8421bb80a # Note: ref anchored because alsa-lib is known for rebasing # tags, and master - unpetrify-ref: baserock/v1.0.28 + unpetrify-ref: baserock/v1.0.29 build-system: autotools - name: alsa-utils morph: strata/audio-bluetooth/alsa-utils.morph repo: upstream:alsa-utils - ref: bbf137f66b2c8ce36db73f59ee69d5c443436524 + ref: 85c622e2984b557e6bd79c13cea466012dfb3761 # Note: ref anchored because alsa-utils is known for rebasing # tags, and master - unpetrify-ref: baserock/v1.0.28 + unpetrify-ref: baserock/v1.0.29 build-depends: - alsa-lib - name: libical -- cgit v1.2.1 From c5f14704b2aa2741ced32fa93ac65d81ad97248d Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:33:33 +0000 Subject: Update connman to 1.31 Change-Id: Iac3e1d1521c79b399829b69c4eafef0e2b4981a1 --- strata/connman-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/connman-common.morph b/strata/connman-common.morph index 415b2fa4..a1dcf76e 100644 --- a/strata/connman-common.morph +++ b/strata/connman-common.morph @@ -7,8 +7,8 @@ chunks: - name: connman morph: strata/connman-common/connman.morph repo: upstream:connman - ref: 9951ba7a0353cfc884e96833c64e58c1bcae3f44 - unpetrify-ref: baserock/1.24 + ref: 1bfe2a8eb20101926e6dfe7f1a535b64c6fcbecb + unpetrify-ref: '1.31' - name: ofono morph: strata/connman-common/ofono.morph repo: upstream:ofono -- cgit v1.2.1 From 40ac228fdc7da690d7edf238edada7611b6661cf Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:34:04 +0000 Subject: Upgrade curl to 7.47.1 Change-Id: Ib445f6589cfed3d9b430a70415d92d42e11ff36e --- strata/core.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index b025e579..1148ecfb 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -143,8 +143,8 @@ chunks: - name: curl morph: strata/core/curl.morph repo: upstream:curl - ref: 202aa9f7758636730299b86715d924f54468a908 - unpetrify-ref: curl-7_38_0 + ref: 8f995e2e0022292374fc99a2277069b08ad98b5c + unpetrify-ref: curl-7_47_1 build-depends: - autoconf - automake -- cgit v1.2.1 From 1ee10f49ae3f932f2fa09b56a41cf04e378fbce0 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:34:26 +0000 Subject: Upgrade libusb to v1.0.20 Change-Id: I6ef453ae841f5f010e0b23eaa284ccc6efc624ae --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index fcb57dbb..06626e5a 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -57,8 +57,8 @@ chunks: - libgcrypt - name: libusb repo: upstream:libusb - ref: e11525c66c7dd2db466c8f5785ff0b37d6a99ec9 - unpetrify-ref: v1.0.19 + ref: 01d6a03f417eb5dbac6ce039febdabdc4954c763 + unpetrify-ref: baserock/v1.0.20+parallel-build-fix build-system: autotools build-depends: - systemd -- cgit v1.2.1 From b145582aa7213f27b130874dadeeb9303b79b88b Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:34:46 +0000 Subject: Upgrade fuse to 2.9.4 Change-Id: I0c4567b61b1aa79acd582c2043d5ca4c2172ab10 --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index 06626e5a..cc40466a 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -77,8 +77,8 @@ chunks: - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: d69e627e79862e2df4ff9ff1ddb0363c4520d8a8 - unpetrify-ref: baserock/morph + ref: 6adcb719a933a31013c73fda8e0ccb0e13b45e58 + unpetrify-ref: fuse_2_9_4 - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs -- cgit v1.2.1 From fe518eb9534b2ae4c81197dd729311bf1e8fbda8 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:35:13 +0000 Subject: Upgrade DLT-daemon to v2.15.0 Change-Id: I774dd7efd74328f29c370a4e1a72280149f5ab24 --- strata/genivi.morph | 4 ++-- strata/genivi/DLT-daemon.morph | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/strata/genivi.morph b/strata/genivi.morph index f33394f8..5920f60d 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -13,8 +13,8 @@ chunks: - name: DLT-daemon morph: strata/genivi/DLT-daemon.morph repo: upstream:DLT-daemon - ref: 8b48e73f79b4463393916e4c6696917e3dedd026 - unpetrify-ref: v2.10.0 + ref: e9a486a08fff6d3cc7133a350cec3ee10f463207 + unpetrify-ref: v2.15.0 - name: node-startup-controller morph: strata/genivi/node-startup-controller.morph repo: upstream:node-startup-controller diff --git a/strata/genivi/DLT-daemon.morph b/strata/genivi/DLT-daemon.morph index d16c42ea..19ffd3b5 100644 --- a/strata/genivi/DLT-daemon.morph +++ b/strata/genivi/DLT-daemon.morph @@ -2,4 +2,6 @@ name: DLT-daemon kind: chunk build-system: cmake configure-commands: -- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DWITH_SYSTEMD=ON +- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" + -DCMAKE_INSTALL_LIBDIR="$PREFIX/lib" + -DWITH_SYSTEMD=ON -- cgit v1.2.1 From 798a958b6afc256d00d4357c582b06b59e040e69 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 09:35:28 +0000 Subject: Upgrade audiomanager to 7.3 Change-Id: I70903e1f152dbb726eb3abf7b5237f3f09639f38 --- strata/genivi.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/genivi.morph b/strata/genivi.morph index 5920f60d..7eff88c6 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -48,8 +48,8 @@ chunks: - genivi-common-api-runtime - name: audiomanager repo: upstream:audiomanager - ref: 8725157e248c6706de59a02996f869b6ccdccb13 - unpetrify-ref: '7.0' + ref: 49e010d6bd40929b00c4855ec3aab4cbafca906e + unpetrify-ref: '7.3' build-system: cmake build-depends: - DLT-daemon -- cgit v1.2.1 From 4d53c09e53914a7ebaea9fa0ca2e419aca06a47b Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 10 Mar 2016 13:54:37 +0000 Subject: Enable CONFIG_BT, needed for bluez Add only to x86 and Jetson-tk1 kernels, given that these are the BSP used on systems with audio-bluetooth (bluez) Change-Id: Iff16d49079a55f00377ad0ee5831eb8aa657762c --- strata/bsp-jetson/linux-jetson-tk1.morph | 1 + strata/bsp-x86_32-generic/linux-x86-32-generic.morph | 1 + strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 1 + 3 files changed, 3 insertions(+) diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index 395ac136..bffe390e 100644 --- a/strata/bsp-jetson/linux-jetson-tk1.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -218,6 +218,7 @@ configure-commands: - scripts/config -e SCSI_LOWLEVEL - scripts/config -e NOUVEAU_PLATFORM_DRIVER - scripts/config -e DRM_TEGRA_STAGING +- scripts/config -e BT - yes '' | make ARCH=arm oldconfig build-commands: - make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph index 529b74bd..8102cea5 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -267,6 +267,7 @@ configure-commands: - scripts/config -e CONFIG_SND_INTEL8X0 - scripts/config -m CONFIG_DRM_CIRRUS_QEMU - scripts/config -m CONFIG_DRM_BOCHS +- scripts/config -e BT - yes '' | make oldconfig build-commands: - make $MAKEFLAGS diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index 4393f89d..08541c2b 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -268,6 +268,7 @@ configure-commands: - scripts/config -m CONFIG_DRM_CIRRUS_QEMU - scripts/config -m CONFIG_DRM_BOCHS - scripts/config -m CONFIG_DRM_VIRTIO_GPU +- scripts/config -e BT - yes '' | make oldconfig build-commands: - make $MAKEFLAGS -- cgit v1.2.1 From 78e75e303a8d599907563f54f17bd10cad073aeb Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 11 Mar 2016 15:45:51 +0000 Subject: Upgrade to systemd v229 Change-Id: I447a5b3d4b4f803e16135dc1a1e23cd7a22cd3db --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index cc40466a..b5b63638 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -49,8 +49,8 @@ chunks: - name: systemd morph: strata/foundation/systemd.morph repo: upstream:systemd - ref: c379f143a5ccdbc94a87cfca0174e7f21fa05f26 - unpetrify-ref: v227 + ref: 95adafc428b5b4be0ddd4d43a7b96658390388bc + unpetrify-ref: v229 build-depends: - dbus-pre - kmod -- cgit v1.2.1 From 152a36a40486313a08f8d328d7b89cd1d6c079c8 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Fri, 11 Mar 2016 16:41:32 +0000 Subject: Upgrade to persitence-client-library v1.1.0 The morphology file is not needed since these patches are included in this version: - http://git.projects.genivi.org/?p=persistence/persistence-client-library.git;a=commit;h=5fac47c728183c4dfee12524348240a07e5ef05c - http://git.projects.genivi.org/?p=persistence/persistence-client-library.git;a=commit;h=6b208bfc268890360fcbd5cede70da5d2f9fb459 Change-Id: I58f049624e5e2cdb9649242d9b5884f696e56b71 --- strata/genivi.morph | 6 +++--- strata/genivi/persistence-client-library.morph | 12 ------------ 2 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 strata/genivi/persistence-client-library.morph diff --git a/strata/genivi.morph b/strata/genivi.morph index 7eff88c6..0195de87 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -71,10 +71,10 @@ chunks: - itzam-tarball - DLT-daemon - name: persistence-client-library - morph: strata/genivi/persistence-client-library.morph repo: upstream:genivi/persistence-client-library - ref: 39c68df2a9ee0b089212855f64a61fbd671b1a80 - unpetrify-ref: baserock/v1.0.0 + ref: 4b503da99c6b04ad21a197dafe6e7243187c7c7e + unpetrify-ref: v1.1.0 + build-system: autotools build-depends: - persistence-common-object - DLT-daemon diff --git a/strata/genivi/persistence-client-library.morph b/strata/genivi/persistence-client-library.morph deleted file mode 100644 index 196572f2..00000000 --- a/strata/genivi/persistence-client-library.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: persistence-client-library -kind: chunk -build-system: autotools -configure-commands: -# Configure library name. We are supposed to change them in this version of -# persistence-client-library. -# The need of doing this has been fixed upstream in the following commit: -# http://git.projects.genivi.org/?p=persistence/persistence-client-library.git;a=commitdiff;h=6b208bfc268890360fcbd5cede70da5d2f9fb459 -# Once we upgrade we can drop this `sed` -- sed -i 's/libpers_common.so.1/libpers_common.so/' config/pclCustomLibConfigFile.cfg -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-werror -- cgit v1.2.1 From dce76dfb1d45d0f080303d1db23ecde630901084 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 14 Mar 2016 00:37:25 +0000 Subject: cracklib: Set target when building 'cracklib-words' We don't need 'cracklib-words' as bz2, and also we avoid race conditions with this Makefile. Change-Id: I59b6e06974c8d1aa2cc62af2b92999642bae9ed4 --- strata/gnome/cracklib.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/gnome/cracklib.morph b/strata/gnome/cracklib.morph index 6b373cfa..fe204255 100644 --- a/strata/gnome/cracklib.morph +++ b/strata/gnome/cracklib.morph @@ -7,7 +7,7 @@ configure-commands: - cd src && ./configure --prefix="$PREFIX" --sysconfdir=/etc --with-default-dict=/lib/cracklib/pw_dict build-commands: - make -C src -- make -C words +- make -C words cracklib-words.gz install-commands: - make -C src install - install -m644 -D words/cracklib-words.gz $DESTDIR$PREFIX/share/dict/cracklib-words.gz -- cgit v1.2.1 From a4b320a013ff25d3f53bf5d5dcce65ea02c1a027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 14 Mar 2016 13:03:16 +0000 Subject: strata/x-generic.morph: Upgrade xserver to 1.18.2 Change-Id: Id5c5f8a03cd580c2db564733f68bfe75c4c5c499 --- strata/x-generic.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 4d93d770..d9462426 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -29,8 +29,8 @@ chunks: - name: xserver morph: strata/x-generic/xserver.morph repo: upstream:xserver - ref: 43fb888bd01cf9d3d277e77a52a3d0c93ccff8bd - unpetrify-ref: xorg-server-1.18.0 + ref: 93d4224ccf3dee5a51815a66f76c905450419b50 + unpetrify-ref: xorg-server-1.18.2 build-depends: - xorg-font-util - xorg-lib-libXfont -- cgit v1.2.1 From ec33cd821b4960aa458abf920bf459c09cdb42f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 14 Mar 2016 13:04:24 +0000 Subject: strata/foundation/systemd.morph: Do not build compat libraries Nothing should depend on them anymore (As a reference, Arch systems dont include them anymore) Change-Id: I0b74bff2968b388bbd797ca626ffa2ac65a09fff --- strata/foundation/systemd.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 04a04c62..4c62d617 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -6,7 +6,7 @@ configure-commands: # KILL added because it picks up /usr/bin/kill, which is not installed on # all systems - | - KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --enable-compat-libs \ + KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \ --disable-tests --sysconfdir=/etc --localstatedir=/var \ --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \ --with-rootprefix= --with-rootlibdir=/lib -- cgit v1.2.1 From d3d769217c4e9b4f74e8eff9a49d979cf37a3631 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Fri, 4 Mar 2016 18:30:28 +0000 Subject: Add sandboxlib to build and devel systems sandboxlib is a runtime dependency of ybd. While ybd is not currently a part of Baserock I found it surprising I couldn't at least run ybd from git using the build image from wiki.baserock.org. Created a new stratum as I was unable to find a suitable home amongst the existing strata. Also moves linux-user-chroot into the new stratum. Change-Id: If55c0ba4b9a48a0abc69ad5d39900c6c7807c72b --- strata/sandboxing.morph | 18 ++++++++++++++++++ strata/tools.morph | 5 ----- systems/build-system-armv5l-openbmc-aspeed.morph | 2 ++ .../build-system-armv7l-altera-socfpga-devkit.morph | 2 ++ systems/build-system-armv7lhf-highbank.morph | 2 ++ systems/build-system-armv7lhf-jetson.morph | 2 ++ systems/build-system-armv7lhf-rootfs.morph | 2 ++ systems/build-system-armv8b64.morph | 2 ++ systems/build-system-armv8l64.morph | 2 ++ systems/build-system-ppc64.morph | 2 ++ systems/build-system-x86_32-chroot.morph | 2 ++ systems/build-system-x86_32.morph | 2 ++ systems/build-system-x86_64-chroot.morph | 2 ++ systems/build-system-x86_64.morph | 2 ++ systems/devel-system-armv7-chroot.morph | 2 ++ systems/devel-system-armv7-highbank.morph | 2 ++ systems/devel-system-armv7-versatile.morph | 2 ++ systems/devel-system-armv7-wandboard.morph | 2 ++ systems/devel-system-armv7b-chroot.morph | 2 ++ systems/devel-system-armv7b-highbank.morph | 2 ++ .../devel-system-armv7l-altera-socfpga-devkit.morph | 2 ++ systems/devel-system-armv7lhf-chroot.morph | 2 ++ systems/devel-system-armv7lhf-highbank.morph | 2 ++ systems/devel-system-armv7lhf-jetson.morph | 2 ++ systems/devel-system-armv7lhf-wandboard.morph | 2 ++ systems/devel-system-armv8b64.morph | 2 ++ systems/devel-system-armv8l64.morph | 2 ++ systems/devel-system-ppc64-chroot.morph | 2 ++ systems/devel-system-ppc64-generic.morph | 2 ++ systems/devel-system-x86_32-chroot.morph | 2 ++ systems/devel-system-x86_32-generic.morph | 2 ++ systems/devel-system-x86_64-chroot.morph | 2 ++ systems/devel-system-x86_64-generic.morph | 2 ++ systems/devel-system-x86_64-vagrant.morph | 2 ++ 34 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 strata/sandboxing.morph diff --git a/strata/sandboxing.morph b/strata/sandboxing.morph new file mode 100644 index 00000000..64de36c3 --- /dev/null +++ b/strata/sandboxing.morph @@ -0,0 +1,18 @@ +name: sandboxing +kind: stratum +description: | + Libraries/tools for running programs/commands in a (partially) isolated + environment. +build-depends: +- morph: strata/python2-core.morph +chunks: +- name: sandboxlib + repo: upstream:sandboxlib + ref: ce30050daa10fa32801e8f798911b36aa82343a4 + unpetrify-ref: master + build-system: python-distutils +- name: linux-user-chroot + repo: upstream:linux-user-chroot + ref: 40e0b71d556414dfe150a74937f2c8a68d351d6d + unpetrify-ref: v2015.1 + build-system: autotools diff --git a/strata/tools.morph b/strata/tools.morph index 0a71acee..45891bbb 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -14,11 +14,6 @@ chunks: repo: upstream:binutils-gdb ref: 129ee12d013f4a2f09fe40a33072e6e47e949890 unpetrify-ref: gdb-7.8-branch -- name: linux-user-chroot - repo: upstream:linux-user-chroot - ref: 40e0b71d556414dfe150a74937f2c8a68d351d6d - unpetrify-ref: v2015.1 - build-system: autotools - name: lsof morph: strata/tools/lsof.morph repo: upstream:lsof diff --git a/systems/build-system-armv5l-openbmc-aspeed.morph b/systems/build-system-armv5l-openbmc-aspeed.morph index 0ceb975e..f9524161 100644 --- a/systems/build-system-armv5l-openbmc-aspeed.morph +++ b/systems/build-system-armv5l-openbmc-aspeed.morph @@ -35,6 +35,8 @@ strata: morph: strata/ostree-core.morph - name: mtd-utilities morph: strata/mtd-utilities.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv7l-altera-socfpga-devkit.morph b/systems/build-system-armv7l-altera-socfpga-devkit.morph index f1e89121..5d83cb6a 100644 --- a/systems/build-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/build-system-armv7l-altera-socfpga-devkit.morph @@ -37,6 +37,8 @@ strata: morph: strata/libsoup-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv7lhf-highbank.morph b/systems/build-system-armv7lhf-highbank.morph index 737c2dc4..afb35fec 100644 --- a/systems/build-system-armv7lhf-highbank.morph +++ b/systems/build-system-armv7lhf-highbank.morph @@ -46,6 +46,8 @@ strata: morph: strata/ostree-core.morph - name: unionfs-fuse-group morph: strata/unionfs-fuse-group.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index ba8665e2..16c8a7d6 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -44,6 +44,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv7lhf-rootfs.morph b/systems/build-system-armv7lhf-rootfs.morph index 0d331f4b..7a614c62 100644 --- a/systems/build-system-armv7lhf-rootfs.morph +++ b/systems/build-system-armv7lhf-rootfs.morph @@ -42,6 +42,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv8b64.morph b/systems/build-system-armv8b64.morph index df24d98e..9d7a69f6 100644 --- a/systems/build-system-armv8b64.morph +++ b/systems/build-system-armv8b64.morph @@ -45,6 +45,8 @@ strata: morph: strata/openstack-clients.morph - name: devtools morph: strata/devtools.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-armv8l64.morph b/systems/build-system-armv8l64.morph index 83e6b3ed..d5c2a7e7 100644 --- a/systems/build-system-armv8l64.morph +++ b/systems/build-system-armv8l64.morph @@ -45,6 +45,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-ppc64.morph b/systems/build-system-ppc64.morph index 20703ad7..fcedcdb0 100644 --- a/systems/build-system-ppc64.morph +++ b/systems/build-system-ppc64.morph @@ -44,6 +44,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-x86_32-chroot.morph b/systems/build-system-x86_32-chroot.morph index 0edb4460..6421e5ec 100644 --- a/systems/build-system-x86_32-chroot.morph +++ b/systems/build-system-x86_32-chroot.morph @@ -44,6 +44,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-x86_32.morph b/systems/build-system-x86_32.morph index 00645b58..14959d5d 100644 --- a/systems/build-system-x86_32.morph +++ b/systems/build-system-x86_32.morph @@ -44,6 +44,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-x86_64-chroot.morph b/systems/build-system-x86_64-chroot.morph index 68ae7dac..55efdf3f 100644 --- a/systems/build-system-x86_64-chroot.morph +++ b/systems/build-system-x86_64-chroot.morph @@ -44,6 +44,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/build-system-x86_64.morph b/systems/build-system-x86_64.morph index 6e6bb512..58f6f20d 100644 --- a/systems/build-system-x86_64.morph +++ b/systems/build-system-x86_64.morph @@ -44,6 +44,8 @@ strata: morph: strata/glib-common.morph - name: ostree-core morph: strata/ostree-core.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-chroot.morph b/systems/devel-system-armv7-chroot.morph index 6812e622..b5310590 100644 --- a/systems/devel-system-armv7-chroot.morph +++ b/systems/devel-system-armv7-chroot.morph @@ -59,6 +59,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-highbank.morph b/systems/devel-system-armv7-highbank.morph index 22cac493..dd98ab71 100644 --- a/systems/devel-system-armv7-highbank.morph +++ b/systems/devel-system-armv7-highbank.morph @@ -62,6 +62,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-versatile.morph b/systems/devel-system-armv7-versatile.morph index 9a38f5ba..cb533696 100644 --- a/systems/devel-system-armv7-versatile.morph +++ b/systems/devel-system-armv7-versatile.morph @@ -60,6 +60,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7-wandboard.morph b/systems/devel-system-armv7-wandboard.morph index c71a3319..c37b599d 100644 --- a/systems/devel-system-armv7-wandboard.morph +++ b/systems/devel-system-armv7-wandboard.morph @@ -60,6 +60,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7b-chroot.morph b/systems/devel-system-armv7b-chroot.morph index b385161e..87579a97 100644 --- a/systems/devel-system-armv7b-chroot.morph +++ b/systems/devel-system-armv7b-chroot.morph @@ -51,6 +51,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7b-highbank.morph b/systems/devel-system-armv7b-highbank.morph index 294ced01..a4f8664e 100644 --- a/systems/devel-system-armv7b-highbank.morph +++ b/systems/devel-system-armv7b-highbank.morph @@ -58,6 +58,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7l-altera-socfpga-devkit.morph b/systems/devel-system-armv7l-altera-socfpga-devkit.morph index f73576bc..f4e74723 100644 --- a/systems/devel-system-armv7l-altera-socfpga-devkit.morph +++ b/systems/devel-system-armv7l-altera-socfpga-devkit.morph @@ -55,6 +55,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-chroot.morph b/systems/devel-system-armv7lhf-chroot.morph index 3e42adba..90825ffe 100644 --- a/systems/devel-system-armv7lhf-chroot.morph +++ b/systems/devel-system-armv7lhf-chroot.morph @@ -59,6 +59,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-highbank.morph b/systems/devel-system-armv7lhf-highbank.morph index 21b31da7..0bbe9acd 100644 --- a/systems/devel-system-armv7lhf-highbank.morph +++ b/systems/devel-system-armv7lhf-highbank.morph @@ -65,6 +65,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 9d343db4..3f8ba53c 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -63,6 +63,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv7lhf-wandboard.morph b/systems/devel-system-armv7lhf-wandboard.morph index e2482245..ae745525 100644 --- a/systems/devel-system-armv7lhf-wandboard.morph +++ b/systems/devel-system-armv7lhf-wandboard.morph @@ -63,6 +63,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv8b64.morph b/systems/devel-system-armv8b64.morph index 496da0bd..339ae230 100644 --- a/systems/devel-system-armv8b64.morph +++ b/systems/devel-system-armv8b64.morph @@ -62,6 +62,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-armv8l64.morph b/systems/devel-system-armv8l64.morph index fbfd8220..53b55569 100644 --- a/systems/devel-system-armv8l64.morph +++ b/systems/devel-system-armv8l64.morph @@ -62,6 +62,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-ppc64-chroot.morph b/systems/devel-system-ppc64-chroot.morph index 2fce60bf..5b6ad771 100644 --- a/systems/devel-system-ppc64-chroot.morph +++ b/systems/devel-system-ppc64-chroot.morph @@ -57,6 +57,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-ppc64-generic.morph b/systems/devel-system-ppc64-generic.morph index 1d89eb8a..f06d23f7 100644 --- a/systems/devel-system-ppc64-generic.morph +++ b/systems/devel-system-ppc64-generic.morph @@ -60,6 +60,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_32-chroot.morph b/systems/devel-system-x86_32-chroot.morph index b28b1ca5..acbf9a2d 100644 --- a/systems/devel-system-x86_32-chroot.morph +++ b/systems/devel-system-x86_32-chroot.morph @@ -59,6 +59,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_32-generic.morph b/systems/devel-system-x86_32-generic.morph index ba103e9d..fe376fcd 100644 --- a/systems/devel-system-x86_32-generic.morph +++ b/systems/devel-system-x86_32-generic.morph @@ -64,6 +64,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_64-chroot.morph b/systems/devel-system-x86_64-chroot.morph index efadb210..47e3d123 100644 --- a/systems/devel-system-x86_64-chroot.morph +++ b/systems/devel-system-x86_64-chroot.morph @@ -61,6 +61,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_64-generic.morph b/systems/devel-system-x86_64-generic.morph index 9cd0242a..91c416c6 100644 --- a/systems/devel-system-x86_64-generic.morph +++ b/systems/devel-system-x86_64-generic.morph @@ -68,6 +68,8 @@ strata: morph: strata/erlang.morph - name: elixir morph: strata/elixir.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/devel-system-x86_64-vagrant.morph b/systems/devel-system-x86_64-vagrant.morph index cf12e97e..fb1e7e9f 100644 --- a/systems/devel-system-x86_64-vagrant.morph +++ b/systems/devel-system-x86_64-vagrant.morph @@ -62,6 +62,8 @@ strata: morph: strata/perl-common.morph - name: CPAN-Mini-Inject morph: strata/CPAN-Mini-Inject.morph +- name: sandboxing + morph: strata/sandboxing.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files -- cgit v1.2.1 From ef6b19c4fade2dda8b7f6e7beb73cef6c60eb3b3 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 14 Mar 2016 20:55:28 +0000 Subject: libical: Set 'max-jobs' to 1 Their build system is broken in version 1.0.1, and this shouldn't slow down the build too much given that this chunk takes only around 40 seconds to build on a 2vCPU 2G RAM VM. It looks like version 2.0.0 includes fixes to this problem. See commit dcc40c7ae2d337a0d83c077bf9d8f283499c6717 in libical repo, and consider removing this restriction when upgrading. Change-Id: Ic55f13944094336addf9a54805cac67a6f3b9e26 --- strata/audio-bluetooth/libical.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.morph index 2ee7c96c..38c7fada 100644 --- a/strata/audio-bluetooth/libical.morph +++ b/strata/audio-bluetooth/libical.morph @@ -1,5 +1,6 @@ name: libical kind: chunk +max-jobs: 1 build-system: cmake configure-commands: - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_INSTALL_LIBDIR=lib -- cgit v1.2.1 From aa2fd0f9bf293b55f01168598d1b4ae98fe4cbb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 15 Mar 2016 12:26:29 +0000 Subject: strata/audio-bluetooth.morph: Upgrade to libical 2.0.0 Also remove max-jobs restriction as per the comments in commit ef6b19c4fade2dda8b7f6e7beb73cef6c60eb3b3 Change-Id: I17e121bb9244aba0218559801c60a81a161de1cd --- strata/audio-bluetooth.morph | 4 ++-- strata/audio-bluetooth/libical.morph | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index 32676382..c7469280 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -29,8 +29,8 @@ chunks: - name: libical morph: strata/audio-bluetooth/libical.morph repo: upstream:libical-git - ref: da69aae790f680b633100475cac14c776fbda722 - unpetrify-ref: v1.0.1 + ref: 6c4af23b0a95fd105f38e879908cbc80390f3716 + unpetrify-ref: v2.0.0 - name: bluez morph: strata/audio-bluetooth/bluez.morph repo: upstream:bluez diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.morph index 38c7fada..2ee7c96c 100644 --- a/strata/audio-bluetooth/libical.morph +++ b/strata/audio-bluetooth/libical.morph @@ -1,6 +1,5 @@ name: libical kind: chunk -max-jobs: 1 build-system: cmake configure-commands: - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_INSTALL_LIBDIR=lib -- cgit v1.2.1 From 23f354034df7c6d2652bca285047d29f5abef560 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 16 Mar 2016 11:32:54 +0000 Subject: Upgrade to Git 2.8.0-rc2 This contains commit 9831e92bfa833ee9c0ce464bbc2f941ae6c2698d which removes the path_name() function. That fixes a remote-code execution security hole, described in CVE-2016-2315 and CVE-2016-2324. I have read in some places that 2.7.1 and later are not vulnerable, but I've not been able to prove that, nor find proof. At time of writing the Debian advisory doesn't show that 2.7.1 and later are safe, only 2.8.0-rc2: https://security-tracker.debian.org/tracker/CVE-2016-2324 See also: https://ma.ttias.be/remote-code-execution-git-versions-client-server-2-7-1-cve-2016-2324-cve-2016-2315/ Change-Id: I8948b295030f2f498780777aa62a54f2337518b5 --- strata/core.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 1148ecfb..5304f50a 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -161,8 +161,8 @@ chunks: - name: git-minimal morph: strata/core/git-minimal.morph repo: upstream:git - ref: 9874fca7122563e28d699a911404fc49d2a24f1c - unpetrify-ref: v2.3.0 + ref: ed9067f705aa51819c7dfff7e4190dd267beaf5d + unpetrify-ref: v2.8.0-rc2 build-depends: - autoconf - python3 -- cgit v1.2.1 From 9c5a8b67ff79c63a38da4dd35a5fcbb6a6650ac2 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Wed, 16 Mar 2016 12:16:18 +0000 Subject: strata/devtools.morph: Upgrade to Git 2.8.0-rc2 This stratum is included in systems like Trove, upgrading Git here is needed too. This commit completes 23f354034df7c6d2652bca285047d29f5abef560, which only upgrades 'git-minimal' in strata/core.morph Change-Id: I9e29190f9ef2fa2dbadc894853dca7a601695094 --- strata/devtools.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/devtools.morph b/strata/devtools.morph index 9f5f7932..92746d3a 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -43,8 +43,8 @@ chunks: - name: git morph: strata/devtools/git.morph repo: upstream:git - ref: 9874fca7122563e28d699a911404fc49d2a24f1c - unpetrify-ref: v2.3.0 + ref: ed9067f705aa51819c7dfff7e4190dd267beaf5d + unpetrify-ref: v2.8.0-rc2 - name: iotop repo: upstream:iotop ref: 59e2537794d91c1375d391293f8fd89ca8b794a8 -- cgit v1.2.1 From 8a5dbfd6f17ffbe396786c0073cb57397c2667d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 15 Mar 2016 20:38:31 +0000 Subject: strata/foundation/systemd.morph: Move some stuff to post-install-commands Change-Id: Ifa0b08168ed9910a7c405f1fee076fc7d51cc205 --- strata/foundation/systemd.morph | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 4c62d617..7d729db3 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -10,8 +10,7 @@ configure-commands: --disable-tests --sysconfdir=/etc --localstatedir=/var \ --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \ --with-rootprefix= --with-rootlibdir=/lib -install-commands: -- make DESTDIR="$DESTDIR" install +post-install-commands: - mkdir -p "$DESTDIR"/sbin - ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init - for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl @@ -20,7 +19,6 @@ install-commands: - sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" -post-install-commands: - | cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF" [Match] -- cgit v1.2.1 From 64e4b0ad6799803466b0f2d7d6cf02e2324bb080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 16 Mar 2016 12:48:30 +0000 Subject: strata/gnome.morph: Use patched accountservice to search for libsystemd Change-Id: Ie577c50e3e62c543bb48ab4cd72c8d2f0cfe8ce5 --- strata/gnome.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/gnome.morph b/strata/gnome.morph index 2ce4858b..ede91e0d 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -426,8 +426,8 @@ chunks: - name: accountsservice morph: strata/gnome/accountsservice.morph repo: upstream:accountsservice - ref: 36b424b4aad91aaf91eeb6b6285cf550b15fcfeb - unpetrify-ref: master + ref: 1b91edfe9db81e75d0f08e98c6909cdf34c9e91e + unpetrify-ref: baserock/0.6.40-8-gcad21b1+libsystemd_fix - name: gdm morph: strata/gnome/gdm.morph repo: upstream:gdm -- cgit v1.2.1 From 080bb0812a4eee5c920009ebe6337e85cf295cfe Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 17 Mar 2016 15:17:47 +0000 Subject: Update sha of gall for fix for Git 2.8.0-rc2 Change-Id: I8b6f699df0100a745d278d4b6cb3ab17566a113c --- strata/trove.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/trove.morph b/strata/trove.morph index e19e673b..3d0721bd 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -44,7 +44,7 @@ chunks: - name: gall morph: strata/trove/gall.morph repo: upstream:gitano/gall - ref: f58c7526fbb0421d7f5446644f01f4cf57035ee2 + ref: 11de77bd79c08a152932a3435d1921abc1020252 unpetrify-ref: baserock/morph build-depends: - lua -- cgit v1.2.1 From 57f3c7dc132e8574405f28ea55b9fb92882f69e9 Mon Sep 17 00:00:00 2001 From: Ed Cragg Date: Fri, 18 Mar 2016 08:32:08 +0000 Subject: foundation/fuse: Apply fix for building on armv8 Cherry pick the upstream fix to use linux/types.h to define types (previously fixed in Baserock as 0479b766923a01553366d8dbf197ac5dabf4b9d6). The upstream patch also fixes on platforms other than Linux. Change-Id: I09cfd055092b24f9259da4179a3d6862f032007a --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index b5b63638..ff87bbb1 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -77,8 +77,8 @@ chunks: - name: fuse morph: strata/foundation/fuse.morph repo: upstream:fuse - ref: 6adcb719a933a31013c73fda8e0ccb0e13b45e58 - unpetrify-ref: fuse_2_9_4 + ref: e9b2eec7c5856032652bb8ff734174764e444c74 + unpetrify-ref: baserock/fuse_2_9_4-fix-armv8 - name: btrfs-progs morph: strata/foundation/btrfs-progs.morph repo: upstream:btrfs-progs -- cgit v1.2.1 From 8ce6149ae89c9c8b632bef13edd577de67c09e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 15 Mar 2016 20:27:39 +0000 Subject: Use integration commands to enable opensshd service So the location of the service files is not harcoded in /lib/systemd/system Change-Id: Ifa771678b11391a5759f370805b8b23b043042e4 --- strata/foundation/openssh.morph | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/strata/foundation/openssh.morph b/strata/foundation/openssh.morph index 45339156..7d38791f 100644 --- a/strata/foundation/openssh.morph +++ b/strata/foundation/openssh.morph @@ -24,6 +24,9 @@ install-commands: - chmod go= "$DESTDIR"/var/lib/sshd - install -m 744 sshd-keygen "$DESTDIR/$PREFIX/sbin/sshd-keygen" - install -m 755 contrib/ssh-copy-id "$DESTDIR/$PREFIX/bin/ssh-copy-id" -- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants" -- install -m 644 opensshd.service "$DESTDIR/lib/systemd/system/opensshd.service" -- ln -s ../opensshd.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/opensshd.service" +- mkdir -p "$DESTDIR$PREFIX/lib/systemd/system/" +- install -m 644 opensshd.service "$DESTDIR$PREFIX/lib/systemd/system/opensshd.service" +system-integration: + openssh-misc: + 00-enable-opensshd-unit: + - systemctl enable opensshd -- cgit v1.2.1 From 0c13ce661c1c6d61a3d80fac9b8d24d44c61b8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 15 Mar 2016 20:39:28 +0000 Subject: strata/foundation/systemd.morph: Remove workaround to configure the shell This doesnt seem to be needed: the service file is configured correctly to use '/bin/sh' even without using this workaround Change-Id: I8cb9ff567c5e1b3f75a3101a958f5421ed87d571 --- strata/foundation/systemd.morph | 1 - 1 file changed, 1 deletion(-) diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 7d729db3..0c733533 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -15,7 +15,6 @@ post-install-commands: - ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init - for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl "$DESTDIR/sbin/$f"; done -- sed -e 's|@sushell@|/bin/sh|g' units/debug-shell.service.in >"$DESTDIR/etc/systemd/system/debug-shell.service" - sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" -- cgit v1.2.1 From 0a0da35e1a693fc909d1628f5e81cb3b2693c057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 15 Mar 2016 20:41:28 +0000 Subject: strata/foundation/systemd.morph: simplify systemd cofiguration a bit - xz is enabled by default - Use the default install directories, ie, /usr/lib and /usr/bin Change-Id: I038113fcbf0288703fbb06cc4b64b34d09d8fc72 --- strata/core/linux-pam.morph | 6 +++--- strata/foundation/systemd.morph | 17 ++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/strata/core/linux-pam.morph b/strata/core/linux-pam.morph index e6cbf642..e65caa63 100644 --- a/strata/core/linux-pam.morph +++ b/strata/core/linux-pam.morph @@ -4,6 +4,6 @@ build-system: autotools pre-configure-commands: - autoreconf -ivf configure-commands: -# libdir has to be specified or it'll go into lib64. It has to be /lib because -# systemd installs its pam library into /lib/security. -- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="/lib" +# libdir has to be specified or it'll go into lib64. It has to be /usr/lib because +# systemd installs its pam library into /usr/lib/security. +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --libdir="$PREFIX/lib" diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index 0c733533..fb624259 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -2,20 +2,19 @@ name: systemd kind: chunk build-system: autotools configure-commands: -- sh autogen.sh +- ./autogen.sh # KILL added because it picks up /usr/bin/kill, which is not installed on # all systems -- | - KILL=/bin/kill ./configure --prefix="$PREFIX" --enable-xz --disable-manpages \ - --disable-tests --sysconfdir=/etc --localstatedir=/var \ - --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" \ - --with-rootprefix= --with-rootlibdir=/lib +- KILL=/bin/kill ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var + --disable-manpages + --disable-tests + --libexecdir="$PREFIX/libexec" post-install-commands: - mkdir -p "$DESTDIR"/sbin -- ln -s /lib/systemd/systemd "$DESTDIR"/sbin/init -- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s /bin/systemctl +- ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init +- for f in telinit runlevel shutdown poweroff reboot halt; do ln -s "$PREFIX"/bin/systemctl "$DESTDIR/sbin/$f"; done -- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR/lib/systemd/system/tmp.mount" +- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR$PREFIX/lib/systemd/system/tmp.mount" >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" - | -- cgit v1.2.1 From 9b1f14f01a59df4a6532ce4bf9a7450890d8992c Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Sat, 19 Mar 2016 19:05:05 +0900 Subject: mesa.morph: Make the conditional configure apply to all arm arches Before we were only specifically casing armv7lhf, use the same configuration for arm* instead, this causes the mesa build to pass on armv5l Change-Id: I9dda3c771270254e1c2c44857b6275af2cad3de2 --- strata/mesa-common/mesa.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index ebcf0a78..41a962b4 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -5,7 +5,7 @@ configure-commands: - | cpu=$(echo $TARGET | cut -d '-' -f 1) case "$cpu" in - armv7lhf) + arm*) DRIDRIVERS=no GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4 ;; -- cgit v1.2.1 From 7d2704b9754abad5997ecbdbaa8cf323c4f58601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 21 Mar 2016 00:19:04 +0000 Subject: strata/gnome.morph: Upgrade e-d-s to latest stable (3.18.5) Change-Id: I5cb2b62dc60defad54574da9050ca6aa220b2412 --- strata/gnome.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/gnome.morph b/strata/gnome.morph index ede91e0d..f43fcc04 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -336,8 +336,8 @@ chunks: - name: evolution-data-server morph: strata/gnome/evolution-data-server.morph repo: upstream:evolution-data-server - ref: 658d6e37796984bf05e275413726ad3b71083ccf - unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_3 + ref: c7e3eb0e4e773e706ab170b9bfb1089ed1546eda + unpetrify-ref: EVOLUTION_DATA_SERVER_3_18_5 build-depends: - gnome-online-accounts - krb5 -- cgit v1.2.1 From 5a728ff25a35519aa31ef9132ff39a2668868dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 21 Mar 2016 00:20:43 +0000 Subject: strata/gnome.morph: Upgrade evolution to 3.18.5.2 Which includes a fix to a build break when using libical 2.0 in commit 70a2e0e1119eb042af7d3963fad6b1f8e5cdc9ee Change-Id: Ied397dcbc94ad533af5c1f7629f154f0c19e5a5b --- strata/gnome.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/gnome.morph b/strata/gnome.morph index f43fcc04..14337cf9 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -912,8 +912,8 @@ chunks: - name: evolution morph: strata/gnome/evolution.morph repo: upstream:gnome/evolution - ref: 579583275620be75afdedcde909a82fd96136188 - unpetrify-ref: EVOLUTION_3_18_3 + ref: 6a02c7980589cf24de90c29556bc84ee2f57b832 + unpetrify-ref: EVOLUTION_3_18_5_2 build-depends: - evolution-data-server - clutter-gtk -- cgit v1.2.1 From efb8dd85721d831d8f0d173a1df48dc15a9419da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 15 Mar 2016 20:39:19 +0000 Subject: strata/foundation/systemd.morph: Remove workaround about strict mounts systemd uses libmount from util-linux now, it doesn't try to run the system's `mount` program directly any more. So we no longer need to hack it into working with Busybox's `mount`. Change-Id: I798635cba1407f96cdd66ecc36bd5958364edda1 --- strata/foundation/systemd.morph | 2 -- 1 file changed, 2 deletions(-) diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index fb624259..ae95cf9b 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -14,8 +14,6 @@ post-install-commands: - ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init - for f in telinit runlevel shutdown poweroff reboot halt; do ln -s "$PREFIX"/bin/systemctl "$DESTDIR/sbin/$f"; done -- sed -r -e '/Options=/s/,?strictatime//' "$DESTDIR$PREFIX/lib/systemd/system/tmp.mount" - >"$DESTDIR/etc/systemd/system/tmp.mount" - touch "$DESTDIR/etc/machine-id" - | cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF" -- cgit v1.2.1 From 856e243035ea1644ba5446ea628a766c47db5857 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 22 Mar 2016 11:10:58 +0000 Subject: wayland-ivi-extension: Include parallel make fix This patch has already been merged in master in commit 96adac823500be172424e94b5094c7d97e68175d of wayland-ivi-extension, but it's not included in any release yet. Change-Id: Ia7e281e9f68cf35ade618c3566f56fd659e769f3 --- strata/weston-genivi.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 2fb1e78d..27ff47cc 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -15,7 +15,7 @@ chunks: - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: beac5d2e25324ca9cc82d0e3b364512258af3567 - unpetrify-ref: 1.9.0 + ref: 435d12930318a0d3d1779b3603e50f52eb312944 + unpetrify-ref: baserock/1.9.0-parallel-make-fix build-depends: - weston -- cgit v1.2.1 From 241c7680feea643e5e126a583ab2b6154f77b4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 21 Mar 2016 09:05:29 +0000 Subject: systems/weston-qt5-system-x86_64.morph: Add qt5-tools-qtmultimedia Change-Id: Ifbad56136a28f53d318d8e515fd504c724710698 --- systems/weston-qt5-system-x86_64.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph index 1e19a543..a58e72b7 100644 --- a/systems/weston-qt5-system-x86_64.morph +++ b/systems/weston-qt5-system-x86_64.morph @@ -46,6 +46,8 @@ strata: morph: strata/x-generic.morph - name: qt5-tools morph: strata/qt5-tools.morph +- name: qt5-tools-qtmultimedia + morph: strata/qt5-tools-qtmultimedia.morph - name: qt5-tools-qtwebkit morph: strata/qt5-tools-qtwebkit.morph - name: qt5-sdk -- cgit v1.2.1 From 33285ac236da8eff485f36e654ea1f5537e9d2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 22 Mar 2016 20:20:45 +0000 Subject: Upgrade qtcreator to 3.6.1 Change-Id: I86c485bb991e262c7272b2ca2e6140a3ffb7220d --- strata/qt5-sdk.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index d4c76ee8..3ee10a52 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -8,5 +8,5 @@ chunks: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph repo: upstream:qt-creator - ref: d81cd236df1cc6bc6977c438f0edbff35eef6682 - unpetrify-ref: baserock/3.3.0 + ref: 8895770ba36f96f150fe8dca71f889ff24d07fd6 + unpetrify-ref: baserock/v3.6.1 -- cgit v1.2.1 From 556b39ee83be5a0dfbd5c6a727c168e2b15c650a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 22 Mar 2016 20:19:10 +0000 Subject: Upgrade to Qt5.6 Change-Id: Ie273f3ba1e9f3f665c9dbf64741f7c9427ddfdb9 --- strata/qt5-tools-qtmultimedia.morph | 6 +- strata/qt5-tools-qtwayland.morph | 4 +- strata/qt5-tools-qtwebkit.morph | 24 +++---- strata/qt5-tools.morph | 102 ++++++++++++++---------------- strata/qt5-tools/qt3d.morph | 10 --- strata/qt5-tools/qtbase.morph | 14 +--- strata/qt5-tools/qtconnectivity.morph | 10 --- strata/qt5-tools/qtdeclarative.morph | 10 --- strata/qt5-tools/qtdoc.morph | 8 --- strata/qt5-tools/qtgraphicaleffects.morph | 8 --- strata/qt5-tools/qtimageformats.morph | 10 --- strata/qt5-tools/qtjsbackend.morph | 10 --- strata/qt5-tools/qtlocation.morph | 10 --- strata/qt5-tools/qtmultimedia.morph | 10 --- strata/qt5-tools/qtquick1.morph | 10 --- strata/qt5-tools/qtquickcontrols.morph | 10 --- strata/qt5-tools/qtscript.morph | 10 --- strata/qt5-tools/qtsensors.morph | 10 --- strata/qt5-tools/qtserialport.morph | 10 --- strata/qt5-tools/qtsvg.morph | 10 --- strata/qt5-tools/qttools.morph | 10 --- strata/qt5-tools/qttranslations.morph | 8 --- strata/qt5-tools/qtwebkit-examples.morph | 8 --- strata/qt5-tools/qtwebkit.morph | 10 --- strata/qt5-tools/qtwebsockets.morph | 10 --- strata/qt5-tools/qtx11extras.morph | 10 --- strata/qt5-tools/qtxmlpatterns.morph | 10 --- strata/qt5-tools/ruby-1.8.morph | 9 --- strata/qt5-tools/ruby-1.9.morph | 9 --- 29 files changed, 65 insertions(+), 315 deletions(-) delete mode 100644 strata/qt5-tools/qt3d.morph delete mode 100644 strata/qt5-tools/qtconnectivity.morph delete mode 100644 strata/qt5-tools/qtdeclarative.morph delete mode 100644 strata/qt5-tools/qtdoc.morph delete mode 100644 strata/qt5-tools/qtgraphicaleffects.morph delete mode 100644 strata/qt5-tools/qtimageformats.morph delete mode 100644 strata/qt5-tools/qtjsbackend.morph delete mode 100644 strata/qt5-tools/qtlocation.morph delete mode 100644 strata/qt5-tools/qtmultimedia.morph delete mode 100644 strata/qt5-tools/qtquick1.morph delete mode 100644 strata/qt5-tools/qtquickcontrols.morph delete mode 100644 strata/qt5-tools/qtscript.morph delete mode 100644 strata/qt5-tools/qtsensors.morph delete mode 100644 strata/qt5-tools/qtserialport.morph delete mode 100644 strata/qt5-tools/qtsvg.morph delete mode 100644 strata/qt5-tools/qttools.morph delete mode 100644 strata/qt5-tools/qttranslations.morph delete mode 100644 strata/qt5-tools/qtwebkit-examples.morph delete mode 100644 strata/qt5-tools/qtwebkit.morph delete mode 100644 strata/qt5-tools/qtwebsockets.morph delete mode 100644 strata/qt5-tools/qtx11extras.morph delete mode 100644 strata/qt5-tools/qtxmlpatterns.morph delete mode 100644 strata/qt5-tools/ruby-1.8.morph delete mode 100644 strata/qt5-tools/ruby-1.9.morph diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index 20473ec2..a4830aff 100644 --- a/strata/qt5-tools-qtmultimedia.morph +++ b/strata/qt5-tools-qtmultimedia.morph @@ -6,7 +6,7 @@ build-depends: - morph: strata/multimedia-gstreamer.morph chunks: - name: qtmultimedia - morph: strata/qt5-tools/qtmultimedia.morph repo: upstream:qt5/qtmultimedia - ref: a42a5ae6191ecbe317a00d8261bc53e842967052 - unpetrify-ref: baserock/qt5.4-wip-gstreamer-1.0 + ref: 9985224a89b830dc182b428f491b6187d6f0e1ba + unpetrify-ref: v5.6.0 + build-system: qmake diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph index d22b3268..8342c42d 100644 --- a/strata/qt5-tools-qtwayland.morph +++ b/strata/qt5-tools-qtwayland.morph @@ -6,6 +6,6 @@ build-depends: chunks: - name: qtwayland repo: upstream:qt5/qtwayland - ref: d5e7965a87d81e2d7157c785403b0aba681de62a - unpetrify-ref: 5.4.2 + ref: 29b8bd8b1117589341110502fe516bf22c920747 + unpetrify-ref: v5.6.0 build-system: qmake diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph index bb86d6b5..5d298e4d 100644 --- a/strata/qt5-tools-qtwebkit.morph +++ b/strata/qt5-tools-qtwebkit.morph @@ -7,28 +7,28 @@ build-depends: - morph: strata/ruby.morph chunks: - name: qtwebkit - morph: strata/qt5-tools/qtwebkit.morph repo: upstream:qt5/qtwebkit - ref: 586bdc38324dfaeec65389bf7646c82cb35db017 - unpetrify-ref: 5.4.2 + ref: 7205faf1a546a690f68176989100109e9a3335b7 + unpetrify-ref: '5.6' + build-system: qmake - name: qtwebkit-examples - morph: strata/qt5-tools/qtwebkit-examples.morph repo: upstream:qt5/qtwebkit-examples - ref: 70bd4d5253f134bf48a30544030bb832f1eba8b3 - unpetrify-ref: v5.4.0 + ref: 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 + unpetrify-ref: '5.6' + build-system: qmake build-depends: - qtwebkit - name: qttools - morph: strata/qt5-tools/qttools.morph repo: upstream:qt5/qttools - ref: 5060a0ec7dcb26826b19eefbd6063efcbde6101f - unpetrify-ref: v5.4.0 + ref: 9904992dc4eb9a5958fcfbac238374ff38498143 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtwebkit - name: qttranslations - morph: strata/qt5-tools/qttranslations.morph repo: upstream:qt5/qttranslations - ref: 3aad4ab4718d4bf952275a07e406e93eb6a22eed - unpetrify-ref: v5.4.0 + ref: 41d212290c3822b8eef151785d89ac5f5b246bde + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qttools diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index 085643f9..ffdb6772 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -9,123 +9,115 @@ chunks: - name: qtbase morph: strata/qt5-tools/qtbase.morph repo: upstream:qt5/qtbase - ref: 5367fa356233da4c0f28172a8f817791525f5457 - unpetrify-ref: v5.4.0 + ref: d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b + unpetrify-ref: v5.6.0 - name: qtsvg - morph: strata/qt5-tools/qtsvg.morph repo: upstream:qt5/qtsvg - ref: eece19e62638409b479cabcbb985978d61d84307 - unpetrify-ref: v5.4.0 + ref: 38777ea7451d55e9c3d32d88d46063016013f60c + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtscript - morph: strata/qt5-tools/qtscript.morph repo: upstream:qt5/qtscript - ref: 1371263991489f11774250aa609ace0b12415186 - unpetrify-ref: v5.4.0 + ref: a70f6a1b9599931fccd13b15a1700e61137f7e72 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtdeclarative - morph: strata/qt5-tools/qtdeclarative.morph repo: upstream:qt5/qtdeclarative - ref: fdf004803d036583f58ceb832803cfe39c6ba6d8 - unpetrify-ref: v5.4.0 - build-depends: - - qtbase - - qtscript -- name: qtquick1 - morph: strata/qt5-tools/qtquick1.morph - repo: upstream:qt5/qtquick1 - ref: 1f92491bd95abc642dcd882846884a5271c8ba16 - unpetrify-ref: v5.4.0 + ref: de276ed0c8a715098245641285405b8a884ef898 + unpetrify-ref: baserock/v5.6.0 + build-system: qmake build-depends: - qtbase - qtscript - name: qt3d - morph: strata/qt5-tools/qt3d.morph repo: upstream:qt5/qt3d - ref: bdb98baf8253c69949a8c259369203da9ffb269c - unpetrify-ref: baserock/v5.0.0-beta1-81-gbdb98ba + ref: 7a208d76ed96bb506899becfe680df06f95451c7 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - qtscript - qtdeclarative - name: qtquickcontrols - morph: strata/qt5-tools/qtquickcontrols.morph repo: upstream:qt5/qtquickcontrols - ref: ea099e341b5f8845be56f81b22e44a8b6cb227a2 - unpetrify-ref: v5.4.0 + ref: 85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - qtdeclarative - name: qtsensors - morph: strata/qt5-tools/qtsensors.morph repo: upstream:qt5/qtsensors - ref: 10702cfa8ce803e0911306284c246a879d865f1d - unpetrify-ref: v5.4.0 + ref: 7197e7f4b385315cb241043495cbfad58deb911a + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtserialport - morph: strata/qt5-tools/qtserialport.morph repo: upstream:qt5/qtserialport - ref: 9aef6c3c8ff97b7998bdd813f7c7f3d845b2a53f - unpetrify-ref: v5.4.0 + ref: 03d492e49e74eefa1c83e37e833d862f4b9f1e45 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtx11extras - morph: strata/qt5-tools/qtx11extras.morph repo: upstream:qt5/qtx11extras - ref: a21bbb45019e1bbc7b583811ff2e84757082a01a - unpetrify-ref: v5.4.0 + ref: d64ee96f0df4d3baa6959b8552bc59d53cb0b451 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtxmlpatterns - morph: strata/qt5-tools/qtxmlpatterns.morph repo: upstream:qt5/qtxmlpatterns - ref: 2e8b90b33d1d8dce4acdb6a116a227f2a5d3e044 - unpetrify-ref: v5.4.0 + ref: e9110eb0a0980aa7e49928a836e0b00c2c3f4120 + unpetrify-ref: baserock/v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtdoc - morph: strata/qt5-tools/qtdoc.morph repo: upstream:qt5/qtdoc - ref: 251f5eaa2dae740c0d0217893038a3f5bab2bca3 - unpetrify-ref: v5.4.0 + ref: 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27d + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtgraphicaleffects - morph: strata/qt5-tools/qtgraphicaleffects.morph repo: upstream:qt5/qtgraphicaleffects - ref: 9e9600d92224084f7942a6bd83b926c630a29747 - unpetrify-ref: v5.4.0 + ref: 4b8e9a348ca379b203c26ff14dd236267dd60646 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - qtdeclarative - name: qtimageformats - morph: strata/qt5-tools/qtimageformats.morph repo: upstream:qt5/qtimageformats - ref: fdc7026fb7d098abbf135fd5e7d2cf00884f9235 - unpetrify-ref: v5.4.0 + ref: 0bd46d5861fa7b48c87cd3a734d00671df929869 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtconnectivity - morph: strata/qt5-tools/qtconnectivity.morph repo: upstream:qt5/qtconnectivity - ref: 5d405d07fb51502d0bfab08f4d74aa5eba365bab - unpetrify-ref: v5.4.0 + ref: 8b550f0a7508ed413cded71a20485e61010b0aa3 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtlocation - morph: strata/qt5-tools/qtlocation.morph repo: upstream:qt5/qtlocation - ref: 7791dd790d2b15751b703db70a5fceb31d3fd99f - unpetrify-ref: v5.4.0 + ref: ca4bce553d03a64fa119650990083267ea9c8d31 + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase - name: qtwebsockets - morph: strata/qt5-tools/qtwebsockets.morph repo: upstream:qt5/qtwebsockets - ref: d1c9ede19976767393fe5db2f396c0c18d6fbced - unpetrify-ref: v5.4.0 + ref: 88946bbe209cb6148b4a3284077bb9a06c7bc1ef + unpetrify-ref: v5.6.0 + build-system: qmake build-depends: - qtbase diff --git a/strata/qt5-tools/qt3d.morph b/strata/qt5-tools/qt3d.morph deleted file mode 100644 index d4e44d4e..00000000 --- a/strata/qt5-tools/qt3d.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qt3d -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtbase.morph b/strata/qt5-tools/qtbase.morph index 9b2a20c6..0a6c61bc 100644 --- a/strata/qt5-tools/qtbase.morph +++ b/strata/qt5-tools/qtbase.morph @@ -1,17 +1,5 @@ name: qtbase kind: chunk +build-system: qmake configure-commands: - ./configure -v -prefix /usr -opensource -confirm-license -build-commands: -- make -- touch /qtbase.build/src/corelib/corelib.pro -- touch /qtbase.build/qmake/qmake.pro -- touch /qtbase.build/qmake/qmake-docs.pro -- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc -- make html_docs -- ./bin/qmake -unset QDOC -install-commands: -- make install INSTALL_ROOT="$DESTDIR" -- ./bin/qmake -set QDOC /qtbase.build/bin/qdoc -- make install_html_docs INSTALL_ROOT="$DESTDIR" -- ./bin/qmake -unset QDOC diff --git a/strata/qt5-tools/qtconnectivity.morph b/strata/qt5-tools/qtconnectivity.morph deleted file mode 100644 index d1123711..00000000 --- a/strata/qt5-tools/qtconnectivity.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtconnectivity -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtdeclarative.morph b/strata/qt5-tools/qtdeclarative.morph deleted file mode 100644 index 9eb02331..00000000 --- a/strata/qt5-tools/qtdeclarative.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtdeclarative -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtdoc.morph b/strata/qt5-tools/qtdoc.morph deleted file mode 100644 index 3b449382..00000000 --- a/strata/qt5-tools/qtdoc.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qtdoc -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtgraphicaleffects.morph b/strata/qt5-tools/qtgraphicaleffects.morph deleted file mode 100644 index 27c42971..00000000 --- a/strata/qt5-tools/qtgraphicaleffects.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qtgraphicaleffects -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtimageformats.morph b/strata/qt5-tools/qtimageformats.morph deleted file mode 100644 index 08323ca1..00000000 --- a/strata/qt5-tools/qtimageformats.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtimageformats -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtjsbackend.morph b/strata/qt5-tools/qtjsbackend.morph deleted file mode 100644 index 5813084c..00000000 --- a/strata/qt5-tools/qtjsbackend.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtjsbackend -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtlocation.morph b/strata/qt5-tools/qtlocation.morph deleted file mode 100644 index 14a527ff..00000000 --- a/strata/qt5-tools/qtlocation.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtlocation -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtmultimedia.morph b/strata/qt5-tools/qtmultimedia.morph deleted file mode 100644 index 537baa08..00000000 --- a/strata/qt5-tools/qtmultimedia.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtmultimedia -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make install_html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtquick1.morph b/strata/qt5-tools/qtquick1.morph deleted file mode 100644 index d4692445..00000000 --- a/strata/qt5-tools/qtquick1.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtquick1 -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtquickcontrols.morph b/strata/qt5-tools/qtquickcontrols.morph deleted file mode 100644 index 12051034..00000000 --- a/strata/qt5-tools/qtquickcontrols.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtquickcontrols -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtscript.morph b/strata/qt5-tools/qtscript.morph deleted file mode 100644 index 6f27842e..00000000 --- a/strata/qt5-tools/qtscript.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtscript -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtsensors.morph b/strata/qt5-tools/qtsensors.morph deleted file mode 100644 index d4b4ec00..00000000 --- a/strata/qt5-tools/qtsensors.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtsensors -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtserialport.morph b/strata/qt5-tools/qtserialport.morph deleted file mode 100644 index 0a623865..00000000 --- a/strata/qt5-tools/qtserialport.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtserialport -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtsvg.morph b/strata/qt5-tools/qtsvg.morph deleted file mode 100644 index 40316a3c..00000000 --- a/strata/qt5-tools/qtsvg.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtsvg -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qttools.morph b/strata/qt5-tools/qttools.morph deleted file mode 100644 index 1baa10e7..00000000 --- a/strata/qt5-tools/qttools.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qttools -kind: chunk -configure-commands: -- qmake -build-commands: -- unset TARGET ; make -- unset TARGET ; make html_docs -install-commands: -- unset TARGET ; make install INSTALL_ROOT=$DESTDIR -- unset TARGET ; make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qttranslations.morph b/strata/qt5-tools/qttranslations.morph deleted file mode 100644 index bfb61302..00000000 --- a/strata/qt5-tools/qttranslations.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qttranslations -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtwebkit-examples.morph b/strata/qt5-tools/qtwebkit-examples.morph deleted file mode 100644 index b6683e65..00000000 --- a/strata/qt5-tools/qtwebkit-examples.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: qtwebkit-examples -kind: chunk -configure-commands: -- qmake -build-commands: -- make -install-commands: -- make install INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtwebkit.morph b/strata/qt5-tools/qtwebkit.morph deleted file mode 100644 index c76db433..00000000 --- a/strata/qt5-tools/qtwebkit.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtwebkit -kind: chunk -configure-commands: -- QMAKEPATH=/qtwebkit.build/Tools/qmake/mkspecs qmake WebKit.pro -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtwebsockets.morph b/strata/qt5-tools/qtwebsockets.morph deleted file mode 100644 index e1cac87f..00000000 --- a/strata/qt5-tools/qtwebsockets.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtwebsockets -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtx11extras.morph b/strata/qt5-tools/qtx11extras.morph deleted file mode 100644 index edea0acf..00000000 --- a/strata/qt5-tools/qtx11extras.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtx11extras -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/qtxmlpatterns.morph b/strata/qt5-tools/qtxmlpatterns.morph deleted file mode 100644 index bdd32d5f..00000000 --- a/strata/qt5-tools/qtxmlpatterns.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: qtxmlpatterns -kind: chunk -configure-commands: -- qmake -build-commands: -- make -- make html_docs -install-commands: -- make install INSTALL_ROOT=$DESTDIR -- make install_html_docs INSTALL_ROOT=$DESTDIR diff --git a/strata/qt5-tools/ruby-1.8.morph b/strata/qt5-tools/ruby-1.8.morph deleted file mode 100644 index cee282c0..00000000 --- a/strata/qt5-tools/ruby-1.8.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: ruby-1.8 -kind: chunk -configure-commands: -- autoconf -- ./configure --prefix=/usr --program-suffix=-1.8 -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install diff --git a/strata/qt5-tools/ruby-1.9.morph b/strata/qt5-tools/ruby-1.9.morph deleted file mode 100644 index bc697ada..00000000 --- a/strata/qt5-tools/ruby-1.9.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: ruby-1.9 -kind: chunk -configure-commands: -- autoconf -- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8 -build-commands: -- make -install-commands: -- make DESTDIR="$DESTDIR" install -- cgit v1.2.1 From fe6bd219f936e49942894e6bde877efe231a3e6c Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Sat, 19 Mar 2016 19:06:10 +0900 Subject: parted.morph: Remove the perl requirement from bootstrap.conf The gnulib bootstrap script is idiotic, when it does get_version(), it looks for a string v${major}.${minor}.${micro}... it starts this by taking the last 'v' on the line and removing everything else. On an arm arch, instead of getting 5.22.0 from the (v5.22.0) string output from perl --version... it gets 5tejl-linux from the armv5tejl-linux string on the same line... get_version() thus thinks we have "perl 5" and breaks. This is not a problem for armv7lhf builds, because the bootstrap script conveniently interprets perl's version as perl version 7, which is newer than the required 5.6. Change-Id: I1445cfd84efd37c1828eae09def88b27f18af250 --- strata/tools/parted.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/tools/parted.morph b/strata/tools/parted.morph index 86d74da6..0f279950 100644 --- a/strata/tools/parted.morph +++ b/strata/tools/parted.morph @@ -3,6 +3,7 @@ kind: chunk build-system: autotools pre-configure-commands: - sed -i -e '/^buildreq="/,/^"/{/rsync/d}' bootstrap.conf +- sed -i -e '/^buildreq="/,/^"/{/perl/d}' bootstrap.conf - ./bootstrap --skip-po --no-git --gnulib-srcdir=gnulib configure-commands: # Disable device-mapper as it is not installed on Baserock -- cgit v1.2.1 From 98d01306bacafaedb4f652c1a31a7b5ae10b0a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 23 Mar 2016 07:31:31 +0000 Subject: Add a generic IVI system and cluster for x86_64 With generic upstream components (some of them already by GENIVI and AGL) Change-Id: Idb849c788dc90b1a95d6a85b7822cfc2a9df5004 --- clusters/ivi-system-x86_64-deploy.morph | 24 +++++++++ systems/ivi-system-x86_64.morph | 88 +++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 clusters/ivi-system-x86_64-deploy.morph create mode 100644 systems/ivi-system-x86_64.morph diff --git a/clusters/ivi-system-x86_64-deploy.morph b/clusters/ivi-system-x86_64-deploy.morph new file mode 100644 index 00000000..0833ec8c --- /dev/null +++ b/clusters/ivi-system-x86_64-deploy.morph @@ -0,0 +1,24 @@ +name: ivi-system-x86_64-deploy +kind: cluster +description: | + Deploy a stock IVI system. + + The resulting image can be copied to a USB and booted from there, + as well as in a virtual machine. + +systems: +- morph: systems/ivi-system-x86_64.morph + deploy: + ivi-system-x86_64: + type: extensions/rawdisk + location: /ivi-system-x86_64.img + HOSTNAME: ivi-system-x86-64 + DISK_SIZE: 6G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + initramfs: + type: initramfs + location: boot/initramfs.gz diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph new file mode 100644 index 00000000..8515c2ec --- /dev/null +++ b/systems/ivi-system-x86_64.morph @@ -0,0 +1,88 @@ +name: ivi-system-x86_64 +kind: system +description: A generic IVI system with components from GENIVI and AGL +arch: x86_64 +strata: +- name: audio-bluetooth + morph: strata/audio-bluetooth.morph +- name: bsp-x86_64-generic + morph: strata/bsp-x86_64-generic.morph +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: data-indexing-management + morph: strata/data-indexing-management.morph +- name: device-management + morph: strata/device-management.morph +- name: dlna-services + morph: strata/dlna-services.morph +- name: foundation + morph: strata/foundation.morph +- name: geolocation + morph: strata/geolocation.morph +- name: glib-common + morph: strata/glib-common.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: icu-common + morph: strata/icu-common.morph +- name: input-common + morph: strata/input-common.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-hardware-codecs-x86 + morph: strata/multimedia-hardware-codecs-x86.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: multimedia-gstreamer-openmax-generic + morph: strata/multimedia-gstreamer-openmax-generic.morph +- name: navigation + morph: strata/navigation.morph +- name: network-security + morph: strata/network-security.morph +- name: NetworkManager-common + morph: strata/NetworkManager-common.morph +- name: privileges-management + morph: strata/privileges-management.morph +- name: python2-core + morph: strata/python2-core.morph +- name: python3-gobject + morph: strata/python3-gobject.morph +- name: qt5-tools + morph: strata/qt5-tools.morph +- name: qt5-tools-qtmultimedia + morph: strata/qt5-tools-qtmultimedia.morph +- name: qt5-tools-qtwebkit + morph: strata/qt5-tools-qtwebkit.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph +- name: ruby + morph: strata/ruby.morph +- name: samba + morph: strata/samba.morph +- name: secret-service + morph: strata/secret-service.morph +- name: spell-checking + morph: strata/spell-checking.morph +- name: storage-management + morph: strata/storage-management.morph +- name: vala-common + morph: strata/vala-common.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: weston-common + morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +configuration-extensions: +- extensions/set-hostname +- extensions/install-essential-files -- cgit v1.2.1 From 01f4d354b512195a914dd90ecd6f16db47621069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 23 Mar 2016 07:51:48 +0000 Subject: Add a generic IVI system and cluster for NVIDIA JETSON board With generic upstream components (some of them already by GENIVI and AGL) Change-Id: Id0562558cc072eed4c90168f44db16daffef65b9 --- clusters/ivi-system-armv7lhf-jetson-deploy.morph | 18 +++++ systems/ivi-system-armv7lhf-jetson.morph | 86 ++++++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 clusters/ivi-system-armv7lhf-jetson-deploy.morph create mode 100644 systems/ivi-system-armv7lhf-jetson.morph diff --git a/clusters/ivi-system-armv7lhf-jetson-deploy.morph b/clusters/ivi-system-armv7lhf-jetson-deploy.morph new file mode 100644 index 00000000..fef89351 --- /dev/null +++ b/clusters/ivi-system-armv7lhf-jetson-deploy.morph @@ -0,0 +1,18 @@ +name: ivi-system-armv7lhf-jetson-deploy +kind: cluster +description: Deploy a IVI system. +systems: +- morph: systems/ivi-system-armv7lhf-jetson.morph + deploy: + ivi-system-armv7lhf-jetson: + type: extensions/rawdisk + location: /ivi-system-armv7lhf-jetson.img + HOSTNAME: ivi-system-armv7lhf-jetson + DISK_SIZE: 6G + BOOT_DEVICE: /dev/mmcblk0p1 + ROOT_DEVICE: /dev/mmcblk0p2 + DTB_PATH: boot/tegra124-jetson-tk1.dtb + BOOTLOADER_CONFIG_FORMAT: extlinux + BOOTLOADER_INSTALL: none + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 + nouveau.pstate=1 diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph new file mode 100644 index 00000000..004d6ae1 --- /dev/null +++ b/systems/ivi-system-armv7lhf-jetson.morph @@ -0,0 +1,86 @@ +name: ivi-system-armv7lhf-jetson +kind: system +description: A generic IVI system with components from GENIVI and AGL +arch: armv7lhf +strata: +- name: audio-bluetooth + morph: strata/audio-bluetooth.morph +- name: bsp-x86_64-generic + morph: strata/bsp-x86_64-generic.morph +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: data-indexing-management + morph: strata/data-indexing-management.morph +- name: device-management + morph: strata/device-management.morph +- name: dlna-services + morph: strata/dlna-services.morph +- name: foundation + morph: strata/foundation.morph +- name: geolocation + morph: strata/geolocation.morph +- name: glib-common + morph: strata/glib-common.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: icu-common + morph: strata/icu-common.morph +- name: input-common + morph: strata/input-common.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: multimedia-gstreamer-openmax-generic + morph: strata/multimedia-gstreamer-openmax-generic.morph +- name: navigation + morph: strata/navigation.morph +- name: network-security + morph: strata/network-security.morph +- name: NetworkManager-common + morph: strata/NetworkManager-common.morph +- name: privileges-management + morph: strata/privileges-management.morph +- name: python2-core + morph: strata/python2-core.morph +- name: python3-gobject + morph: strata/python3-gobject.morph +- name: qt5-tools + morph: strata/qt5-tools.morph +- name: qt5-tools-qtmultimedia + morph: strata/qt5-tools-qtmultimedia.morph +- name: qt5-tools-qtwebkit + morph: strata/qt5-tools-qtwebkit.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph +- name: ruby + morph: strata/ruby.morph +- name: samba + morph: strata/samba.morph +- name: secret-service + morph: strata/secret-service.morph +- name: spell-checking + morph: strata/spell-checking.morph +- name: storage-management + morph: strata/storage-management.morph +- name: vala-common + morph: strata/vala-common.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: weston-common + morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +configuration-extensions: +- extensions/set-hostname +- extensions/install-essential-files -- cgit v1.2.1 From 748260cdf49f66f3ec901e09efb11ef35b262edc Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Wed, 30 Mar 2016 08:56:19 +0000 Subject: Update Morph This removes support for definitions V6, and adds support for definitions V8. The last release of the Baserock reference system images was 15.47.1, which used definitions V6. Full list of changes: a7f1247 Add support for definitions version 8 9404317 Remove support for definitions version 6 575c40c Adapt integration test to definitions version 7 0ee859a morphloader: simplify API d58d8e8 Unify local and remote repo cache modules 014a029 Get rid of the CachedRepo class (almost) e8a67a7 Hide get_repo() and cache_repo() functions, always use get_updated_repo() bb139ec Fix some test failures Change-Id: Ied8aa209ab8eede2a160c4273f93c15b7ff41793 --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 6dd1633e..0d37ae18 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -37,7 +37,7 @@ chunks: build-system: python-distutils - name: morph repo: baserock:baserock/morph - ref: 7067e405a7dad7976a9b7d61ed67fb8bb5042d3c + ref: a7f12476d4e7b2025a60be58027b67b9e551f31b unpetrify-ref: master build-system: python-distutils build-depends: -- cgit v1.2.1 From 6738a187e1c9e175bd07a691587f7c088ba7cb1a Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Tue, 29 Mar 2016 12:04:51 +0000 Subject: Update to latest stable versions of GNU Patch, & GNU Bison Also, switch to using upstream v2.4.6 tag of GNU Libtool. This is easy to do once definitions V8 is merged -- no more .gitmodules patching! Tested by building a minimal-system-x86_64 Change-Id: If2f01507d364245736727699a33225ce929655dc --- strata/core.morph | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index 5304f50a..aa68d652 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -187,8 +187,8 @@ chunks: - name: bison morph: strata/core/bison.morph repo: upstream:bison - ref: 2ab6d1daaccf32fc4314e4b2fe44da977f11a308 - unpetrify-ref: baserock/v3.0.2 + ref: c4e686a1abd817b4d4da5bdd5b3a5540566fd4a0 + unpetrify-ref: v3.0.4 build-depends: - autoconf - automake @@ -200,8 +200,8 @@ chunks: - name: patch morph: strata/core/patch.morph repo: upstream:patch - ref: 3bbb26c928a147cfcf0756f1cc0a1307e5cc663f - unpetrify-ref: baserock/v2.7.1 + ref: 3b698ab6a13fd3e5890689cd85cf41312c682f8c + unpetrify-ref: v2.7.5 build-depends: - autoconf - automake @@ -221,8 +221,8 @@ chunks: - libtool-tarball - name: libtool repo: upstream:libtool - ref: 5e11a17c39a2a976a09c33a568431a9f7ad00d48 - unpetrify-ref: baserock/v2.4.6 + ref: f09d00cbcf924c378573163e244fffeb8d28005f + unpetrify-ref: v2.4.6 build-system: autotools build-depends: - autoconf -- cgit v1.2.1 From 71a2b8bb2271523c420fdd1c5b5a6b604dc75d50 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sun, 27 Mar 2016 02:23:00 +0000 Subject: Apply migration to definitions version 8 Note: Migration scripts live now in: http://git.baserock.org/cgit/baserock/baserock/spec.git Change-Id: Ica4fd12d96e563e5195172318d2d65847266146f --- VERSION | 2 +- strata/ansible.morph | 9 ++++++ strata/ceph-service.morph | 15 ++++++++++ strata/chef.morph | 6 ++++ strata/core.morph | 13 +++++++- strata/coreutils-common.morph | 17 +++++++++++ strata/devtools.morph | 3 ++ strata/foundation.morph | 5 +++- strata/genivi-demo-platform.morph | 5 +++- strata/gnome.morph | 46 +++++++++++++++++++++++++++-- strata/multimedia-gstreamer-0.10.morph | 9 ++++++ strata/multimedia-gstreamer.morph | 17 +++++++++++ strata/multimedia-hardware-codecs-x86.morph | 3 ++ strata/network-security.morph | 3 ++ strata/openstack-services.morph | 33 ++++++++++++++++----- strata/ostree-core.morph | 5 ++++ strata/qt4-sdk.morph | 3 ++ strata/qt5-sdk.morph | 3 ++ strata/qt5-tools.morph | 6 ++++ strata/tools.morph | 3 ++ strata/trove.morph | 19 ++++++++++++ strata/vala-common.morph | 3 ++ strata/virtualization.morph | 26 ++++++++++++++++ strata/x-common.morph | 12 ++++++++ strata/xdg-app-common.morph | 3 ++ 25 files changed, 255 insertions(+), 14 deletions(-) diff --git a/VERSION b/VERSION index e8b0c161..9a47f2b9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -version: 7 +version: 8 diff --git a/strata/ansible.morph b/strata/ansible.morph index 43ebc2bd..583093f4 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -10,6 +10,15 @@ chunks: repo: upstream:ansible ref: 0a7124541247cc613352054f4bc0c3e116e0b657 unpetrify-ref: baserock/v1.8.4 + submodules: + lib/ansible/modules/core: + url: upstream:ansible-modules-core.git + v2/ansible/modules/core: + url: upstream:ansible-modules-core.git + v2/ansible/modules/extras: + url: upstream:ansible-modules-extras.git + lib/ansible/modules/extras: + url: upstream:ansible-modules-extras.git - name: openstack-ansible-modules morph: strata/ansible/openstack-ansible-modules.morph repo: upstream:openstack/openstack-ansible-modules diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index c428a1ba..39e1c919 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -61,3 +61,18 @@ chunks: - libeditline - keyutils - boost + submodules: + src/erasure-code/jerasure/gf-complete: + url: https://github.com/ceph/gf-complete.git + src/civetweb: + url: https://github.com/ceph/civetweb + ceph-erasure-code-corpus: + url: https://github.com/ceph/ceph-erasure-code-corpus.git + src/rocksdb: + url: https://github.com/ceph/rocksdb + src/erasure-code/jerasure/jerasure: + url: https://github.com/ceph/jerasure.git + src/libs3: + url: https://github.com/ceph/libs3.git + ceph-object-corpus: + url: https://github.com/ceph/ceph-object-corpus.git diff --git a/strata/chef.morph b/strata/chef.morph index 9a7f6e73..7a72fc3b 100644 --- a/strata/chef.morph +++ b/strata/chef.morph @@ -17,6 +17,9 @@ chunks: unpetrify-ref: 1.0.1 build-depends: - yajl + submodules: + ext/libyajl2/vendor/yajl: + url: https://github.com/lloyd/yajl.git - name: chef-12.0.0.alpha.0 morph: strata/chef/chef-master.morph repo: upstream:ruby-gems/chef @@ -49,6 +52,9 @@ chunks: unpetrify-ref: master build-depends: - libyajl2-1.0.1 + submodules: + ext/libyajl2/vendored: + url: https://github.com/lloyd/yajl - name: hashie-2.1.2 morph: strata/chef/hashie-2.1.2.morph repo: upstream:ruby-gems/hashie diff --git a/strata/core.morph b/strata/core.morph index aa68d652..cb306dad 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -197,6 +197,11 @@ chunks: - git-minimal - help2man - mini-utils + submodules: + submodules/autoconf: + url: upstream:autoconf + gnulib: + url: upstream:gnulib - name: patch morph: strata/core/patch.morph repo: upstream:patch @@ -208,6 +213,9 @@ chunks: - bison - git-minimal - mini-utils + submodules: + gnulib: + url: upstream:gnulib - name: xz repo: upstream:xz ref: a0cd05ee71d330b79ead6eb9222e1b24e1559d3a @@ -233,6 +241,9 @@ chunks: - patch - texinfo-tarball - xz + submodules: + gnulib: + url: upstream:gnulib - name: pkg-config morph: strata/core/pkg-config.morph repo: upstream:pkg-config @@ -385,7 +396,7 @@ chunks: - name: cython repo: upstream:cython ref: 4dd8e762fa51d01775506fbbc102c45dbcea065d - unpetrify-ref: "0.22" + unpetrify-ref: '0.22' build-system: python3-distutils build-depends: - python3 diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index 088276c5..e8937866 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -12,6 +12,9 @@ chunks: repo: upstream:coreutils ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 unpetrify-ref: baserock/8.23 + submodules: + gnulib: + url: upstream:gnulib - name: sed morph: strata/coreutils-common/sed.morph repo: upstream:sed @@ -19,6 +22,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: - coreutils + submodules: + gnulib: + url: upstream:gnulib - name: diff morph: strata/coreutils-common/diff.morph repo: upstream:diffutils @@ -26,6 +32,9 @@ chunks: unpetrify-ref: baserock/v3.3 build-depends: - coreutils + submodules: + gnulib: + url: upstream:gnulib - name: tar morph: strata/coreutils-common/tar.morph repo: upstream:tar @@ -33,11 +42,19 @@ chunks: unpetrify-ref: baserock/release_1_28 build-depends: - coreutils + submodules: + paxutils: + url: upstream:paxutils + gnulib: + url: upstream:gnulib - name: findutils morph: strata/coreutils-common/findutils.morph repo: upstream:findutils ref: ee6b25541336f9d74624ca814538ddc8c67f0732 unpetrify-ref: baserock/v4.5.14 + submodules: + gnulib: + url: upstream:gnulib - name: less repo: upstream:less ref: 09a405d8f652b56944c93ebf5c673cdfe5319b04 diff --git a/strata/devtools.morph b/strata/devtools.morph index 92746d3a..a6649ff2 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -40,6 +40,9 @@ chunks: repo: upstream:wget ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f unpetrify-ref: baserock/v1.16.3 + submodules: + gnulib: + url: upstream:gnulib - name: git morph: strata/devtools/git.morph repo: upstream:git diff --git a/strata/foundation.morph b/strata/foundation.morph index ff87bbb1..be87728b 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -7,7 +7,7 @@ chunks: - name: bash-completion repo: upstream:bash-completion ref: 3085c7e12179817a02a611016606391295c69942 - unpetrify-ref: "2.1" + unpetrify-ref: '2.1' build-system: autotools - name: groff morph: strata/foundation/groff.morph @@ -69,6 +69,9 @@ chunks: build-system: autotools build-depends: - libusb + submodules: + usbhid-dump: + url: upstream:usbhid-dump - name: lzo morph: strata/foundation/lzo.morph repo: upstream:lzo diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index e1ea819c..50a2e04b 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -15,11 +15,14 @@ chunks: repo: upstream:genivi/browser-poc ref: d90501f8bd3edcd35eae72efbfb4583ba8f3cdfc unpetrify-ref: baserock/genivi/genivi-demo-platform + submodules: + documentation/designdocument/cls: + url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git - name: automotive-message-broker morph: strata/genivi-demo-platform/automotive-message-broker.morph repo: upstream:automotive-message-broker ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 - unpetrify-ref: "0.14" + unpetrify-ref: '0.14' - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph repo: upstream:audiomanager diff --git a/strata/gnome.morph b/strata/gnome.morph index 14337cf9..39310946 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -216,6 +216,9 @@ chunks: - libnotify - lcms2 - upower + submodules: + plugins/media-keys/gvc: + url: upstream:gnome/libgnome-volume-control - name: zenity repo: upstream:zenity ref: d7135db2bdfdca812c0165f90e4611af9c7c6a50 @@ -315,6 +318,9 @@ chunks: - librest - telepathy-glib - WebKitGtk + submodules: + telepathy-account-widgets: + url: upstream:gnome/telepathy-account-widgets - name: liboauth repo: upstream:liboauth ref: 9ff9d2902caf8a85c5019c11214d73e67053ba69 @@ -409,6 +415,11 @@ chunks: - startup-notification - telepathy-glib - network-manager-applet + submodules: + src/gvc: + url: upstream:gnome/libgnome-volume-control + data/theme/gnome-shell-sass: + url: upstream:gnome/gnome-shell-sass - name: gnome-session morph: strata/gnome/gnome-session.morph repo: upstream:gnome/gnome-session @@ -499,11 +510,14 @@ chunks: - vte - gnome-desktop - gsettings-desktop-schemas + submodules: + libgd: + url: upstream:gnome/libgd - name: desktop-file-utils morph: strata/gnome/desktop-file-utils.morph repo: upstream:desktop-file-utils ref: 4944725bddcf5821d53d7d648fc53347ce12cc03 - unpetrify-ref: "0.22" + unpetrify-ref: '0.22' - name: gnome-terminal morph: strata/gnome/gnome-terminal.morph repo: upstream:gnome/gnome-terminal @@ -528,6 +542,9 @@ chunks: build-system: autotools build-depends: - libnice + submodules: + common: + url: upstream:gstreamer-common - name: telepathy-farstream repo: upstream:telepathy-farstream ref: 0b1bba79cfe94e7676fe69e9e0d2e3983a3c14c5 @@ -544,6 +561,9 @@ chunks: build-depends: - libnice - telepathy-glib + submodules: + lib/ext/wocky: + url: upstream:wocky - name: telepathy-salut morph: strata/gnome/telepathy-salut.morph repo: upstream:telepathy-salut @@ -551,6 +571,9 @@ chunks: unpetrify-ref: baserock/telepathy-salut-0.8.1 build-depends: - telepathy-glib + submodules: + lib/ext/wocky: + url: upstream:wocky - name: telepathy-idle repo: upstream:telepathy-idle ref: 55e9841a4af51d7f014395475526b700abec4d0b @@ -690,6 +713,11 @@ chunks: - libgtop - libpwquality - network-manager-applet + submodules: + libgd: + url: upstream:gnome/libgd + panels/sound/gvc: + url: upstream:gnome/libgnome-volume-control - name: gnome-initial-setup morph: strata/gnome/gnome-initial-setup.morph repo: upstream:gnome/gnome-initial-setup @@ -718,7 +746,7 @@ chunks: build-system: autotools repo: upstream:sound-theme-freedesktop ref: 9d2ac65a2f88263f0eec8b777ef3bdc023b93c25 - unpetrify-ref: "0.8" + unpetrify-ref: '0.8' - name: libwnck morph: strata/gnome/libwnck.morph repo: upstream:libwnck @@ -770,9 +798,12 @@ chunks: - iso-codes - libpeas - yelp-tools + submodules: + libgd: + url: upstream:gnome/libgd - name: yelp repo: upstream:gnome/yelp - morph: strata/gnome/yelp.morph + morph: strata/gnome/yelp.morph ref: 9932283ce9610f969e023a0dc326c81159c06a15 unpetrify-ref: 3.18.1 build-depends: @@ -803,6 +834,9 @@ chunks: - iso-codes - libpeas - yelp-tools + submodules: + libgd: + url: upstream:gnome/libgd - name: gnome-calendar repo: upstream:gnome/gnome-calendar ref: 5292e9d57442067701ce94eea54b4b12d13b7aa3 @@ -844,6 +878,9 @@ chunks: - telepathy-logger - telepathy-mission-control - yelp-tools + submodules: + telepathy-account-widgets: + url: upstream:gnome/telepathy-account-widgets - name: gnome-contacts repo: upstream:gnome/gnome-contacts ref: 3715ec79662989038d5055bb74aa0b728b40edb5 @@ -857,6 +894,9 @@ chunks: - libchamplain - libnotify - telepathy-glib + submodules: + libgd: + url: upstream:gnome/libgd - name: gnome-maps repo: upstream:gnome/gnome-maps ref: 6d6e8afd54735e565a0c81cb761f22bb82d142db diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index a9c84ca4..6f9d9f67 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -19,6 +19,9 @@ chunks: build-system: autotools build-depends: - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-base@0.10 repo: upstream:gstreamer-plugins-base ref: 960c596309dbb983a1d733259adccc45c47006a2 @@ -26,6 +29,9 @@ chunks: build-system: autotools build-depends: - gstreamer@0.10 + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-good@0.10 repo: upstream:gstreamer-plugins-good ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3 @@ -35,3 +41,6 @@ chunks: - gstreamer@0.10 - gstreamer-plugins-base@0.10 - orc + submodules: + common: + url: upstream:gstreamer-common diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 0cef379e..884fc9fb 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -20,6 +20,9 @@ chunks: build-system: autotools build-depends: - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-base repo: upstream:gstreamer-plugins-base ref: 644cd58c5a1142580ad133a5122986581cf4d8ef @@ -28,6 +31,9 @@ chunks: build-depends: - gstreamer - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-good repo: upstream:gstreamer-plugins-good ref: e6fb1b485dd2726e6c65d938c5ea4d002cf1036e @@ -37,6 +43,9 @@ chunks: - gstreamer - gstreamer-plugins-base - orc + submodules: + common: + url: upstream:gstreamer-common - name: gstreamer-plugins-bad repo: upstream:gstreamer-plugins-bad ref: 9a2e845040c3aafff00159a6b0031e123cad4b2f @@ -46,6 +55,9 @@ chunks: - gstreamer - gstreamer-plugins-base - orc + submodules: + common: + url: upstream:gstreamer-common - name: gst-libav morph: strata/multimedia-gstreamer/gst-libav.morph repo: upstream:gst-libav @@ -55,3 +67,8 @@ chunks: - gstreamer - gstreamer-plugins-base - orc + submodules: + gst-libs/ext/libav: + url: upstream:ffmpeg + common: + url: upstream:gstreamer-common diff --git a/strata/multimedia-hardware-codecs-x86.morph b/strata/multimedia-hardware-codecs-x86.morph index 421d55e5..d53698e4 100644 --- a/strata/multimedia-hardware-codecs-x86.morph +++ b/strata/multimedia-hardware-codecs-x86.morph @@ -26,3 +26,6 @@ chunks: build-system: autotools build-depends: - libva + submodules: + common: + url: upstream:gstreamer-common diff --git a/strata/network-security.morph b/strata/network-security.morph index caf4a08b..881a515a 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -42,3 +42,6 @@ chunks: - nettle - libtasn1 - p11-kit + submodules: + devel/openssl: + url: upstream:openssl-new diff --git a/strata/openstack-services.morph b/strata/openstack-services.morph index a26a6729..ac7ed111 100644 --- a/strata/openstack-services.morph +++ b/strata/openstack-services.morph @@ -13,7 +13,7 @@ chunks: morph: strata/openstack-services/erlang-sd_notify.morph repo: upstream:erlang-modules/erlang-sd_notify ref: 99f4689c2c18570680329f822591f95f9341ca10 - unpetrify-ref: "0.1" + unpetrify-ref: '0.1' - name: rabbitmq-codegen morph: strata/openstack-services/rabbitmq-codegen.morph ref: 4dc5ccde2a0b3d638e5754b00abf94196fe9ca32 @@ -43,6 +43,11 @@ chunks: unpetrify-ref: baserock/v1.6.1 build-depends: - py-amqp + submodules: + rabbitmq-codegen: + url: upstream:rabbitmq-codegen.git + rabbitmq-c: + url: upstream:python-packages/rabbitmq-c-github-ask.git - name: anyjson repo: upstream:python-packages/anyjson ref: 016506078e94718e1fe750eb5083ab5ba07498c8 @@ -125,6 +130,9 @@ chunks: ref: cce3ebd658f28aeb7dd54561554dedf5259303dc unpetrify-ref: baserock/v0.5.4 build-system: python-distutils + submodules: + ext/spec: + url: upstream:mustache-spec - name: pies repo: upstream:python-packages/pies.git ref: 593dcce07fdb3e8d0053a863a7aba7f2ce8a6c9c @@ -189,7 +197,7 @@ chunks: - name: repoze-lru repo: upstream:python-packages/repoze-lru ref: 29c8281dee7fe8dae8c66c7c40ce7c058ec2ab0f - unpetrify-ref: "0.6" + unpetrify-ref: '0.6' build-system: python-distutils - name: routes repo: upstream:python-packages/routes @@ -206,7 +214,7 @@ chunks: - name: tempita repo: upstream:python-packages/tempita ref: b2b67795a009e9f825cbd855d766b78a00273f10 - unpetrify-ref: "0.5" + unpetrify-ref: '0.5' build-system: python-distutils - name: numpy repo: upstream:python-packages/numpy.git @@ -215,6 +223,11 @@ chunks: build-system: python-distutils build-depends: - sphinx + submodules: + doc/sphinxext: + url: upstream:numpydoc.git + doc/scipy-sphinx-theme: + url: upstream:scipy-sphinx-theme.git - name: websockify repo: upstream:python-packages/websockify ref: 2f025741f86419d4ad5702dabf5903db3dbfe77c @@ -222,6 +235,9 @@ chunks: build-system: python-distutils build-depends: - numpy + submodules: + include/web-socket-js-project: + url: upstream:web-socket-js.git - name: httplib2 repo: upstream:python-packages/httplib2 ref: f9f797223d075874b0031aea832152688ec23fef @@ -245,7 +261,7 @@ chunks: - name: python-pexpect repo: upstream:python-packages/pexpect ref: 671417beb41c21f772687c565196fdde444b053b - unpetrify-ref: "3.3" + unpetrify-ref: '3.3' build-system: python-distutils - name: ply repo: upstream:python-packages/ply.git @@ -355,7 +371,7 @@ chunks: - name: aioeventlet repo: upstream:python-packages/aioeventlet ref: 3cac0d7740592a380a7dadb2ddcdda000cae2bda - unpetrify-ref: "0.4" + unpetrify-ref: '0.4' build-system: python-distutils build-depends: - trollius @@ -409,7 +425,7 @@ chunks: - name: happybase repo: upstream:python-packages/happybase ref: 90a4b7ef741f0ecfe5145693f64c6f7180b9ba3d - unpetrify-ref: "0.8" + unpetrify-ref: '0.8' build-system: python-distutils build-depends: - thrift @@ -713,7 +729,7 @@ chunks: - name: pint repo: upstream:python-packages/pint ref: e7e7de5ca2e1c19963be8a918369fb19186f9a73 - unpetrify-ref: "0.6" + unpetrify-ref: '0.6' build-system: python-distutils - name: horizon morph: strata/openstack-services/horizon.morph @@ -730,6 +746,9 @@ chunks: repo: upstream:novnc ref: 97be997f62d59c028fc45323b00e3b93fafe4eb4 unpetrify-ref: baserock/v0.5.1 + submodules: + include/web-socket-js-project: + url: upstream:web-socket-js - name: pyserial repo: upstream:python-packages/pyserial ref: bcfc1ec2fdb9a8c9c867481d7673e85fe512e667 diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph index 5d0297eb..1f753b4f 100644 --- a/strata/ostree-core.morph +++ b/strata/ostree-core.morph @@ -30,3 +30,8 @@ chunks: build-depends: - gpgme - libgsystem + submodules: + libglnx: + url: upstream:libglnx + bsdiff: + url: upstream:bsdiff diff --git a/strata/qt4-sdk.morph b/strata/qt4-sdk.morph index 0533ea58..107d76be 100644 --- a/strata/qt4-sdk.morph +++ b/strata/qt4-sdk.morph @@ -9,3 +9,6 @@ chunks: repo: upstream:qt-creator ref: d5a6b10634c1a3271012e9578e016772ef077d59 unpetrify-ref: baserock/morph/2.7 + submodules: + qbs: + url: upstream:qbs diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 3ee10a52..0d556d38 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -10,3 +10,6 @@ chunks: repo: upstream:qt-creator ref: 8895770ba36f96f150fe8dca71f889ff24d07fd6 unpetrify-ref: baserock/v3.6.1 + submodules: + qbs: + url: upstream:qbs diff --git a/strata/qt5-tools.morph b/strata/qt5-tools.morph index ffdb6772..7424a41c 100644 --- a/strata/qt5-tools.morph +++ b/strata/qt5-tools.morph @@ -33,6 +33,9 @@ chunks: build-depends: - qtbase - qtscript + submodules: + tests/manual/v4/test262: + url: upstream:qt5/qtdeclarative-testsuites.git - name: qt3d repo: upstream:qt5/qt3d ref: 7a208d76ed96bb506899becfe680df06f95451c7 @@ -78,6 +81,9 @@ chunks: build-system: qmake build-depends: - qtbase + submodules: + testsuites: + url: upstream:qt5/qtxmlpatterns-testsuites.git - name: qtdoc repo: upstream:qt5/qtdoc ref: 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27d diff --git a/strata/tools.morph b/strata/tools.morph index 45891bbb..c17da999 100644 --- a/strata/tools.morph +++ b/strata/tools.morph @@ -59,6 +59,9 @@ chunks: repo: upstream:parted ref: 387e96e6eac59d84e9a688422b4b321ae9beaa20 unpetrify-ref: baserock/v3.2 + submodules: + gnulib: + url: upstream:gnulib - name: zip morph: strata/tools/zip.morph repo: upstream:zip diff --git a/strata/trove.morph b/strata/trove.morph index 3d0721bd..fa5c45e0 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -19,6 +19,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: - lua + submodules: + extras/luacov: + url: upstream:gitano/luacov - name: luxio morph: strata/trove/luxio.morph repo: upstream:luxio @@ -34,6 +37,9 @@ chunks: build-depends: - lua - luxio + submodules: + extras/luacov: + url: upstream:gitano/luacov - name: clod morph: strata/trove/clod.morph repo: upstream:gitano/clod @@ -41,6 +47,9 @@ chunks: unpetrify-ref: baserock/morph build-depends: - lua + submodules: + extras/luacov: + url: upstream:gitano/luacov - name: gall morph: strata/trove/gall.morph repo: upstream:gitano/gall @@ -49,6 +58,13 @@ chunks: build-depends: - lua - luxio + submodules: + libgit2: + url: upstream:gitano/libgit2 + luagit2: + url: upstream:gitano/luagit2 + extras/luacov: + url: upstream:gitano/luacov - name: lrexlib-pcre morph: strata/trove/lrexlib-pcre.morph repo: upstream:lrexlib @@ -68,6 +84,9 @@ chunks: repo: upstream:cgit ref: dc881acb0c857c783b611c03294d79a7553a4ec7 unpetrify-ref: baserock/v0.12 + submodules: + git: + url: upstream:git - name: trove-setup morph: strata/trove/trove-setup.morph repo: baserock:baserock/trove-setup diff --git a/strata/vala-common.morph b/strata/vala-common.morph index 7827703c..e1438de3 100644 --- a/strata/vala-common.morph +++ b/strata/vala-common.morph @@ -22,6 +22,9 @@ chunks: ref: 6e9a4d3b35c5ce8af050e66d8caff96070c57d34 unpetrify-ref: baserock/2015-12-15 build-system: autotools + submodules: + autoconf-archive: + url: upstream:autoconf-archive - name: libgee repo: upstream:gnome/libgee ref: 4301ab58efc217409c588a5527f68990b4e3d220 diff --git a/strata/virtualization.morph b/strata/virtualization.morph index 2a91fa17..32131bc5 100644 --- a/strata/virtualization.morph +++ b/strata/virtualization.morph @@ -30,6 +30,29 @@ chunks: repo: upstream:qemu ref: c5691f7ecb32cbe7a95b491314ce070e211fd97d unpetrify-ref: baserock/v2.2.0 + submodules: + roms/openbios: + url: upstream:qemu-openbios + dtc: + url: upstream:device-tree-compiler + roms/openhackware: + url: upstream:qemu-openhackware + roms/seabios: + url: upstream:qemu-seabios + roms/vgabios: + url: upstream:qemu-vgabios + roms/u-boot: + url: upstream:u-boot + roms/SLOF: + url: upstream:qemu-SLOF + roms/qemu-palcode: + url: upstream:qemu-palcode + roms/ipxe: + url: upstream:qemu-ipxe + roms/sgabios: + url: upstream:qemu-sgabios + pixman: + url: upstream:pixman - name: libpciaccess repo: upstream:libpciaccess ref: b9c068896914b4132a24839c9ef7f9fcd6282d88 @@ -51,6 +74,9 @@ chunks: - qemu - yajl - dmidecode + submodules: + gnulib: + url: upstream:gnulib - name: pycurl repo: upstream:pycurl ref: 5ca370827d88817eeca3c56cbb37e4ddccc16c6e diff --git a/strata/x-common.morph b/strata/x-common.morph index 33254949..65212bb8 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -160,6 +160,9 @@ chunks: build-system: autotools build-depends: - xcb-libxcb + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: util-wm repo: upstream:util-wm ref: fb7afc3f291c8cc072d327cd8d97ab1db3283c21 @@ -167,6 +170,9 @@ chunks: build-system: autotools build-depends: - xcb-libxcb + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: util-keysyms repo: upstream:util-keysyms ref: edb763a8837d3932690b9d6d77cb7e20a9ab8013 @@ -174,6 +180,9 @@ chunks: build-system: autotools build-depends: - xcb-libxcb + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: util-image repo: upstream:util-image ref: f20f25a1c017c58d5d7dfffc6e9adc8d31879152 @@ -182,6 +191,9 @@ chunks: build-depends: - xcb-libxcb - xcb-util + submodules: + m4: + url: upstream:xcb/util-common-m4 - name: xorg-lib-libxtrans repo: upstream:xorg-lib-libxtrans ref: 7cbad9fe2e61cd9d5caeaf361826a6f4bd320f03 diff --git a/strata/xdg-app-common.morph b/strata/xdg-app-common.morph index 44f82403..b25970ac 100644 --- a/strata/xdg-app-common.morph +++ b/strata/xdg-app-common.morph @@ -16,3 +16,6 @@ chunks: unpetrify-ref: baserock/0.4.13 build-depends: - elfutils + submodules: + libglnx: + url: upstream:libglnx -- cgit v1.2.1 From 2b3c24a32fedcfbca4ae9469263c143467cea143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 1 Apr 2016 19:16:30 +0100 Subject: strata/ostree-core: Upgrade ostree to v2016.4 release Change-Id: I566daebbd32a8924fa160f6b01eb18db0b73ca0d --- strata/ostree-core.morph | 6 +++--- strata/ostree-core/ostree.morph | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 strata/ostree-core/ostree.morph diff --git a/strata/ostree-core.morph b/strata/ostree-core.morph index 1f753b4f..f2207be6 100644 --- a/strata/ostree-core.morph +++ b/strata/ostree-core.morph @@ -23,10 +23,10 @@ chunks: unpetrify-ref: master build-system: autotools - name: ostree + morph: strata/ostree-core/ostree.morph repo: upstream:ostree - ref: 45ec78735daf72da1998f9df2887ea9b5e2600c3 - unpetrify-ref: baserock/v2015.9 - build-system: autotools + ref: 80698543c2cae285220b0406b24ea71b647ab0aa + unpetrify-ref: v2016.4 build-depends: - gpgme - libgsystem diff --git a/strata/ostree-core/ostree.morph b/strata/ostree-core/ostree.morph new file mode 100644 index 00000000..85c7cde0 --- /dev/null +++ b/strata/ostree-core/ostree.morph @@ -0,0 +1,7 @@ +me: ostree +kind: chunk +build-system: autotools +configure-commands: +- NOCONFIGURE=1 ./autogen.sh +- ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var + --disable-man -- cgit v1.2.1 From bc54ca46ec3cef243fa5e406a15ecf39a283ec88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 30 Mar 2016 18:14:55 +0100 Subject: Add qtwebengine stratum This is the new Qt web runtime, which replace the now deprecated QtWebkit Change-Id: If6a873b218ac4f8779f48e7b706b4e773c523b8f --- strata/qt5-tools-qtwebengine.morph | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 strata/qt5-tools-qtwebengine.morph diff --git a/strata/qt5-tools-qtwebengine.morph b/strata/qt5-tools-qtwebengine.morph new file mode 100644 index 00000000..9c954f5f --- /dev/null +++ b/strata/qt5-tools-qtwebengine.morph @@ -0,0 +1,16 @@ +name: qt5-tools-qtwebengine +kind: stratum +description: Qt5 WebEngine Development Libraries and Tools +build-depends: +- morph: strata/multimedia-gstreamer.morph +- morph: strata/qt5-tools.morph +- morph: strata/ruby.morph +chunks: +- name: qtwebengine + repo: upstream:qt5/qtwebengine + ref: 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f + unpetrify-ref: v5.6.0 + build-system: qmake + submodules: + src/3rdparty: + url: upstream:qt5/qtwebengine-chromium.git -- cgit v1.2.1 From 73b8c68ac5f95c2053e1b9e13308e31f12144e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 30 Mar 2016 18:16:17 +0100 Subject: Replace QtWebkit for QtWebEngine in ivi, qt5-devel and weston-qt5 systems Change-Id: I30162f7ec4561d2cead1ba53271f96825fcfb49c --- strata/qt5-sdk.morph | 2 +- systems/ivi-system-armv7lhf-jetson.morph | 4 ++-- systems/ivi-system-x86_64.morph | 4 ++-- systems/qt5-devel-system-x86_64-generic.morph | 4 ++-- systems/weston-qt5-system-x86_64.morph | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index 0d556d38..f64c4b7b 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -3,7 +3,7 @@ kind: stratum description: Qt5 Desktop Environment, IDE and Example Apps build-depends: - morph: strata/qt5-tools.morph -- morph: strata/qt5-tools-qtwebkit.morph +- morph: strata/qt5-tools-qtwebengine.morph chunks: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph index 004d6ae1..a8383fbf 100644 --- a/systems/ivi-system-armv7lhf-jetson.morph +++ b/systems/ivi-system-armv7lhf-jetson.morph @@ -59,8 +59,8 @@ strata: morph: strata/qt5-tools.morph - name: qt5-tools-qtmultimedia morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-tools-qtwebkit - morph: strata/qt5-tools-qtwebkit.morph +- name: qt5-tools-qtwebengine + morph: strata/qt5-tools-qtwebengine.morph - name: qt5-tools-qtwayland morph: strata/qt5-tools-qtwayland.morph - name: ruby diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph index 8515c2ec..63355a48 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -61,8 +61,8 @@ strata: morph: strata/qt5-tools.morph - name: qt5-tools-qtmultimedia morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-tools-qtwebkit - morph: strata/qt5-tools-qtwebkit.morph +- name: qt5-tools-qtwebengine + morph: strata/qt5-tools-qtwebengine.morph - name: qt5-tools-qtwayland morph: strata/qt5-tools-qtwayland.morph - name: ruby diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 90b6703a..eb393f12 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -28,8 +28,8 @@ strata: morph: strata/x-generic.morph - name: qt5-tools morph: strata/qt5-tools.morph -- name: qt5-tools-qtwebkit - morph: strata/qt5-tools-qtwebkit.morph +- name: qt5-tools-qtwebengine + morph: strata/qt5-tools-qtwebengine.morph - name: qt5-sdk morph: strata/qt5-sdk.morph - name: lua51 diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph index a58e72b7..7ac315c1 100644 --- a/systems/weston-qt5-system-x86_64.morph +++ b/systems/weston-qt5-system-x86_64.morph @@ -48,10 +48,10 @@ strata: morph: strata/qt5-tools.morph - name: qt5-tools-qtmultimedia morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-tools-qtwebkit - morph: strata/qt5-tools-qtwebkit.morph - name: qt5-sdk morph: strata/qt5-sdk.morph +- name: qt5-tools-qtwebengine + morph: strata/qt5-tools-qtwebengine.morph - name: qt5-tools-qtwayland morph: strata/qt5-tools-qtwayland.morph - name: connectivity -- cgit v1.2.1 From b984a05413a0d1db088088a1b74a573c31f01026 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 4 Apr 2016 12:06:07 +0100 Subject: ostree: Fix missing name in morphology file Change-Id: Ib6af59cfd4c4294ba33aa2ea22ac5101dd1f8d90 --- strata/ostree-core/ostree.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/ostree-core/ostree.morph b/strata/ostree-core/ostree.morph index 85c7cde0..2f2d86c7 100644 --- a/strata/ostree-core/ostree.morph +++ b/strata/ostree-core/ostree.morph @@ -1,4 +1,4 @@ -me: ostree +name: ostree kind: chunk build-system: autotools configure-commands: -- cgit v1.2.1 From 6d978781931c9ee6f83af5baf9d44737a1fd1363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 1 Apr 2016 19:12:54 +0100 Subject: strata/xdg-app-common.morph: Upgrade xdg-app to 0.5.1 Change-Id: I46ddfbcdda64097cc816a2ce1da64651b4f9e392 --- strata/xdg-app-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/xdg-app-common.morph b/strata/xdg-app-common.morph index b25970ac..0cbe8c2c 100644 --- a/strata/xdg-app-common.morph +++ b/strata/xdg-app-common.morph @@ -12,8 +12,8 @@ chunks: - name: xdg-app morph: strata/xdg-app-common/xdg-app.morph repo: upstream:xdg-app - ref: 7e90d39533745d5fd2a1b030f55099f803ae3a5c - unpetrify-ref: baserock/0.4.13 + ref: 619e1f1025851179dee3e616000e5de2ccde9412 + unpetrify-ref: 0.5.1 build-depends: - elfutils submodules: -- cgit v1.2.1 From 617505f2d79614442f2f360ea520430afa03f3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 1 Apr 2016 18:21:49 +0000 Subject: Move libarchive to foundation Its a common dependency between gnome and genivi strata, also a optional one for the ostree stratum Change-Id: I19f5df84e1f10319d3a7268a9da729545d52fd55 --- strata/foundation.morph | 5 +++++ strata/foundation/libarchive.morph | 6 ++++++ strata/genivi.morph | 6 ------ strata/genivi/libarchive.morph | 6 ------ strata/gnome.morph | 6 ------ strata/gnome/libarchive.morph | 6 ------ 6 files changed, 11 insertions(+), 24 deletions(-) create mode 100644 strata/foundation/libarchive.morph delete mode 100644 strata/genivi/libarchive.morph delete mode 100644 strata/gnome/libarchive.morph diff --git a/strata/foundation.morph b/strata/foundation.morph index be87728b..399ed06c 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -120,3 +120,8 @@ chunks: unpetrify-ref: v231 build-depends: - systemd +- name: libarchive + morph: strata/foundation/libarchive.morph + repo: upstream:libarchive + ref: 19f23e191f9d3e1dd2a518735046100419965804 + unpetrify-ref: v3.1.2 diff --git a/strata/foundation/libarchive.morph b/strata/foundation/libarchive.morph new file mode 100644 index 00000000..bf840f58 --- /dev/null +++ b/strata/foundation/libarchive.morph @@ -0,0 +1,6 @@ +name: libarchive +kind: chunk +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" --disable-acl diff --git a/strata/genivi.morph b/strata/genivi.morph index 0195de87..b0442120 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -87,11 +87,6 @@ chunks: build-depends: - DLT-daemon - persistence-client-library -- name: libarchive - morph: strata/genivi/libarchive.morph - repo: upstream:libarchive - ref: 19f23e191f9d3e1dd2a518735046100419965804 - unpetrify-ref: v3.1.2 - name: persistence-administrator morph: strata/genivi/persistence-administrator.morph repo: upstream:genivi/persistence-administrator @@ -100,7 +95,6 @@ chunks: build-depends: - persistence-common-object - DLT-daemon - - libarchive - node-state-manager - name: node-health-monitor repo: upstream:genivi/node-health-monitor diff --git a/strata/genivi/libarchive.morph b/strata/genivi/libarchive.morph deleted file mode 100644 index bf840f58..00000000 --- a/strata/genivi/libarchive.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: libarchive -kind: chunk -build-system: autotools -configure-commands: -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-acl diff --git a/strata/gnome.morph b/strata/gnome.morph index 39310946..5581747d 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -627,11 +627,6 @@ chunks: build-depends: - libcanberra - libnotify -- name: libarchive - morph: strata/gnome/libarchive.morph - repo: upstream:libarchive - ref: 19f23e191f9d3e1dd2a518735046100419965804 - unpetrify-ref: v3.1.2 - name: gcab repo: upstream:gnome/gcab ref: e57dd3d1ddb0da91df9188c2a98d59d1050ac6cb @@ -647,7 +642,6 @@ chunks: build-system: autotools build-depends: - gcab - - libarchive - name: gnome-color-manager morph: strata/gnome/gnome-color-manager.morph repo: upstream:gnome/gnome-color-manager diff --git a/strata/gnome/libarchive.morph b/strata/gnome/libarchive.morph deleted file mode 100644 index bf840f58..00000000 --- a/strata/gnome/libarchive.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: libarchive -kind: chunk -build-system: autotools -configure-commands: -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-acl -- cgit v1.2.1 From 74370e79e94be0d7715ac4544363c75b8b244090 Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Tue, 5 Apr 2016 02:35:25 +0000 Subject: Install git-completion script Change-Id: I68c12f9425bc2a3f0f6478d2a434bbc2b590d6d9 --- strata/devtools/git.morph | 2 ++ 1 file changed, 2 insertions(+) diff --git a/strata/devtools/git.morph b/strata/devtools/git.morph index 6ca079a5..40945640 100644 --- a/strata/devtools/git.morph +++ b/strata/devtools/git.morph @@ -7,3 +7,5 @@ build-commands: - make all doc install-commands: - make install install-doc +post-install-commands: +- install -D -m 644 -t "$DESTDIR"/etc/bash_completion.d/. contrib/completion/git-completion.bash -- cgit v1.2.1 From 9de09c4697f8c2a5ef45515f7366a68912cb1715 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 18:17:04 +0000 Subject: ansible: Point to upstream tags Don't upgrade for now, we might want to test that our Ansible scripts still work with a newer version first. Change-Id: Iee9107ba07957ae06fe95e835cd20c376d7c1337 --- strata/ansible.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/ansible.morph b/strata/ansible.morph index 583093f4..f21cb222 100644 --- a/strata/ansible.morph +++ b/strata/ansible.morph @@ -8,8 +8,8 @@ chunks: - name: ansible morph: strata/ansible/ansible.morph repo: upstream:ansible - ref: 0a7124541247cc613352054f4bc0c3e116e0b657 - unpetrify-ref: baserock/v1.8.4 + ref: ebc8d48d34296fe010096f044e2b7591df37a622 + unpetrify-ref: v1.8.4 submodules: lib/ansible/modules/core: url: upstream:ansible-modules-core.git -- cgit v1.2.1 From 3a102f740ae47e53e9f144634644cbd8b78487f3 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 18:22:01 +0000 Subject: devtools: Upgrade wget to 1.17.1 Change-Id: I9e9c9cce8766e2778e8de9b11da9dce086ab9a50 --- strata/devtools.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/devtools.morph b/strata/devtools.morph index a6649ff2..41dd501c 100644 --- a/strata/devtools.morph +++ b/strata/devtools.morph @@ -38,8 +38,8 @@ chunks: - name: wget morph: strata/devtools/wget.morph repo: upstream:wget - ref: 71d79f4f3043cf4ca3b2fb7f5328eae725c1293f - unpetrify-ref: baserock/v1.16.3 + ref: f65f522f58606f125535306e712c2c29921ee8b4 + unpetrify-ref: v1.17.1 submodules: gnulib: url: upstream:gnulib -- cgit v1.2.1 From 6bc93927f8985d63296bbbede9077f6adcce17e3 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 18:27:07 +0000 Subject: foundation: Use upstream tags Change-Id: Ie6c11252bab86971ccc8e6217297c2a2b211b222 --- strata/foundation.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index 399ed06c..3784a48f 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -64,8 +64,8 @@ chunks: - systemd - name: usbutils repo: upstream:usbutils - ref: c37f146eb2c6642c600f1b025a6d56996b0697ff - unpetrify-ref: baserock/v008 + ref: 3bafa6940f512357d7aa54d3a76de01662a19e48 + unpetrify-ref: v008 build-system: autotools build-depends: - libusb -- cgit v1.2.1 From 6ed84bb68fa4ea9d4a50cdc568634a8b11adfa88 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 18:44:40 +0000 Subject: gnome: Use upstream tags when possible Some components still use 'baserock/*' branches because they weren't using a branch just for fixing .gitmodules file Change-Id: I89d0edd3d7fb0bea51107cc21f9e348dd6ddc140 --- strata/gnome.morph | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/strata/gnome.morph b/strata/gnome.morph index 5581747d..3a8e0f64 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -312,8 +312,8 @@ chunks: - name: gnome-online-accounts morph: strata/gnome/gnome-online-accounts.morph repo: upstream:gnome/gnome-online-accounts - ref: 167ada60a66a0ed851bb65335a46570cf071115a - unpetrify-ref: baserock/3.18.1 + ref: d08463aefde22f36898f4e79798d365359e57614 + unpetrify-ref: 3.18.1 build-depends: - librest - telepathy-glib @@ -537,8 +537,8 @@ chunks: build-system: autotools - name: farstream repo: upstream:farstream - ref: 9247c10816835dc76269baa7c4c8996ae1a2fac3 - unpetrify-ref: baserock/0.2.7 + ref: 01fafe82fbc01f31e76623fbbbe6dd99eb28d6bb + unpetrify-ref: 0.2.7 build-system: autotools build-depends: - libnice @@ -556,8 +556,8 @@ chunks: - name: telepathy-gabble morph: strata/gnome/telepathy-gabble.morph repo: upstream:telepathy-gabble - ref: 91d890ef3f269e92ea3a2a265597293e056e842c - unpetrify-ref: baserock/telepathy-gabble-0.18.3 + ref: f10f557fd67ec11738670828a553496960c0d411 + unpetrify-ref: telepathy-gabble-0.18.3 build-depends: - libnice - telepathy-glib @@ -567,8 +567,8 @@ chunks: - name: telepathy-salut morph: strata/gnome/telepathy-salut.morph repo: upstream:telepathy-salut - ref: e554f3c595307f665e5c2dd464f1baf0120ab43d - unpetrify-ref: baserock/telepathy-salut-0.8.1 + ref: cd32e00a3a461756cbf1f6899a0c2aa5bd5d79ee + unpetrify-ref: telepathy-salut-0.8.1 build-depends: - telepathy-glib submodules: @@ -685,8 +685,8 @@ chunks: - name: gnome-control-center morph: strata/gnome/gnome-control-center.morph repo: upstream:gnome/gnome-control-center - ref: f00c05ba3b3c7aa328d7970b73a784739cef560a - unpetrify-ref: baserock/3.18 + ref: 49da7d8089298ba9e15d8e025db606278802d5ac + unpetrify-ref: GNOME_CONTROL_CENTER_3_18_0 build-depends: - accountsservice - cheese @@ -777,8 +777,8 @@ chunks: - WebKitGtk - name: totem repo: upstream:gnome/totem - ref: 77cf0b9d3de4fd3a48492c77e25308d6c411b651 - unpetrify-ref: baserock/V_3_18_1 + ref: dc21ef2e61f7e8a085a0f98eeec808b6424af988 + unpetrify-ref: V_3_18_1 build-system: autotools build-depends: - appstream-glib @@ -819,8 +819,8 @@ chunks: - yelp-tools - name: gedit repo: upstream:gnome/gedit - ref: 4b318c265d71eca3572920bb159dcda9aa9f9184 - unpetrify-ref: baserock/3.18.2 + ref: 8156d35a6eb27f3251e1ea454a48cb2a2ae4f87c + unpetrify-ref: 3.18.2 build-system: autotools build-depends: - gsettings-desktop-schemas @@ -852,8 +852,8 @@ chunks: - name: empathy morph: strata/gnome/empathy.morph repo: upstream:gnome/empathy - ref: facd02a2cf3c0d2778b10626362b29e2a6df546a - unpetrify-ref: baserock/EMPATHY_3_12_11 + ref: 1245792e78ab67683349d376f4b7b5a2a02a0b9f + unpetrify-ref: EMPATHY_3_12_11 build-depends: - cheese - clutter @@ -877,8 +877,8 @@ chunks: url: upstream:gnome/telepathy-account-widgets - name: gnome-contacts repo: upstream:gnome/gnome-contacts - ref: 3715ec79662989038d5055bb74aa0b728b40edb5 - unpetrify-ref: baserock/3.18.0 + ref: fa736997cc7ec8df89458502c0a181090def64e9 + unpetrify-ref: 3.18.0 build-system: autotools build-depends: - cheese -- cgit v1.2.1 From e67463f5ffa98374ff64c38832a85e554b4acdc7 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 19:03:14 +0000 Subject: multimedia-gstreamer: Use upstream tags Change-Id: I58460cf6d0a52adccb3a89c9604bc9f1795e3068 --- strata/multimedia-gstreamer.morph | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 884fc9fb..782410c3 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -15,8 +15,8 @@ chunks: unpetrify-ref: orc-0.4.24 - name: gstreamer repo: upstream:gstreamer - ref: 3119e6bb4b574a01921da2e652d2910d98a6eb27 - unpetrify-ref: baserock/1.6.3 + ref: 98aec4a963556cbe569e8a66aff758e5d7fac612 + unpetrify-ref: 1.6.3 build-system: autotools build-depends: - orc @@ -25,8 +25,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-base repo: upstream:gstreamer-plugins-base - ref: 644cd58c5a1142580ad133a5122986581cf4d8ef - unpetrify-ref: baserock/1.6.3 + ref: 9c28866c9c65dcc79ffdff9c2880f5c68f09280c + unpetrify-ref: 1.6.3 build-system: autotools build-depends: - gstreamer @@ -36,8 +36,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-good repo: upstream:gstreamer-plugins-good - ref: e6fb1b485dd2726e6c65d938c5ea4d002cf1036e - unpetrify-ref: baserock/1.6.3 + ref: 0708c89706601a858a815b5d1fa6c03b4158e215 + unpetrify-ref: 1.6.3 build-system: autotools build-depends: - gstreamer @@ -48,8 +48,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-bad repo: upstream:gstreamer-plugins-bad - ref: 9a2e845040c3aafff00159a6b0031e123cad4b2f - unpetrify-ref: baserock/1.6.3 + ref: 7dee47fe39223d8a98615f03f34d9221f9e8a6c1 + unpetrify-ref: 1.6.3 build-system: autotools build-depends: - gstreamer @@ -61,8 +61,8 @@ chunks: - name: gst-libav morph: strata/multimedia-gstreamer/gst-libav.morph repo: upstream:gst-libav - ref: ac8afa33d47e10246d9b7329f39dc53b4bd4711e - unpetrify-ref: baserock/1.6.3 + ref: 0457d1d45b04cd8ef368d5e682d133daf4660fc6 + unpetrify-ref: 1.6.3 build-depends: - gstreamer - gstreamer-plugins-base -- cgit v1.2.1 From d54e9248fe195dfa139197e2d0eea4d860968aad Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 19:05:50 +0000 Subject: multimedia-hardware-codecs-x86: Use upstream tags Change-Id: Icca1708bd241e051b5529cc641bdbfb268c14bb2 --- strata/multimedia-hardware-codecs-x86.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/multimedia-hardware-codecs-x86.morph b/strata/multimedia-hardware-codecs-x86.morph index d53698e4..58d4260b 100644 --- a/strata/multimedia-hardware-codecs-x86.morph +++ b/strata/multimedia-hardware-codecs-x86.morph @@ -21,8 +21,8 @@ chunks: - libva - name: gstreamer-vaapi repo: upstream:gstreamer-vaapi - ref: a5842bbcfae873306f52c60386ea06357a4cb9d0 - unpetrify-ref: baserock/1.6.0 + ref: 11221fe868bb08e0acf046bfa81dc2781c2a2d0c + unpetrify-ref: 1.6.0 build-system: autotools build-depends: - libva -- cgit v1.2.1 From e4c095b9861e79f6352327038f3c2482ea833fc0 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 19:07:07 +0000 Subject: network-security: Use upstream tags Change-Id: Ib7a8e10f81c50b1d3a86cd9992269403a348ba7f --- strata/network-security.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/network-security.morph b/strata/network-security.morph index 881a515a..14490ba5 100644 --- a/strata/network-security.morph +++ b/strata/network-security.morph @@ -36,8 +36,8 @@ chunks: - name: gnutls morph: strata/network-security/gnutls.morph repo: upstream:gnutls - ref: 21fecbde80ae824f85a10a0c23a327c49e4e5fb6 - unpetrify-ref: baserock/gnutls_3_4_6 + ref: a9bcd4881a539e64bd948eff3fa3434e23973262 + unpetrify-ref: gnutls_3_4_6 build-depends: - nettle - libtasn1 -- cgit v1.2.1 From 0b3624ebc1fdcce9d3ccf4ba6b67b5e3a96abc11 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 18:55:32 +0000 Subject: multimedia-gstreamer-0.10: Use upstream branch "0.10" Change-Id: I44e125835bdf7c8168585808407f931ab0f8d12b --- strata/multimedia-gstreamer-0.10.morph | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index 6f9d9f67..390f3933 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -14,8 +14,8 @@ chunks: build-system: autotools - name: gstreamer@0.10 repo: upstream:gstreamer - ref: 1bb950008f4656f6a6153fa88a8ebb5a39fbe84f - unpetrify-ref: baserock/morph/0.10 + ref: 76fc67b18c38e7f6c9cfacc4e4d0ed11d3b2c548 + unpetrify-ref: "0.10" build-system: autotools build-depends: - orc @@ -24,8 +24,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-base@0.10 repo: upstream:gstreamer-plugins-base - ref: 960c596309dbb983a1d733259adccc45c47006a2 - unpetrify-ref: baserock/morph/0.10 + ref: 1e1e6eaf3f0dd11f6618154d9739cbe3e007d206 + unpetrify-ref: "0.10" build-system: autotools build-depends: - gstreamer@0.10 @@ -34,8 +34,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-good@0.10 repo: upstream:gstreamer-plugins-good - ref: 725e80e0c6b7f8e66d9b3fcaffd283ecbd8498d3 - unpetrify-ref: baserock/morph/0.10 + ref: 5af6f5bfb6c3619a9ccc3b1681579aeb90e8b89a + unpetrify-ref: "0.10" build-system: autotools build-depends: - gstreamer@0.10 -- cgit v1.2.1 From 19f8bfce95741de8ada632aab1177f8f844ebf0c Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Sat, 2 Apr 2016 18:19:21 +0000 Subject: coreutils: Upgrades and use upstream tags Upgrades - coreutils to 8.25 - findutils to 4.6.0 Change-Id: If63d96b6d34cbc1f69d67de80880ab30f3c25e11 --- strata/coreutils-common.morph | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index e8937866..a1b946b2 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -10,8 +10,8 @@ chunks: - name: coreutils morph: strata/coreutils-common/coreutils.morph repo: upstream:coreutils - ref: 9df9643842e4b4d8ece710fe6105f32fa38a0d22 - unpetrify-ref: baserock/8.23 + ref: 68f73f23866d6137e9c8d88d86073b33588d7b56 + unpetrify-ref: v8.25 submodules: gnulib: url: upstream:gnulib @@ -38,8 +38,8 @@ chunks: - name: tar morph: strata/coreutils-common/tar.morph repo: upstream:tar - ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 - unpetrify-ref: baserock/release_1_28 + ref: b500277de7eeac4893fe6517c38dc417b4a4d976 + unpetrify-ref: release_1_28 build-depends: - coreutils submodules: @@ -50,8 +50,8 @@ chunks: - name: findutils morph: strata/coreutils-common/findutils.morph repo: upstream:findutils - ref: ee6b25541336f9d74624ca814538ddc8c67f0732 - unpetrify-ref: baserock/v4.5.14 + ref: 992a6b62ab8061531dc0ad40325b8e4c222fce66 + unpetrify-ref: v4.6.0 submodules: gnulib: url: upstream:gnulib -- cgit v1.2.1 From 99c4cafad882e76318981dbe91cdfad504aded4d Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 5 Apr 2016 11:51:36 +0000 Subject: Fix build of findutils, broken since last upgrade Change-Id: Id85a2412958b902f9081dce4cb78963271d41156 --- strata/coreutils-common.morph | 2 +- strata/coreutils-common/findutils.morph | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 strata/coreutils-common/findutils.morph diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index a1b946b2..c5b8fea0 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -48,10 +48,10 @@ chunks: gnulib: url: upstream:gnulib - name: findutils - morph: strata/coreutils-common/findutils.morph repo: upstream:findutils ref: 992a6b62ab8061531dc0ad40325b8e4c222fce66 unpetrify-ref: v4.6.0 + build-system: autotools submodules: gnulib: url: upstream:gnulib diff --git a/strata/coreutils-common/findutils.morph b/strata/coreutils-common/findutils.morph deleted file mode 100644 index c9ba5ab6..00000000 --- a/strata/coreutils-common/findutils.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: findutils -kind: chunk -build-system: autotools -pre-configure-commands: -- ./import-gnulib.sh -d gnulib -- cgit v1.2.1 From 6d581e3f29be66edefae8d6326c33e513f10a282 Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Tue, 5 Apr 2016 13:30:45 +0000 Subject: update bps-x86_64-generic.morph to linux 4.5 Change-Id: I0374a55cdbc62f78115de14fbd12132383fd7bb3 --- strata/bsp-x86_64-generic.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/bsp-x86_64-generic.morph b/strata/bsp-x86_64-generic.morph index c8d1c37f..ab6a3877 100644 --- a/strata/bsp-x86_64-generic.morph +++ b/strata/bsp-x86_64-generic.morph @@ -10,8 +10,8 @@ chunks: - name: linux-x86-64-generic morph: strata/bsp-x86_64-generic/linux-x86-64-generic.morph repo: upstream:linux-stable - ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc - unpetrify-ref: v4.4 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: nasm morph: strata/bsp-x86_64-generic/nasm.morph repo: upstream:nasm -- cgit v1.2.1 From f6d5589bbcec78a7bba832d89d6f4999be126d82 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Tue, 5 Apr 2016 13:17:16 +0000 Subject: Revert .gitmoudules cleanup for tar This commit partially reverts 19f8bfce95741de8ada632aab1177f8f844ebf0c. Turns out we weren't fixing the .gitmodules, but creating them to fix build issues. These issues seem to be fixed in the master branch, but there aren't new releases with the fixes in. Another solution would be to investigate if we could build from master directly. Change-Id: Ib234e02e2c9460442b1429dc3a03aff86361f19d --- strata/coreutils-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/coreutils-common.morph b/strata/coreutils-common.morph index c5b8fea0..a7f75129 100644 --- a/strata/coreutils-common.morph +++ b/strata/coreutils-common.morph @@ -38,8 +38,8 @@ chunks: - name: tar morph: strata/coreutils-common/tar.morph repo: upstream:tar - ref: b500277de7eeac4893fe6517c38dc417b4a4d976 - unpetrify-ref: release_1_28 + ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37 + unpetrify-ref: baserock/release_1_28 build-depends: - coreutils submodules: -- cgit v1.2.1 From 1caf6cf3ae4aba0fe0225ff131417920cd6c79e7 Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Tue, 5 Apr 2016 17:39:00 +0000 Subject: update bsp-x86_32-generic.morph to linux v4.5 Change-Id: I7be27624f25ba5d96cf032c21b9c53bd1a017f4e --- strata/bsp-x86_32-generic.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/bsp-x86_32-generic.morph b/strata/bsp-x86_32-generic.morph index 05d179b5..9c83c359 100644 --- a/strata/bsp-x86_32-generic.morph +++ b/strata/bsp-x86_32-generic.morph @@ -10,8 +10,8 @@ chunks: - name: linux-x86-32-generic morph: strata/bsp-x86_32-generic/linux-x86-32-generic.morph repo: upstream:linux - ref: 39a8804455fb23f09157341d3ba7db6d7ae6ee76 - unpetrify-ref: v4.0 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: nasm morph: strata/bsp-x86_32-generic/nasm.morph repo: upstream:nasm -- cgit v1.2.1 From aae6c313a831b8a5d876b89e351ef1fbe3b7741d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 1 Apr 2016 18:35:21 +0000 Subject: Move automotive-message-broke to ivi-common Currently this module is used by GENIVI and AGL Change-Id: I3a867e64cd650088342256dcda3974f04d5ef110 --- strata/genivi-demo-platform.morph | 5 ----- .../automotive-message-broker.morph | 20 -------------------- strata/ivi-common.morph | 11 +++++++++++ strata/ivi-common/automotive-message-broker.morph | 20 ++++++++++++++++++++ systems/genivi-demo-platform-armv7lhf-jetson.morph | 2 ++ systems/genivi-demo-platform-x86_64-generic.morph | 2 ++ systems/ivi-system-armv7lhf-jetson.morph | 2 ++ systems/ivi-system-x86_64.morph | 2 ++ 8 files changed, 39 insertions(+), 25 deletions(-) delete mode 100644 strata/genivi-demo-platform/automotive-message-broker.morph create mode 100644 strata/ivi-common.morph create mode 100644 strata/ivi-common/automotive-message-broker.morph diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 50a2e04b..249afec3 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -18,11 +18,6 @@ chunks: submodules: documentation/designdocument/cls: url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git -- name: automotive-message-broker - morph: strata/genivi-demo-platform/automotive-message-broker.morph - repo: upstream:automotive-message-broker - ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 - unpetrify-ref: '0.14' - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph repo: upstream:audiomanager diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/genivi-demo-platform/automotive-message-broker.morph deleted file mode 100644 index 2516cf29..00000000 --- a/strata/genivi-demo-platform/automotive-message-broker.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: automotive-message-broker -kind: chunk -description: The GENIVI Automotive Message Broker -build-system: cmake -post-install-commands: -- mkdir -p "$DESTDIR/usr/lib/systemd/system" -- | - cat >"$DESTDIR/usr/lib/systemd/system/ambd.service" <"$DESTDIR/usr/lib/systemd/system/ambd.service" < Date: Wed, 6 Apr 2016 10:16:34 +0000 Subject: Revert "Move automotive-message-broke to ivi-common" This reverts commit aae6c313a831b8a5d876b89e351ef1fbe3b7741d. Change-Id: I09bb426f2d8199d3edc45a4d707ff718b602e945 --- strata/genivi-demo-platform.morph | 5 +++++ .../automotive-message-broker.morph | 20 ++++++++++++++++++++ strata/ivi-common.morph | 11 ----------- strata/ivi-common/automotive-message-broker.morph | 20 -------------------- systems/genivi-demo-platform-armv7lhf-jetson.morph | 2 -- systems/genivi-demo-platform-x86_64-generic.morph | 2 -- systems/ivi-system-armv7lhf-jetson.morph | 2 -- systems/ivi-system-x86_64.morph | 2 -- 8 files changed, 25 insertions(+), 39 deletions(-) create mode 100644 strata/genivi-demo-platform/automotive-message-broker.morph delete mode 100644 strata/ivi-common.morph delete mode 100644 strata/ivi-common/automotive-message-broker.morph diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 249afec3..50a2e04b 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -18,6 +18,11 @@ chunks: submodules: documentation/designdocument/cls: url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git +- name: automotive-message-broker + morph: strata/genivi-demo-platform/automotive-message-broker.morph + repo: upstream:automotive-message-broker + ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 + unpetrify-ref: '0.14' - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph repo: upstream:audiomanager diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/genivi-demo-platform/automotive-message-broker.morph new file mode 100644 index 00000000..2516cf29 --- /dev/null +++ b/strata/genivi-demo-platform/automotive-message-broker.morph @@ -0,0 +1,20 @@ +name: automotive-message-broker +kind: chunk +description: The GENIVI Automotive Message Broker +build-system: cmake +post-install-commands: +- mkdir -p "$DESTDIR/usr/lib/systemd/system" +- | + cat >"$DESTDIR/usr/lib/systemd/system/ambd.service" <"$DESTDIR/usr/lib/systemd/system/ambd.service" < Date: Thu, 7 Apr 2016 18:46:52 +0100 Subject: gst.omx: point to SHA1 And use new submodules funtionality Change-Id: Iea2820fbb14aab182cd20fea8c9040fe1a03cc96 --- strata/multimedia-gstreamer-openmax-generic.morph | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/strata/multimedia-gstreamer-openmax-generic.morph b/strata/multimedia-gstreamer-openmax-generic.morph index 9d21a0db..1a006971 100644 --- a/strata/multimedia-gstreamer-openmax-generic.morph +++ b/strata/multimedia-gstreamer-openmax-generic.morph @@ -7,5 +7,8 @@ chunks: - name: gst-omx morph: strata/multimedia-gstreamer-openmax-generic/gst-omx.morph repo: upstream:gst-omx - ref: baserock/1.2.0 - unpetrify-ref: baserock/1.2.0 + ref: b4c7c726ef443cf8a89df26026706e391846bb4a + unpetrify-ref: 1.2.0 + submodules: + common: + url: upstream:gstreamer-common -- cgit v1.2.1 From 4d88d29e3a0ce720d82d16dad3155ea488db027c Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Fri, 8 Apr 2016 12:56:38 +0000 Subject: Update Linux to v4.5 in bsp-jetson Change-Id: I73024dda7e13e64988aa909c1fa8cf89b12ec310 --- strata/bsp-jetson.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 4cb5034f..3b139fcc 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -27,8 +27,8 @@ chunks: - name: linux-jetson-tk1 morph: strata/bsp-jetson/linux-jetson-tk1.morph repo: upstream:linux - ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc - unpetrify-ref: v4.4 + ref: b562e44f507e863c6792946e4e1b1449fbbac85d + unpetrify-ref: v4.5 - name: linux-firmware@jetson morph: strata/bsp-jetson/linux-firmware@jetson.morph repo: upstream:linux-firmware -- cgit v1.2.1 From 942bf3731eb1f49132e5630156ff317ff30c2c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 7 Apr 2016 21:52:36 +0100 Subject: Move boost to new stratum: cpp-common-libs Change-Id: I56ac7f4a9ac4e2559a31cb66e0233a0c0707e1a6 --- strata/ceph-service.morph | 7 +------ strata/ceph-service/boost.morph | 8 -------- strata/cpp-common-libs.morph | 11 +++++++++++ strata/cpp-common-libs/boost.morph | 9 +++++++++ strata/genivi-demo-platform-libs.morph | 5 ----- strata/genivi-demo-platform-libs/boost.morph | 8 -------- strata/genivi-demo-platform.morph | 1 + systems/ceph-service-x86_64-generic.morph | 2 ++ systems/genivi-demo-platform-armv7lhf-jetson.morph | 2 ++ systems/genivi-demo-platform-x86_64-generic.morph | 2 ++ 10 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 strata/ceph-service/boost.morph create mode 100644 strata/cpp-common-libs.morph create mode 100644 strata/cpp-common-libs/boost.morph delete mode 100644 strata/genivi-demo-platform-libs/boost.morph diff --git a/strata/ceph-service.morph b/strata/ceph-service.morph index 39e1c919..0cd09dc4 100644 --- a/strata/ceph-service.morph +++ b/strata/ceph-service.morph @@ -1,6 +1,7 @@ name: ceph-service kind: stratum build-depends: +- morph: strata/cpp-common-libs.morph - morph: strata/foundation.morph - morph: strata/network-security.morph chunks: @@ -44,11 +45,6 @@ chunks: ref: 7503ff5f8610734521f40e276b59b3b6291830e7 unpetrify-ref: baserock/morph build-system: autotools -- name: boost - morph: strata/ceph-service/boost.morph - repo: upstream:boost-tarball - ref: ed232fdd34968697a68783b3195b1da4226915b5 - unpetrify-ref: boost_1_57_0 - name: ceph morph: strata/ceph-service/ceph.morph repo: upstream:ceph @@ -60,7 +56,6 @@ chunks: - leveldb - libeditline - keyutils - - boost submodules: src/erasure-code/jerasure/gf-complete: url: https://github.com/ceph/gf-complete.git diff --git a/strata/ceph-service/boost.morph b/strata/ceph-service/boost.morph deleted file mode 100644 index fa785e3c..00000000 --- a/strata/ceph-service/boost.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: boost -kind: chunk -configure-commands: -- ./bootstrap.sh -build-commands: -- ./b2 -install-commands: -- ./b2 install --prefix="$DESTDIR$PREFIX" diff --git a/strata/cpp-common-libs.morph b/strata/cpp-common-libs.morph new file mode 100644 index 00000000..470f0155 --- /dev/null +++ b/strata/cpp-common-libs.morph @@ -0,0 +1,11 @@ +name: cpp-common-libs +kind: stratum +description: C++ common libraries +build-depends: +- morph: strata/python2-core.morph +chunks: +- name: boost + morph: strata/cpp-common-libs/boost.morph + repo: upstream:boost-tarball + ref: ed232fdd34968697a68783b3195b1da4226915b5 + unpetrify-ref: boost_1_57_0 diff --git a/strata/cpp-common-libs/boost.morph b/strata/cpp-common-libs/boost.morph new file mode 100644 index 00000000..6aaee8ad --- /dev/null +++ b/strata/cpp-common-libs/boost.morph @@ -0,0 +1,9 @@ +name: boost +kind: chunk +build-system: manual +configure-commands: +- ./bootstrap.sh +build-commands: +- ./b2 $MAKEFLAGS +install-commands: +- ./b2 install --prefix="$DESTDIR$PREFIX" diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph index 598180b2..5ddc0d1b 100644 --- a/strata/genivi-demo-platform-libs.morph +++ b/strata/genivi-demo-platform-libs.morph @@ -6,11 +6,6 @@ build-depends: - morph: strata/python-pygobject.morph - morph: strata/audio-bluetooth.morph chunks: -- name: boost - morph: strata/genivi-demo-platform-libs/boost.morph - repo: upstream:boost-tarball - ref: ed232fdd34968697a68783b3195b1da4226915b5 - unpetrify-ref: boost_1_57_0 - name: dbus-c++ morph: strata/genivi-demo-platform-libs/dbus-c++.morph repo: upstream:dbus-c++ diff --git a/strata/genivi-demo-platform-libs/boost.morph b/strata/genivi-demo-platform-libs/boost.morph deleted file mode 100644 index 49c0590e..00000000 --- a/strata/genivi-demo-platform-libs/boost.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: boost -kind: chunk -configure-commands: -- ./bootstrap.sh -build-commands: -- ./b2 $MAKEFLAGS -install-commands: -- ./b2 install --prefix="$DESTDIR$PREFIX" diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 50a2e04b..81072628 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -2,6 +2,7 @@ name: genivi-demo-platform kind: stratum description: Components which make up the GENIVI demo platform. build-depends: +- morph: strata/cpp-common-libs.morph - morph: strata/genivi-demo-platform-libs.morph - morph: strata/qt5-tools.morph - morph: strata/qt5-tools-qtmultimedia.morph diff --git a/systems/ceph-service-x86_64-generic.morph b/systems/ceph-service-x86_64-generic.morph index 803d002f..0e263556 100644 --- a/systems/ceph-service-x86_64-generic.morph +++ b/systems/ceph-service-x86_64-generic.morph @@ -8,6 +8,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph - name: foundation morph: strata/foundation.morph - name: bsp-x86_64-generic diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index b2eef775..f61b61c2 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph - name: python2-core morph: strata/python2-core.morph - name: glib-common diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index 17f077ad..e5c8c6cd 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -7,6 +7,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph - name: python2-core morph: strata/python2-core.morph - name: glib-common -- cgit v1.2.1 From 4b69b26d55cf392a5b16ac411ef8546e82653219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 7 Apr 2016 21:55:33 +0100 Subject: Move automotive-message-broke to ivi-common Currently this module is used by GENIVI and AGL Change-Id: I9b1024d3b9546de418e5d235e3bd845c8402db09 --- strata/genivi-demo-platform.morph | 6 ------ .../automotive-message-broker.morph | 20 -------------------- strata/ivi-common.morph | 12 ++++++++++++ strata/ivi-common/automotive-message-broker.morph | 20 ++++++++++++++++++++ systems/genivi-demo-platform-armv7lhf-jetson.morph | 2 ++ systems/genivi-demo-platform-x86_64-generic.morph | 2 ++ 6 files changed, 36 insertions(+), 26 deletions(-) delete mode 100644 strata/genivi-demo-platform/automotive-message-broker.morph create mode 100644 strata/ivi-common.morph create mode 100644 strata/ivi-common/automotive-message-broker.morph diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 81072628..249afec3 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -2,7 +2,6 @@ name: genivi-demo-platform kind: stratum description: Components which make up the GENIVI demo platform. build-depends: -- morph: strata/cpp-common-libs.morph - morph: strata/genivi-demo-platform-libs.morph - morph: strata/qt5-tools.morph - morph: strata/qt5-tools-qtmultimedia.morph @@ -19,11 +18,6 @@ chunks: submodules: documentation/designdocument/cls: url: http://github.com/Pelagicore/Pelagicore-LaTeX-Class.git -- name: automotive-message-broker - morph: strata/genivi-demo-platform/automotive-message-broker.morph - repo: upstream:automotive-message-broker - ref: 5cac4bd2958ea24ac6913be5baa0dfcda6466089 - unpetrify-ref: '0.14' - name: audiomanager-poc morph: strata/genivi-demo-platform/audiomanager-poc.morph repo: upstream:audiomanager diff --git a/strata/genivi-demo-platform/automotive-message-broker.morph b/strata/genivi-demo-platform/automotive-message-broker.morph deleted file mode 100644 index 2516cf29..00000000 --- a/strata/genivi-demo-platform/automotive-message-broker.morph +++ /dev/null @@ -1,20 +0,0 @@ -name: automotive-message-broker -kind: chunk -description: The GENIVI Automotive Message Broker -build-system: cmake -post-install-commands: -- mkdir -p "$DESTDIR/usr/lib/systemd/system" -- | - cat >"$DESTDIR/usr/lib/systemd/system/ambd.service" <"$DESTDIR/usr/lib/systemd/system/ambd.service" < Date: Thu, 7 Apr 2016 21:55:47 +0100 Subject: Use ivi-common in ivi-system-* Change-Id: If7f255bf71ad70f07e32d94abfc1bb4dd93c56a4 --- systems/ivi-system-armv7lhf-jetson.morph | 4 ++++ systems/ivi-system-x86_64.morph | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph index a8383fbf..5e10db6d 100644 --- a/systems/ivi-system-armv7lhf-jetson.morph +++ b/systems/ivi-system-armv7lhf-jetson.morph @@ -11,6 +11,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph - name: data-indexing-management morph: strata/data-indexing-management.morph - name: device-management @@ -29,6 +31,8 @@ strata: morph: strata/icu-common.morph - name: input-common morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: libsoup-common diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph index 63355a48..53d4f488 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -11,6 +11,8 @@ strata: morph: strata/build-essential.morph - name: core morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph - name: data-indexing-management morph: strata/data-indexing-management.morph - name: device-management @@ -29,6 +31,8 @@ strata: morph: strata/icu-common.morph - name: input-common morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: libsoup-common -- cgit v1.2.1 From 1f340313181a427175701f15a2dca429b053f825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 25 Feb 2016 14:01:10 +0000 Subject: Upgrade wayland to 1.10.0 Change-Id: I8dd87c5fe2a2455a95f11758fd25ca4a55c0818d --- strata/wayland-generic.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index f2de396d..58795f64 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -6,5 +6,5 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: b05668f0ad64ad9ba82e124965163daed4172ead - unpetrify-ref: 1.9.0 + ref: 0ff73b7666b8aee1a68302dd6a7664b68aa659af + unpetrify-ref: 1.10.0 -- cgit v1.2.1 From 69b65d64e93d61dcc96381fb0f87b9657091879e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 25 Feb 2016 14:01:18 +0000 Subject: Add wayland-protocols Change-Id: I0a69b84f6bc6b3c295f2b0a5a7a6bb85c35e6df7 --- strata/wayland-generic.morph | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 58795f64..8ea59e6f 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -8,3 +8,10 @@ chunks: repo: upstream:wayland ref: 0ff73b7666b8aee1a68302dd6a7664b68aa659af unpetrify-ref: 1.10.0 +- name: wayland-protocols + repo: upstream:wayland-protocols + ref: 596dfda882a51c05699bcb28a8459ce936a138db + unpetrify-ref: 1.1 + build-system: autotools + build-depends: + - wayland -- cgit v1.2.1 From 0e701a2de59fb430a03195043c918bd198571064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 25 Feb 2016 14:01:29 +0000 Subject: Upgrade weston to 1.10.0 Change-Id: Ib26ae6a46414bbb733dd95b04e6a389596dd7d5f --- strata/weston-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/weston-common.morph b/strata/weston-common.morph index a7ef2401..24545c2a 100644 --- a/strata/weston-common.morph +++ b/strata/weston-common.morph @@ -10,5 +10,5 @@ chunks: - name: weston morph: strata/weston-common/weston.morph repo: upstream:weston - ref: c7dbc0a8c18e03719b3618b2dff7102f47a1331b - unpetrify-ref: baserock/weston-1.9.0/tegra + ref: 3d983f5964cbdcf44876e62925c39df74dfa1d6b + unpetrify-ref: baserock/weston-1.10.0/tegra -- cgit v1.2.1 From cf84a64b3bffa01ed8359e2a351639345b553063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 25 Feb 2016 14:01:40 +0000 Subject: weston: Enables systemd notifications .. to notify systemd about weston state Change-Id: I82020a7748ecb48f0fbee6f5016faa7c0af0dddf --- strata/weston-common/weston.morph | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/strata/weston-common/weston.morph b/strata/weston-common/weston.morph index b97294ef..af0844ed 100644 --- a/strata/weston-common/weston.morph +++ b/strata/weston-common/weston.morph @@ -2,6 +2,6 @@ name: weston kind: chunk build-system: autotools configure-commands: -- | - ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc \ - --enable-demo-clients-install +- ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc + --enable-demo-clients-install + --enable-systemd-notify -- cgit v1.2.1 From f3155082000fa595e5c10cd5c30e7ed14e93b994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 8 Apr 2016 21:42:31 +0100 Subject: Use qtwayland 5.6 with a backported patch to add ivi-shell support So eventually genivi systems doesnt have to use a different stratum and can use this instead Change-Id: I86cce0e5a0f5a35f39b7e9e9e408876aa84caf00 --- strata/qt5-tools-qtwayland.morph | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph index 8342c42d..75a24bd2 100644 --- a/strata/qt5-tools-qtwayland.morph +++ b/strata/qt5-tools-qtwayland.morph @@ -2,10 +2,11 @@ name: qt5-tools-qtwayland kind: stratum description: Qt5 Wayland module build-depends: +- morph: strata/input-common.morph - morph: strata/qt5-tools.morph chunks: - name: qtwayland repo: upstream:qt5/qtwayland - ref: 29b8bd8b1117589341110502fe516bf22c920747 - unpetrify-ref: v5.6.0 + ref: ebba84e70fe3610affc3974f51c8ed6d539377aa + unpetrify-ref: baserock/v5.6.0-15-gebba84e+ivi-shell build-system: qmake -- cgit v1.2.1 From 190cea2c80bf0766c992a060a53ab770fac33f2a Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Mon, 11 Apr 2016 18:00:19 +0100 Subject: Upgrade wayland-ivi-extension to 1.9.1 Change-Id: I45817176834e8b813637db4e0f64310e63e3d0e4 --- strata/weston-genivi.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 27ff47cc..ccea9434 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -15,7 +15,7 @@ chunks: - name: wayland-ivi-extension morph: strata/weston-genivi/wayland-ivi-extension.morph repo: upstream:genivi/wayland-ivi-extension - ref: 435d12930318a0d3d1779b3603e50f52eb312944 - unpetrify-ref: baserock/1.9.0-parallel-make-fix + ref: 44598504503eea5ac7f94c88477a5a78bda01f30 + unpetrify-ref: 1.9.1 build-depends: - weston -- cgit v1.2.1 From f06e708ce400f077505c378165997952e1bf1638 Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Fri, 8 Apr 2016 12:39:56 +0000 Subject: Update mesa driver to mesa-11.2.0 Change-Id: Idbc04aa46165b6907b871b7d5395dc5c1678d179 --- strata/mesa-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 092ff3ca..e0562a00 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -11,8 +11,8 @@ chunks: - name: mesa morph: strata/mesa-common/mesa.morph repo: upstream:mesa - ref: 7bcd827806b0816d61122ba3d37dd40178d96d98 - unpetrify-ref: mesa-11.1.2 + ref: ff9ddb9eb1b3b25f40e71a95bb48421abfcb11d9 + unpetrify-ref: mesa-11.2.0 - name: libepoxy repo: upstream:libepoxy ref: e2c33af5bfcfc9d168f9e776156dd47c33f428b3 -- cgit v1.2.1 From 21bd9569e99ffb9053cb39c53ffebd430ff151db Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Tue, 12 Apr 2016 12:00:55 +0000 Subject: Update components: - kmod - pciutils Built in a baserock system/build-system-x86_64.morph. Deployed and boot with the same system and checked both versions. Change-Id: I9f95f660485ae99d66bab0a04c003564eb24f60c --- strata/foundation.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index 3784a48f..64e021c1 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -17,8 +17,8 @@ chunks: - name: kmod morph: strata/foundation/kmod.morph repo: upstream:kmod - ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566 - unpetrify-ref: v18 + ref: 42f32b8ae45ad8e3a1da29c9b20af9b5e2e9e676 + unpetrify-ref: v22 - name: time-zone-database morph: strata/foundation/time-zone-database.morph repo: upstream:tz @@ -27,8 +27,8 @@ chunks: - name: pciutils morph: strata/foundation/pciutils.morph repo: upstream:pciutils - ref: bae04bd0473c68a2f21b7712a627abb08fd84b29 - unpetrify-ref: baserock/morph + ref: 37c9315c504f266c23d51e62e59d32422dbbe9e7 + unpetrify-ref: v3.4.1 - name: dbus-pre morph: strata/foundation/dbus-pre.morph repo: upstream:dbus -- cgit v1.2.1 From 6105450773851f0e150aaa7787ff48c9203b449e Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Thu, 14 Apr 2016 13:43:00 +0000 Subject: Update gstreamer and plugins to 1.8.0 Version Change-Id: Ie6513a8a4be80990a22e2ac6532e76d48de1728c --- strata/multimedia-gstreamer.morph | 24 ++++++++++++------------ strata/multimedia-hardware-codecs-x86.morph | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 782410c3..81c59f73 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -11,12 +11,12 @@ chunks: - name: orc morph: strata/multimedia-gstreamer/orc.morph repo: upstream:orc - ref: 1a3af3cb4daeb6802197a7854507d6ee8bc9a06b - unpetrify-ref: orc-0.4.24 + ref: 831886d1f70d3cc21a913b2e335da38af4cae524 + unpetrify-ref: orc-0.4.25 - name: gstreamer repo: upstream:gstreamer - ref: 98aec4a963556cbe569e8a66aff758e5d7fac612 - unpetrify-ref: 1.6.3 + ref: 1abf889dddc75b4e4db2f4505a4287cb20878d27 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - orc @@ -25,8 +25,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-base repo: upstream:gstreamer-plugins-base - ref: 9c28866c9c65dcc79ffdff9c2880f5c68f09280c - unpetrify-ref: 1.6.3 + ref: d67525d594d592e01f13be3c498fef891d11cbf3 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - gstreamer @@ -36,8 +36,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-good repo: upstream:gstreamer-plugins-good - ref: 0708c89706601a858a815b5d1fa6c03b4158e215 - unpetrify-ref: 1.6.3 + ref: 7b809209f7abc07fca51addb60bd499fa8693eed + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - gstreamer @@ -48,8 +48,8 @@ chunks: url: upstream:gstreamer-common - name: gstreamer-plugins-bad repo: upstream:gstreamer-plugins-bad - ref: 7dee47fe39223d8a98615f03f34d9221f9e8a6c1 - unpetrify-ref: 1.6.3 + ref: 740d3507eaf4381ba80de18b607bbd732bccca65 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - gstreamer @@ -61,8 +61,8 @@ chunks: - name: gst-libav morph: strata/multimedia-gstreamer/gst-libav.morph repo: upstream:gst-libav - ref: 0457d1d45b04cd8ef368d5e682d133daf4660fc6 - unpetrify-ref: 1.6.3 + ref: 2d362cc9206785bab4d20c7e375b9c8872d60f95 + unpetrify-ref: 1.8.0 build-depends: - gstreamer - gstreamer-plugins-base diff --git a/strata/multimedia-hardware-codecs-x86.morph b/strata/multimedia-hardware-codecs-x86.morph index 58d4260b..83a32f70 100644 --- a/strata/multimedia-hardware-codecs-x86.morph +++ b/strata/multimedia-hardware-codecs-x86.morph @@ -21,8 +21,8 @@ chunks: - libva - name: gstreamer-vaapi repo: upstream:gstreamer-vaapi - ref: 11221fe868bb08e0acf046bfa81dc2781c2a2d0c - unpetrify-ref: 1.6.0 + ref: 4f62bf5a5e729ca851223b82d88a7f8c0b321de9 + unpetrify-ref: 1.8.0 build-system: autotools build-depends: - libva -- cgit v1.2.1 From f76b2d058882a746fc0264861916f3534a1bd2b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 14 Apr 2016 17:50:45 +0000 Subject: GDP: Use qt5-tools-qtwayland instead qt5-tools-qtwayland-genivi Our generic version of qtwayland has already backported the needed bits genivi systems need for the layer management Change-Id: I99c34053889b4fc85a89c04bcfe86bb5455ff312 --- strata/qt5-tools-qtwayland-genivi.morph | 13 ------------- systems/genivi-demo-platform-armv7lhf-jetson.morph | 4 ++-- systems/genivi-demo-platform-x86_64-generic.morph | 4 ++-- 3 files changed, 4 insertions(+), 17 deletions(-) delete mode 100644 strata/qt5-tools-qtwayland-genivi.morph diff --git a/strata/qt5-tools-qtwayland-genivi.morph b/strata/qt5-tools-qtwayland-genivi.morph deleted file mode 100644 index 1a93c5d3..00000000 --- a/strata/qt5-tools-qtwayland-genivi.morph +++ /dev/null @@ -1,13 +0,0 @@ -name: qt5-tools-qtwayland-genivi -kind: stratum -description: | - Modified version of Qt5 Wayland which makes Qt applications use the - LayerManager API -build-depends: -- morph: strata/qt5-tools.morph -chunks: -- name: qtwayland@genivi - repo: upstream:qt5/qtwayland - ref: 394c54253d5d965e353b618fd373fa89f79cbd96 - unpetrify-ref: baserock/genivi-5.4.0-wip - build-system: qmake diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index 27fbf166..08700b8f 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -59,8 +59,8 @@ strata: morph: strata/qt5-tools-qtmultimedia.morph - name: qt5-tools-qtwebkit morph: strata/qt5-tools-qtwebkit.morph -- name: qt5-tools-qtwayland-genivi - morph: strata/qt5-tools-qtwayland-genivi.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph - name: python-pygobject morph: strata/python-pygobject.morph - name: genivi-demo-platform-libs diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index 29518bbb..cfdb5c82 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -61,8 +61,8 @@ strata: morph: strata/qt5-tools-qtmultimedia.morph - name: qt5-tools-qtwebkit morph: strata/qt5-tools-qtwebkit.morph -- name: qt5-tools-qtwayland-genivi - morph: strata/qt5-tools-qtwayland-genivi.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph - name: python-pygobject morph: strata/python-pygobject.morph - name: genivi-demo-platform-libs -- cgit v1.2.1 From 19d8855a264f1f85730d63c7c7d3ba0336e061b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 15 Apr 2016 10:06:10 +0000 Subject: Add clusters/genivi-demo-platform-x86_64-deploy.morph Change-Id: Ib6a1836525ba448666e9a090beb324bac0940168 --- clusters/genivi-demo-platform-x86_64-deploy.morph | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 clusters/genivi-demo-platform-x86_64-deploy.morph diff --git a/clusters/genivi-demo-platform-x86_64-deploy.morph b/clusters/genivi-demo-platform-x86_64-deploy.morph new file mode 100644 index 00000000..cbbfbf39 --- /dev/null +++ b/clusters/genivi-demo-platform-x86_64-deploy.morph @@ -0,0 +1,22 @@ +name: genivi-demo-platform-x86_64-deploy +kind: cluster +description: | + Deploy GENIVI Demo platform system +systems: +- morph: systems/genivi-demo-platform-x86_64-generic.morph + deploy: + genivi-demo-platform-x86_64-generic: + type: extensions/rawdisk + location: genivi-demo-platform-x86_64-generic.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + HOSTNAME: genivi-demo-platform-x86-64-generic + GENIVI_WESTON_CONFIG: gdp + GENIVI_WESTON_AUTOSTART: False + subsystems: + - morph: systems/initramfs-x86_64.morph + deploy: + initramfs-genivi-demo-platform-x86_64-generic: + type: extensions/initramfs + location: boot/initramfs.gz -- cgit v1.2.1 From b7dfc88bd32c48034ce65304115a035f5b84239c Mon Sep 17 00:00:00 2001 From: Edward Cragg Date: Tue, 5 Apr 2016 16:08:24 +0100 Subject: scripts/licensecheck.py: Fall back to `git clone` if morph isn't available This is a quick fix to allow the script to be run without dependence on morph. As discussed on IRC, since it isn't a simple problem finding a way to safely allow access to caches from different build tools, such a solution hasn't been attempted. When falling back to `git clone`, this change prevents the script from using an existing cache, generating its own instead by cloning from the Baserock cache server, which takes longer. Also add automatic creation of REPOS_DIR if it doesn't exist. Change-Id: Id4b0977a2cae90068b6c2e2fd0c62470287bdfcb --- scripts/licensecheck.py | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/scripts/licensecheck.py b/scripts/licensecheck.py index 59125ea1..08d0e1b4 100755 --- a/scripts/licensecheck.py +++ b/scripts/licensecheck.py @@ -84,6 +84,8 @@ def check_repo_if_needed(name, repo, ref, repos_dir, licenses_dir): if repo_name.endswith(".git"): repo_name = repo_name[:-4] + repo_url = scriptslib.parse_repo_alias(repo) + # Check if ref is sha1 to speedup if len(ref) == 40 and all(c in string.hexdigits for c in ref): license_file = license_file_name(repo_name, ref, licenses_dir) @@ -98,13 +100,31 @@ def check_repo_if_needed(name, repo, ref, repos_dir, licenses_dir): subprocess.check_call([ "git", "remote", "update", "origin", "--prune"], stderr=devnull, stdout=devnull, cwd=clone_path) + # Update submodules + subprocess.check_call( + ["git", "submodule", "update", "--recursive"], + stderr=devnull, stdout=devnull, cwd=clone_path) subprocess.check_call(["git", "checkout", ref], stderr=devnull, stdout=devnull, cwd=clone_path) else: sys.stderr.write("Getting repo '%s' ...\n" % repo_name) with open(os.devnull, 'w') as devnull: - subprocess.check_call(["morph", "get-repo", name, clone_path], - stdout=devnull, stderr=devnull) + try: + # Attempt to use morph to obtain a repository, from morph's + # existing local git cache if possible + subprocess.check_call( + ["morph", "get-repo", name, clone_path], + stdout=devnull, stderr=devnull) + + except (OSError, subprocess.CalledProcessError): + # Fall back to git clone, when morph hasn't been found on the + # system, or otherwise fails to get a repo. This is required + # where morph isn't available, e.g. when using YBD to build. + # YBD currently doesn't offer a similar 'get-repo' feature. + sys.stderr.write("Falling back to git clone.\n") + subprocess.check_call( + ["git", "clone", "--recursive", repo_url, clone_path], + stdout=devnull, stderr=devnull) # also clone submodules sha = subprocess.check_output( ["git", "rev-parse", "HEAD"], cwd=clone_path).strip() @@ -145,6 +165,9 @@ def main(): args = parser.parse_args() + if not os.path.exists(args.repos_dir): + os.makedirs(args.repos_dir) + system = scriptslib.load_yaml_file(args.system) license_files = [] for stratum in system['strata']: -- cgit v1.2.1 From c75d7c8ada76a292959907cedbe31bb751b4275d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 15 Oct 2015 11:18:26 +0100 Subject: Add weston-qt5-system-x86_64 to the ci So the Qt5 strata doesnt bitrot and everyone can take advantage of the cache Change-Id: Ic1c23edbbe688cbbeff7da100f24c306f785354f --- clusters/ci.morph | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/clusters/ci.morph b/clusters/ci.morph index a7469512..a162eff0 100644 --- a/clusters/ci.morph +++ b/clusters/ci.morph @@ -91,6 +91,13 @@ systems: GENIVI_WESTON_BACKEND: drm GENIVI_WESTON_CONFIG: baseline GENIVI_WESTON_AUTOSTART: True +- morph: systems/weston-qt5-system-x86_64.morph + deploy: + weston-qt5-system-x86_64.morph: + type: extensions/rawdisk + location: weston-qt5-system-x86_64.morph.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 - morph: systems/openstack-system-x86_64.morph deploy: openstack-system-x86_64: -- cgit v1.2.1 From 611486d22daee2e6690dc7bac9346f7a545dd963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 21 Apr 2016 17:25:02 +0100 Subject: Add systems/ivi-system-x86_32.morph Change-Id: Ie5477d44b8c4abe7f28c22407d06e002a0cc0a50 --- systems/ivi-system-x86_32.morph | 92 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 systems/ivi-system-x86_32.morph diff --git a/systems/ivi-system-x86_32.morph b/systems/ivi-system-x86_32.morph new file mode 100644 index 00000000..36678739 --- /dev/null +++ b/systems/ivi-system-x86_32.morph @@ -0,0 +1,92 @@ +name: ivi-system-x86_32 +kind: system +description: A generic IVI system with components from GENIVI and AGL +arch: x86_32 +strata: +- name: audio-bluetooth + morph: strata/audio-bluetooth.morph +- name: bsp-x86_32-generic + morph: strata/bsp-x86_32-generic.morph +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph +- name: data-indexing-management + morph: strata/data-indexing-management.morph +- name: device-management + morph: strata/device-management.morph +- name: dlna-services + morph: strata/dlna-services.morph +- name: foundation + morph: strata/foundation.morph +- name: geolocation + morph: strata/geolocation.morph +- name: glib-common + morph: strata/glib-common.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: icu-common + morph: strata/icu-common.morph +- name: input-common + morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: libsoup-common + morph: strata/libsoup-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-hardware-codecs-x86 + morph: strata/multimedia-hardware-codecs-x86.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: multimedia-gstreamer-openmax-generic + morph: strata/multimedia-gstreamer-openmax-generic.morph +- name: navigation + morph: strata/navigation.morph +- name: network-security + morph: strata/network-security.morph +- name: NetworkManager-common + morph: strata/NetworkManager-common.morph +- name: privileges-management + morph: strata/privileges-management.morph +- name: python2-core + morph: strata/python2-core.morph +- name: python3-gobject + morph: strata/python3-gobject.morph +- name: qt5-tools + morph: strata/qt5-tools.morph +- name: qt5-tools-qtmultimedia + morph: strata/qt5-tools-qtmultimedia.morph +- name: qt5-tools-qtwebengine + morph: strata/qt5-tools-qtwebengine.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph +- name: ruby + morph: strata/ruby.morph +- name: samba + morph: strata/samba.morph +- name: secret-service + morph: strata/secret-service.morph +- name: spell-checking + morph: strata/spell-checking.morph +- name: storage-management + morph: strata/storage-management.morph +- name: vala-common + morph: strata/vala-common.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: weston-common + morph: strata/weston-common.morph +- name: x-common + morph: strata/x-common.morph +configuration-extensions: +- extensions/set-hostname +- extensions/install-essential-files -- cgit v1.2.1 From 49e2f7f9bec02c5d9fb0290c8c657ea67c1d3312 Mon Sep 17 00:00:00 2001 From: Edward Cragg Date: Thu, 21 Apr 2016 17:46:03 +0100 Subject: Update morph to latest master Update morph to the latest master ref. Change-Id: Id4aaf9576f542c5d1dbadee4cdca004d907014bd --- strata/morph-utils.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 0d37ae18..f713ba18 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -37,7 +37,7 @@ chunks: build-system: python-distutils - name: morph repo: baserock:baserock/morph - ref: a7f12476d4e7b2025a60be58027b67b9e551f31b + ref: 74e8d1b9aeb47d957d526250784d2c0087e59bf9 unpetrify-ref: master build-system: python-distutils build-depends: -- cgit v1.2.1 From 6e3d709d733ee991335fc22627a254420fe4615b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 23 Apr 2016 14:59:48 +0100 Subject: strata/qt5-sdk.morph: qtcreator still depends on qtwebkit Change-Id: Id7d2a9bc423ea583e47efc5cc2c93485d5627dd4 --- strata/qt5-sdk.morph | 2 +- systems/weston-qt5-system-x86_64.morph | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/strata/qt5-sdk.morph b/strata/qt5-sdk.morph index f64c4b7b..0d556d38 100644 --- a/strata/qt5-sdk.morph +++ b/strata/qt5-sdk.morph @@ -3,7 +3,7 @@ kind: stratum description: Qt5 Desktop Environment, IDE and Example Apps build-depends: - morph: strata/qt5-tools.morph -- morph: strata/qt5-tools-qtwebengine.morph +- morph: strata/qt5-tools-qtwebkit.morph chunks: - name: qt-creator morph: strata/qt5-sdk/qt-creator.morph diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph index 7ac315c1..839a596c 100644 --- a/systems/weston-qt5-system-x86_64.morph +++ b/systems/weston-qt5-system-x86_64.morph @@ -52,6 +52,8 @@ strata: morph: strata/qt5-sdk.morph - name: qt5-tools-qtwebengine morph: strata/qt5-tools-qtwebengine.morph +- name: qt5-tools-qtwebkit + morph: strata/qt5-tools-qtwebkit.morph - name: qt5-tools-qtwayland morph: strata/qt5-tools-qtwayland.morph - name: connectivity -- cgit v1.2.1 From 1c762659c81e6916dd65fc9721b1d6c1fd42d071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 23 Apr 2016 15:00:07 +0100 Subject: Remove qt5-sdk from systems/weston-qt5-system-x86_64.morph This system was never meant to be a development environment Change-Id: I52adaaad24ed199aead33375ad804a34f70b83f8 --- systems/weston-qt5-system-x86_64.morph | 4 ---- 1 file changed, 4 deletions(-) diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph index 839a596c..13ccd9d8 100644 --- a/systems/weston-qt5-system-x86_64.morph +++ b/systems/weston-qt5-system-x86_64.morph @@ -48,12 +48,8 @@ strata: morph: strata/qt5-tools.morph - name: qt5-tools-qtmultimedia morph: strata/qt5-tools-qtmultimedia.morph -- name: qt5-sdk - morph: strata/qt5-sdk.morph - name: qt5-tools-qtwebengine morph: strata/qt5-tools-qtwebengine.morph -- name: qt5-tools-qtwebkit - morph: strata/qt5-tools-qtwebkit.morph - name: qt5-tools-qtwayland morph: strata/qt5-tools-qtwayland.morph - name: connectivity -- cgit v1.2.1 From cfc3fae66614ea3def60eb12719bf820183c12ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 4 Apr 2016 00:01:18 +0100 Subject: Add x86_64-ivi kernel Add the mostcore driver to support MOST bus Change-Id: Iaf1de1f0a5d2d00be98f53f014fb1ea99488f872 --- strata/bsp-x86_64-ivi.morph | 12 +++++++ strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph | 48 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 strata/bsp-x86_64-ivi.morph create mode 100644 strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph diff --git a/strata/bsp-x86_64-ivi.morph b/strata/bsp-x86_64-ivi.morph new file mode 100644 index 00000000..b94166c7 --- /dev/null +++ b/strata/bsp-x86_64-ivi.morph @@ -0,0 +1,12 @@ +name: bsp-x86_64-ivi +kind: stratum +description: Set of components required for booting a 64-bit + x86 based system, with some options specific to IVI systems. +build-depends: +- morph: strata/bsp-x86_both-tools.morph +chunks: +- name: linux-x86-64-generic + morph: strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph + repo: upstream:linux-stable + ref: afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc + unpetrify-ref: v4.4 diff --git a/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph b/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph new file mode 100644 index 00000000..456a4858 --- /dev/null +++ b/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph @@ -0,0 +1,48 @@ +name: linux-x86-64-ivi +kind: chunk +products: +- artifact: linux-x86-64-ivi-devel + include: + - (usr/)?src/linux/.* +- artifact: linux-x86-64-ivi-bins + include: + - boot/.* +- artifact: linux-x86-64-ivi-libs + include: + - lib/.* +configure-commands: +- make defconfig +- scripts/config -m CONFIG_DRM_CIRRUS_QEMU +- scripts/config -m CONFIG_DRM_BOCHS +- scripts/config -m CONFIG_DRM_VIRTIO_GPU +- scripts/config -m CONFIG_BT_INTEL +- scripts/config -m CONFIG_MOSTCORE +- yes '' | make oldconfig +build-commands: +- make $MAKEFLAGS +install-commands: +- mkdir -p "$DESTDIR"/boot +- make INSTALL_PATH="$DESTDIR"/boot install +- make INSTALL_MOD_PATH="$DESTDIR" modules_install +- install -d "$DESTDIR$PREFIX/src/linux" +- | + ( + printf 'Makefile\0' + printf 'Module.symvers\0' + find arch/x86 -maxdepth 1 -name 'Makefile*' -print0 + find arch/x86 \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0 + find arch/x86 \( -type d -a \( -name include -o -name scripts \) \) -o \ + \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0 + find include -name 'asm*' -prune -o -print0 + find include/asm-generic -print0 + find include/uapi -print0 + find scripts -print0 + ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux" +system-integration: + linux-x86-64-generic-misc: + # This is required for any modules to work correctly. However, it depends + # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs + # conditionally on `depmod` existing to avoid breaking in + # minimal-system-x86_64. + 00-depmod: + - if which depmod; then (cd /lib/modules && for version in *; do depmod -a "$version"; done) fi -- cgit v1.2.1 From ad0adf856d4e67f97d7cc012211722399ef901c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 26 Apr 2016 18:43:37 +0100 Subject: strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph: Fix system-integration command Change-Id: I5c750002039e7c346e34aa27c5802f344f9ec0c6 --- strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph b/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph index 456a4858..4ea25199 100644 --- a/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph +++ b/strata/bsp-x86_64-ivi/linux-x86-64-ivi.morph @@ -39,7 +39,7 @@ install-commands: find scripts -print0 ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux" system-integration: - linux-x86-64-generic-misc: + linux-x86-64-ivi-misc: # This is required for any modules to work correctly. However, it depends # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs # conditionally on `depmod` existing to avoid breaking in -- cgit v1.2.1 From 6693b13163c151ffddad705417bf984a27a654c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 27 Apr 2016 18:59:48 +0100 Subject: Add systems/genivi-demo-platform-x86_32-generic.morph Change-Id: Id434166dcaadfc688bda1e8638faec22f4fd5c42 --- systems/genivi-demo-platform-x86_32-generic.morph | 81 +++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 systems/genivi-demo-platform-x86_32-generic.morph diff --git a/systems/genivi-demo-platform-x86_32-generic.morph b/systems/genivi-demo-platform-x86_32-generic.morph new file mode 100644 index 00000000..afacbe97 --- /dev/null +++ b/systems/genivi-demo-platform-x86_32-generic.morph @@ -0,0 +1,81 @@ +name: genivi-demo-platform-x86_32-generic +kind: system +description: A GENIVI demo platform for a 32-bit x86 system. +arch: x86_32 +strata: +- name: build-essential + morph: strata/build-essential.morph +- name: core + morph: strata/core.morph +- name: cpp-common-libs + morph: strata/cpp-common-libs.morph +- name: python2-core + morph: strata/python2-core.morph +- name: glib-common + morph: strata/glib-common.morph +- name: foundation + morph: strata/foundation.morph +- name: bsp-x86_32-generic + morph: strata/bsp-x86_32-generic.morph +- name: connectivity + morph: strata/connectivity.morph +- name: connman-common + morph: strata/connman-common.morph +- name: device-management + morph: strata/device-management.morph +- name: audio-bluetooth + morph: strata/audio-bluetooth.morph +- name: libdrm-common + morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph +- name: navigation + morph: strata/navigation.morph +- name: genivi + morph: strata/genivi.morph +- name: wayland-generic + morph: strata/wayland-generic.morph +- name: graphics-common + morph: strata/graphics-common.morph +- name: input-common + morph: strata/input-common.morph +- name: ivi-common + morph: strata/ivi-common.morph +- name: llvm-common + morph: strata/llvm-common.morph +- name: mesa-common + morph: strata/mesa-common.morph +- name: x-common + morph: strata/x-common.morph +- name: weston-genivi + morph: strata/weston-genivi.morph +- name: ruby + morph: strata/ruby.morph +- name: icu-common + morph: strata/icu-common.morph +- name: qt5-tools + morph: strata/qt5-tools.morph +- name: qt5-tools-qtmultimedia + morph: strata/qt5-tools-qtmultimedia.morph +- name: qt5-tools-qtwebkit + morph: strata/qt5-tools-qtwebkit.morph +- name: qt5-tools-qtwayland + morph: strata/qt5-tools-qtwayland.morph +- name: python-pygobject + morph: strata/python-pygobject.morph +- name: genivi-demo-platform-libs + morph: strata/genivi-demo-platform-libs.morph +- name: genivi-demo-platform + morph: strata/genivi-demo-platform.morph +- name: tools + morph: strata/tools.morph +configuration-extensions: +- extensions/set-hostname +- extensions/add-config-files +- extensions/nfsboot +- extensions/install-files +- extensions/fstab +- extensions/install-essential-files +- extensions/genivi -- cgit v1.2.1 From f62673de357d4d29ddb1078b81c84c8869287e15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 27 Apr 2016 19:01:07 +0100 Subject: Add clusters/genivi-demo-platform-x86_32-deploy.morph Change-Id: I9220ad0a2f25e3e22915fa46bb05da20e24cec74 --- clusters/genivi-demo-platform-x86_32-deploy.morph | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 clusters/genivi-demo-platform-x86_32-deploy.morph diff --git a/clusters/genivi-demo-platform-x86_32-deploy.morph b/clusters/genivi-demo-platform-x86_32-deploy.morph new file mode 100644 index 00000000..df02719d --- /dev/null +++ b/clusters/genivi-demo-platform-x86_32-deploy.morph @@ -0,0 +1,22 @@ +name: genivi-demo-platform-x86_32-deploy +kind: cluster +description: | + Deploy GENIVI Demo platform system +systems: +- morph: systems/genivi-demo-platform-x86_32-generic.morph + deploy: + genivi-demo-platform-x86_32-generic: + type: extensions/rawdisk + location: genivi-demo-platform-x86_32-generic.img + DISK_SIZE: 4G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + HOSTNAME: genivi-demo-platform-x86-32-generic + GENIVI_WESTON_CONFIG: gdp + GENIVI_WESTON_AUTOSTART: False + subsystems: + - morph: systems/initramfs-x86_32.morph + deploy: + initramfs-genivi-demo-platform-x86_32-generic: + type: extensions/initramfs + location: boot/initramfs.gz -- cgit v1.2.1 From 3559e14308e0cf7844983b8ba6c0ed7b22ab17b1 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 28 Apr 2016 12:26:33 +0100 Subject: Upgrade lorry-controller to include fixes Webapp service binds now to 127.0.0.1, making it only reachable from the same host. Change-Id: I1f32d8fdf0a1783d89a5b57a3bee458e9103c048 --- strata/lorry-controller.morph | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/strata/lorry-controller.morph b/strata/lorry-controller.morph index 57e34185..f0316824 100644 --- a/strata/lorry-controller.morph +++ b/strata/lorry-controller.morph @@ -12,5 +12,5 @@ chunks: - name: lorry-controller morph: strata/lorry-controller/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: 05ce93f191039df06a812a085476ba60af5a2cb6 + ref: f271373b9b93037d9183d777f34d55d1bc2310b7 unpetrify-ref: master -- cgit v1.2.1 From 8fdc122f65e128782eeac6f699b58a64e378bd12 Mon Sep 17 00:00:00 2001 From: Edward Cragg Date: Fri, 8 Apr 2016 14:32:30 +0100 Subject: extensions/strip-gplv3.configure: Fix to work with YBD Add an object and functions allowing metadata to be read more easily from multiple sources, either morph metadata, or with a conversion function for YBD formatted metadata. Change-Id: I94ea2425edecb4a659968134b0900081e22913d3 --- extensions/strip-gplv3.configure | 31 ++++------- scripts/scriptslib.py | 110 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 119 insertions(+), 22 deletions(-) diff --git a/extensions/strip-gplv3.configure b/extensions/strip-gplv3.configure index 2dac0907..70a08d77 100755 --- a/extensions/strip-gplv3.configure +++ b/extensions/strip-gplv3.configure @@ -1,5 +1,5 @@ #!/usr/bin/python -# Copyright (C) 2013 Codethink Limited +# Copyright (C) 2013-2016 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ to find the files created by that chunk, then remove them. ''' -import json import os import re import subprocess @@ -29,6 +28,9 @@ import sys import writeexts +import imp +scriptslib = imp.load_source('scriptslib', 'scripts/scriptslib.py') + class StripGPLv3ConfigureExtension(writeexts.Extension): gplv3_chunks = [ ['autoconf', ''], @@ -59,29 +61,16 @@ class StripGPLv3ConfigureExtension(writeexts.Extension): def process_args(self, args): target_root = args[0] meta_dir = os.path.join(target_root, 'baserock') + metadata = scriptslib.meta_load_from_dir(meta_dir) for chunk in self.gplv3_chunks: - regex = os.path.join(meta_dir, "%s-[^-]\+\.meta" % chunk[0]) - artifacts = subprocess.check_output(['busybox', 'find', meta_dir, - '-regex', regex]) - - for artifact in artifacts.split(): - self.remove_chunk(target_root, artifact, chunk[1]) - - os.symlink(os.path.join(os.sep, 'bin', 'busybox'), - os.path.join(target_root, 'usr', 'bin', 'awk')) + for meta in metadata.get_name(chunk[0]): + self.remove_chunk( + target_root, reversed(meta['contents']), chunk[1]) - def remove_chunk(self, target_root, chunk, pattern): - chunk_meta_path = os.path.join(target_root, 'baserock', chunk) - - with open(chunk_meta_path, 'r') as f: - chunk_meta_data = json.load(f) - - if not 'contents' in chunk_meta_data: - raise writeexts.ExtensionError( - 'Chunk %s does not have a "contents" list' % chunk) + def remove_chunk(self, target_root, chunk_contents, pattern): updated_contents = [] - for content_entry in reversed(chunk_meta_data['contents']): + for content_entry in chunk_contents: pat = re.compile(pattern) if len(pattern) == 0 or not pat.match(content_entry): self.remove_content_entry(target_root, content_entry) diff --git a/scripts/scriptslib.py b/scripts/scriptslib.py index 68470c28..1f79fb95 100644 --- a/scripts/scriptslib.py +++ b/scripts/scriptslib.py @@ -17,7 +17,8 @@ import yaml import subprocess - +import os +import sys aliases = { 'baserock:': 'git://%(trove)s/baserock/', @@ -43,3 +44,110 @@ def definitions_root(): def load_yaml_file(yaml_file): with open(yaml_file, 'r') as f: return yaml.safe_load(f) + + +class BaserockMeta(object): + '''An object representing Baserock metadata contained in a Baserock + system image, for available metadata formats''' + + def __init__(self): + self.metas = {} + + def get_each(self): + '''Yield an iterable for the whole list of metas''' + for key in self.metas: + yield self.metas[key] + + def get_name(self, name): + '''Yield an iterable of metadata matched by name, e.g. `bash`''' + for key in self.metas: + if self.metas[key]['source-name'] == name: + yield self.metas[key] + + def import_meta(self, meta_text): + importers = (self.import_meta_ybd, + self.import_meta_morph) + + for i in importers: + try: + i(meta_text) + return + except (KeyError, Exception) as err: + pass + + # Shouldn't get here + sys.stderr.write('Metadata format not recognised.\n' + 'Error:\n') + raise err + + def import_meta_morph(self, meta_text): + self._add_meta(yaml.load(meta_text)) + + def import_meta_ybd(self, meta_text): + source = yaml.load(meta_text) + + null = '0' * 32 + + if 'repo' not in source: + kind = 'stratum' + contents = 'components' + source['repo'] = 'upstream:definitions' + source['ref'] = null # No ref info + else: + kind = 'chunk' + contents = 'files' + + repo = parse_repo_alias(source['repo']) + source_name = '-'.join( + source['products'][0]['artifact'].split('-')[:-1]) + + # Needed until YBD provides cache-key in metadata + if not 'cache-key' in source: + source['cache-key'] = null + + for product in source['products']: + + self._add_meta({ + 'kind': kind, + 'source-name': source_name, + 'artifact-name': product['artifact'], + 'contents': product[contents], + 'repo': repo, + 'repo-alias': source['repo'], + 'sha1': source['ref'], + 'original_ref': source['ref'], + 'cache-key': source['cache-key'] + }) + + def _add_meta(self, meta_dict): + '''Validate and add a meta''' + + ignore = ('configuration', + 'system-artifact-name') + + for i in ignore: + if i in meta_dict: + return + + required_fields = ('repo', 'sha1', 'contents') + for f in required_fields: + if not f in meta_dict: + raise Exception('Metadata format not recognised, no ' + 'value for \'%s\'. Data: \'%s\''% (f, str(meta_dict))) + + self.metas[meta_dict['artifact-name']] = meta_dict + + +def meta_load_from_dir(meta_dir_path): + '''Read Baserock metadata from a directory''' + + files = [f for f in os.listdir(meta_dir_path) + if os.path.isfile(os.path.join(meta_dir_path, f))] + + meta = BaserockMeta() + for f in files: + if f.endswith('.meta'): + meta.import_meta( + open(os.path.join(meta_dir_path, f), 'r').read()) + + return meta -- cgit v1.2.1 From 046148d9b4649b53fbdbfdbef52c07472d1d411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Tue, 3 May 2016 12:02:41 +0100 Subject: strata/genivi-demo-platform.morph: Use latest genivi-demo-platform-hmi As is being used in the Yocto GDP Change-Id: I9579dfba0bb7502263c112fa5018c582537d969d --- strata/genivi-demo-platform.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/genivi-demo-platform.morph b/strata/genivi-demo-platform.morph index 249afec3..f58b8a6b 100644 --- a/strata/genivi-demo-platform.morph +++ b/strata/genivi-demo-platform.morph @@ -38,5 +38,5 @@ chunks: - name: genivi-demo-platform-hmi morph: strata/genivi-demo-platform/genivi-demo-platform-hmi.morph repo: upstream:genivi/genivi-demo-platform-hmi - ref: f56acfadb5400087c1bb935406fcb005e315f27f - unpetrify-ref: baserock/weston-1.9-wip + ref: fd2c954165b0c0f7f4d9e94e8c9c3c8541a53e79 + unpetrify-ref: master -- cgit v1.2.1 From cf278838cfcf4bd808a57b9bef0e861d6402f19b Mon Sep 17 00:00:00 2001 From: Ben Brown Date: Tue, 3 May 2016 15:17:00 +0100 Subject: Add --enable-split-usr to systemd configuration systemd assumes /bin and /sbin are symlinks into /usr unless HAVE_SPLIT_USR is defined, and so does not append them (/bin and /sbin) to the PATH for spawned processes. Fixes trove-setup.service failing due to /sbin and /bin not being in PATH: TASK: [trove-setup | Change the hostname to HOSTNAME] ****************** failed: [localhost] => {"changed": true, "cmd": "hostname emon", "delta": "0:00:00.002074", "end": "2016-05-03 14:58:31.459438", "rc": 127, "start": "2016-05-03 14:58:31.457364", "warnings": []} stderr: /bin/sh: hostname: not found Change-Id: I6f4d49363554e8b55265027cff4b52b0f8689cc4 --- strata/foundation/systemd.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph index ae95cf9b..ae1f6a14 100644 --- a/strata/foundation/systemd.morph +++ b/strata/foundation/systemd.morph @@ -9,6 +9,7 @@ configure-commands: --disable-manpages --disable-tests --libexecdir="$PREFIX/libexec" + --enable-split-usr post-install-commands: - mkdir -p "$DESTDIR"/sbin - ln -s "$PREFIX"/lib/systemd/systemd "$DESTDIR"/sbin/init -- cgit v1.2.1 From 195d70a7b308e149516b801f7cbe52979bd66fdf Mon Sep 17 00:00:00 2001 From: Lauren Perry Date: Mon, 9 May 2016 13:21:34 +0000 Subject: Add qt5-ivi stratum Containing QtApplicationManager and QtIVI Change-Id: Iebc3a8c83d59d4738ba9786859c8eae675c06e5d --- strata/qt5-ivi.morph | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 strata/qt5-ivi.morph diff --git a/strata/qt5-ivi.morph b/strata/qt5-ivi.morph new file mode 100644 index 00000000..94036d84 --- /dev/null +++ b/strata/qt5-ivi.morph @@ -0,0 +1,17 @@ +name: qt5-ivi +kind: stratum +description: Qt5 IVI stratum +build-depends: +- morph: strata/ruby.morph +- morph: strata/qt5-tools.morph +chunks: +- name: qtapplicationmanager + repo: upstream:qt5/qtapplicationmanager + ref: fb9670e9e381aa391e5fe3eccd76db0f7b866abb + unpetrify-ref: 5.7 + build-system: qmake +- name: qtivi + repo: upstream:qt5/qtivi + ref: 36616e36cb1f0b30aa9ca7977af7a5b682689f7a + unpetrify-ref: 5.7 + build-system: qmake -- cgit v1.2.1 From 0824e69a0529b770959db39c6fd7d694caaa025c Mon Sep 17 00:00:00 2001 From: Ana Huelamo Date: Thu, 5 May 2016 08:26:07 +0000 Subject: Added CORBA integration files Change-Id: Ifb376f52e346c1ac9d5ac9d440e55bf0e0090292 --- strata/corba.morph | 17 +++++++++++++++++ strata/corba/MPC.morph | 6 ++++++ strata/corba/ace_tao.morph | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 strata/corba.morph create mode 100644 strata/corba/MPC.morph create mode 100644 strata/corba/ace_tao.morph diff --git a/strata/corba.morph b/strata/corba.morph new file mode 100644 index 00000000..3164ecc0 --- /dev/null +++ b/strata/corba.morph @@ -0,0 +1,17 @@ +name: corba +kind: stratum +build-depends: + - morph: strata/core.morph +chunks: + - name: MPC + repo: upstream:MPC + morph: strata/corba/MPC.morph + ref: c2cddd1335036f1ca3610274a155d2222a8b5f7c + unpetrify-ref: ACE+TAO-6_3_4 + - name: ACE_TAO + morph: strata/corba/ace_tao.morph + repo: upstream:ATCD + ref: b9ab94b74529a926864c154675559fd6a1d8998b + unpetrify-ref: ACE+TAO-6_3_4 + build-depends: + - MPC diff --git a/strata/corba/MPC.morph b/strata/corba/MPC.morph new file mode 100644 index 00000000..84b015ec --- /dev/null +++ b/strata/corba/MPC.morph @@ -0,0 +1,6 @@ +name: MPC +kind: chunk +build-system: manual +install-commands: +- mkdir -p "$DESTDIR/usr/src/MPC" +- cp -r * "$DESTDIR/usr/src/MPC" diff --git a/strata/corba/ace_tao.morph b/strata/corba/ace_tao.morph new file mode 100644 index 00000000..bfbbb4cc --- /dev/null +++ b/strata/corba/ace_tao.morph @@ -0,0 +1,32 @@ +name: ACE_TAO +kind: chunk +build-system: manual +configure-commands: +- | + export ACE_ROOT="$PWD/ACE" + export TAO_ROOT="$PWD/TAO" + export MPC_ROOT='/usr/src/MPC' + cd "$TAO_ROOT" + perl "$ACE_ROOT"/bin/mwc.pl TAO_ACE.mwc -type gnuace + +build-commands: +- | + export ACE_ROOT="$PWD/ACE" + export TAO_ROOT="$PWD/TAO" + export MPC_ROOT='/usr/src/MPC' + echo '#include "ace/config-linux.h"' > "$ACE_ROOT"/ace/config.h + echo "include "$ACE_ROOT"/include/makeinclude/platform_linux.GNU" > "$ACE_ROOT"/include/makeinclude/platform_macros.GNU + export LD_LIBRARY_PATH="$ACE_ROOT"/lib:$LD_LIBRARY_PATH + cd "$TAO_ROOT" + make +install-commands: +- | + export ACE_ROOT="$PWD/ACE" + export TAO_ROOT="$PWD/TAO" + export MPC_ROOT='/usr/src/MPC' + cd "$TAO_ROOT" + make DESTDIR="$DESTDIR" INSTALL_PREFIX="$PREFIX" install +system-integration: + ACE_TAO-misc: + 00-remove-build-dependencies: + - rm -rf /usr/src/MPC -- cgit v1.2.1 From 405b92d75d3e61472f3736f538e7bf8037467879 Mon Sep 17 00:00:00 2001 From: Lauren Perry Date: Mon, 9 May 2016 13:23:27 +0000 Subject: Add qt5-ivi stratum to x86_32 and x86_64 IVI systems Change-Id: I684f79b2de02655e8818d9342d714129fccd8ccf --- systems/ivi-system-x86_32.morph | 2 ++ systems/ivi-system-x86_64.morph | 2 ++ 2 files changed, 4 insertions(+) diff --git a/systems/ivi-system-x86_32.morph b/systems/ivi-system-x86_32.morph index 36678739..a42d9ac4 100644 --- a/systems/ivi-system-x86_32.morph +++ b/systems/ivi-system-x86_32.morph @@ -61,6 +61,8 @@ strata: morph: strata/python2-core.morph - name: python3-gobject morph: strata/python3-gobject.morph +- name: qt5-ivi + morph: strata/qt5-ivi.morph - name: qt5-tools morph: strata/qt5-tools.morph - name: qt5-tools-qtmultimedia diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph index 53d4f488..45ec5cb6 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -61,6 +61,8 @@ strata: morph: strata/python2-core.morph - name: python3-gobject morph: strata/python3-gobject.morph +- name: qt5-ivi + morph: strata/qt5-ivi.morph - name: qt5-tools morph: strata/qt5-tools.morph - name: qt5-tools-qtmultimedia -- cgit v1.2.1 From 6ba6bd697e4f9e50185022f01f3c519f5408ed2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 9 May 2016 11:58:10 +0100 Subject: Add clusters/ivi-system-x86_32-deploy.morph Change-Id: I61fe44a481d23034e2788737113e7f2b3e23f998 --- clusters/ivi-system-x86_32-deploy.morph | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 clusters/ivi-system-x86_32-deploy.morph diff --git a/clusters/ivi-system-x86_32-deploy.morph b/clusters/ivi-system-x86_32-deploy.morph new file mode 100644 index 00000000..90ce4940 --- /dev/null +++ b/clusters/ivi-system-x86_32-deploy.morph @@ -0,0 +1,24 @@ +name: ivi-system-x86_32-deploy +kind: cluster +description: | + Deploy a stock IVI system. + + The resulting image can be copied to a USB and booted from there, + as well as in a virtual machine. + +systems: +- morph: systems/ivi-system-x86_32.morph + deploy: + ivi-system-x86_32: + type: extensions/rawdisk + location: /ivi-system-x86_32.img + HOSTNAME: ivi-system-x86-32 + DISK_SIZE: 6G + KERNEL_ARGS: vga=788 + INITRAMFS_PATH: boot/initramfs.gz + subsystems: + - morph: systems/initramfs-x86_32.morph + deploy: + initramfs: + type: initramfs + location: boot/initramfs.gz -- cgit v1.2.1 From 41713f11f255a25a55f27fd1fde023aa87c96457 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Wed, 11 May 2016 13:41:05 -0700 Subject: Configure and install qtapplicationmanager correctly Now installs to $PREFIX, and installs the configuration files to /opt/am Change-Id: I6dd8d11f85f772c71f7a291081e5faddfa7c18a5 --- strata/qt5-ivi.morph | 2 +- strata/qt5-ivi/qtapplicationmanager.morph | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 strata/qt5-ivi/qtapplicationmanager.morph diff --git a/strata/qt5-ivi.morph b/strata/qt5-ivi.morph index 94036d84..16e7cd26 100644 --- a/strata/qt5-ivi.morph +++ b/strata/qt5-ivi.morph @@ -6,10 +6,10 @@ build-depends: - morph: strata/qt5-tools.morph chunks: - name: qtapplicationmanager + morph: strata/qt5-ivi/qtapplicationmanager.morph repo: upstream:qt5/qtapplicationmanager ref: fb9670e9e381aa391e5fe3eccd76db0f7b866abb unpetrify-ref: 5.7 - build-system: qmake - name: qtivi repo: upstream:qt5/qtivi ref: 36616e36cb1f0b30aa9ca7977af7a5b682689f7a diff --git a/strata/qt5-ivi/qtapplicationmanager.morph b/strata/qt5-ivi/qtapplicationmanager.morph new file mode 100644 index 00000000..45f2c07a --- /dev/null +++ b/strata/qt5-ivi/qtapplicationmanager.morph @@ -0,0 +1,8 @@ +name: qtapplicationmanager +kind: chunk +build-system: qmake +configure-commands: +- qmake -config install-prefix=$PREFIX +post-install-commands: +- mkdir -p $DESTDIR/opt/am +- cp -r template-opt/am/* $DESTDIR/opt/am/ -- cgit v1.2.1 From cdb63fee6340c45ae3ead6019b262bacae0665c7 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez Date: Thu, 12 May 2016 13:44:29 +0000 Subject: Upgrade OpenSSL to 1.0.1t Change-Id: Ie9a866a7b9aa29e46986aa62fb0816e0bca71bf8 --- strata/core.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/core.morph b/strata/core.morph index cb306dad..e10fd894 100644 --- a/strata/core.morph +++ b/strata/core.morph @@ -90,8 +90,8 @@ chunks: - name: openssl-new morph: strata/core/openssl-new.morph repo: upstream:openssl-new - ref: 57ac73fb5d0a878f282cbcd9e7951c77fdc59e3c - unpetrify-ref: OpenSSL_1_0_1s + ref: 3d2e575b3f71b4d66c0b948d411d8e936f192127 + unpetrify-ref: OpenSSL_1_0_1t build-depends: - perl - name: bzip2 -- cgit v1.2.1 From 36611656639d85afcd3c97d0dbaa657edda0a470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 9 May 2016 11:58:47 +0100 Subject: Add systems/initramfs-x86_32.morph Change-Id: I5e76f0d90e738bc08adb2aba581b876a2bcde4fe --- systems/initramfs-x86_32.morph | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 systems/initramfs-x86_32.morph diff --git a/systems/initramfs-x86_32.morph b/systems/initramfs-x86_32.morph new file mode 100644 index 00000000..df817c13 --- /dev/null +++ b/systems/initramfs-x86_32.morph @@ -0,0 +1,11 @@ +name: initramfs-x86_32 +kind: system +description: Initramfs for x86_32 +arch: x86_32 +strata: +- name: build-essential + morph: strata/build-essential.morph + artifacts: + - build-essential-minimal +- name: initramfs-utils + morph: strata/initramfs-utils.morph -- cgit v1.2.1 From 6f099f254633a3426d64531715633f1956d68122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 11 May 2016 20:44:24 +0100 Subject: strata/qt5-tools-qtwayland.morph: Build compositor API Change-Id: I9de23958e878796412288dc374c1fca6e5fe94e2 --- strata/qt5-tools-qtwayland.morph | 2 +- strata/qt5-tools-qtwayland/qtwayland.morph | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 strata/qt5-tools-qtwayland/qtwayland.morph diff --git a/strata/qt5-tools-qtwayland.morph b/strata/qt5-tools-qtwayland.morph index 75a24bd2..54dcf1e2 100644 --- a/strata/qt5-tools-qtwayland.morph +++ b/strata/qt5-tools-qtwayland.morph @@ -6,7 +6,7 @@ build-depends: - morph: strata/qt5-tools.morph chunks: - name: qtwayland + morph: strata/qt5-tools-qtwayland/qtwayland.morph repo: upstream:qt5/qtwayland ref: ebba84e70fe3610affc3974f51c8ed6d539377aa unpetrify-ref: baserock/v5.6.0-15-gebba84e+ivi-shell - build-system: qmake diff --git a/strata/qt5-tools-qtwayland/qtwayland.morph b/strata/qt5-tools-qtwayland/qtwayland.morph new file mode 100644 index 00000000..06e8ac7c --- /dev/null +++ b/strata/qt5-tools-qtwayland/qtwayland.morph @@ -0,0 +1,5 @@ +name: qtwayland +kind: chunk +build-system: qmake +configure-commands: +- qmake -makefile CONFIG+=wayland-compositor -- cgit v1.2.1 From 8f39c37588e7b246bf977058e70ad6d7e4bd93df Mon Sep 17 00:00:00 2001 From: Paul Sherwood Date: Thu, 12 May 2016 22:22:51 +0000 Subject: Update cryptography and cffi (fix broken build) Change-Id: If1d05c8590882b3855970e733d9043af8162a8f4 --- strata/openstack-common.morph | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/strata/openstack-common.morph b/strata/openstack-common.morph index 2cc262c8..91ea24eb 100644 --- a/strata/openstack-common.morph +++ b/strata/openstack-common.morph @@ -14,8 +14,8 @@ chunks: build-system: python-distutils - name: cffi repo: upstream:python-packages/cffi - ref: fc53b53095d61a1ec5814c09c3bf2c7e18627fb5 - unpetrify-ref: master + ref: 40b9759b5bbf9f6a4efa1168acc9a60890527f6f + unpetrify-ref: release-1.6 build-system: python-distutils build-depends: - pycparser @@ -47,8 +47,8 @@ chunks: build-system: python-distutils - name: cryptography repo: upstream:python-packages/cryptography - ref: 9ac7d55150c8410a08ee3b00b89bfeac3dbd8e8f - unpetrify-ref: 0.7.2 + ref: afcd8f5ad8eb21f13be308c5183ef34ad28f9987 + unpetrify-ref: 1.3.2 build-system: python-distutils build-depends: - pyasn1 -- cgit v1.2.1 From 0e0a329c086d424452eaa0bfa77e573f77e3b930 Mon Sep 17 00:00:00 2001 From: Lauren Perry Date: Thu, 12 May 2016 14:27:40 +0000 Subject: Add erlang dependency to x86 IVI systems, and update erlang to OTP-18.3.3 Change-Id: I89ad3271debed5b697c0c610daef79045c263917 --- strata/erlang.morph | 4 ++-- systems/ivi-system-x86_32.morph | 2 ++ systems/ivi-system-x86_64.morph | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/strata/erlang.morph b/strata/erlang.morph index 8f92dadb..3aad68e8 100644 --- a/strata/erlang.morph +++ b/strata/erlang.morph @@ -7,8 +7,8 @@ chunks: - name: erlang morph: strata/erlang/erlang.morph repo: upstream:erlang - ref: d646221c59fbf57d5beac913248b46f5dbebfbe7 - unpetrify-ref: OTP-18.2.4 + ref: 1ab69efa960703b86a13ea6ba96f4fd56f1565f9 + unpetrify-ref: OTP-18.3.3 - name: rebar morph: strata/erlang/rebar.morph repo: upstream:erlang-modules/rebar diff --git a/systems/ivi-system-x86_32.morph b/systems/ivi-system-x86_32.morph index a42d9ac4..ae62b2c7 100644 --- a/systems/ivi-system-x86_32.morph +++ b/systems/ivi-system-x86_32.morph @@ -19,6 +19,8 @@ strata: morph: strata/device-management.morph - name: dlna-services morph: strata/dlna-services.morph +- name: erlang + morph: strata/erlang.morph - name: foundation morph: strata/foundation.morph - name: geolocation diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph index 45ec5cb6..b2e386f3 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -19,6 +19,8 @@ strata: morph: strata/device-management.morph - name: dlna-services morph: strata/dlna-services.morph +- name: erlang + morph: strata/erlang.morph - name: foundation morph: strata/foundation.morph - name: geolocation -- cgit v1.2.1