Merge pull request #1476 from kernelkit/misc

troglobit · web-flow · commit 091618c5271e · 2026-04-22T16:27:47.000+02:00
Fix two regressions and add developer build helpers
diff --git a/.github/workflows/bitsign.yml b/.github/workflows/bitsign.yml
@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     - name: Validate release version format
       id: validate
@@ -170,7 +170,7 @@ jobs:
         fi
 
     - name: Upload signed artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: signed-infix-${{ steps.validate.outputs.file_version }}
         path: ${{ steps.download_signed.outputs.signed_filename }}
@@ -212,4 +212,4 @@ jobs:
         ---
 
         **Next Steps:** The signed release can now be distributed with cryptographic verification of authenticity.
-        EOF
+        EOF
diff --git a/.github/workflows/build-boot.yml b/.github/workflows/build-boot.yml
@@ -41,7 +41,7 @@ jobs:
           ls -la ./
 
       - name: Checkout infix repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }}
           clean: true
@@ -96,7 +96,7 @@ jobs:
           mv images ${{ steps.vars.outputs.dirname }}
           tar cfz ${{ steps.vars.outputs.archive }} ${{ steps.vars.outputs.dirname }}/
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           path: output/${{ steps.vars.outputs.archive }}
           name: artifact-${{ matrix.defconfig }}
@@ -108,7 +108,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         with:
           pattern: "artifact-*"
           merge-multiple: true
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           clean: true
           fetch-depth: 0
@@ -277,7 +277,7 @@ jobs:
           fi
 
       - name: Upload images as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: images-${{ inputs.board }}
           path: |
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -23,7 +23,7 @@ jobs:
         target: [aarch64, arm, x86_64]
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           clean: true
           submodules: recursive
