20240408 Merging with jens-maus

.github/release-template.md

@@ -15,5 +15,25 @@ ${CHANGELOG}
 ## :package:  Download:
 The following installation archives can be downloaded for different hardware platforms. To verify their integrity a `sha256` checksum is provided as well.
 
-- Intel NUC:
-<sub>:package: [thinRoot-${VERSION}-intelnuc.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinRoot-${VERSION}-intelnuc.img)<br/>SHA256: XSHAintelnuc.imgX</sub>
+- Generic-x86_64:
+<sub>:package: [thinroot-${VERSION}-generic-x86_64.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-generic-x86_64.img)<br/>SHA256: XSHAgeneric-x86_64.imgX</sub>
+
+- RaspberryPi5 Model B, RaspberryPi Compute Module 5, RaspberryPi 500:
+<sub>:package: [thinroot-${VERSION}-rpi5.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi5.img)<br/>SHA256: XSHArpi5.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-rpi5-kernel.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi5-kernel.img)<br/>SHA256: XSHArpi5-kernel.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-rpi5-sdcard.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi5-sdcard.img)<br/>SHA256: XSHArpi5-sdcard.imgX</sub>
+
+- RaspberryPi4 Model B, RaspberryPi Compute Module 4, RaspberryPi 400:
+<sub>:package: [thinroot-${VERSION}-rpi4.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi4.img)<br/>SHA256: XSHArpi4.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-rpi4-kernel.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi4-kernel.img)<br/>SHA256: XSHArpi4-kernel.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-rpi4-sdcard.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi4-sdcard.img)<br/>SHA256: XSHArpi4-sdcard.imgX</sub>
+
+- RaspberryPi3 Model B+, RaspberryPi3 Model B, RaspberryPi3 Model A+, RaspberryPi Compute Module 3, RaspberryPi Compute Module 3 lite, RaspberryPi Zero 2 W:
+<sub>:package: [thinroot-${VERSION}-rpi3.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi3.img)<br/>SHA256: XSHArpi3.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-rpi3-kernel.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi3-kernel.img)<br/>SHA256: XSHArpi3-kernel.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-rpi3-sdcard.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-rpi3-sdcard.img)<br/>SHA256: XSHArpi3-sdcard.imgX</sub>
+
+- TinkerBoard S, TinkerBoard:
+<sub>:package: [thinroot-${VERSION}-tinkerboard.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-tinkerboard.img)<br/>SHA256: XSHAtinkerboard.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-tinkerboard-kernel.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-tinkerboard-kernel.img)<br/>SHA256: XSHAtinkerboard-kernel.imgX</sub>
+<sub>:package: [thinroot-${VERSION}-tinkerboard-sdcard.img](https://github.com/jens-maus/thinRoot/releases/download/${VERSION}/thinroot-${VERSION}-tinkerboard-sdcard.img)<br/>SHA256: XSHAtinkerboard-sdcard.imgX</sub>

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ permissions:
 jobs:
   skip_check:
     name: Duplicate Check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     outputs:
       should_skip: ${{ steps.check.outputs.should_skip }}
     steps:
@@ -32,14 +32,19 @@ jobs:
     name: Linter Checks
     needs: skip_check
     if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check shell scripts
         uses: ludeeus/action-shellcheck@2.0.0
+        with:
+          ignore_paths: >-
+            buildroot-patches/0010-lib32-integration/buildroot/support/scripts
+        env:
+          SHELLCHECK_OPTS: -e SC3010 -e SC3014 -e SC3057 -e SC3036 -e SC3028 -e SC3020
 
       - name: Check yaml files
         uses: frenck/action-yamllint@v1.5

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
     permissions:
       contents: write  # ncipollo/release-action
     name: Release draft
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       upload_url: ${{ steps.release_drafter.outputs.upload_url }}
       version: ${{ steps.env.outputs.version }}
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -60,7 +60,7 @@ jobs:
 
       - name: Generate changelog
         id: changelog
-        uses: metcalfc/changelog-generator@v4.3.1
+        uses: metcalfc/changelog-generator@v4.6.2
         with:
           myToken: ${{ secrets.GITHUB_TOKEN }}
 
@@ -78,7 +78,7 @@ jobs:
 
       - name: Create release draft
         id: release_drafter
-        uses: ncipollo/release-action@v1.14.0
+        uses: ncipollo/release-action@v1.20.0
         with:
           tag: ${{ steps.env.outputs.tag }}
           name: 'thinRoot ${{ steps.env.outputs.version }}'
@@ -89,7 +89,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Upload release-template.md artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           path: /tmp/release-template.md
           name: release-template.md
@@ -108,11 +108,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [intelnuc]
+        platform: [generic-x86_64, rpi3, rpi4, rpi5, tinkerboard]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Dependencies
         run: |
@@ -148,7 +148,7 @@ jobs:
 
       # - name: remote debug tmate session
       #   uses: mxschmitt/action-tmate@v1
-      #   if: matrix.platform == 'intelnuc'
+      #   if: matrix.platform == 'generic-x86_64'
 
       # major build step
       - name: Build
@@ -159,24 +159,56 @@ jobs:
 
       #######################
       # release uploads
-      - name: Upload release snapshot [intelnuc]
+      - name: Upload release image [generic-x86_64, rpi3, rpi4, rpi5, tinkerboard]
         uses: shogo82148/actions-upload-release-asset@v1
         with:
           upload_url: ${{ needs.release_draft.outputs.upload_url }}
           asset_path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}.img
           asset_content_type: application/octet-stream
 
