diff options
| -rw-r--r-- | strata/mesa-common-vm.morph | 12 | ||||
| -rw-r--r-- | strata/mesa-common.morph | 4 | ||||
| -rw-r--r-- | strata/mesa-common/mesa@vm.morph | 12 | ||||
| -rw-r--r-- | systems/genivi-baseline-system-x86_64-generic.morph | 4 | ||||
| -rw-r--r-- | systems/weston-system-x86_64-generic.morph | 4 |
5 files changed, 6 insertions, 30 deletions
diff --git a/strata/mesa-common-vm.morph b/strata/mesa-common-vm.morph deleted file mode 100644 index 47394dea..00000000 --- a/strata/mesa-common-vm.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: mesa-common-vm -kind: stratum -build-depends: -- morph: strata/llvm-common.morph -- morph: strata/libdrm-common.morph -- morph: strata/wayland-generic.morph -chunks: -- name: mesa@vm - morph: strata/mesa-common/mesa@vm.morph - repo: upstream:mesa - ref: f7d157a4f011fd5ace94f55c8674be4b12d86f95 - unpetrify-ref: baserock/mesa-10.3.7-2-gf7d157a/fstat_fix diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 76a8fc25..9dcdf5c1 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -9,5 +9,5 @@ chunks: - name: mesa morph: strata/mesa-common/mesa.morph repo: upstream:mesa - ref: d623ac7304feff9ddf3fea07e738bc52d42e7605 - unpetrify-ref: baserock/mesa-10.5.5-jetson + ref: 635ad274470a064100ff6aa38ede83d748ae07cf + unpetrify-ref: baserock/mesa-10.6.0-rc1-jetson diff --git a/strata/mesa-common/mesa@vm.morph b/strata/mesa-common/mesa@vm.morph deleted file mode 100644 index 517b6ba4..00000000 --- a/strata/mesa-common/mesa@vm.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: mesa@vm -kind: chunk -build-system: autotools -configure-commands: -- | - ./autogen.sh --prefix="$PREFIX" \ - --enable-gles2 \ - --disable-glx \ - --with-egl-platforms=drm,wayland \ - --with-gallium-drivers="yes" \ - --with-dri-drivers="yes" \ - --enable-gallium-egl diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index 7b339c43..f04485bc 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -33,8 +33,8 @@ strata: morph: strata/input-common.morph - name: llvm-common morph: strata/llvm-common.morph -- name: mesa-common-vm - morph: strata/mesa-common-vm.morph +- name: mesa-common + morph: strata/mesa-common.morph - name: x-common morph: strata/x-common.morph - name: weston-genivi diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index 6cef12ff..84f0bad0 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -31,8 +31,8 @@ strata: morph: strata/input-common.morph - name: llvm-common morph: strata/llvm-common.morph -- name: mesa-common-vm - morph: strata/mesa-common-vm.morph +- name: mesa-common + morph: strata/mesa-common.morph - name: weston-common morph: strata/weston-common.morph - name: x-common |