From 3d9cd16f820df2fe268931157d2c3447d5bc7094 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 12 Aug 2026 10:17:54 -0400 Subject: [PATCH 1/2] Bump rawhide to Fedora 46 --- fedora-iot.conf | 18 +++++++++--------- nightly.sh | 6 +++--- sync-bootc-base-containers.sh | 4 ++-- sync-release.sh | 8 ++++---- twoweek-nightly.sh | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index fe7c0d3..a3a3c10 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -1,7 +1,7 @@ # PRODUCT INFO release_name = 'Fedora-IoT' release_short = 'Fedora-IoT' -release_version = '45' +release_version = '46' # Let's not build install media during this run. For the image builds # and OSTree installer we'll use inputs from other f45 runs. skip_phases = ["buildinstall", "createrepo", "extra_files"] @@ -11,11 +11,11 @@ comps_file = { 'scm': 'git', 'repo': 'https://forge.fedoraproject.org/releng/fedora-comps.git', 'branch': 'main', - 'file': 'comps-f45.xml', - 'command': 'make comps-f45.xml' + 'file': 'comps-f46.xml', + 'command': 'make comps-f46.xml' } variants_file='variants-fedora.xml' -sigkeys = ['F577861E'] +sigkeys = ['91211FCE'] # limit tree architectures # if undefined, all architectures from variants.xml will be included @@ -27,7 +27,7 @@ hashed_directories = True # RUNROOT settings runroot_channel = 'compose' -runroot_tag = 'f45-build' +runroot_tag = 'f46-build' # PKGSET pkgset_source = 'koji' # koji, repos @@ -37,7 +37,7 @@ pkgset_source = 'koji' # koji, repos # pkgset_repos = {} # PKGSET - KOJI -pkgset_koji_tag = 'f45-iot' +pkgset_koji_tag = 'f46-iot' pkgset_koji_inherit = False filter_system_release_packages = False @@ -204,10 +204,10 @@ translate_paths = [ # These may be inherited by various phases for creating Koji tasks global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' -global_version = '45' -global_target = 'f45' +global_version = '46' +global_target = 'f46' -imagebuilder_target = 'f45-image-builder' +imagebuilder_target = 'f46-image-builder' imagebuilder = { "^IoT$": [ { diff --git a/nightly.sh b/nightly.sh index 4859e4b..fa8dfcb 100755 --- a/nightly.sh +++ b/nightly.sh @@ -9,9 +9,9 @@ SKIP_PHASES="--skip-phase=productimg" DEST=$(pwd) DATE=$(date "+%Y%m%d") SHORT="Fedora-IoT" -RELEASE="45" -RELEASE_TITLE="45" -COMPSFILE="comps-f45.xml" +RELEASE="46" +RELEASE_TITLE="46" +COMPSFILE="comps-f46.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " diff --git a/sync-bootc-base-containers.sh b/sync-bootc-base-containers.sh index 06ad1fc..ebab8ee 100755 --- a/sync-bootc-base-containers.sh +++ b/sync-bootc-base-containers.sh @@ -47,9 +47,9 @@ arch_to_goarch() { # This is the release of Fedora that is currently stable, it will define if we # need to move the fedora:latest tag -current_stable="43" +current_stable="44" # Define what is rawhide so we know to push that tag -current_rawhide="45" +current_rawhide="46" # Sanity checking if ! [[ "${1}" =~ ^-?[0-9]+$ ]]; then diff --git a/sync-release.sh b/sync-release.sh index 391d130..5badf8c 100755 --- a/sync-release.sh +++ b/sync-release.sh @@ -12,14 +12,14 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="45" -RELEASE_TITLE="45" -COMPSFILE="comps-f45.xml" +RELEASE="46" +RELEASE_TITLE="46" +COMPSFILE="comps-f46.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/45/" +RSYNCTARGET="/pub/alt/iot/46/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 642e30d..c0925c7 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -11,9 +11,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-IoT" -RELEASE="45" -RELEASE_TITLE="45" -COMPSFILE="comps-f45.xml" +RELEASE="46" +RELEASE_TITLE="46" +COMPSFILE="comps-f46.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " From 3a738a8929bd7f0f8bd60eef0051dfdcb636959a Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Wed, 12 Aug 2026 10:17:54 -0400 Subject: [PATCH 2/2] Branch Fedora IoT 45 from rawhide --- fedora-iot.conf | 26 +++++++++++++------------- twoweek-nightly.sh | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/fedora-iot.conf b/fedora-iot.conf index fe7c0d3..4f7a254 100644 --- a/fedora-iot.conf +++ b/fedora-iot.conf @@ -214,10 +214,10 @@ imagebuilder = { "name": "%s-raw" % release_name, "types": ["iot-raw-xz"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-45/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", + "ref": "fedora/devel/$arch/iot", }, "subvariant": "IoT", "failable": ["*"], @@ -226,10 +226,10 @@ imagebuilder = { "name": "%s-ostree" % release_name, "types": ["iot-installer"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-45/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", + "ref": "fedora/devel/$arch/iot", }, "subvariant": "IoT", "manifest_type": "dvd-ostree", @@ -239,10 +239,10 @@ imagebuilder = { "name": "%s-provisioner" % release_name, "types": ["iot-simplified-installer"], "arches": ["x86_64", "aarch64"], - "repos": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$arch/os/"], + "repos": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-45/compose/Everything/$arch/os/"], "ostree": { "url": "https://kojipkgs.fedoraproject.org/compose/iot/repo/", - "ref": "fedora/rawhide/$arch/iot", + "ref": "fedora/devel/$arch/iot", }, "blueprint": { "customizations": { @@ -263,14 +263,14 @@ ostree = { "unified_core": True, "treefile": "fedora-iot.yaml", "config_url": "https://forge.fedoraproject.org/iot/ostree.git", - "config_branch": "main", + "config_branch": "f45", "repo": [ "IoT", - "https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/" + "https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-45/compose/Everything/$basearch/os/" ] "tag_ref": False, "ostree_repo": "/mnt/koji/compose/iot/repo/", - "ostree_ref": "fedora/rawhide/${basearch}/iot", + "ostree_ref": "fedora/devel/${basearch}/iot", "runroot_packages": ["selinux-policy-targeted"], "arches": ["x86_64", "aarch64"], "update_summary": True, @@ -283,8 +283,8 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://forge.fedoraproject.org/iot/base-images.git", "config_branch": "main", - "treefile": "fedora-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "treefile": "fedora-45.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-45/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64", "ppc64le", "s390x"], "failable": ['*'], "subvariant": "base", @@ -294,8 +294,8 @@ ostree_container = { "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN", "config_url": "https://forge.fedoraproject.org/iot/fedora-iot-bootc.git", "config_branch": "main", - "treefile": "fedora-iot-rawhide.yaml", - "repo": ["https://kojipkgs.fedoraproject.org/compose/rawhide/latest-Fedora-Rawhide/compose/Everything/$basearch/os/"], + "treefile": "fedora-iot-45.yaml", + "repo": ["https://kojipkgs.fedoraproject.org/compose/branched/latest-Fedora-45/compose/Everything/$basearch/os/"], "arches": ["x86_64", "aarch64"], "failable": ['*'], "name": "Fedora-IoT-bootc", diff --git a/twoweek-nightly.sh b/twoweek-nightly.sh index 642e30d..f49221a 100755 --- a/twoweek-nightly.sh +++ b/twoweek-nightly.sh @@ -18,7 +18,7 @@ TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="iot@lists.fedoraproject.org" FROM="Fedora IoT Report " RSYNCPREFIX="sudo -u ftpsync" -RSYNCTARGET="/pub/alt/iot/rawhide/" +RSYNCTARGET="/pub/alt/iot/branched/" OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID) # assume a releng dir is a git checkout of the releng repo