diff options
-rw-r--r-- | audio-bluetooth.morph | 21 | ||||
-rw-r--r-- | base-system-x86_32-generic.morph | 2 | ||||
-rw-r--r-- | bsp-armv7-versatile.morph | 2 | ||||
-rw-r--r-- | bsp-imx53.morph | 2 | ||||
-rw-r--r-- | bsp-x86_32-generic.morph | 2 | ||||
-rw-r--r-- | bsp-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | build-essential.morph | 19 | ||||
-rw-r--r-- | busybox-init.configure | 145 | ||||
-rw-r--r-- | core.morph | 10 | ||||
-rw-r--r-- | distbuild.configure | 1 | ||||
-rw-r--r-- | foundation.morph | 13 | ||||
-rw-r--r-- | genivi-baseline-system-armv7-versatile.morph | 2 | ||||
-rw-r--r-- | genivi-baseline-system-x86_64-generic.morph | 1 | ||||
-rw-r--r-- | genivi.morph | 19 | ||||
-rwxr-xr-x | licensecheck.sh | 8 | ||||
-rw-r--r-- | minimal-system-deploy.morph | 14 | ||||
-rw-r--r-- | minimal-system-x86_32-generic.morph | 19 | ||||
-rw-r--r-- | minimal-system-x86_64-generic.morph | 19 | ||||
-rwxr-xr-x | strip-gplv3.configure | 12 | ||||
-rw-r--r-- | tools.morph | 2 | ||||
-rw-r--r-- | wayland-armv7-versatile.morph | 74 | ||||
-rw-r--r-- | wayland-x86_64-generic.morph | 76 |
22 files changed, 415 insertions, 50 deletions
diff --git a/audio-bluetooth.morph b/audio-bluetooth.morph index e1cd778a..07db9d16 100644 --- a/audio-bluetooth.morph +++ b/audio-bluetooth.morph @@ -20,22 +20,29 @@ chunks: unpetrify-ref: baserock/morph build-depends: - alsa-lib +- name: libical + repo: upstream:libical + ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 + unpetrify-ref: baserock/morph + build-depends: [] +- name: readline + repo: upstream:readline + ref: 518937ab89be812ccd45e9b8c1ce4ad721d35ef6 + unpetrify-ref: baserock/genivi/baseline + build-depends: [] - name: bluez repo: upstream:bluez - ref: df1dd28e3a5c92fb67209e4ae3ad2d04c6380b9b - unpetrify-ref: baserock/genivi/baseline + ref: 9e483337a42f0ddef06cc9ad146c8523f2b08888 + unpetrify-ref: baserock/v5.17 build-depends: + - readline + - libical - alsa-lib - name: bluez-tools repo: upstream:bluez-tools ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 unpetrify-ref: baserock/morph build-depends: [] -- name: libical - repo: upstream:libical - ref: 52568782ae136e1ec4ddf3eb6da7b0f3fbd3f1b3 - unpetrify-ref: baserock/morph - build-depends: [] - name: obexd repo: upstream:obexd ref: 4225280022c206762c91beee47c62d05e1baeacc diff --git a/base-system-x86_32-generic.morph b/base-system-x86_32-generic.morph index a1eff551..e53b2d97 100644 --- a/base-system-x86_32-generic.morph +++ b/base-system-x86_32-generic.morph @@ -5,7 +5,7 @@ configuration-extensions: - simple-network - nfsboot - install-files -description: The set of strata required to have a minimal system for a 32-bit x86 +description: The set of strata required to have a basic system for a 32-bit x86 system. kind: system name: base-system-x86_32-generic diff --git a/bsp-armv7-versatile.morph b/bsp-armv7-versatile.morph index 9ad1e5d0..797fdeec 100644 --- a/bsp-armv7-versatile.morph +++ b/bsp-armv7-versatile.morph @@ -7,6 +7,6 @@ build-depends: chunks: - name: linux repo: upstream:linux - ref: 2a054e5708e376890693f71c3697c4a259a5e46f + ref: 5a9b14cc3d6bc4060cc55ed6e1d2b5565b201ad5 unpetrify-ref: baserock/arm/versatile build-depends: [] diff --git a/bsp-imx53.morph b/bsp-imx53.morph index e10adfae..395fad19 100644 --- a/bsp-imx53.morph +++ b/bsp-imx53.morph @@ -7,6 +7,6 @@ build-depends: chunks: - name: linux repo: upstream:linux - ref: 44884486fd3c8fd6d5c66044e1ca743f253832cd + ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe unpetrify-ref: baserock/morph build-depends: [] diff --git a/bsp-x86_32-generic.morph b/bsp-x86_32-generic.morph index c44673d1..b6cb845a 100644 --- a/bsp-x86_32-generic.morph +++ b/bsp-x86_32-generic.morph @@ -7,7 +7,7 @@ build-depends: chunks: - name: linux repo: upstream:linux - ref: 44884486fd3c8fd6d5c66044e1ca743f253832cd + ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe unpetrify-ref: baserock/morph build-depends: [] - name: nasm diff --git a/bsp-x86_64-generic.morph b/bsp-x86_64-generic.morph index 3ce52d93..a824fdfc 100644 --- a/bsp-x86_64-generic.morph +++ b/bsp-x86_64-generic.morph @@ -7,7 +7,7 @@ build-depends: chunks: - name: linux repo: upstream:linux - ref: 44884486fd3c8fd6d5c66044e1ca743f253832cd + ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe unpetrify-ref: baserock/morph build-depends: [] - name: nasm diff --git a/build-essential.morph b/build-essential.morph index c6e7ba2c..628fffcb 100644 --- a/build-essential.morph +++ b/build-essential.morph @@ -31,6 +31,11 @@ description: | stage2-fhs-dirs.morph for details. Basically, /bin is a symlink to /tools/bin during stage 2 but in stage 3 it becomes a real directory again. +products: +- artifact: build-essential-minimal + include: + - fhs-dirs-.* + - busybox-.* chunks: - name: stage1-binutils repo: upstream:binutils-redhat @@ -179,7 +184,7 @@ chunks: prefix: /usr - name: eglibc repo: upstream:eglibc2 - ref: 43ee5d250ad47d2bee8ec17954efb7f22d2b804c + ref: e57ce33023d37183847a0c2f692645887691576a unpetrify-ref: baserock/2.15-build-essential build-depends: - stage2-binutils @@ -193,10 +198,14 @@ chunks: - stage2-reset-specs - linux-api-headers build-mode: staging + artifacts: + eglibc-gconv: build-essential-runtime + eglibc-libs: build-essential-minimal + eglibc-nss: build-essential-runtime prefix: /usr - name: zlib repo: upstream:zlib - ref: db3aed6856d7a23186844fdf93105cad2fcf2f2f + ref: db333af7e9b90a23fd7f9cd8dc128123b34bf698 unpetrify-ref: baserock/build-essential build-depends: - stage2-binutils @@ -210,6 +219,8 @@ chunks: - stage2-reset-specs - eglibc build-mode: staging + artifacts: + zlib-libs: build-essential-minimal prefix: /usr - name: binutils repo: upstream:binutils-redhat @@ -265,7 +276,7 @@ chunks: prefix: /usr - name: gcc repo: upstream:gcc-tarball - ref: dd78b627480ed8d3c135271cd627096ae76fa5fc + ref: 088b7ab28fe53b198ec5c4eaba0f54176c4c35a0 unpetrify-ref: baserock/build-essential build-depends: - stage2-binutils @@ -280,6 +291,8 @@ chunks: - eglibc - zlib build-mode: staging + artifacts: + gcc-libs: build-essential-minimal prefix: /usr - name: make repo: upstream:make diff --git a/busybox-init.configure b/busybox-init.configure new file mode 100644 index 00000000..c7dba3b9 --- /dev/null +++ b/busybox-init.configure @@ -0,0 +1,145 @@ +#!/bin/sh +# +# Copyright (C) 2014 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. +# +# This is a "morph deploy" configuration extension to configure a system +# to use busybox for its init, if INIT_SYSTEM=busybox is specified. +# +# As well as checking INIT_SYSTEM, the following variables are used. +# +# Getty configuration: +# * CONSOLE_DEVICE: Which device to spawn a getty on (default: ttyS0) +# * CONSOLE_BAUDRATE: Baud rate of the console (default: 115200) +# * CONSOLE_MODE: What kind of terminal this console emulates +# (default: vt100) + +if [ "$INIT_SYSTEM" != busybox ]; then + echo Not configuring system to use busybox init. + exit 0 +fi + +set -e +echo Configuring system to use busybox init + +RUN_SCRIPT=/etc/rcS +INIT_SCRIPT=/sbin/init + +install_mdev_config(){ + install -D -m644 /dev/stdin "$1" <<'EOF' +# support module loading on hotplug +$MODALIAS=.* root:root 660 @modprobe "$MODALIAS" + +# null may already exist; therefore ownership has to be changed with command +null root:root 666 @chmod 666 $MDEV +zero root:root 666 +full root:root 666 +random root:root 444 +urandom root:root 444 +hwrandom root:root 444 +grsec root:root 660 + +kmem root:root 640 +mem root:root 640 +port root:root 640 +# console may already exist; therefore ownership has to be changed with command +console root:root 600 @chmod 600 $MDEV +ptmx root:root 666 +pty.* root:root 660 + +# Typical devices + +tty root:root 666 +tty[0-9]* root:root 660 +vcsa*[0-9]* root:root 660 +ttyS[0-9]* root:root 660 + +# block devices +ram[0-9]* root:root 660 +loop[0-9]+ root:root 660 +sd[a-z].* root:root 660 +hd[a-z][0-9]* root:root 660 +md[0-9]* root:root 660 +sr[0-9]* root:root 660 @ln -sf $MDEV cdrom +fd[0-9]* root:root 660 + +# net devices +SUBSYSTEM=net;.* root:root 600 @nameif +tun[0-9]* root:root 600 =net/ +tap[0-9]* root:root 600 =net/ +EOF +} + +install_start_script(){ + install -D -m755 /dev/stdin "$1" <<'EOF' +#!/bin/sh +mount -t devtmpfs devtmpfs /dev +mount -t proc proc /proc +mount -t sysfs sysfs /sys +mkdir -p /dev/pts +mount -t devpts devpts /dev/pts + +echo /sbin/mdev >/proc/sys/kernel/hotplug +mdev -s + +hostname -F /etc/hostname + +run-parts -a start /etc/init.d +EOF +} + +install_inittab(){ + local inittab="$1" + local dev="$2" + local baud="$3" + local mode="$4" + install -D -m644 /dev/stdin "$1" <<EOF +::sysinit:$RUN_SCRIPT + +::askfirst:-/bin/cttyhack /bin/sh +::askfirst:/sbin/getty -L $dev $baud $mode + +::ctrlaltdel:/sbin/reboot +::shutdown:/sbin/swapoff -a +::shutdown:/bin/umount -a -r +::restart:/sbin/init +EOF +} + +install_init_symlink(){ + local initdir="$(dirname "$1")" + local initname="$(basename "$1")" + mkdir -p "$initdir" + cd "$initdir" + for busybox_dir in . ../bin ../sbin ../usr/bin ../usr/sbin; do + local busybox="$busybox_dir/busybox" + if [ ! -x "$busybox" ]; then + continue + fi + ln -sf "$busybox" "$initname" + return 0 + done + echo Unable to find busybox >&2 + exit 1 +} + +install_mdev_config "$1/etc/mdev.conf" + +install_start_script "$1$RUN_SCRIPT" + +install_inittab "$1/etc/inittab" "${CONSOLE_DEV-ttyS0}" \ + "${CONSOLE_BAUD-115200}" "${CONSOLE_MODE-vt100}" + +install_init_symlink "$1$INIT_SCRIPT" @@ -5,6 +5,11 @@ description: Core components of a Baserock base system that are build tools requ build-depends: - morph: build-essential chunks: +- name: sqlite3 + repo: upstream:sqlite3 + ref: f6c2a9fe49d20654c2c41844d056033692a223b7 + unpetrify-ref: baserock/morph + build-depends: [] - name: cmake repo: upstream:cmake ref: 7f9a761e761046a479fda38ee13f5dacd94ceeea @@ -86,8 +91,8 @@ chunks: - m4 - name: openssl-new repo: upstream:openssl-new - ref: 2bee25a915c2ba40e58229788aabc97765426016 - unpetrify-ref: baserock/morph + ref: e691010325922fe85950e3fd29484ca11ec83f44 + unpetrify-ref: baserock/OpenSSL_1_0_2-stable build-depends: - perl - name: bzip2 @@ -102,6 +107,7 @@ chunks: build-depends: - openssl-new - bzip2 + - sqlite3 - name: libtool repo: upstream:libtool ref: d388b7f2dc628b22006025d01179bc09b8aabe81 diff --git a/distbuild.configure b/distbuild.configure index 31afc813..bf145b14 100644 --- a/distbuild.configure +++ b/distbuild.configure @@ -71,6 +71,7 @@ log-max = 100M cachedir = /srv/distbuild tempdir = /srv/distbuild/tmp trove-host = $TROVE_ID +trove-id = $TROVE_ID controller-initiator-address = $CONTROLLERHOST tempdir-min-space = 0 cachedir-min-space = 0 diff --git a/foundation.morph b/foundation.morph index 8de0a5a4..4ad2b9f7 100644 --- a/foundation.morph +++ b/foundation.morph @@ -30,11 +30,6 @@ chunks: ref: 77d4586cc47e8f4c02278afbc220145bba0d442b unpetrify-ref: baserock/morph build-depends: [] -- name: sqlite3 - repo: upstream:sqlite3 - ref: f6c2a9fe49d20654c2c41844d056033692a223b7 - unpetrify-ref: baserock/morph - build-depends: [] - name: libusbx repo: upstream:libusbx ref: 7ec94a45ed8155e7a1d4d5d75575099b09c78834 @@ -65,8 +60,8 @@ chunks: - glib - name: dbus-pre repo: upstream:dbus - ref: a0f3687d650c8c73134f318820f4978a4ff3e9e2 - unpetrify-ref: baserock/build-essential + ref: f2e4718bf42f507684949ebf484aa94df42abbbe + unpetrify-ref: baserock/v1.8.0 build-depends: - glib - name: systemd @@ -99,8 +94,8 @@ chunks: - lzo - name: dbus repo: upstream:dbus - ref: a0f3687d650c8c73134f318820f4978a4ff3e9e2 - unpetrify-ref: baserock/build-essential + ref: f2e4718bf42f507684949ebf484aa94df42abbbe + unpetrify-ref: baserock/v1.8.0 build-depends: - glib - systemd diff --git a/genivi-baseline-system-armv7-versatile.morph b/genivi-baseline-system-armv7-versatile.morph index efa122a6..910d00f8 100644 --- a/genivi-baseline-system-armv7-versatile.morph +++ b/genivi-baseline-system-armv7-versatile.morph @@ -6,6 +6,7 @@ configuration-extensions: - nfsboot - install-files - strip-gplv3 +- fstab description: A GENIVI baseline system for an ARMv7 system. kind: system name: genivi-baseline-system-armv7-versatile @@ -22,3 +23,4 @@ strata: - 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 1ed20b57..3b9f7dc5 100644 --- a/genivi-baseline-system-x86_64-generic.morph +++ b/genivi-baseline-system-x86_64-generic.morph @@ -22,3 +22,4 @@ strata: - morph: multimedia - morph: genivi - morph: genivi-x-x86_64-generic +- morph: wayland-x86_64-generic diff --git a/genivi.morph b/genivi.morph index 3164d294..70384d3c 100644 --- a/genivi.morph +++ b/genivi.morph @@ -47,3 +47,22 @@ chunks: - googlemock - genivi-common-api-runtime - genivi-common-api-dbus-runtime +- name: itzam-tarball + repo: upstream:itzam-tarball + ref: 4ebcf671416927b64475da7b810b6016c847bf73 + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: persistence-client-library + repo: upstream:genivi/persistence-client-library + ref: 0934ba263e69be8453cc3150f997dad28489f0c7 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - DLT-daemon + - itzam-tarball +- name: node-state-manager + repo: upstream:node-state-manager + ref: dd4a86b9459537d2e85489b36abf80f34d12f098 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - DLT-daemon + - persistence-client-library diff --git a/licensecheck.sh b/licensecheck.sh index 5ddd9ffb..1592b568 100755 --- a/licensecheck.sh +++ b/licensecheck.sh @@ -31,7 +31,7 @@ if [ -z "$1" ]; then exit 1 fi -workspace="$PWD"/../.. +workspace="$PWD"/../../.. system="$1" gplv3_chunks="\ @@ -87,10 +87,10 @@ repos=`for stratum in $strata; do for repo in $repos; do if ! (echo $gplv3_repos | grep -wq "$repo") && \ - [ -d "$workspace/upstream:$repo" ] ; then + [ -d "$workspace/upstream/$repo" ] ; then echo "$repo" - perl licensecheck.pl -r "$workspace/upstream:$repo" | \ - cut -d: -f4- | sort -u + perl licensecheck.pl -r "$workspace/upstream/$repo" | \ + cut -d: -f2- | sort -u echo fi done diff --git a/minimal-system-deploy.morph b/minimal-system-deploy.morph new file mode 100644 index 00000000..f6213c39 --- /dev/null +++ b/minimal-system-deploy.morph @@ -0,0 +1,14 @@ +name: minimal-system-deploy +kind: cluster +description: | + Deploy a minimal system to a system running KVM +systems: +- morph: minimal-system-x86_32-generic + deploy: + vm: + type: kvm + location: kvm+ssh://192.168.122.1/tiny-x86_32/srv/VMs/tiny-x86_32.img + HOSTNAME: tiny-x86_32 + DISK_SIZE: 512M + RAM_SIZE: 512M + INIT_SYSTEM: busybox diff --git a/minimal-system-x86_32-generic.morph b/minimal-system-x86_32-generic.morph new file mode 100644 index 00000000..b9e9b9e9 --- /dev/null +++ b/minimal-system-x86_32-generic.morph @@ -0,0 +1,19 @@ +arch: x86_32 +configuration-extensions: +- set-hostname +- simple-network +- nfsboot +- install-files +- busybox-init +description: The set of strata required to have a minimal system for a 32-bit x86 + system. +kind: system +name: minimal-system-x86_32-generic +strata: +- morph: build-essential + artifacts: + - build-essential-minimal +- morph: bsp-x86_32-generic + # Don't include kernel headers in the system + artifacts: + - bsp-x86_32-generic-runtime diff --git a/minimal-system-x86_64-generic.morph b/minimal-system-x86_64-generic.morph new file mode 100644 index 00000000..9ead85e8 --- /dev/null +++ b/minimal-system-x86_64-generic.morph @@ -0,0 +1,19 @@ +arch: x86_64 +configuration-extensions: +- set-hostname +- simple-network +- nfsboot +- install-files +- busybox-init +description: The set of strata required to have a minimal system for a 64-bit x86 + system. +kind: system +name: minimal-system-x86_64-generic +strata: +- morph: build-essential + artifacts: + - build-essential-minimal +- morph: bsp-x86_64-generic + # Don't include kernel headers in the system + artifacts: + - bsp-x86_64-generic-runtime diff --git a/strip-gplv3.configure b/strip-gplv3.configure index b0a1ff5f..5be060bf 100755 --- a/strip-gplv3.configure +++ b/strip-gplv3.configure @@ -51,17 +51,21 @@ class StripGPLv3ConfigureExtension(cliapp.Application): def process_args(self, args): target_root = args[0] + meta_dir = os.path.join(target_root, 'baserock') for chunk in self.gplv3_chunks: - self.remove_chunk(target_root, chunk[0], chunk[1]) + regex = os.path.join(meta_dir, "%s-[^-]\+\.meta" % chunk[0]) + artifacts = self.runcmd(['find', meta_dir, '-regex', regex]) + + 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')) def remove_chunk(self, target_root, chunk, pattern): - chunk_meta_path = os.path.join(target_root, 'baserock', - chunk + '.meta') + chunk_meta_path = os.path.join(target_root, 'baserock', chunk) with open(chunk_meta_path, 'r') as f: chunk_meta_data = json.load(f) @@ -76,8 +80,6 @@ class StripGPLv3ConfigureExtension(cliapp.Application): self.remove_content_entry(target_root, content_entry) else: updated_contents.append(content_entry) - if len(updated_contents) == 0: - os.remove(chunk_meta_path) def remove_content_entry(self, target_root, content_entry): entry_path = os.path.join(target_root, './' + content_entry) diff --git a/tools.morph b/tools.morph index f78a6660..449b19d0 100644 --- a/tools.morph +++ b/tools.morph @@ -92,7 +92,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: 3bdabb5ae6652f7932301a4472a3d409661c9fb6 + ref: c04760ffe1d385134e5092a22db5e5f78c205038 unpetrify-ref: master build-depends: - cliapp diff --git a/wayland-armv7-versatile.morph b/wayland-armv7-versatile.morph index 87345671..9b779477 100644 --- a/wayland-armv7-versatile.morph +++ b/wayland-armv7-versatile.morph @@ -1,20 +1,17 @@ name: wayland-armv7-versatile kind: stratum build-depends: -- morph: core -- morph: foundation -- morph: genivi-foundation - morph: x-common chunks: - name: libxkbcommon repo: upstream:xorg-lib-libxkbcommon - ref: bb620df7aa98c129687382e4866e643b8482fc59 - unpetrify-ref: baserock/morph + ref: b721254769212d671a4729f1c88b059979b80efc + unpetrify-ref: baserock/genivi/baseline build-depends: [] - name: wayland repo: upstream:wayland - ref: 006abd0a68e96749beeebf08aad298036b3fbfd4 - unpetrify-ref: baserock/genivi/wayland + ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c + unpetrify-ref: baserock/1.4.0 build-depends: - libxkbcommon - name: mesa-wayland @@ -23,3 +20,66 @@ chunks: unpetrify-ref: baserock/genivi/baseline-armv7-versatile build-depends: - wayland +- name: pixman + repo: upstream:pixman + ref: 958bd334b3c17f529c80f2eeef4224f45c62f292 + unpetrify-ref: baserock/morph + build-depends: [] +- name: cairo + repo: upstream:cairo + ref: 86fd783959c537b8c0fd49fd979881178ca9a24e + unpetrify-ref: baserock/genivi/baseline + build-depends: + - wayland + - mesa-wayland + - pixman +- name: mtdev + repo: upstream:mtdev-git + ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: xorg-lib-libxkbfile + repo: upstream:xorg-lib-libxkbfile + ref: 7381c2f9013ef7784c78091fa671e652a62ca706 + unpetrify-ref: baserock/morph + build-depends: [] +- name: xorg-app-xkbcomp + repo: upstream:xorg-app-xkbcomp + ref: 705b9bbb426410f9510601c7010da51184919b36 + unpetrify-ref: baserock/morph + build-depends: + - xorg-lib-libxkbfile +- name: xkeyboard-config + repo: upstream:xkeyboard-config + ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 + unpetrify-ref: baserock/morph + build-depends: + - xorg-app-xkbcomp +- name: libevdev + repo: upstream:libevdev + ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528 + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: linux-api-headers + repo: upstream:linux + ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe + unpetrify-ref: baserock/morph + build-depends: [] +- name: libinput + repo: upstream:libinput + ref: f0fd32db8f3df558e1d763dfa2db76cdca260323 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - libxkbcommon + - mtdev + - libevdev + - linux-api-headers +- name: weston + repo: upstream:weston + ref: e2136e1f2494c2c1732f0afeba9a7050bdd48e42 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - wayland + - mesa-wayland + - libinput + - cairo diff --git a/wayland-x86_64-generic.morph b/wayland-x86_64-generic.morph index 7a8962a8..2b9f581f 100644 --- a/wayland-x86_64-generic.morph +++ b/wayland-x86_64-generic.morph @@ -1,20 +1,17 @@ name: wayland-x86_64-generic kind: stratum build-depends: -- morph: core -- morph: foundation -- morph: genivi-foundation - morph: x-common chunks: - name: libxkbcommon repo: upstream:xorg-lib-libxkbcommon - ref: bb620df7aa98c129687382e4866e643b8482fc59 - unpetrify-ref: baserock/morph + ref: b721254769212d671a4729f1c88b059979b80efc + unpetrify-ref: baserock/genivi/baseline build-depends: [] - name: wayland repo: upstream:wayland - ref: 006abd0a68e96749beeebf08aad298036b3fbfd4 - unpetrify-ref: baserock/genivi/wayland + ref: cbd8ab5ba7f3f0dba6c9b04176b3a2da965cd21c + unpetrify-ref: baserock/1.4.0 build-depends: - libxkbcommon - name: mesa-wayland @@ -23,3 +20,68 @@ chunks: unpetrify-ref: baserock/genivi/morph build-depends: - wayland +- name: pixman + repo: upstream:pixman + ref: 958bd334b3c17f529c80f2eeef4224f45c62f292 + unpetrify-ref: baserock/morph + build-depends: [] +- name: cairo + repo: upstream:cairo + ref: 86fd783959c537b8c0fd49fd979881178ca9a24e + unpetrify-ref: baserock/genivi/baseline + build-depends: + - wayland + - mesa-wayland + - pixman +- name: mtdev + repo: upstream:mtdev-git + ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: xorg-lib-libxkbfile + repo: upstream:xorg-lib-libxkbfile + ref: 7381c2f9013ef7784c78091fa671e652a62ca706 + unpetrify-ref: baserock/morph + build-depends: [] +- name: xorg-app-xkbcomp + repo: upstream:xorg-app-xkbcomp + ref: 705b9bbb426410f9510601c7010da51184919b36 + unpetrify-ref: baserock/morph + build-depends: + - xorg-lib-libxkbfile +- name: xkeyboard-config + repo: upstream:xkeyboard-config + ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 + unpetrify-ref: baserock/morph + build-depends: + - xorg-app-xkbcomp +- name: libevdev + repo: upstream:libevdev + ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528 + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: linux-api-headers + repo: upstream:linux + ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe + unpetrify-ref: baserock/morph + build-depends: [] +- name: libinput + repo: upstream:libinput + ref: f0fd32db8f3df558e1d763dfa2db76cdca260323 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - libxkbcommon + - mtdev + - libevdev + - linux-api-headers +- name: weston + repo: upstream:weston + ref: e2136e1f2494c2c1732f0afeba9a7050bdd48e42 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - wayland + - mesa-wayland + - libinput + - cairo + - pixman + - libxkbcommon |