Merge branch 'renovate/f40-all' into 'f40'

chore(deps): update pre-commit hook pre-commit/pre-commit-hooks to v4.6.0 (f40)

See merge request fedora/bootc/base-images!30

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace

Containerfile

@@ -23,7 +23,7 @@
 # Because it's generating a base image and uses containerbuildcontextization features itself.
 # In the future some of this can be lifted.
 
-FROM quay.io/fedora/fedora:rawhide as repos
+FROM quay.io/fedora/fedora:40 as repos
 
 FROM quay.io/centos-bootc/bootc-image-builder:latest as builder
 ARG MANIFEST=fedora-bootc.yaml

fedora-bootc-config.json

@@ -3,7 +3,7 @@
         "containers.bootc": "1",
         "bootc.diskimage-builder": "quay.io/centos-bootc/bootc-image-builder",
         "redhat.id": "fedora",
-        "redhat.version-id": "rawhide"
+        "redhat.version-id": "40"
     },
     "StopSignal": "SIGRTMIN+3",
     "Env": [

fedora-bootc.yaml

@@ -1,12 +1,15 @@
-releasever: rawhide
+releasever: 40
+variables:
+  distro: "fedora"
+
 repos:
-  - rawhide
+  - fedora
+  - updates
 
 metadata:
   name: fedora-boot-tier1
   summary: Fedora Bootable Tier 1
 
 include:
-  - fedora-generic.yaml
   - tier-1/manifest.yaml
   - tier-1/kernel.yaml

fedora-generic.yaml

@@ -1,7 +0,0 @@
-variables:
-  distro: "fedora"
-
-# Fedora-specific packages here
-packages:
-  # https://gitlab.com/fedora/bootc/base-images/-/issues/12
-  - fedora-repos-archive

fedora-tier-0.yaml

@@ -1,12 +1,15 @@
-releasever: rawhide
+releasever: 40
+variables:
+  distro: "fedora"
+
 repos:
-  - rawhide
+  - fedora-devel
+  - fedora-updates
 
 metadata:
   name: fedora-boot-tier0
   summary: Fedora Bootable Tier 0
 
 include:
-  - fedora-generic.yaml
   - tier-0/manifest.yaml
   - tier-0/kernel.yaml

renovate.json

@@ -3,12 +3,10 @@
   "extends": [
     "github>platform-engineering-org/.github"
   ],
-  "baseBranches": ["main", "f40"],
   "packageRules": [
     {
       "matchPackageNames": ["quay.io/fedora/fedora"],
-      "allowedVersions": "=40",
+      "allowedVersions": "=40"
-      "matchBaseBranches": ["f40"]
     }
   ]
 }

tier-0/manifest.yaml

@@ -50,7 +50,6 @@ remove-from-packages:
 
 include:
   - bootc.yaml
-  - bootupd.yaml
   - ostree.yaml
   - initramfs.yaml
   - autoupdates.yaml
@@ -66,3 +65,8 @@ packages:
   - container-selinux
   # Needed for tpm2 bound luks
   - tpm2-tools
+
+# See https://github.com/coreos/bootupd
+arch-include:
+  x86_64: bootupd.yaml
+  aarch64: bootupd.yaml

tier-1/bootc-generic-growpart

@@ -3,18 +3,15 @@ set -eu
 
 backing_device=$(findmnt -vno SOURCE /sysroot)
 echo "Backing device: ${backing_device}"
-
-# Handling devicemapper targets is a whole other thing
-case $backing_device in
-    /dev/mapper/*) echo "Not growing $backing_device"; exit 0 ;;
-esac
-
 syspath=/sys/class/block/$(basename "${backing_device}")
 if ! test -d "${syspath}"; then
     echo "failed to find backing device ${syspath}"; exit 1
 fi
 
-
+# Handling devicemapper targets is a whole other thing
+case $backing_device in
+    /dev/mapper/*) "Not growing $backing_device"; exit 0 ;;
+esac
 
 # Note that we expect that the rootfs is on a partition
 partition=$(cat "${syspath}"/partition)