feat: enable CONFIG_BRIDGE_VLAN_FILTERING

This enables VLAN filtering. Signed-off-by: Andrew Rynhard <andrew@andrewrynhard.com>
siderolabs · Jan 23, 2020 · e393bff · e393bff
1 parent 1e63ad5
commit e393bff
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 81 deletions.
diff --git a/kernel/config-amd64 b/kernel/config-amd64
@@ -1399,7 +1399,7 @@ CONFIG_L2TP=y
 CONFIG_STP=y
 CONFIG_BRIDGE=y
 CONFIG_BRIDGE_IGMP_SNOOPING=y
-# CONFIG_BRIDGE_VLAN_FILTERING is not set
+CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=y
 # CONFIG_NET_DSA_TAG_8021Q is not set

diff --git a/kernel/pkg.yaml b/kernel/pkg.yaml
@@ -2,90 +2,90 @@ name: kernel
 variant: scratch
 shell: /toolchain/bin/bash
 dependencies:
-    - image: '{{ .TOOLS_IMAGE }}'
+  - image: "{{ .TOOLS_IMAGE }}"
 steps:
-    - sources:
-          - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.11.tar.xz
-            destination: linux.tar.xz
-            sha256: 62bd36e5d5e1d8208750ccddd8e8aa3d109b29b5ac5344b5b1c47d0f6d55d72c
-            sha512: 75aba0e124def6604cc0050ca7b005d1d5398498d71199cb9e196d5739f0fc25664637849025aa7f965d46f9aecb2fafadc7b35dcb83e396dc4d3a084c458497
-      prepare:
-          - |
-              tar -xJf linux.tar.xz --strip-components=1
+  - sources:
+      - url: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.11.tar.xz
+        destination: linux.tar.xz
+        sha256: 62bd36e5d5e1d8208750ccddd8e8aa3d109b29b5ac5344b5b1c47d0f6d55d72c
+        sha512: 75aba0e124def6604cc0050ca7b005d1d5398498d71199cb9e196d5739f0fc25664637849025aa7f965d46f9aecb2fafadc7b35dcb83e396dc4d3a084c458497
+    prepare:
+      - |
+        tar -xJf linux.tar.xz --strip-components=1
 
-              mkdir /bin
-              ln -sv /toolchain/bin/bash /bin/bash
-              ln -sv /toolchain/bin/bash /bin/sh
-              ln -sv /toolchain/lib /lib
-              mkdir -p /usr/bin \
-                  && ln -sf /toolchain/bin/env /usr/bin/env \
-                  && ln -sf /toolchain/bin/true /bin/true \
-                  && ln -sf /toolchain/bin/pwd /bin/pwd
+        mkdir /bin
+        ln -sv /toolchain/bin/bash /bin/bash
+        ln -sv /toolchain/bin/bash /bin/sh
+        ln -sv /toolchain/lib /lib
+        mkdir -p /usr/bin \
+            && ln -sf /toolchain/bin/env /usr/bin/env \
+            && ln -sf /toolchain/bin/true /bin/true \
+            && ln -sf /toolchain/bin/pwd /bin/pwd
 
-              # Ensure that `make menuconfig` works.
+        # Ensure that `make menuconfig` works.
 
-              mkdir -p /usr/lib/pkgconfig
-              ln -s /toolchain/include /usr/include
+        mkdir -p /usr/lib/pkgconfig
+        ln -s /toolchain/include /usr/include
 
-              for lib in ncurses form panel menu ; do
-                  rm -vf                    /lib/lib${lib}.so
-                  echo "INPUT(-l${lib}w)" > /lib/lib${lib}.so
-                  ln -sfv ${lib}w.pc        /lib/pkgconfig/${lib}.pc
-              done
+        for lib in ncurses form panel menu ; do
+            rm -vf                    /lib/lib${lib}.so
+            echo "INPUT(-l${lib}w)" > /lib/lib${lib}.so
+            ln -sfv ${lib}w.pc        /lib/pkgconfig/${lib}.pc
+        done
 
-              case $ARCH in
-                  x86_64)
-                      make mrproper
-                      cp -v /pkg/config-amd64 .config
-                  ;;
-                  aarch64)
-                      export ARCH=arm64
-                      make mrproper
-                      cp -v /pkg/config-arm64 .config
-                  ;;
-                  *)
-                      echo "unsupported arch ${ARCH}"
-                      exit 1
-                  ;;
-              esac
-      build:
-          - |
-              case $ARCH in
-                  x86_64)
-                  ;;
-                  aarch64)
-                      export ARCH=arm64
-                  ;;
-                  *)
-                      echo "unsupported arch ${ARCH}"
-                      exit 1
-                  ;;
-              esac
-              make -j $(nproc)
-              make -j $(nproc) modules
-      install:
-          - |
-              mkdir -p /rootfs/boot
-              case $ARCH in
-                  x86_64)
-                      mv arch/x86/boot/bzImage /rootfs/boot/vmlinuz
-                      mv vmlinux /rootfs/boot/vmlinux
-                  ;;
-                  aarch64)
-                      export ARCH=arm64
-                      mv arch/arm64/boot/Image.gz /rootfs/boot/vmlinuz
-                      mv vmlinux /rootfs/boot/vmlinux
-                  ;;
-                  *)
-                      echo "unsupported arch ${ARCH}"
-                      exit 1
-                  ;;
-              esac
-              export KERNELRELEASE=$(cat include/config/kernel.release)
-              make -j $(nproc) modules_install DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs
-              depmod -b /rootfs $KERNELRELEASE
-              unlink /rootfs/lib/modules/$KERNELRELEASE/build
-              unlink /rootfs/lib/modules/$KERNELRELEASE/source
+        case $ARCH in
+            x86_64)
+                make mrproper
+                cp -v /pkg/config-amd64 .config
+            ;;
+            aarch64)
+                export ARCH=arm64
+                make mrproper
+                cp -v /pkg/config-arm64 .config
+            ;;
+            *)
+                echo "unsupported arch ${ARCH}"
+                exit 1
+            ;;
+        esac
+    build:
+      - |
+        case $ARCH in
+            x86_64)
+            ;;
+            aarch64)
+                export ARCH=arm64
+            ;;
+            *)
+                echo "unsupported arch ${ARCH}"
+                exit 1
+            ;;
+        esac
+        make -j $(nproc)
+        make -j $(nproc) modules
+    install:
+      - |
+        mkdir -p /rootfs/boot
+        case $ARCH in
+            x86_64)
+                mv arch/x86/boot/bzImage /rootfs/boot/vmlinuz
+                mv vmlinux /rootfs/boot/vmlinux
+            ;;
+            aarch64)
+                export ARCH=arm64
+                mv arch/arm64/boot/Image.gz /rootfs/boot/vmlinuz
+                mv vmlinux /rootfs/boot/vmlinux
+            ;;
+            *)
+                echo "unsupported arch ${ARCH}"
+                exit 1
+            ;;
+        esac
+        export KERNELRELEASE=$(cat include/config/kernel.release)
+        make -j $(nproc) modules_install DEPMOD=/toolchain/bin/depmod INSTALL_MOD_PATH=/rootfs
+        depmod -b /rootfs $KERNELRELEASE
+        unlink /rootfs/lib/modules/$KERNELRELEASE/build
+        unlink /rootfs/lib/modules/$KERNELRELEASE/source
 finalize:
-    - from: /rootfs
-      to: /
+  - from: /rootfs
+    to: /