@@ -86,12 +86,12 @@ jobs:
           ln -s ${{ steps.vars.outputs.dir }} images
           tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: artifact-${{ matrix.target }}
           path: output/*.tar.gz
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: artifact-disk-image-${{ matrix.target }}
           path: output/images/*.qcow2
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,7 +80,7 @@ jobs:
           ls -la ./
 
       - name: Checkout infix repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ${{ env.INFIX_REPO }}
           ref: ${{ env.INFIX_BRANCH != '' && env.INFIX_BRANCH || github.ref }}
@@ -178,7 +178,7 @@ jobs:
           ln -s ${{ steps.vars.outputs.dir }} images
           tar cfz ${{ steps.vars.outputs.tgz }} ${{ steps.vars.outputs.dir }}
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           path: output/${{ steps.vars.outputs.tgz }}
           name: artifact-${{ env.TARGET }}
diff --git a/.github/workflows/check-kernel-release.yml b/.github/workflows/check-kernel-release.yml
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Check out infix repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
           token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
@@ -103,7 +103,7 @@ jobs:
 
       - name: Create pull request
         if: steps.check.outputs.new_release == 'true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{ secrets.KERNEL_UPDATE_TOKEN }}
           script: |
diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml
@@ -16,7 +16,7 @@ jobs:
     if: ${{github.repository_owner == 'kernelkit'}}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Fetch latest Coverity Scan MD5
         id: var
         env:
@@ -27,7 +27,7 @@ jobs:
                -O coverity-latest.tar.gz.md5
           echo "md5=$(cat coverity-latest.tar.gz.md5)" | tee -a $GITHUB_OUTPUT
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v5
         id: cache
         with:
           path: coverity-latest.tar.gz
@@ -98,7 +98,7 @@ jobs:
             https://scan.coverity.com/builds?project=${PROJECT_NAME}
 
       - name: Upload build.log
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: coverity-build.log
           path: cov-int/build-log.txt
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -24,12 +24,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 
diff --git a/.github/workflows/generic-x86-build.yml b/.github/workflows/generic-x86-build.yml
@@ -33,7 +33,7 @@ jobs:
             mtools
 
       - name: Checkout infix repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ${{ github.repository }}
           ref: ${{ github.ref }}
@@ -77,7 +77,7 @@ jobs:
           ln -s Infix-x86_64 images
           tar cfz Infix-x86_64.tar.gz Infix-x86_64
 
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           path: output/Infix-x86_64.tar.gz
           name: artifact-x86_64
diff --git a/.github/workflows/inventory.yml b/.github/workflows/inventory.yml
@@ -44,7 +44,7 @@ jobs:
   checkout:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: kernelkit/actions/cache-restore@v1
         with:
           target: x86_64
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
       contents: write
       discussions: write
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: 'true'
 
@@ -78,7 +78,7 @@ jobs:
           echo "pre=${{ steps.rel.outputs.pre }}"
           echo "latest=${{ steps.rel.outputs.latest }}"
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         with:
           pattern: "artifact-*"
           merge-multiple: true
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,7 +61,7 @@ jobs:
     runs-on: [self-hosted, regression]
     steps:
       - name: Checkout infix repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ${{ env.INFIX_REPO }}
           ref: ${{ env.INFIX_BRANCH != '' && env.INFIX_BRANCH || github.ref }}
@@ -93,7 +93,7 @@ jobs:
         run: |
           make ${{ env.TARGET }}_defconfig
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v7
         with:
           pattern: "artifact-*"
           merge-multiple: true
@@ -131,7 +131,7 @@ jobs:
           make test-dir="$(pwd)/$TEST_PATH" test-report
 
       - name: Upload Test Report as Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: test-report
           path: output/images/test-report.pdf
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -78,7 +78,7 @@ jobs:
           ls -la ./
 
       - name: Checkout infix repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           repository: ${{ env.INFIX_REPO }}
           ref: ${{ env.INFIX_BRANCH != '' && env.INFIX_BRANCH || github.ref }}
diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml
@@ -22,7 +22,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           pattern: "artifact-*"
           merge-multiple: true
diff --git a/Makefile b/Makefile
@@ -9,8 +9,10 @@ O    ?= output
 # otherwise treat it as relative to ./buildroot.
 override O := $(if $(filter /%,$O),$O,$(CURDIR)/$O)
 
-config := $(O)/.config
-bmake   = $(MAKE) -C buildroot O=$(O) $1
+config      := $(O)/.config
+bmake        = $(MAKE) -C buildroot O=$(O) $1
+SNIPPETS_DIR := $(CURDIR)/configs/snippets
+MERGE_CONFIG := $(CURDIR)/buildroot/support/kconfig/merge_config.sh
 
 
 all: $(config) buildroot/Makefile
@@ -26,6 +28,23 @@ $(config):
 	@echo "'make <board>_defconfig' before building an image."
 	@exit 1
 
+apply-%: $(SNIPPETS_DIR)/%.conf | $(config)
+	@KCONFIG_CONFIG=$(config) $(MERGE_CONFIG) -m $(config) $<
+	@+$(call bmake,olddefconfig)
+	@echo "Applied snippet: $<"
+
+list-snippets:
+	@echo "Available snippets (use 'make apply-<name>'):"
+	@ls $(SNIPPETS_DIR)/*.conf 2>/dev/null | sed 's|.*/||; s|\.conf$$||; s|^|  |'
+
+dev: | $(config)
+	@for s in $(SNIPPETS_DIR)/*.conf; do \
+		KCONFIG_CONFIG=$(config) $(MERGE_CONFIG) -m $(config) $$s; \
+		echo "Applied snippet: $$s"; \
+	done
+	@+$(call bmake,olddefconfig)
+	@+$(call bmake,all)
+
 %: | buildroot/Makefile
 	@+$(call bmake,$@)
 
@@ -44,4 +63,4 @@ test:
 buildroot/Makefile:
 	@git submodule update --init
 
-.PHONY: all check coverity dep test cyclonedx
+.PHONY: all check coverity dep test cyclonedx list-snippets dev
diff --git a/configs/snippets/dev.conf b/configs/snippets/dev.conf
@@ -0,0 +1 @@
+BR2_TARGET_ENABLE_ROOT_LOGIN=y
diff --git a/configs/snippets/ext4.conf b/configs/snippets/ext4.conf
@@ -0,0 +1,3 @@
+BR2_TARGET_ROOTFS_EXT2=y
+BR2_TARGET_ROOTFS_EXT2_4=y
+BR2_TARGET_ROOTFS_EXT2_SIZE="512M"
diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md
@@ -15,7 +15,10 @@ All notable changes to the project are documented in this file.
 
 ### Fixes
 
-- N/A
+- Fix #1458: `show ntp tracking` displaying a truncated Reference ID, e.g.,
+  `92.2` instead of `92.246.137.39`
+- Fix #1466: `show container` showing no output for containers whose command
+  line includes environment variables
 
 [BPI-R4]: https://docs.banana-pi.org/en/BPI-R4/BananaPi_BPI-R4
 
diff --git a/doc/developers-guide.md b/doc/developers-guide.md
@@ -7,12 +7,12 @@ account, which is created based on credentials found in the VPD area --
 for Qemu devices this is emulated using `qemu_fw_cfg`.
 
 For developers this can be quite frustrating to be blocked from logging
-in to debug the system.  So we recommend enabling the `root` account in
-the Buildroot `make menuconfig` system.
+in to debug the system.  The quickest way to enable root login is to
+apply the `dev` configuration snippet:
 
-    make menuconfig
-         -> System configuration
-            -> [*]Enable root login with password
+    make apply-dev
+
+See [Configuration Snippets](#configuration-snippets) for more details.
 
 > [!IMPORTANT]
 > Please see the [Contributing](#contributing) section, below, for
@@ -166,6 +166,36 @@ on Buildroot to finalize the target filesystem and generate the images.
 The final `run` argument is explained below.
 
 
+### Configuration Snippets
+
+Infix ships a set of Kconfig fragments in `configs/snippets/` that can
+be merged into your active `.config` on demand.  This avoids polluting
+defconfigs with settings that are only useful during development.
+
+To see what snippets are available:
+
+    make list-snippets
+
+To apply a single snippet to the current output directory:
+
+    make apply-dev          # enable root login
+    make apply-ext4         # build an ext4 rootfs (needed for boards
+                            # whose bootloader lacks squashfs support,
+                            # e.g. Marvell ESPRESSObin)
+
+The `apply-*` targets require an existing `.config` (i.e. you must have
+already run a `make <board>_defconfig`).  The snippet is merged using
+Buildroot's `merge_config.sh`, so it behaves like `make menuconfig`:
+unrelated settings are preserved, conflicting ones are overridden.
+
+To apply **all** snippets at once and then build:
+
+    make dev
+
+This is the recommended one-shot command for setting up a development
+build from a freshly selected defconfig.
+
+
 ### YANG Model
 
 When making changes to the `confd` and `statd` services, you will often
diff --git a/doc/img/windows-ipv6-ping-reply.png b/doc/img/windows-ipv6-ping-reply.png
diff --git a/src/confd/yang/confd/infix-containers.yang b/src/confd/yang/confd/infix-containers.yang
diff --git a/src/confd/yang/confd/infix-containers@2026-04-20.yang b/src/confd/yang/confd/infix-containers@2026-04-20.yang
diff --git a/src/confd/yang/containers.inc b/src/confd/yang/containers.inc
diff --git a/src/statd/python/yanger/ietf_ntp.py b/src/statd/python/yanger/ietf_ntp.py
diff --git a/src/statd/python/yanger/infix_containers.py b/src/statd/python/yanger/infix_containers.py
diff --git a/test/case/repo/defconfig.sh b/test/case/repo/defconfig.sh
diff --git a/test/case/statd/containers/infix-containers.json b/test/case/statd/containers/infix-containers.json
diff --git a/test/case/statd/containers/operational.json b/test/case/statd/containers/operational.json
