[pull] main from u-root:main

.circleci/images/kernel-amd64/config_linux.txt

@@ -90,6 +90,27 @@ CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
 CONFIG_ETHERNET=y
 CONFIG_E1000=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_NETLINK_DIAG=y
+
+# Network shaping
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
 
 # 9P net filesystem
 CONFIG_NET_9P=y

.circleci/images/kernel-arm/config_linux.txt

@@ -104,6 +104,27 @@ CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
 CONFIG_ETHERNET=y
 CONFIG_E1000=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_NETLINK_DIAG=y
+
+# Network shaping
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
 
 # GPIO test - mock GPIO libraries
 CONFIG_GPIOLIB=y

.circleci/images/kernel-arm64/config_linux.txt

@@ -98,6 +98,27 @@ CONFIG_NET_CORE=y
 CONFIG_NETDEVICES=y
 CONFIG_ETHERNET=y
 CONFIG_E1000=y
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_CFM=y
+CONFIG_BRIDGE_MRP=y
+CONFIG_NETLINK_DIAG=y
+
+# Network shaping
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_NETFILTER_NETLINK=y
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_HTB=y
+CONFIG_NET_SCH_HFSC=y
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_SCH_CHOKE=y
+CONFIG_NET_SCH_QFQ=y
+CONFIG_NET_SCH_CODEL=y
+CONFIG_NET_SCH_FQ_CODEL=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=y
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_GACT=y
 
 # GPIO test - mock GPIO libraries
 CONFIG_GPIOLIB=y

.github/workflows/codeql-analysis.yml

@@ -25,35 +25,35 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
         # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
-        
+
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-        
+
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
 
-    #   If the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
     #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
 
     # - run: |
     #   echo "Run, Build Application using script"
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/go.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.22.x'
     - name: Check vendored dependencies
@@ -39,7 +39,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.22.x'
 
@@ -59,7 +59,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.22.x'
 
@@ -75,3 +75,23 @@ jobs:
       run: |
         echo buildfail got ${{ steps.buildfail.outcome }} and should get failure
         bash -c "if [[ ${{ steps.buildfail.outcome }} == failure ]]; then exit 0; else exit 1; fi"
+
+  multi-os-arch:
+    strategy:
+      matrix:
+        os: [linux, freebsd]
+        arch: [amd64, arm, arm64, riscv64]
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: "1.22.x"
+
+    - name: Build
+      run: |
+        go build .
+        GOOS=${{ matrix.os }} GOARCH=${{ matrix.arch }}  ./u-root

.github/workflows/golangci-lint.yml

@@ -16,12 +16,13 @@ jobs:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
           cache: false
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.56.1
+          version: v1.60.3
+          args: --out-format=line-number --timeout=5m

.github/workflows/homepage.yml

@@ -21,3 +21,4 @@ jobs:
         with:
           publish_dir: ./docs/dist
           github_token: ${{ secrets.GITHUB_TOKEN }}
+          cname: u-root.org

.github/workflows/test-images.yml

@@ -41,26 +41,26 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository }}/test-${{ matrix.image }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: ./.circleci/images/${{ matrix.image }}
           # Build for PRs, only push for main.

.github/workflows/tests.yml

@@ -16,31 +16,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ '1.21.x', '1.22.x' ]
+        go-version: ['1.22.x' ]
         vmarch: [ 'amd64', 'arm', 'arm64' ]
         pattern: [ 'integration/generic-tests/...', 'integration/gotests/...' ]
         include:
           # Only run these with VM arch amd64 for now.
-          - go-version: '1.21.x'
-            vmarch: 'amd64'
-            pattern: 'cmds/...'
           - go-version: '1.22.x'
             vmarch: 'amd64'
             pattern: 'cmds/...'
 
-          - go-version: '1.21.x'
-            vmarch: 'amd64'
-            pattern: 'pkg/...'
-            extra-arg: '-coverpkg=./pkg/...'
           - go-version: '1.22.x'
             vmarch: 'amd64'
             pattern: 'pkg/...'
             extra-arg: '-coverpkg=./pkg/...'
 
           # Root dir tests
-          - go-version: '1.21.x'
-            vmarch: 'amd64'
-            pattern: '.'
           - go-version: '1.22.x'
             vmarch: 'amd64'
             pattern: '.'
