summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--armv7lhf-cross-toolchain.morph6
-rw-r--r--audio-bluetooth.morph4
-rw-r--r--build-essential.morph12
-rw-r--r--genivi-baseline-system-armv7-versatile.morph2
-rw-r--r--genivi-baseline-system-x86_64-generic.morph2
-rwxr-xr-xstrip-gplv3.configure1
-rw-r--r--tools.morph5
-rw-r--r--trove-system-x86_64.morph1
-rwxr-xr-xtrove.configure35
-rw-r--r--trove.morph6
-rw-r--r--wayland-armv7-versatile.morph56
-rw-r--r--wayland-x86_64-generic.morph54
-rw-r--r--x-common.morph4
13 files changed, 156 insertions, 32 deletions
diff --git a/armv7lhf-cross-toolchain.morph b/armv7lhf-cross-toolchain.morph
index 692f14f2..37553c6c 100644
--- a/armv7lhf-cross-toolchain.morph
+++ b/armv7lhf-cross-toolchain.morph
@@ -16,7 +16,8 @@ chunks:
build-depends: []
- name: armv7lhf-cross-gcc-nolibc
repo: upstream:gcc-tarball
- ref: baserock/sam/gcc-4.6-fixed-for-4.7
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
+ unpetrify-ref: baserock/build-essential
build-depends:
- armv7lhf-cross-binutils
- name: armv7lhf-cross-eglibc
@@ -29,7 +30,8 @@ chunks:
- armv7lhf-cross-linux-api-headers
- name: armv7lhf-cross-gcc
repo: upstream:gcc-tarball
- ref: baserock/sam/gcc-4.7
+ ref: b0254026149b13782eae26d38435a4c62a002cf0
+ unpetrify-ref: baserock/build-essential-4.7
build-depends:
- armv7lhf-cross-binutils
- armv7lhf-cross-eglibc
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph
index 07db9d16..ffb7d5ff 100644
--- a/audio-bluetooth.morph
+++ b/audio-bluetooth.morph
@@ -32,8 +32,8 @@ chunks:
build-depends: []
- name: bluez
repo: upstream:bluez
- ref: 9e483337a42f0ddef06cc9ad146c8523f2b08888
- unpetrify-ref: baserock/v5.17
+ ref: a18201b5321e8b41d2ee7c7bc7285d976fc433e6
+ unpetrify-ref: baserock/v5.17-patched
build-depends:
- readline
- libical
diff --git a/build-essential.morph b/build-essential.morph
index e1d70046..7729611b 100644
--- a/build-essential.morph
+++ b/build-essential.morph
@@ -46,7 +46,8 @@ chunks:
prefix: /tools
- name: stage1-gcc
repo: upstream:gcc-tarball
- ref: baserock/sam/gcc-4.6-fixed-for-4.7
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
build-mode: bootstrap
@@ -82,7 +83,8 @@ chunks:
prefix: /tools
- name: stage2-gcc-fixed-headers
repo: upstream:gcc-tarball
- ref: baserock/sam/gcc-4.6-fixed-for-4.7
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
- stage1-gcc
@@ -91,7 +93,8 @@ chunks:
prefix: /tools
- name: stage2-gcc
repo: upstream:gcc-tarball
- ref: baserock/sam/gcc-4.6-fixed-for-4.7
+ ref: 0a1a077d3466cd99a4ed5590db2146b3fec6fff1
+ unpetrify-ref: baserock/build-essential
build-depends:
- stage1-binutils
- stage1-gcc
@@ -273,7 +276,8 @@ chunks:
prefix: /usr
- name: gcc
repo: upstream:gcc-tarball
- ref: baserock/sam/gcc-4.7
+ ref: b0254026149b13782eae26d38435a4c62a002cf0
+ unpetrify-ref: baserock/build-essential-4.7
build-depends:
- stage2-binutils
- stage2-busybox
diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph
index 910d00f8..32c69100 100644
--- a/genivi-baseline-system-armv7-versatile.morph
+++ b/genivi-baseline-system-armv7-versatile.morph
@@ -19,8 +19,6 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-armv7-versatile
- morph: multimedia
- morph: genivi
-- morph: genivi-x-armv7-versatile
- morph: wayland-armv7-versatile
diff --git a/genivi-baseline-system-x86_64-generic.morph b/genivi-baseline-system-x86_64-generic.morph
index 3b9f7dc5..7b08a895 100644
--- a/genivi-baseline-system-x86_64-generic.morph
+++ b/genivi-baseline-system-x86_64-generic.morph
@@ -18,8 +18,6 @@ strata:
- morph: connectivity
- morph: audio-bluetooth
- morph: x-common
-- morph: x-x86_64-generic
- morph: multimedia
- morph: genivi
-- morph: genivi-x-x86_64-generic
- morph: wayland-x86_64-generic
diff --git a/strip-gplv3.configure b/strip-gplv3.configure
index 5be060bf..8464487e 100755
--- a/strip-gplv3.configure
+++ b/strip-gplv3.configure
@@ -60,7 +60,6 @@ class StripGPLv3ConfigureExtension(cliapp.Application):
for artifact in artifacts.split():
self.remove_chunk(target_root, artifact, chunk[1])
- os.remove(os.path.join(target_root, 'usr', 'bin', 'awk'))
os.symlink(os.path.join(os.sep, 'bin', 'busybox'),
os.path.join(target_root, 'usr', 'bin', 'awk'))
diff --git a/tools.morph b/tools.morph
index ed0985a6..834ea701 100644
--- a/tools.morph
+++ b/tools.morph
@@ -51,7 +51,8 @@ chunks:
build-depends: []
- name: distcc
repo: upstream:distcc
- ref: baserock/sam/gcc-4.7
+ ref: c9691a9604fdf9d6711204999787d332b7141692
+ unpetrify-ref: baserock/morph
build-depends: []
- name: e2fsprogs
repo: upstream:e2fsprogs
@@ -91,7 +92,7 @@ chunks:
- six
- name: morph
repo: baserock:baserock/morph
- ref: b8f2100e3f7fbff990d4f28c71f9c7a178b5d8f0
+ ref: f23b51aaa0dff06c7926e803b0f09103c60147a4
unpetrify-ref: master
build-depends:
- cliapp
diff --git a/trove-system-x86_64.morph b/trove-system-x86_64.morph
index c415e54d..f0ae109b 100644
--- a/trove-system-x86_64.morph
+++ b/trove-system-x86_64.morph
@@ -5,6 +5,7 @@ configuration-extensions:
- trove-backup
- fstab
- simple-network
+- install-files
description: Trove server
kind: system
name: trove-system-x86_64
diff --git a/trove.configure b/trove.configure
index 42ad6321..cdd37b95 100755
--- a/trove.configure
+++ b/trove.configure
@@ -29,6 +29,7 @@
# * TROVE_ADMIN_EMAIL
# * TROVE_ADMIN_NAME
# * TROVE_ADMIN_SSH_PUBKEY
+# * LORRY_CONTROLLER_MINIONS (optional, defaults to 4)
#
# The configuration of a Trove is slightly tricky: part of it has to
# be run on the configured system after it has booted. We accomplish
@@ -66,6 +67,7 @@ s/##TROVE_COMPANY##/$TROVE_COMPANY/g
s/##TROVE_LOG_PREFIX##/$TROVE_ID/g
s/##ESC_PERSONAL_PREFIX##/people/g
s/##PREFIX##/$TROVE_ID/g
+s/##UPSTREAM_TROVE##/$UPSTREAM_TROVE/g
## The same prefix as above, only lua-pattern-escaped
s/##ESC_PREFIX##/$(lua_escape "$TROVE_ID")/g
EOF
@@ -100,9 +102,42 @@ EOF
# create a symlink in /var/www/htdocs to what will be the rsync area of
# the releases repository
+echo "Symlink rsync releases in htdocs"
ln -s "/home/git/repos/$TROVE_ID/site/releases.git/rsync" \
"$ROOT/var/www/htdocs/releases"
+
+##########################################################################
+
+echo "Create Lorry Controller config"
+install -d "$ROOT/etc/lorry-controller"
+cat <<EOF > "$ROOT/etc/lorry-controller/webapp.conf"
+[config]
+log = /home/lorry/webapp.log
+log-max = 100M
+log-keep = 10
+log-level = debug
+statedb = /home/lorry/webapp.db
+configuration-directory = /home/lorry/confgit
+status-html = /home/lorry/lc-status.html
+wsgi = yes
+debug-port = 12765
+templates = /usr/share/lorry-controller/templates
+confgit-url = ssh://git@localhost/$TROVE_ID/local-config/lorries
+EOF
+
+
+echo "Set up Lorry Controller MINIONs"
+UNITS="$ROOT/usr/lib/systemd/system"
+seq "${LORRY_CONTROLLER_MINIONS:-4}" |
+while read i
+do
+ ln -s "../lorry-controller-minion@.service" \
+ "$UNITS/multi-user.target.wants/lorry-controller-minion@$i.service"
+done
+
+
+
##########################################################################
# Configuration of trove-early-setup
#
diff --git a/trove.morph b/trove.morph
index 84fbaf72..2cb73192 100644
--- a/trove.morph
+++ b/trove.morph
@@ -163,7 +163,7 @@ chunks:
build-depends: []
- name: lorry
repo: baserock:baserock/lorry
- ref: 5afef32028fbcacb7acc3d0318407169dd2353de
+ ref: ede3f337e9769b0e6756d4b9cc37d33aa62b82ba
unpetrify-ref: master
build-depends:
- bzr-tarball
@@ -178,12 +178,12 @@ chunks:
- hg-fast-export
- name: trove-setup
repo: baserock:baserock/trove-setup
- ref: 56b4fc537662d8d42f366b5cb5be0eada79d8d56
+ ref: eafba37e2bfc3897e3e7f65f2ce087fbee358f43
unpetrify-ref: master
build-depends: []
- name: lorry-controller
repo: baserock:baserock/lorry-controller
- ref: 627c50633977804e6a10bafad81e72ae376b1cf6
+ ref: 5e2584a7936af5413588232be1f0df7b4cef18c1
unpetrify-ref: master
build-depends: []
- name: lighttpd
diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph
index 9b779477..a882611f 100644
--- a/wayland-armv7-versatile.morph
+++ b/wayland-armv7-versatile.morph
@@ -16,8 +16,8 @@ chunks:
- libxkbcommon
- name: mesa-wayland
repo: upstream:mesa
- ref: e96f3daac78e3971e4500a31e72c0a7e5845c3d1
- unpetrify-ref: baserock/genivi/baseline-armv7-versatile
+ ref: e51e5d4f9875e9a970d7560c6ac0bfed933facc5
+ unpetrify-ref: baserock/arm/10.0.4-gallium
build-depends:
- wayland
- name: pixman
@@ -25,11 +25,29 @@ chunks:
ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
unpetrify-ref: baserock/morph
build-depends: []
+- name: freetype2
+ repo: upstream:freetype2
+ ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: fontconfig
+ repo: upstream:fontconfig
+ ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - freetype2
+- name: freefont-otf
+ repo: upstream:freefont-otf
+ ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ unpetrify-ref: baserock/morph
+ build-depends: []
- name: cairo
repo: upstream:cairo
- ref: 86fd783959c537b8c0fd49fd979881178ca9a24e
- unpetrify-ref: baserock/genivi/baseline
+ ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
+ unpetrify-ref: baserock/genivi/1.12.10
build-depends:
+ - fontconfig
+ - freetype2
- wayland
- mesa-wayland
- pixman
@@ -74,12 +92,38 @@ chunks:
- mtdev
- libevdev
- linux-api-headers
+- name: harfbuzz
+ repo: upstream:harfbuzz
+ ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+ unpetrify-ref: baserock/0.9.12
+ build-depends:
+ - freetype2
+- name: pango
+ repo: upstream:pango
+ ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
+ unpetrify-ref: baserock/1.36.3
+ build-depends:
+ - cairo
+ - harfbuzz
+ - fontconfig
+ - freetype2
+ - freefont-otf
- name: weston
repo: upstream:weston
- ref: e2136e1f2494c2c1732f0afeba9a7050bdd48e42
- unpetrify-ref: baserock/genivi/baseline
+ ref: 74f7c94c9186f8fc9ea8f50ab5d5f805d679d05f
+ unpetrify-ref: baserock/weston-ivi-shell-1.4.0-v12
build-depends:
+ - pango
+ - pixman
+ - libxkbcommon
- wayland
- mesa-wayland
- libinput
- cairo
+- name: wayland-ivi-extension
+ repo: upstream:genivi/wayland-ivi-extension
+ ref: 04485758e5aa78f7c7eb548fd117b2001dc416e6
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - wayland
+ - weston
diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph
index 2b9f581f..b76ea8ca 100644
--- a/wayland-x86_64-generic.morph
+++ b/wayland-x86_64-generic.morph
@@ -16,8 +16,8 @@ chunks:
- libxkbcommon
- name: mesa-wayland
repo: upstream:mesa
- ref: f64dd91f4f2a2591e66b38fdfdfa83077f8221ab
- unpetrify-ref: baserock/genivi/morph
+ ref: a77b370b4ba1045e2612650503cf45827af94a12
+ unpetrify-ref: baserock/10.0.4-gallium
build-depends:
- wayland
- name: pixman
@@ -25,11 +25,29 @@ chunks:
ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
unpetrify-ref: baserock/morph
build-depends: []
+- name: freetype2
+ repo: upstream:freetype2
+ ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: fontconfig
+ repo: upstream:fontconfig
+ ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - freetype2
+- name: freefont-otf
+ repo: upstream:freefont-otf
+ ref: 0ca3ccce74e81f7feb6e922edd988be0e1a43f05
+ unpetrify-ref: baserock/morph
+ build-depends: []
- name: cairo
repo: upstream:cairo
- ref: 86fd783959c537b8c0fd49fd979881178ca9a24e
- unpetrify-ref: baserock/genivi/baseline
+ ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
+ unpetrify-ref: baserock/genivi/1.12.10
build-depends:
+ - fontconfig
+ - freetype2
- wayland
- mesa-wayland
- pixman
@@ -74,14 +92,38 @@ chunks:
- mtdev
- libevdev
- linux-api-headers
+- name: harfbuzz
+ repo: upstream:harfbuzz
+ ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+ unpetrify-ref: baserock/0.9.12
+ build-depends:
+ - freetype2
+- name: pango
+ repo: upstream:pango
+ ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
+ unpetrify-ref: baserock/1.36.3
+ build-depends:
+ - cairo
+ - harfbuzz
+ - fontconfig
+ - freetype2
+ - freefont-otf
- name: weston
repo: upstream:weston
- ref: e2136e1f2494c2c1732f0afeba9a7050bdd48e42
- unpetrify-ref: baserock/genivi/baseline
+ ref: 74f7c94c9186f8fc9ea8f50ab5d5f805d679d05f
+ unpetrify-ref: baserock/weston-ivi-shell-1.4.0-v12
build-depends:
+ - pango
- wayland
- mesa-wayland
- libinput
- cairo
- pixman
- libxkbcommon
+- name: wayland-ivi-extension
+ repo: upstream:genivi/wayland-ivi-extension
+ ref: 04485758e5aa78f7c7eb548fd117b2001dc416e6
+ unpetrify-ref: baserock/genivi/baseline
+ build-depends:
+ - wayland
+ - weston
diff --git a/x-common.morph b/x-common.morph
index 81ca96ab..77ba793b 100644
--- a/x-common.morph
+++ b/x-common.morph
@@ -225,8 +225,8 @@ chunks:
- xorg-util-macros
- name: drm
repo: upstream:drm
- ref: 20c5607b57da113ca1a29caaa5a52eaf83808dff
- unpetrify-ref: baserock/morph
+ ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de
+ unpetrify-ref: baserock/libdrm-2.4.49
build-depends:
- xcb-pthread-stubs
- xorg-lib-libpciaccess
View Lorry Controller Status