-      - name: Upload build release checksum [intelnuc]
+      - name: Upload release image checksum [generic-x86_64, rpi3, rpi4, rpi5, tinkerboard]
         uses: shogo82148/actions-upload-release-asset@v1
         with:
           upload_url: ${{ needs.release_draft.outputs.upload_url }}
           asset_path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}.img.sha256
           asset_content_type: text/plain
 
+      - name: Upload release sdcard image [rpi3, rpi4, rpi5, tinkerboard]
+        if: matrix.platform == 'rpi3' || matrix.platform == 'rpi4' || matrix.platform == 'rpi5' || matrix.platform == 'tinkerboard'
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release_draft.outputs.upload_url }}
+          asset_path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}-sdcard.img
+          asset_content_type: application/octet-stream
+
+      - name: Upload release sdcard image checksum [rpi3, rpi4, rpi5, tinkerboard]
+        if: matrix.platform == 'rpi3' || matrix.platform == 'rpi4' || matrix.platform == 'rpi5' || matrix.platform == 'tinkerboard'
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release_draft.outputs.upload_url }}
+          asset_path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}-sdcard.img.sha256
+          asset_content_type: text/plain
+
+      - name: Upload release kernel image [rpi3, rpi4, rpi5, tinkerboard]
+        if: matrix.platform == 'rpi3' || matrix.platform == 'rpi4' || matrix.platform == 'rpi5' || matrix.platform == 'tinkerboard'
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release_draft.outputs.upload_url }}
+          asset_path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}-kernel.img
+          asset_content_type: application/octet-stream
+
+      - name: Upload release kernel image checksum [rpi3, rpi4, rpi5, tinkerboard]
+        if: matrix.platform == 'rpi3' || matrix.platform == 'rpi4' || matrix.platform == 'rpi5' || matrix.platform == 'tinkerboard'
+        uses: shogo82148/actions-upload-release-asset@v1
+        with:
+          upload_url: ${{ needs.release_draft.outputs.upload_url }}
+          asset_path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}-kernel.img.sha256
+          asset_content_type: text/plain
+
       #######################
       # manifest file artifact upload
       - name: Upload manifest artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           path: release/thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}.mf
           name: thinroot-${{ needs.release_draft.outputs.version }}-${{ matrix.platform }}.mf
