summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-24 11:51:56 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-04-24 11:51:56 +0000
commitd5e7d616c1728fbc9d9bf212af324b913dda52dc (patch)
tree6ca564ce842678570f0c8e710c17302895d37c9c
parent7bf8bd3961b2f5a47071e9c28827089e1fc50f15 (diff)
parentefdf545d5e56b4b00f12d0bd0eb080247fdcebc6 (diff)
downloaddefinitions-d5e7d616c1728fbc9d9bf212af324b913dda52dc.tar.gz
Merge branch 'baserock/pedroalvarez/genivi-baseline'
Reviewed by: Daniel Silverstone Reviewed by: Lars Wirzenius
-rw-r--r--audio-bluetooth.morph4
-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--wayland-armv7-versatile.morph56
-rw-r--r--wayland-x86_64-generic.morph54
-rw-r--r--x-common.morph4
7 files changed, 102 insertions, 21 deletions
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/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/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