summaryrefslogtreecommitdiff
path: root/strata
diff options
context:
space:
mode:
Diffstat (limited to 'strata')
-rw-r--r--strata/NetworkManager-common.morph3
-rw-r--r--strata/audio-bluetooth.morph13
-rw-r--r--strata/audio-bluetooth/alsa-lib.morph4
-rw-r--r--strata/baserock-import.morph31
-rw-r--r--strata/bsp-armv7-highbank/linux-armv7-highbank.morph2
-rw-r--r--strata/bsp-armv7-versatile/linux-armv7-versatile.morph2
-rw-r--r--strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph2
-rw-r--r--strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph2
-rw-r--r--strata/bsp-jetson-devel.morph39
-rw-r--r--strata/bsp-jetson-devel/linux-jetson-tk1.morph53
-rw-r--r--strata/bsp-jetson-genivi/bsp-support.morph6
-rw-r--r--strata/bsp-jetson-genivi/device-tree-compiler.morph6
-rw-r--r--strata/bsp-jetson-genivi/u-boot.morph16
-rw-r--r--strata/bsp-jetson.morph (renamed from strata/bsp-jetson-genivi.morph)32
-rw-r--r--strata/bsp-jetson/bsp-support.morph (renamed from strata/bsp-jetson-devel/bsp-support.morph)0
-rw-r--r--strata/bsp-jetson/device-tree-compiler.morph (renamed from strata/bsp-jetson-devel/device-tree-compiler.morph)0
-rw-r--r--strata/bsp-jetson/linux-firmware-jetson.morph6
-rw-r--r--strata/bsp-jetson/linux-jetson-tk1.morph (renamed from strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph)4
-rw-r--r--strata/bsp-jetson/nouveau-drm.morph (renamed from strata/bsp-jetson-genivi/nouveau-drm.morph)0
-rw-r--r--strata/bsp-jetson/u-boot.morph (renamed from strata/bsp-jetson-devel/u-boot.morph)0
-rw-r--r--strata/bsp-wandboard/linux-armv7-wandboard.morph2
-rw-r--r--strata/bsp-x86_32-generic/linux-x86-32-generic.morph2
-rw-r--r--strata/bsp-x86_64-generic/linux-x86-64-generic.morph2
-rw-r--r--strata/build-essential.morph2
-rw-r--r--strata/build-essential/busybox.morph41
-rw-r--r--strata/core.morph4
-rw-r--r--strata/foundation.morph18
-rw-r--r--strata/foundation/systemd.morph13
-rw-r--r--strata/genivi.morph14
-rw-r--r--strata/lorry.morph129
-rw-r--r--strata/lorry/cvs-tarball.morph (renamed from strata/trove/cvs-tarball.morph)0
-rw-r--r--strata/lorry/cvsps.morph (renamed from strata/trove/cvsps.morph)0
-rw-r--r--strata/lorry/hg-fast-export.morph (renamed from strata/trove/hg-fast-export.morph)0
-rw-r--r--strata/lorry/libapr-util-tarball.morph (renamed from strata/trove/libapr-util-tarball.morph)0
-rw-r--r--strata/lorry/lorry.morph (renamed from strata/trove/lorry.morph)0
-rw-r--r--strata/lorry/mercurial-tarball.morph (renamed from strata/trove/mercurial-tarball.morph)0
-rw-r--r--strata/lorry/neon.morph (renamed from strata/trove/neon.morph)0
-rw-r--r--strata/lorry/perl-dbi-tarball.morph (renamed from strata/trove/perl-dbi-tarball.morph)0
-rw-r--r--strata/lorry/subversion-tarball.morph (renamed from strata/trove/subversion-tarball.morph)0
-rw-r--r--strata/lorry/swig-tarball.morph (renamed from strata/trove/swig-tarball.morph)0
-rw-r--r--strata/mesa-common.morph4
-rw-r--r--strata/mesa-common/mesa.morph3
-rw-r--r--strata/morph-utils.morph2
-rw-r--r--strata/multimedia.morph20
-rw-r--r--strata/trove.morph114
-rw-r--r--strata/webtools.morph4
-rw-r--r--strata/webtools/tar.morph2
-rw-r--r--strata/weston-genivi.morph9
-rw-r--r--strata/weston-genivi/wayland-ivi-extension.morph8
-rw-r--r--strata/weston-genivi/weston.morph2
50 files changed, 277 insertions, 339 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph
index 7233d84f..44adc1fb 100644
--- a/strata/NetworkManager-common.morph
+++ b/strata/NetworkManager-common.morph
@@ -7,7 +7,8 @@ build-depends:
chunks:
- name: libndp
repo: upstream:libndp
- ref: master
+ ref: f3a3a63d5b5abced8f75731d7b995606933c6e33
+ unpetrify-ref: v1.4
build-depends: []
- name: NetworkManager
morph: strata/NetworkManager-common/NetworkManager.morph
diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph
index a24158b6..0c67ee5c 100644
--- a/strata/audio-bluetooth.morph
+++ b/strata/audio-bluetooth.morph
@@ -10,16 +10,15 @@ chunks:
unpetrify-ref: baserock/morph
build-depends: []
- name: alsa-lib
- morph: strata/audio-bluetooth/alsa-lib.morph
repo: upstream:alsa-lib
- ref: ab715503853be8d8f365fd157c3cb97ef7a89f7b
- unpetrify-ref: baserock/morph
+ ref: 9cfd1faa27511edbb8bebbab85030125f33590ae
+ unpetrify-ref: v1.0.28
build-depends: []
- name: alsa-utils
morph: strata/audio-bluetooth/alsa-utils.morph
repo: upstream:alsa-utils
- ref: f12208425051a7abf5ffc87ac2b9d2bd9e096fe1
- unpetrify-ref: baserock/morph
+ ref: bbf137f66b2c8ce36db73f59ee69d5c443436524
+ unpetrify-ref: v1.0.28
build-depends:
- alsa-lib
- name: libical
@@ -70,8 +69,8 @@ chunks:
- name: ofono
morph: strata/audio-bluetooth/ofono.morph
repo: upstream:ofono
- ref: a53228f6b1b32d0405c0c3c8e0861d6202ffbba2
- unpetrify-ref: baserock/morph
+ ref: d05b718cc0b0d367227fbfbf52e60fc5462cc549
+ unpetrify-ref: "1.15"
build-depends:
- mobile-broadband-provider-info
- bluez
diff --git a/strata/audio-bluetooth/alsa-lib.morph b/strata/audio-bluetooth/alsa-lib.morph
deleted file mode 100644
index 1e3015ca..00000000
--- a/strata/audio-bluetooth/alsa-lib.morph
+++ /dev/null
@@ -1,4 +0,0 @@
-name: alsa-lib
-kind: chunk
-description: ALSA library
-build-system: autotools
diff --git a/strata/baserock-import.morph b/strata/baserock-import.morph
new file mode 100644
index 00000000..6e875e8c
--- /dev/null
+++ b/strata/baserock-import.morph
@@ -0,0 +1,31 @@
+name: baserock-import
+kind: stratum
+description: Tools for importing software into Baserock definitions.
+build-depends:
+- morph: strata/morph-utils.morph
+chunks:
+- name: ansicolor
+ repo: upstream:python-packages/ansicolor
+ ref: 9d3adbaff35bb6cde1d63414a8cc72f572c4d0ef
+ unpetrify-ref: 0.2.4
+ build-depends: []
+- name: python-decorator
+ repo: upstream:python-packages/python-decorator
+ ref: b02f7a254c3679dfac57a824e08dd02ced850636
+ unpetrify-ref: decorator-3.4.0
+ build-depends: []
+- name: networkx
+ repo: upstream:python-packages/networkx
+ ref: 8ac796aba866ade1a56b83e30f25ed392ca3512c
+ unpetrify-ref: networkx-1.9.1
+ build-depends: []
+- name: requests-cache
+ repo: upstream:python-packages/requests-cache
+ ref: a1b5e65ccd715f1e8434f18f27913715340d6aaf
+ unpetrify-ref: 0.4.6
+ build-depends: []
+- name: baserock-import
+ repo: baserock:baserock/import
+ ref: edd18a77973d8cd12b09bc6e3ac06fecd72a7e45
+ unpetrify-ref: master
+ build-depends: []
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
index 58ad90b4..dfebf69c 100644
--- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
+++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph
@@ -37,6 +37,8 @@ configure-commands:
- scripts/config -e TMPFS
- scripts/config -e TMPFS_POSIX_ACL
- scripts/config -e VFAT_FS
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make oldconfig
build-commands:
- make zImage $MAKEFLAGS
diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
index 9b03991b..1da640e7 100644
--- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
+++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph
@@ -17,6 +17,8 @@ configure-commands:
- scripts/config -e SECCOMP
- scripts/config -d DEBUG_STACK_TRACE
- scripts/config -e FB_VESA
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make oldconfig
build-commands:
- make ARCH=arm zImage $MAKEFLAGS
diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
index e3601dc4..ea1a2d5f 100644
--- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
+++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph
@@ -39,6 +39,8 @@ configure-commands:
- scripts/config -e EXT4_USE_FOR_EXT23
- scripts/config -e MSDOS_FS
- scripts/config -e VFAT_FS
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make oldconfig
build-commands:
- make zImage $MAKEFLAGS
diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
index e187716d..ecf6b9bc 100644
--- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
+++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph
@@ -39,6 +39,8 @@ configure-commands:
- scripts/config -e EXT4_USE_FOR_EXT23
- scripts/config -e MSDOS_FS
- scripts/config -e VFAT_FS
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make oldconfig
build-commands:
- make zImage vexpress-v2p-ca15_a7.dtb
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph
deleted file mode 100644
index e5f52a9c..00000000
--- a/strata/bsp-jetson-devel.morph
+++ /dev/null
@@ -1,39 +0,0 @@
-name: bsp-jetson-devel
-kind: stratum
-description: |
- Platform-specific chunks for NVIDIA Jetson TK1 development system.
-
- Support for the Tegra platform is still being developed. This BSP uses
- a patched version of Linux 3.10 supplied by NVIDIA, which provides
- reliable SATA, USB and networking and runs the CPUs at full speed.
- To make use of the graphics acceleration on the Jetson you will need
- to use a newer kernel.
-build-depends:
-- morph: strata/core.morph
-chunks:
-- name: device-tree-compiler
- morph: strata/bsp-jetson-devel/device-tree-compiler.morph
- repo: upstream:device-tree-compiler
- ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: u-boot
- morph: strata/bsp-jetson-devel/u-boot.morph
- repo: upstream:u-boot
- ref: b15ae44ab9f085140039b09a00232d5aed6596a9
- unpetrify-ref: baserock/arm/tegra-uboot-btrfs
- build-depends:
- - device-tree-compiler
-- name: linux-jetson-tk1
- morph: strata/bsp-jetson-devel/linux-jetson-tk1.morph
- repo: upstream:linux
- ref: de3664efca390a8d2fe525a583d17772deee8500
- unpetrify-ref: baserock/arm/tegra-3.10
- build-depends:
- - u-boot
-- name: bsp-support
- morph: strata/bsp-jetson-devel/bsp-support.morph
- repo: baserock:baserock/bsp-support
- ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
- unpetrify-ref: baserock/arm/tegra-3.10
- build-depends: []
diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph
deleted file mode 100644
index 3494f62b..00000000
--- a/strata/bsp-jetson-devel/linux-jetson-tk1.morph
+++ /dev/null
@@ -1,53 +0,0 @@
-name: linux-jetson-tk1
-kind: chunk
-configure-commands:
-- make ARCH=arm tegra12_defconfig
-- scripts/config -d KERNEL_LZO
-- scripts/config -e KERNEL_GZIP
-- scripts/config -e NAMESPACES
-- scripts/config -e PACKET
-- scripts/config -e SATA_AHCI
-- scripts/config -e ATA_GENERIC
-- scripts/config -e HAVE_IDE
-- scripts/config -d BLK_DEV_IDE_SATA
-- scripts/config -e BTRFS_FS
-- scripts/config -e BTRFS_FS_POSIX_ACL
-- scripts/config -e DEVTMPFS
-- scripts/config -e DEVTMPFS_MOUNT
-- scripts/config -e CONFIG_FHANDLE
-- scripts/config -e CGROUPS
-- scripts/config -e AUTOFS4_FS
-- scripts/config --set-str UEVENT_HELPER_PATH ''
-- scripts/config -e EXT2_FS
-- scripts/config -e EXT2_FS_XATTR
-- scripts/config -e EXT2_FS_POSIX_ACL
-- scripts/config -e EXT2_FS_SECURITY
-- scripts/config -e EXT2_FS_XIP
-- scripts/config -e EXT3_FS
-- scripts/config -d EXT3_DEFAULTS_TO_ORDERED
-- scripts/config -e EXT3_FS_XATTR
-- scripts/config -e EXT3_FS_POSIX_ACL
-- scripts/config -e EXT3_FS_SECURITY
-- scripts/config -e EXT4_FS
-- scripts/config -e EXT4_FS_XATTR
-- scripts/config -e EXT4_FS_POSIX_ACL
-- scripts/config -e EXT4_FS_SECURITY
-- scripts/config -d EXT4_DEBUG
-- scripts/config -d JBD_DEBUG
-- scripts/config -d JBD2_DEBUG
-- scripts/config -e BLK_DEV_LOOP
-- scripts/config -d BLK_DEV_CRYPTOLOOP
-- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8
-- scripts/config -e IKCONFIG
-- scripts/config -e IKCONFIG_PROC
-- scripts/config -e SECCOMP
-- scripts/config -d DEBUG_STACK_TRACE
-- scripts/config -e NFSD
-- scripts/config -e NFSD_V3
-- yes '' | make ARCH=arm oldconfig
-build-commands:
-- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
-install-commands:
-- mkdir -p "$DESTDIR"/boot
-- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage
-- cp arch/arm/boot/dts/tegra124-pm375.dtb "$DESTDIR"/boot/.
diff --git a/strata/bsp-jetson-genivi/bsp-support.morph b/strata/bsp-jetson-genivi/bsp-support.morph
deleted file mode 100644
index 23524ac7..00000000
--- a/strata/bsp-jetson-genivi/bsp-support.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: bsp-support
-kind: chunk
-install-commands:
-- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service"
-- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants"
-- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service"
diff --git a/strata/bsp-jetson-genivi/device-tree-compiler.morph b/strata/bsp-jetson-genivi/device-tree-compiler.morph
deleted file mode 100644
index 8abfafc8..00000000
--- a/strata/bsp-jetson-genivi/device-tree-compiler.morph
+++ /dev/null
@@ -1,6 +0,0 @@
-name: device-tree-compiler
-kind: chunk
-build-commands:
-- make all
-install-commands:
-- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX"
diff --git a/strata/bsp-jetson-genivi/u-boot.morph b/strata/bsp-jetson-genivi/u-boot.morph
deleted file mode 100644
index 705b3851..00000000
--- a/strata/bsp-jetson-genivi/u-boot.morph
+++ /dev/null
@@ -1,16 +0,0 @@
-name: u-boot
-kind: chunk
-configure-commands:
-- make ARCH=arm jetson-tk1_config
-build-commands:
-- make ARCH=arm CROSS_COMPILE=/usr/bin/
-- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools
-install-commands:
-- mkdir -p "$DESTDIR$PREFIX/bin"
-- mkdir -p "$DESTDIR/boot"
-- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin"
-- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/."
-- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/."
diff --git a/strata/bsp-jetson-genivi.morph b/strata/bsp-jetson.morph
index 62835b74..eda1d99b 100644
--- a/strata/bsp-jetson-genivi.morph
+++ b/strata/bsp-jetson.morph
@@ -1,7 +1,7 @@
-name: bsp-jetson-genivi
+name: bsp-jetson
kind: stratum
description: |
- Platform-specific chunks for NVIDIA Jetson TK1 GENIVI Baseline
+ Platform-specific chunks for NVIDIA Jetson TK1
Support for the Tegra platform is still being developed. A very recent
kernel with some patches is currently required to get a fully
@@ -13,35 +13,41 @@ build-depends:
- morph: strata/core.morph
chunks:
- name: device-tree-compiler
- morph: strata/bsp-jetson-genivi/device-tree-compiler.morph
+ morph: strata/bsp-jetson/device-tree-compiler.morph
repo: upstream:device-tree-compiler
ref: c92f284c3cf76d471eb27a271de3a51cb45ed058
unpetrify-ref: baserock/morph
build-depends: []
- name: u-boot
- morph: strata/bsp-jetson-genivi/u-boot.morph
+ morph: strata/bsp-jetson/u-boot.morph
repo: upstream:u-boot
ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e
unpetrify-ref: baserock/jetson/u-boot-tegra-next
build-depends:
- device-tree-compiler
-- name: linux-jetson-tk1-genivi
- morph: strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph
+- name: linux-jetson-tk1
+ morph: strata/bsp-jetson/linux-jetson-tk1.morph
repo: upstream:linux
- ref: 8da6ad2e1c6366ebb2d9a72aeaf4a42dc32c8623
- unpetrify-ref: baserock/jetson/3.17.0-rc5
+ ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69
+ unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3
build-depends:
- u-boot
- name: bsp-support
- morph: strata/bsp-jetson-genivi/bsp-support.morph
+ morph: strata/bsp-jetson/bsp-support.morph
repo: baserock:baserock/bsp-support
ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525
unpetrify-ref: baserock/arm/tegra-3.10
build-depends: []
- name: nouveau-drm
- morph: strata/bsp-jetson-genivi/nouveau-drm.morph
+ morph: strata/bsp-jetson/nouveau-drm.morph
repo: upstream:nouveau
- ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45
- unpetrify-ref: baserock/jetson/3.17-rc5
+ ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501
+ unpetrify-ref: baserock/jetson/gk20a
build-depends:
- - linux-jetson-tk1-genivi
+ - linux-jetson-tk1
+- name: linux-firmware-jetson
+ morph: strata/bsp-jetson/linux-firmware-jetson.morph
+ repo: upstream:linux-firmware
+ ref: 9322ef5b14c78ec28163baa41bff240a0e098810
+ unpetrify-ref: baserock/jetson
+ build-depends: []
diff --git a/strata/bsp-jetson-devel/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph
index 23524ac7..23524ac7 100644
--- a/strata/bsp-jetson-devel/bsp-support.morph
+++ b/strata/bsp-jetson/bsp-support.morph
diff --git a/strata/bsp-jetson-devel/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.morph
index 8abfafc8..8abfafc8 100644
--- a/strata/bsp-jetson-devel/device-tree-compiler.morph
+++ b/strata/bsp-jetson/device-tree-compiler.morph
diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph
new file mode 100644
index 00000000..c803eab2
--- /dev/null
+++ b/strata/bsp-jetson/linux-firmware-jetson.morph
@@ -0,0 +1,6 @@
+name: linux-firmware-jetson
+kind: chunk
+install-commands:
+- install -d "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
+- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124"
diff --git a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph b/strata/bsp-jetson/linux-jetson-tk1.morph
index e1c99473..42c16f01 100644
--- a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph
+++ b/strata/bsp-jetson/linux-jetson-tk1.morph
@@ -1,4 +1,4 @@
-name: linux-jetson-tk1-genivi
+name: linux-jetson-tk1
kind: chunk
configure-commands:
- make ARCH=arm tegra_defconfig
@@ -46,6 +46,8 @@ configure-commands:
- scripts/config -e NFSD_V3
- scripts/config -e DRM_TEGRA_STAGING
- scripts/config -m DRM_NOUVEAU
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make ARCH=arm oldconfig
build-commands:
- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs
diff --git a/strata/bsp-jetson-genivi/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph
index e297a069..e297a069 100644
--- a/strata/bsp-jetson-genivi/nouveau-drm.morph
+++ b/strata/bsp-jetson/nouveau-drm.morph
diff --git a/strata/bsp-jetson-devel/u-boot.morph b/strata/bsp-jetson/u-boot.morph
index 705b3851..705b3851 100644
--- a/strata/bsp-jetson-devel/u-boot.morph
+++ b/strata/bsp-jetson/u-boot.morph
diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph
index 16929c9d..15317978 100644
--- a/strata/bsp-wandboard/linux-armv7-wandboard.morph
+++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph
@@ -44,6 +44,8 @@ configure-commands:
- scripts/config -d DEBUG_STACK_TRACE
- scripts/config -e NFSD
- scripts/config -e NFSD_V3
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make oldconfig
build-commands:
- make $MAKEFLAGS ARCH=arm LOADADDR=0x10800000 uImage 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 10bac0cd..593d9a65 100644
--- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
+++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph
@@ -78,6 +78,8 @@ configure-commands:
- scripts/config -e FB_VESA
- scripts/config -e HOTPLUG_PCI
- scripts/config -e HOTPLUG_PCI_ACPI
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- 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 4b18b537..fe0721cc 100644
--- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
+++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph
@@ -78,6 +78,8 @@ configure-commands:
- scripts/config -e FB_VESA
- scripts/config -e HOTPLUG_PCI
- scripts/config -e HOTPLUG_PCI_ACPI
+- scripts/config -e VLAN_8021Q
+- scripts/config -e BRIDGE_VLAN_FILTERING
- yes '' | make oldconfig
build-commands:
- make $MAKEFLAGS
diff --git a/strata/build-essential.morph b/strata/build-essential.morph
index 38bd60d8..d7b86648 100644
--- a/strata/build-essential.morph
+++ b/strata/build-essential.morph
@@ -261,7 +261,7 @@ chunks:
- name: busybox
morph: strata/build-essential/busybox.morph
repo: upstream:busybox
- ref: 8a801e0f024f1385d8e989b80b90443546bceae7
+ ref: 772a98fec669cf881d7c1ea17631bc8560bccf5c
unpetrify-ref: baserock/build-essential
build-depends:
- stage2-binutils
diff --git a/strata/build-essential/busybox.morph b/strata/build-essential/busybox.morph
index b0bb46f5..35f57357 100644
--- a/strata/build-essential/busybox.morph
+++ b/strata/build-essential/busybox.morph
@@ -57,12 +57,6 @@ configure-commands:
build-commands:
- make
-- |
- for fin in systemd-units/*.in
- do
- f=$(echo "$fin" | sed 's/\.in$//')
- sed -e 's|@rootprefix@||g' "$fin" >"$f";
- done
install-commands:
- |
@@ -70,41 +64,8 @@ install-commands:
make CONFIG_PREFIX="$DESTDIR$PREFIX" install &&
chmod 6755 "$DESTDIR$PREFIX"/bin/busybox
-- mkdir -p "$DESTDIR/var/spool/cron/crontabs"
-
-# Install systemd units
-- mkdir -p "$DESTDIR/lib/systemd/system/multi-user.target.wants"
-- |
- for f in systemd-units/*.service; do
- install -m 644 "$f" "$DESTDIR/lib/systemd/system";
- done
-- |
- for f in $(cd systemd-units; ls *.service | grep -v -F "@"); do
- ln -s "../$f" "$DESTDIR/lib/systemd/system/multi-user.target.wants/";
- done
-
-# Install custom udev rule to run ifup for every network device detected
-- mkdir -p "$DESTDIR/lib/udev/rules.d"
-- for f in udev-rules/100-baserock.rules; do
- install -m 644 "$f" "$DESTDIR/lib/udev/rules.d";
- done
-
-# Set up DHCP
-- mkdir -p "$DESTDIR$PREFIX"/share/udhcpc
-- cp examples/udhcp/simple.script "$DESTDIR$PREFIX"/share/udhcpc/default.script
-
-# Set up NTP
-- install scripts/run-ntpd-with-config "$DESTDIR$PREFIX"/sbin/.
-- install -d "$DESTDIR/etc"
-- |
- cat << EOF > "$DESTDIR/etc/ntpd.conf"
- server 0.pool.ntp.org
- server 1.pool.ntp.org
- server 2.pool.ntp.org
- server 3.pool.ntp.org
- EOF
-
# Set up man environment variables
+- mkdir -p "$DESTDIR"/etc
- |
cat << EOF > "$DESTDIR/etc/profile"
# Set default pager to less
diff --git a/strata/core.morph b/strata/core.morph
index e6ca9663..0a8122fd 100644
--- a/strata/core.morph
+++ b/strata/core.morph
@@ -105,8 +105,8 @@ chunks:
- name: openssl-new
morph: strata/core/openssl-new.morph
repo: upstream:openssl-new
- ref: ed9938171f80c7534f6eb52f75c2538bca462807
- unpetrify-ref: baserock/OpenSSL_1_0_1g
+ ref: 872e681c00a713e840ebed77a4e05fa0e181f16f
+ unpetrify-ref: OpenSSL_1_0_1j
build-depends:
- perl
- name: bzip2
diff --git a/strata/foundation.morph b/strata/foundation.morph
index a652fbd6..efe8fcd5 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -19,8 +19,8 @@ chunks:
- name: kmod
morph: strata/foundation/kmod.morph
repo: upstream:kmod
- ref: 7f3b215d4e848afa74aea20a4c64f0cc1ef30eb4
- unpetrify-ref: baserock/morph
+ ref: ae58de0fcb4a6528dd365e23d383bbe2eaf2d566
+ unpetrify-ref: v18
build-depends: []
- name: libcap2
morph: strata/foundation/libcap2.morph
@@ -69,16 +69,26 @@ chunks:
unpetrify-ref: baserock/genivi/dbus-1.8.8
build-depends:
- glib
+- name: libgpg-error
+ repo: upstream:libgpg-error
+ ref: a498812d767c59ae2b75b0c985f5280b139e7dc4
+ build-depends: []
+- name: libgcrypt
+ repo: upstream:libgcrypt
+ ref: 412eed473b557ed2172d81d76fa1e1f53c973a67
+ build-depends:
+ - libgpg-error
- name: systemd
morph: strata/foundation/systemd.morph
repo: upstream:systemd
- ref: a77af3ec96015b2382ea31020d0a14b482d10a76
- unpetrify-ref: baserock/morph
+ ref: 941a643569dc6b53d0b334276d2a3cc0ed159e88
+ unpetrify-ref: v217
build-depends:
- dbus-pre
- gobject-introspection
- kmod
- libcap2
+ - libgcrypt
- pciutils
- usbutils
- name: lzo
diff --git a/strata/foundation/systemd.morph b/strata/foundation/systemd.morph
index 2a1933d7..1ee23cb8 100644
--- a/strata/foundation/systemd.morph
+++ b/strata/foundation/systemd.morph
@@ -6,16 +6,23 @@ configure-commands:
- sh autogen.sh
- ./configure --prefix="$PREFIX" --enable-xz --disable-manpages --sysconfdir=/etc
--localstatedir=/var --libdir="$PREFIX/lib" --libexecdir="$PREFIX/libexec" --with-rootprefix=
- --with-rootlibdir=/lib --with-firmware-path=/lib/firmware/updates:/lib/firmware
+ --with-rootlibdir=/lib
install-commands:
- make DESTDIR="$DESTDIR" install
- 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
"$DESTDIR/sbin/$f"; done
-- rm -f "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
-- touch "$DESTDIR/etc/udev/rules.d/80-net-name-slot.rules"
- 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"
+post-install-commands:
+- |
+ cat > "$DESTDIR/etc/systemd/network/10-dhcp.network" << "EOF"
+ [Match]
+ Name=en*
+
+ [Network]
+ DHCP=yes
+ EOF
diff --git a/strata/genivi.morph b/strata/genivi.morph
index 1ba464c6..24050b4c 100644
--- a/strata/genivi.morph
+++ b/strata/genivi.morph
@@ -18,8 +18,8 @@ chunks:
- name: node-startup-controller
morph: strata/genivi/node-startup-controller.morph
repo: upstream:node-startup-controller
- ref: c78fddaddc24a2c49f5ef18896c93403575295ae
- unpetrify-ref: baserock/morph
+ ref: b77fb1dbb280ec45525853e52a362eafd736b400
+ unpetrify-ref: baserock/systemd_v216
build-depends:
- DLT-daemon
- name: googletest
@@ -37,13 +37,13 @@ chunks:
- googletest
- name: genivi-common-api-runtime
repo: upstream:genivi-common-api-runtime
- ref: 8a62115bad2c0615fdf40f4e54a41454ae6e4698
+ ref: 188abb5e24d6a2a7fdd7e5d150439a162621292c
unpetrify-ref: 2.1.6
build-depends: []
- name: genivi-common-api-dbus-runtime
repo: upstream:genivi-common-api-dbus-runtime
- ref: 53d9341444ff9a31b9cc551b10fd0b341207937b
- unpetrify-ref: 2.1.6
+ ref: 3372155b32a2cf3b05e1a2a13f6f8413069de33f
+ unpetrify-ref: 2.1.6-p1
build-depends:
- genivi-common-api-runtime
- name: audiomanager
@@ -71,8 +71,8 @@ chunks:
- itzam-tarball
- name: node-state-manager
repo: upstream:node-state-manager
- ref: dd4a86b9459537d2e85489b36abf80f34d12f098
- unpetrify-ref: baserock/genivi/baseline
+ ref: 30add4659e002f1df205cc36f71ef3141c10c1fb
+ unpetrify-ref: baserock/systemd_v216
build-depends:
- DLT-daemon
- persistence-client-library
diff --git a/strata/lorry.morph b/strata/lorry.morph
new file mode 100644
index 00000000..158071cc
--- /dev/null
+++ b/strata/lorry.morph
@@ -0,0 +1,129 @@
+name: lorry
+kind: stratum
+description: |
+ Lorry and tools for working with version control systems other than Git.
+
+ Lorry is a tool for creating and maintaining Git mirrors of source code
+ repositories, which aims to support most version control systems in use
+ by software projects that are used Baserock systems.
+
+ The commandline tools 'hg', 'bzr', 'svn', and 'cvs' are also made available
+ by this stratum.
+build-depends:
+# The 'morph-utils' stratum is required for 'cliapp', which Lorry needs at
+# build-time to generate its man page. Otherwise we could simply depend on
+# the 'foundation' stratum.
+- morph: strata/morph-utils.morph
+chunks:
+- name: bzr-tarball
+ repo: upstream:bzr-tarball
+ ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: python-fastimport
+ repo: upstream:python-fastimport
+ ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: bzr-fastimport
+ repo: upstream:bzr-fastimport
+ ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - bzr-tarball
+ - python-fastimport
+- name: cvs-tarball
+ morph: strata/lorry/cvs-tarball.morph
+ repo: upstream:cvs-tarball
+ ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libapr-tarball
+ repo: upstream:libapr-tarball
+ ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: libapr-util-tarball
+ morph: strata/lorry/libapr-util-tarball.morph
+ repo: upstream:libapr-util-tarball
+ ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libapr-tarball
+- name: perl-dbi-tarball
+ morph: strata/lorry/perl-dbi-tarball.morph
+ repo: upstream:perl-dbi-tarball
+ ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: perl-dbd-sqlite-tarball
+ repo: upstream:perl-dbd-sqlite-tarball
+ ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - perl-dbi-tarball
+- name: libserf-tarball
+ repo: upstream:libserf-tarball
+ ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - libapr-tarball
+ - libapr-util-tarball
+- name: swig-tarball
+ morph: strata/lorry/swig-tarball.morph
+ repo: upstream:swig-tarball
+ ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: neon
+ morph: strata/lorry/neon.morph
+ repo: upstream:neon
+ ref: 837374e9d797e216f1de684595cefe791f67c0e4
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: subversion-tarball
+ morph: strata/lorry/subversion-tarball.morph
+ repo: upstream:subversion-tarball
+ ref: 351e074672d9aa6446d5829938b697a3d6b23266
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - swig-tarball
+ - libapr-tarball
+ - libapr-util-tarball
+ - libserf-tarball
+ - neon
+- name: mercurial-tarball
+ morph: strata/lorry/mercurial-tarball.morph
+ repo: upstream:mercurial-tarball
+ ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: hg-fast-export
+ morph: strata/lorry/hg-fast-export.morph
+ repo: upstream:hg-fast-export
+ ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - mercurial-tarball
+- name: cvsps
+ morph: strata/lorry/cvsps.morph
+ repo: upstream:cvsps
+ ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: lorry
+ morph: strata/lorry/lorry.morph
+ repo: baserock:baserock/lorry
+ ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
+ unpetrify-ref: master
+ build-depends:
+ - bzr-tarball
+ - python-fastimport
+ - bzr-fastimport
+ - perl-dbi-tarball
+ - perl-dbd-sqlite-tarball
+ - cvs-tarball
+ - cvsps
+ - subversion-tarball
+ - mercurial-tarball
+ - hg-fast-export
diff --git a/strata/trove/cvs-tarball.morph b/strata/lorry/cvs-tarball.morph
index e8322017..e8322017 100644
--- a/strata/trove/cvs-tarball.morph
+++ b/strata/lorry/cvs-tarball.morph
diff --git a/strata/trove/cvsps.morph b/strata/lorry/cvsps.morph
index ff53784e..ff53784e 100644
--- a/strata/trove/cvsps.morph
+++ b/strata/lorry/cvsps.morph
diff --git a/strata/trove/hg-fast-export.morph b/strata/lorry/hg-fast-export.morph
index ef99a97a..ef99a97a 100644
--- a/strata/trove/hg-fast-export.morph
+++ b/strata/lorry/hg-fast-export.morph
diff --git a/strata/trove/libapr-util-tarball.morph b/strata/lorry/libapr-util-tarball.morph
index e34e3610..e34e3610 100644
--- a/strata/trove/libapr-util-tarball.morph
+++ b/strata/lorry/libapr-util-tarball.morph
diff --git a/strata/trove/lorry.morph b/strata/lorry/lorry.morph
index 6b8cb355..6b8cb355 100644
--- a/strata/trove/lorry.morph
+++ b/strata/lorry/lorry.morph
diff --git a/strata/trove/mercurial-tarball.morph b/strata/lorry/mercurial-tarball.morph
index 03264f56..03264f56 100644
--- a/strata/trove/mercurial-tarball.morph
+++ b/strata/lorry/mercurial-tarball.morph
diff --git a/strata/trove/neon.morph b/strata/lorry/neon.morph
index 19f8e83f..19f8e83f 100644
--- a/strata/trove/neon.morph
+++ b/strata/lorry/neon.morph
diff --git a/strata/trove/perl-dbi-tarball.morph b/strata/lorry/perl-dbi-tarball.morph
index 9eb3a537..9eb3a537 100644
--- a/strata/trove/perl-dbi-tarball.morph
+++ b/strata/lorry/perl-dbi-tarball.morph
diff --git a/strata/trove/subversion-tarball.morph b/strata/lorry/subversion-tarball.morph
index cb416d53..cb416d53 100644
--- a/strata/trove/subversion-tarball.morph
+++ b/strata/lorry/subversion-tarball.morph
diff --git a/strata/trove/swig-tarball.morph b/strata/lorry/swig-tarball.morph
index 61f154a4..61f154a4 100644
--- a/strata/trove/swig-tarball.morph
+++ b/strata/lorry/swig-tarball.morph
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index 290ff0c2..efae2449 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -8,6 +8,6 @@ chunks:
- name: mesa
morph: strata/mesa-common/mesa.morph
repo: upstream:mesa
- ref: 3b6a4758fa8958db4b76e6d7efccc93b12b1da06
- unpetrify-ref: mesa-10.3.2
+ ref: 1a9cc5f50db5d27530a3449743b43aac389d781f
+ unpetrify-ref: mesa-10.3.3
build-depends: []
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index f946390f..4194acc2 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -8,7 +8,6 @@ configure-commands:
armv7lhf)
DRIDRIVERS=no
GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4
- EXTRAARGS="--enable-gallium-egl"
;;
*)
DRIDRIVERS=yes
@@ -21,4 +20,4 @@ configure-commands:
--with-egl-platforms=drm,wayland \
--with-gallium-drivers="$GALLIUMDRIVERS" \
--with-dri-drivers="$DRIDRIVERS" \
- $EXTRAARGS
+ --enable-gallium-egl
diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph
index 81496d8d..54292eb0 100644
--- a/strata/morph-utils.morph
+++ b/strata/morph-utils.morph
@@ -71,7 +71,7 @@ chunks:
build-depends: []
- name: morph
repo: baserock:baserock/morph
- ref: 384dc8d2eb9222746085f0274c625eb163eda88a
+ ref: 9b0b5206a25c1d874d6e17952c4385838e57563e
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/strata/multimedia.morph b/strata/multimedia.morph
index b0d82984..6acab0f7 100644
--- a/strata/multimedia.morph
+++ b/strata/multimedia.morph
@@ -6,33 +6,33 @@ build-depends:
chunks:
- name: orc
repo: upstream:orc
- ref: ec132ae118bead13312f126a1f6e5709a2429ff6
- unpetrify-ref: orc-0.4.19
+ ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9
+ unpetrify-ref: orc-0.4.22
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: 0217fba607637860a475d0b5d48a3d4b249ca360
- unpetrify-ref: baserock/morph/1.2
+ ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558
+ unpetrify-ref: baserock/1.4
build-depends:
- orc
- name: gstreamer-plugins-base
repo: upstream:gstreamer-plugins-base
- ref: 1263caa96fcc1e3d2963bc27acbcf88b5b17d5dd
- unpetrify-ref: baserock/morph/1.2
+ ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46
+ unpetrify-ref: baserock/1.4
build-depends:
- gstreamer
- name: gstreamer-plugins-good
repo: upstream:gstreamer-plugins-good
- ref: b7e3af91197812e41028016d2e75ad2d6530b9b3
- unpetrify-ref: baserock/morph/1.2
+ ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667
+ unpetrify-ref: baserock/1.4
build-depends:
- gstreamer
- gstreamer-plugins-base
- orc
- name: gstreamer-plugins-bad
repo: upstream:gstreamer-plugins-bad
- ref: 343470e7fd1e7a6bb95b953d25b2caf5425d0185
- unpetrify-ref: baserock/morph/1.2
+ ref: bb2a4669ff57af90c8101c54744d3228aa060475
+ unpetrify-ref: baserock/1.4
build-depends:
- gstreamer
- gstreamer-plugins-base
diff --git a/strata/trove.morph b/strata/trove.morph
index d0773314..133e67fd 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -69,118 +69,6 @@ chunks:
ref: acbf4a15e260c711094455dbef7c024f2553fd32
unpetrify-ref: baserock/morph
build-depends: []
-- name: bzr-tarball
- repo: upstream:bzr-tarball
- ref: e61c7edb4789abcd0f73c30fe719fa6fea478a52
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: python-fastimport
- repo: upstream:python-fastimport
- ref: 6500a5e7d82651ade9002d44e3ecc71a50302616
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: bzr-fastimport
- repo: upstream:bzr-fastimport
- ref: b3cda9967f857127bd4dab5eb72223a95916f5ea
- unpetrify-ref: baserock/morph
- build-depends:
- - bzr-tarball
- - python-fastimport
-- name: cvs-tarball
- morph: strata/trove/cvs-tarball.morph
- repo: upstream:cvs-tarball
- ref: ca4cd317a75ef4349563b5a9a734561beb4a4f98
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libapr-tarball
- repo: upstream:libapr-tarball
- ref: dea1efeb7f60fc6848e1e72b3fc973d0057565db
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: libapr-util-tarball
- morph: strata/trove/libapr-util-tarball.morph
- repo: upstream:libapr-util-tarball
- ref: daba269ee5a262cc23621b3ee37ed368d2a2b69b
- unpetrify-ref: baserock/morph
- build-depends:
- - libapr-tarball
-- name: perl-dbi-tarball
- morph: strata/trove/perl-dbi-tarball.morph
- repo: upstream:perl-dbi-tarball
- ref: 09e269cff811f0c1881ea0d6b7571173bab8377b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: perl-dbd-sqlite-tarball
- repo: upstream:perl-dbd-sqlite-tarball
- ref: 485b97be9f2f2abf5a40923b5fd85f75714a8c02
- unpetrify-ref: baserock/morph
- build-depends:
- - perl-dbi-tarball
-- name: libserf-tarball
- repo: upstream:libserf-tarball
- ref: 6f61a1acd01dc2ad1d2f5c1f7458702c77c69f9c
- unpetrify-ref: baserock/morph
- build-depends:
- - libapr-tarball
- - libapr-util-tarball
-- name: swig-tarball
- morph: strata/trove/swig-tarball.morph
- repo: upstream:swig-tarball
- ref: 1f6cb46b6a4b3ebf9352fa10198b0b286f84138b
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: neon
- morph: strata/trove/neon.morph
- repo: upstream:neon
- ref: 837374e9d797e216f1de684595cefe791f67c0e4
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: subversion-tarball
- morph: strata/trove/subversion-tarball.morph
- repo: upstream:subversion-tarball
- ref: 351e074672d9aa6446d5829938b697a3d6b23266
- unpetrify-ref: baserock/morph
- build-depends:
- - swig-tarball
- - libapr-tarball
- - libapr-util-tarball
- - libserf-tarball
- - neon
-- name: mercurial-tarball
- morph: strata/trove/mercurial-tarball.morph
- repo: upstream:mercurial-tarball
- ref: 4b0aa73b8c69bd5b7521337809f7bc4714209a5a
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: hg-fast-export
- morph: strata/trove/hg-fast-export.morph
- repo: upstream:hg-fast-export
- ref: 09a472aa58da0417a11a22bae172785f7cb2e80f
- unpetrify-ref: baserock/morph
- build-depends:
- - mercurial-tarball
-- name: cvsps
- morph: strata/trove/cvsps.morph
- repo: upstream:cvsps
- ref: 71c6d1f5668f405a7b259a0aac0d423f6c9b4d49
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: lorry
- morph: strata/trove/lorry.morph
- repo: baserock:baserock/lorry
- ref: 9fe25bf02dceec04f0ffd6a05cc47146ceab9904
- unpetrify-ref: master
- build-depends:
- - bzr-tarball
- - python-fastimport
- - bzr-fastimport
- - perl-dbi-tarball
- - perl-dbd-sqlite-tarball
- - cvs-tarball
- - cvsps
- - subversion-tarball
- - mercurial-tarball
- - hg-fast-export
- name: trove-setup
morph: strata/trove/trove-setup.morph
repo: baserock:baserock/trove-setup
@@ -190,7 +78,7 @@ chunks:
- name: lorry-controller
morph: strata/trove/lorry-controller.morph
repo: baserock:baserock/lorry-controller
- ref: d7ca3f2f14ad28437f7332ca387a790fecb8b081
+ ref: 689174532cc4920d2ef96bcebeb8a1adaf985804
unpetrify-ref: master
build-depends: []
- name: lua-scrypt
diff --git a/strata/webtools.morph b/strata/webtools.morph
index fd893ae6..8df32e9c 100644
--- a/strata/webtools.morph
+++ b/strata/webtools.morph
@@ -19,8 +19,8 @@ chunks:
- name: tar
morph: strata/webtools/tar.morph
repo: upstream:tar
- ref: 0492b656656ca7973b126b8c117804d80952de48
- unpetrify-ref: baserock/morph
+ ref: 9a58d148c26c220cb1b163c71e7a51a2e41f6b37
+ unpetrify-ref: baserock/release_1_28
build-depends: []
- name: pip
repo: upstream:pip.git
diff --git a/strata/webtools/tar.morph b/strata/webtools/tar.morph
index 2253e3b7..9219abeb 100644
--- a/strata/webtools/tar.morph
+++ b/strata/webtools/tar.morph
@@ -3,7 +3,7 @@ kind: chunk
configure-commands:
- bash bootstrap --skip-po
- FORCE_UNSAFE_CONFIGURE=1 ./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin
- --disable-nls
+ --disable-nls --disable-gcc-warnings
build-commands:
- make
install-commands:
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index c676d636..d47d0ac4 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -15,13 +15,14 @@ chunks:
- name: weston
morph: strata/weston-genivi/weston.morph
repo: upstream:weston
- ref: 5d9e9c1393c6b0ea6ce52912fc458c963e644547
- unpetrify-ref: baserock/genivi/1.2.0
+ ref: 5d7a71cb941ed419ec042ea28be56c87ea407db6
+ unpetrify-ref: baserock/genivi/1.3.0
build-depends:
- linux-pam
- name: wayland-ivi-extension
+ morph: strata/weston-genivi/wayland-ivi-extension.morph
repo: upstream:genivi/wayland-ivi-extension
- ref: 633ce4f89f695c575bdfc080551b0e59c8287427
- unpetrify-ref: baserock/genivi/1.2.0
+ ref: 43fa65ede93cef9e6c902df2248229ad204b510a
+ unpetrify-ref: master
build-depends:
- weston
diff --git a/strata/weston-genivi/wayland-ivi-extension.morph b/strata/weston-genivi/wayland-ivi-extension.morph
new file mode 100644
index 00000000..bceb2a88
--- /dev/null
+++ b/strata/weston-genivi/wayland-ivi-extension.morph
@@ -0,0 +1,8 @@
+name: wayland-ivi-extension
+kind: chunk
+configure-commands:
+- cmake -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_C_FLAGS="-I/usr/include/weston"
+build-commands:
+- make
+install-commands:
+- make install DESTDIR="$DESTDIR"
diff --git a/strata/weston-genivi/weston.morph b/strata/weston-genivi/weston.morph
index 892adfb4..810ce5e9 100644
--- a/strata/weston-genivi/weston.morph
+++ b/strata/weston-genivi/weston.morph
@@ -6,7 +6,7 @@ configure-commands:
- autoreconf -ivf
- |
LDFLAGS='-L/lib64 -lrt' \
- ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \
+ ./configure --prefix=$PREFIX --disable-xwayland \
--disable-x11-compositor \
--disable-wayland-compositor --enable-egl \
--enable-clients --enable-demo-clients-install --enable-fbdev-compositor