@@ -193,29 +225,29 @@ jobs:
     permissions:
       contents: write  # ncipollo/release-action
     name: Update checksums
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [release_draft, build]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
 
       # download all artifact files
       - name: Download all workflow artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
 
       - name: Patch release draft
         shell: bash
         run: |
           for f in */*.mf; do
             while read -r line; do
-              NEEDLE=$(echo "${line}" | awk '{print $3}' | sed 's/.*-\(.*\..*\)$/\1/')
+              NEEDLE=$(echo "${line}" | awk '{print $3}' | cut -d'-' -f3-)
               SHACKS=$(echo "${line}" | awk '{print $2}')
               sed -i "s/XSHA${NEEDLE}X/${SHACKS}/" release-template.md/release-template.md
             done < <(cat ${f})
           done
 
       - name: Update release draft
-        uses: ncipollo/release-action@v1.14.0
+        uses: ncipollo/release-action@v1.20.0
         with:
           tag: ${{ needs.release_draft.outputs.tag }}
           bodyFile: release-template.md/release-template.md

.github/workflows/snapshot.yml

@@ -5,7 +5,7 @@ name: Snapshot Build
 
 on:
   schedule:
-    - cron: '0 0 * * *'  # run at 0 AM UTC
+    - cron: '0 5 * * *'  # run at 5:00 AM UTC
   workflow_dispatch:
     inputs:
       skip_build:
@@ -20,9 +20,9 @@ permissions:
 jobs:
   repo-check:
     name: Check for Changes
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - id: commit-check
         run: echo "has-commits=$(git --no-pager log --pretty='format:%an' --since='24 hours ago' | grep -v github-actions | wc -l)" >> $GITHUB_OUTPUT
     outputs:
@@ -43,11 +43,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform: [intelnuc]
+        platform: [generic-x86_64, rpi3, rpi4, rpi5, tinkerboard]
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Dependencies
         run: |
@@ -103,11 +103,11 @@ jobs:
 
       ########################
       # upload build artifacts
-      - name: Upload build artifact [intelnuc]
-        uses: actions/upload-artifact@v4
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v6
         with:
-          path: release/thinroot-${{ env.VERSION }}-${{ matrix.platform }}.img*
-          name: thinroot-${{ env.VERSION }}-${{ env.GITHUB_SHA7 }}-${{ matrix.platform }}.img
+          path: release/thinroot-${{ env.VERSION }}-${{ matrix.platform }}*
+          name: thinroot-${{ env.VERSION }}-${{ env.GITHUB_SHA7 }}-${{ matrix.platform }}
         continue-on-error: true
 
       # cleanup
@@ -122,7 +122,7 @@ jobs:
       packages: write  # smartsquaregmbh/delete-old-packages
       actions: write  # c-hive/gha-remove-artifacts
     name: Cleanup artifacts/packages
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Remove old artifacts
         uses: c-hive/gha-remove-artifacts@v1.4.0

Makefile

@@ -1,5 +1,5 @@
-BUILDROOT_VERSION=2024.02.1
-BUILDROOT_SHA256=4c9f3a3bc19462a9bf838d7f37996c49c68a63af9f9e6c254ee76e0e02cd8194
+BUILDROOT_VERSION=2025.11.1
+BUILDROOT_SHA256=234b2e9bfad26d38dcca297daf9d7c0055826d98730c3f1da5515ba8e3ad7ca6
 BUILDROOT_EXTERNAL=buildroot-external
 DEFCONFIG_DIR=$(BUILDROOT_EXTERNAL)/configs
 DATE=$(shell date +%Y%m%d)
@@ -29,7 +29,7 @@ buildroot-$(BUILDROOT_VERSION).tar.gz: $(BR2_DL_DIR)
 
 buildroot-$(BUILDROOT_VERSION): | buildroot-$(BUILDROOT_VERSION).tar.gz
 	@echo "[patching buildroot-$(BUILDROOT_VERSION)]"
-	if [ ! -d $@ ]; then tar xf buildroot-$(BUILDROOT_VERSION).tar.gz; for p in $(sort $(wildcard buildroot-patches/*.patch)); do echo "\nApplying $${p}"; patch -d buildroot-$(BUILDROOT_VERSION) --remove-empty-files -p1 < $${p} || exit 127; [ ! -x $${p%.*}.sh ] || $${p%.*}.sh buildroot-$(BUILDROOT_VERSION); done; fi
+	if [ ! -d $@ ]; then tar xf buildroot-$(BUILDROOT_VERSION).tar.gz; for p in $(sort $(wildcard buildroot-patches/*.patch)); do echo "\nApplying $${p}"; patch -d buildroot-$(BUILDROOT_VERSION) --remove-empty-files --no-backup-if-mismatch -p1 < $${p} || exit 127; [ ! -x $${p%.*}.sh ] || $${p%.*}.sh buildroot-$(BUILDROOT_VERSION); done; fi
 
 build-$(PRODUCT): | buildroot-$(BUILDROOT_VERSION)
 	mkdir $(shell pwd)/build-$(PRODUCT)
@@ -70,7 +70,7 @@ $(addsuffix -release, $(PRODUCTS)): %:
 
 release: build
 	@echo "[creating release: $(PRODUCT)]"
-	$(eval BOARD_DIR := $(BUILDROOT_EXTERNAL)/board/$(shell echo $(PRODUCT) | cut -d'_' -f2))
+	$(eval BOARD_DIR := $(BUILDROOT_EXTERNAL)/board/$(PRODUCT))
 	if [ -x $(BOARD_DIR)/post-release.sh ]; then $(BOARD_DIR)/post-release.sh $(BOARD_DIR) ${PRODUCT} ${PRODUCT_VERSION}; fi
 
 check-all: $(addsuffix -check, $(PRODUCTS))
@@ -79,7 +79,7 @@ $(addsuffix -check, $(PRODUCTS)): %:
 
 check: buildroot-$(BUILDROOT_VERSION) build-$(PRODUCT)/.config
 	@echo "[checking: $(PRODUCT)]"
-	$(eval BOARD_DIR := $(BUILDROOT_EXTERNAL)/board/$(shell echo $(PRODUCT) | cut -d'_' -f2))
+	$(eval BOARD_DIR := $(BUILDROOT_EXTERNAL)/board/$(PRODUCT))
 	@echo "[checking status: $(BUILDROOT_EXTERNAL)]"
 	buildroot-$(BUILDROOT_VERSION)/utils/check-package --exclude PackageHeader --br2-external $(BUILDROOT_EXTERNAL)/package/*/*
 