@@ -58,7 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup Go ${{ matrix.go-version }}
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ matrix.go-version }}
 
@@ -76,7 +66,7 @@ jobs:
       - name: Convert GOCOVERDIR coverage data
         run: go tool covdata textfmt -i=gocov -o vmintcoverage.txt
 
-      - uses: codecov/codecov-action@v4-beta
+      - uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: '0ecf29bb-15fb-46f2-8c7d-0fb610d79f71'
         with:

.gitignore

@@ -41,6 +41,7 @@ initramfs.cpio
 bzImage
 vmlinux
 *.patch
+.gdb_history
 
 # Python Virtual Env
 *.env

.golangci.yml

@@ -1,8 +1,3 @@
-run:
-  skip-dirs:
-    - pkg/uroot/test
-    - cmds/core/elvish
-
 linters:
   disable-all: true
   enable:
@@ -18,6 +13,8 @@ linters-settings:
     checks: ["all", "-ST1003"]
 
 issues:
+  exclude-dirs:
+    - pkg/uroot/test
   exclude-rules:
     - linters: revive
       text: "don't use underscores"

.vmtest.yaml

@@ -6,19 +6,19 @@ amd64:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-amd64@sha256:10ea580ef29468f6d6f4674279586d37e118b145564fd1e99b708370262961a4"
+    container: "ghcr.io/u-root/u-root/test-kernel-amd64@sha256:0b4f399fd61f2f5e060c86216150ec12439851101921337add61402c185e8007"
     template: "{{.bzImage}}"
     files:
       bzImage: "/bzImage"
 
   UROOT_MULTIBOOT_TEST_KERNEL_DIR:
-    container: "ghcr.io/u-root/u-root/test-multiboot-test-kernel-amd64@sha256:0fba729eddd76a50f5cfdfdabc4389d6a6902486b1190d354813ae953cc94b52"
+    container: "ghcr.io/u-root/u-root/test-multiboot-test-kernel-amd64@sha256:4439ae6289f5ccb5fa193556de8d639900c1a4c6f57c8d1d6015f5ea49b5d9f9"
     template: "{{.mbdir}}"
     directories:
       mbdir: "/mb"
 
   UROOT_TEST_UEFIPAYLOAD:
-    container: "ghcr.io/u-root/u-root/test-uefipayload-amd64@sha256:4a9a47cdce32fb6dd7610f6de9f55d64b5dc380cf95bc23561696bb48e34622a"
+    container: "ghcr.io/u-root/u-root/test-uefipayload-amd64@sha256:0c8eb1b8a20b1ab3748b830eef76634711586f18ff0accf7ba98015fa86383ff"
     template: "{{.payload}}"
     files:
       payload: "/UEFIPAYLOAD.fd"
@@ -31,7 +31,7 @@ arm:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-arm@sha256:d185d93812738b2869f4835d5a209fcf25ffdea4fd6601fcd206dfad67c9bced"
+    container: "ghcr.io/u-root/u-root/test-kernel-arm@sha256:0429fa0ab8dbc4d1913f1c2b8ccc45fa8000897c801ed90b90c14a15e1f32020"
     template: "{{.zImage}}"
     files:
       zImage: "/zImage"
@@ -44,7 +44,7 @@ arm64:
       qemu: "/zqemu"
 
   VMTEST_KERNEL:
-    container: "ghcr.io/u-root/u-root/test-kernel-arm64@sha256:805d64653b654ddf96e307cd3d7e835e5e9b9fd67d1b7e79b73cfa8ea2ce86e4"
+    container: "ghcr.io/u-root/u-root/test-kernel-arm64@sha256:e48f32266071edaec44445da98375fe512b1532640e256f9f7138633e0000866"
     template: "{{.Image}}"
     files:
       Image: "/Image"

README.md

@@ -522,3 +522,9 @@ Improving existing commands (e.g., additional currently unsupported flags) is
 very welcome. In this case it is not even required to build an initramfs, just
 enter the `cmds/` directory and start coding. A list of commands that are on the
 roadmap can be found [here](roadmap.md).
+
+## Website
+
+The sources of [u-root.org](https://u-root.org) are inside the `docs/` directory and
+are deployed to the gh-pages branch. The CNAME file is currently not part of the CI
+which deploys to the branch which shall be evaluated if this makes futures deployments easier.