PR#547: Branch Fedora 41 from Rawhide - workstation-ostree-config

workstation-ostree-config

#547 Branch Fedora 41 from Rawhide

Merged a year ago by kevin. Opened a year ago by jnsamyak.

jnsamyak/workstation-ostree-config f41 into f41

Branch Fedora 41 from Rawhide

Samyak Jain • a year ago

b9dca1c

base-atomic.yaml

file modified

+3 -3

		`@@ -5,7 +5,7 @@`
		`include:`
		`- common.yaml`

		`- ref: fedora/rawhide/${basearch}/base`
		`+ ref: fedora/41/${basearch}/base`
		`rojig:`
		`name: fedora-base`
		`summary: "Fedora Base Atomic"`
		`@@ -24,5 +24,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

budgie-atomic-common.yaml

file modified

+1 -1

		`@@ -5,7 +5,7 @@`
		`- common.yaml`
		`- budgie-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/onyx`
		`+ ref: fedora/41/${basearch}/onyx`
		`rojig:`
		`name: fedora-onyx`
		`summary: "Fedora Budgie Atomic"`

budgie-atomic-ostree.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

budgie-atomic.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

cinnamon-atomic.yaml

file modified

+3 -3

		`@@ -6,7 +6,7 @@`
		`- common.yaml`
		`- cinnamon-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/cinnamon`
		`+ ref: fedora/41/${basearch}/cinnamon`
		`rojig:`
		`name: fedora-cinnamon`
		`summary: "Fedora Cinnamon Atomic"`
		`@@ -21,5 +21,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

deepin-atomic.yaml

file modified

+3 -3

		`@@ -6,7 +6,7 @@`
		`- common.yaml`
		`- deepin-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/deepin`
		`+ ref: fedora/41/${basearch}/deepin`
		`rojig:`
		`name: fedora-deepin`
		`summary: "Fedora Deepin Atomic"`
		`@@ -22,5 +22,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

fedora-kinoite.yaml

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- kinoite-ostree.yaml`
		`\ No newline at end of file`

fedora-kinoite.yaml

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ variables:`
		`+ bootable_container: false`
		`+`
		`+ include:`
		`+ - kinoite-common.yaml`
		`+`
		`+ # Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`+ repos:`
		`+ - fedora-41`
		`+ - fedora-41-updates`

fedora-onyx.yaml

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- budgie-atomic-ostree.yaml`
		`\ No newline at end of file`

fedora-onyx.yaml

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ variables:`
		`+ bootable_container: false`
		`+`
		`+ include:`
		`+ - budgie-atomic-common.yaml`
		`+`
		`+ # Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`+ repos:`
		`+ - fedora-41`
		`+ - fedora-41-updates`

fedora-rawhide.repo

file removed

-6

		`@@ -1,6 +0,0 @@`
		`- [fedora-rawhide]`
		`- name=Fedora rawhide $basearch`
		`- mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch`
		`- enabled=1`
		`- gpgcheck=1`
		`- metadata_expire=1d`

fedora-sericea.yaml

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- sway-atomic-ostree.yaml`
		`\ No newline at end of file`

fedora-sericea.yaml

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ variables:`
		`+ bootable_container: false`
		`+`
		`+ include:`
		`+ - sway-atomic-common.yaml`
		`+`
		`+ # Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`+ repos:`
		`+ - fedora-41`
		`+ - fedora-41-updates`

fedora-silverblue.yaml

file removed

-1

		`@@ -1,1 +0,0 @@`
		`- silverblue-ostree.yaml`
		`\ No newline at end of file`

fedora-silverblue.yaml

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ variables:`
		`+ bootable_container: false`
		`+`
		`+ include:`
		`+ - silverblue-common.yaml`
		`+`
		`+ # Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`+ repos:`
		`+ - fedora-41`
		`+ - fedora-41-updates`

kinoite-common.yaml

file modified