@@ -113,6 +113,14 @@ savedefconfig: buildroot-$(BUILDROOT_VERSION) build-$(PRODUCT)
 toolchain: buildroot-$(BUILDROOT_VERSION) build-$(PRODUCT)/.config
 	cd $(shell pwd)/build-$(PRODUCT) && $(MAKE) O=$(shell pwd)/build-$(PRODUCT) -C ../buildroot-$(BUILDROOT_VERSION) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) BR2_DL_DIR=$(BR2_DL_DIR) BR2_CCACHE_DIR=$(BR2_CCACHE_DIR) BR2_JLEVEL=$(BR2_JLEVEL) PRODUCT=$(PRODUCT) PRODUCT_VERSION=$(PRODUCT_VERSION) toolchain
 
+.PHONY: multilib32-menuconfig
+multilib32-menuconfig: buildroot-$(BUILDROOT_VERSION) build-$(PRODUCT)/.config
+	cd $(shell pwd)/build-$(PRODUCT)/build/multilib32-*/output && $(MAKE) BR2_EXTERNAL_THINROOT_PATH=$(shell pwd)/$(BUILDROOT_EXTERNAL) menuconfig
+
+.PHONY: multilib32-savedefconfig
+multilib32-savedefconfig: buildroot-$(BUILDROOT_VERSION) build-$(PRODUCT)/.config
+	cd $(shell pwd)/build-$(PRODUCT)/build/multilib32-*/output && $(MAKE) BR2_EXTERNAL_THINROOT_PATH=$(shell pwd)/$(BUILDROOT_EXTERNAL) savedefconfig
+
 .PHONY: linux-check-dotconfig
 linux-check-dotconfig: buildroot-$(BUILDROOT_VERSION) build-$(PRODUCT)
 	cd $(shell pwd)/build-$(PRODUCT) && $(MAKE) O=$(shell pwd)/build-$(PRODUCT) -C ../buildroot-$(BUILDROOT_VERSION) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) BR2_DL_DIR=$(BR2_DL_DIR) BR2_CCACHE_DIR=$(BR2_CCACHE_DIR) BR2_JLEVEL=$(BR2_JLEVEL) PRODUCT=$(PRODUCT) PRODUCT_VERSION=$(PRODUCT_VERSION) linux-check-dotconfig BR2_DEFCONFIG=../$(DEFCONFIG_DIR)/$(PRODUCT).config BR2_CHECK_DOTCONFIG_OPTS="--github-format --strip-path-prefix=$(PWD)/"
@@ -156,6 +164,8 @@ help:
 	@echo "  $(MAKE) PRODUCT=<product> busybox-update-config: update busybox defconfig file"
 	@echo "  $(MAKE) PRODUCT=<product> uboot-menuconfig: change u-boot config options"
 	@echo "  $(MAKE) PRODUCT=<product> uboot-update-defconfig: update u-boot defconfig file"
+	@echo "  $(MAKE) PRODUCT=<product> multilib32-menuconfig: change config options for multilib32 build environment"
+	@echo "  $(MAKE) PRODUCT=<product> multilib32-savedefconfig: update defconfig file for multilib32 build environment"
 	@echo
 	@echo "  $(MAKE) PRODUCT=<product> legal-info: update legal information file"
 	@echo