From d05b776460e093ef2c4da9cb1096d38720aa9b2e Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 8 Feb 2022 13:16:49 +0100 Subject: [PATCH] Branch f36 from rawhide Signed-off-by: Tomas Hrcka --- fedora-iot.ks | 8 ++++---- fedora-repo.ks | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fedora-iot.ks b/fedora-iot.ks index 7c422a9..3c7b59d 100644 --- a/fedora-iot.ks +++ b/fedora-iot.ks @@ -19,7 +19,7 @@ autopart --nohome --noswap --type=plain # Equivalent of %include fedora-repo.ks # Pull from the ostree repo that was created during the compose -ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/rawhide/${basearch}/iot +ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot reboot @@ -45,14 +45,14 @@ fi # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes. # We want consumers of this image to track the two week releases. -ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/rawhide/${arch}/iot" +ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/devel/${arch}/iot" # Make sure the ref we're supposedly sitting on (according # to the updated origin) exists. -ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --create "fedora-iot:fedora/rawhide/${arch}/iot" +ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot" # Remove the old ref so that the commit eventually gets cleaned up. -ostree refs "fedora-iot:fedora/rawhide/${arch}/iot" --delete +ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete # delete/add the remote with new options to enable gpg verification # and to point them at the cdn url diff --git a/fedora-repo.ks b/fedora-repo.ks index 9c7dfff..92d4d65 100644 --- a/fedora-repo.ks +++ b/fedora-repo.ks @@ -3,7 +3,7 @@ # Exactly one of the following should be uncommented # For the master branch the following should be uncommented -%include fedora-repo-rawhide.ks +# %include fedora-repo-rawhide.ks # For non-master branches the following should be uncommented -# %include fedora-repo-not-rawhide.ks +%include fedora-repo-not-rawhide.ks