diff options
Diffstat (limited to 'strata')
-rw-r--r-- | strata/bsp-armv7-highbank/linux-armv7-highbank.morph | 2 | ||||
-rw-r--r-- | strata/bsp-armv7-versatile/linux-armv7-versatile.morph | 2 | ||||
-rw-r--r-- | strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph | 2 | ||||
-rw-r--r-- | strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph | 2 | ||||
-rw-r--r-- | strata/bsp-jetson/linux-jetson-tk1.morph | 2 | ||||
-rw-r--r-- | strata/bsp-wandboard/linux-armv7-wandboard.morph | 2 | ||||
-rw-r--r-- | strata/bsp-x86_32-generic/linux-x86-32-generic.morph | 2 | ||||
-rw-r--r-- | strata/bsp-x86_64-generic/linux-x86-64-generic.morph | 2 | ||||
-rw-r--r-- | strata/mesa-common.morph | 4 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 3 | ||||
-rw-r--r-- | strata/morph-utils.morph | 2 | ||||
-rw-r--r-- | strata/trove.morph | 2 |
12 files changed, 21 insertions, 6 deletions
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/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index 1f980098..42c16f01 100644 --- a/strata/bsp-jetson/linux-jetson-tk1.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -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-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/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/trove.morph b/strata/trove.morph index d0773314..3b285372 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -190,7 +190,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 |