+1 -1

		`@@ -5,7 +5,7 @@`
		`- common.yaml`
		`- kinoite-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/kinoite`
		`+ ref: fedora/41/${basearch}/kinoite`
		`rojig:`
		`name: fedora-kde`
		`summary: "Fedora Kinoite"`

kinoite-mobile.yaml

file modified

+3 -3

		`@@ -6,7 +6,7 @@`
		`- common.yaml`
		`- kinoite-mobile-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/kinoite-mobile`
		`+ ref: fedora/41/${basearch}/kinoite-mobile`
		`rojig:`
		`name: fedora-kde`
		`summary: "Fedora Kinoite Mobile"`
		`@@ -46,5 +46,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

kinoite-ostree.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

kinoite.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

lxqt-atomic.yaml

file modified

+3 -3

		`@@ -6,7 +6,7 @@`
		`- common.yaml`
		`- lxqt-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/lazurite`
		`+ ref: fedora/41/${basearch}/lazurite`
		`rojig:`
		`name: fedora-lxqt`
		`summary: "Fedora LXQt Atomic"`
		`@@ -26,5 +26,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

mate-atomic.yaml

file modified

+3 -3

		`@@ -6,7 +6,7 @@`
		`- common.yaml`
		`- mate-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/mate`
		`+ ref: fedora/41/${basearch}/mate`
		`rojig:`
		`name: fedora-mate`
		`summary: "Fedora Mate Atomic"`
		`@@ -24,5 +24,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

silverblue-common.yaml

file modified

+1 -1

		`@@ -5,7 +5,7 @@`
		`- common.yaml`
		`- silverblue-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/silverblue`
		`+ ref: fedora/41/${basearch}/silverblue`
		`rojig:`
		`name: fedora-silverblue`
		`summary: "Fedora Silverblue"`

silverblue-ostree.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

silverblue.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

sway-atomic-common.yaml

file modified

+1 -1

		`@@ -5,7 +5,7 @@`
		`- common.yaml`
		`- sway-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/sericea`
		`+ ref: fedora/41/${basearch}/sericea`
		`rojig:`
		`name: fedora-sericea`
		`summary: "Fedora Sway Atomic"`

sway-atomic-ostree.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

sway-atomic.yaml

file modified

+2 -2

		`@@ -7,5 +7,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

xfce-atomic.yaml

file modified

+3 -3

		`@@ -6,7 +6,7 @@`
		`- common.yaml`
		`- xfce-atomic-packages.yaml`

		`- ref: fedora/rawhide/${basearch}/vauxite`
		`+ ref: fedora/41/${basearch}/vauxite`
		`rojig:`
		`name: fedora-vauxite`
		`summary: "Fedora XFCE Atomic"`
		`@@ -22,5 +22,5 @@`
		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`
		`- fedora-rawhide`
		`- # - fedora-41`
		`- # - fedora-41-updates`
		`+ - fedora-41`
		`+ - fedora-41-updates`

jnsamyak commented a year ago

This should not be merged before August 13, but it is open for review.

CC: @siosm (thanks for the readme <3)

Signed-off-by: Samyak Jain samyak.jn11@gmail.com

zuul commented a year ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
https://fedora.softwarefactory-project.io/zuul/buildset/5040e588395b401baceaa7d45c46082b

validate : FAILURE in 1m 29s

kevin commented a year ago

Shouldn't - fedora-rawhide repos get commented/removed here?

jnsamyak commented a year ago

yep those are removed here and this is done as per the instructions mentioned in the README

Edited a year ago by jnsamyak

kevin commented a year ago

recheck

zuul commented a year ago

validate : FAILURE in 1m 28s

Pull-Request has been merged by kevin

a year ago

siosm commented a year ago

Same here: https://pagure.io/workstation-ostree-config/pull-request/546#comment-207479

siosm commented a year ago

The Rawhide repo lines where not removed as I had missed a rename as well in the instructions. Instructions fixed in: https://pagure.io/workstation-ostree-config/pull-request/551

siosm commented a year ago

Fixup in: https://pagure.io/workstation-ostree-config/pull-request/552