PR#1140: Add Fedora Sway Spin - pungi-fedora

pungi-fedora

#1140 Add Fedora Sway Spin

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

alebastr/pungi-fedora main into main

Add Fedora Sericea (Sway OSTree) variant.

Aleksei Bavshin • a year ago

38db5fa

Add Fedora Sway Spin

Aleksei Bavshin • a year ago

41794ed

fedora.conf

file modified

+51

		`@@ -336,6 +336,7 @@`
		`'Astronomy_KDE': 'AstK',`
		`'Silverblue': 'SB',`
		`'Kinoite': 'Knt',`
		`+ 'Sericea': 'Src',`
		`'Cinnamon': 'Cinn',`
		`'Cloud': 'C',`
		`'Comp_Neuro': 'CNr',`
		`@@ -729,6 +730,15 @@`
		`'repo': 'Everything',`
		`'install_tree_from': 'Everything',`
		`'subvariant': 'i3'`
		`+ },`
		`+ {`
		`+ 'name': 'Fedora-Sway-Live',`
		`+ 'kickstart': 'fedora-live-sway.ks',`
		`+ 'arches': ['x86_64'],`
		`+ 'failable': ['*'],`
		`+ 'repo': 'Everything',`
		`+ 'install_tree_from': 'Everything',`
		`+ 'subvariant': 'Sway'`
		`}`
		`],`
		`'^Labs$': [`
		`@@ -853,6 +863,19 @@`
		`"ostree_ref": "fedora/rawhide/${basearch}/kinoite",`
		`"arches": ["x86_64", "ppc64le", "aarch64"],`
		`"failable": ['*'],`
		`+ },`
		`+ "^Sericea$": {`
		`+ "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",`
		`+ "force_new_commit": True,`
		`+ "treefile": "fedora-sericea.yaml",`
		`+ "config_url": "https://pagure.io/workstation-ostree-config.git",`
		`+ "config_branch": "main",`
		`+ "repo": "Everything",`
		`+ "tag_ref": False,`
		`+ "ostree_repo": "/mnt/koji/compose/ostree/repo/",`
		`+ "ostree_ref": "fedora/rawhide/${basearch}/sericea",`
		`+ "arches": ["x86_64"],`
		`+ "failable": ['*'],`
		`}`
		`}`

		`@@ -1018,6 +1041,34 @@`
		`'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`'failable': ['*'],`
		`}`
		`+ }),`
		`+ ("^Sericea$", {`
		`+ "x86_64": {`
		`+ "repo": "Everything",`
		`+ "release": None,`
		`+ "rootfs_size": "8",`
		`+ "add_template": ["ostree-based-installer/lorax-configure-repo.tmpl",`
		`+ "ostree-based-installer/lorax-embed-repo.tmpl"],`
		`+ "add_template_var": [`
		`+ "ostree_install_repo=https://kojipkgs.fedoraproject.org/compose/ostree/repo/",`
		`+ "ostree_update_repo=https://ostree.fedoraproject.org",`
		`+ "ostree_osname=fedora",`
		`+ "ostree_oskey=fedora-38-primary",`
		`+ "ostree_contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist",`
		`+ "ostree_install_ref=fedora/rawhide/x86_64/sericea",`
		`+ "ostree_update_ref=fedora/rawhide/x86_64/sericea",`
		`+ "flatpak_remote_name=fedora",`
		`+ # using registry-no-cdn avoids redirects to the CDN;`
		`+ # needed because of network restrictions on koji runroot`
		`+ "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",`
		`+ "flatpak_remote_refs=",`
		`+ ],`
		`+ 'template_repo': 'https://pagure.io/fedora-lorax-templates.git',`
		`+ 'template_branch': 'main',`
		`+ # dbus-run-session is needed for Flatpak to talk to flatpak-oci-authenticator`
		`+ 'extra_runroot_pkgs': ['flatpak', 'dbus-daemon'],`
		`+ 'failable': ['*'],`
		`+ }`
		`})`
		`]`

nightly.sh

file modified

+4 -2

		`@@ -132,6 +132,7 @@`
		`--variant Spins \`
		`--variant Silverblue \`
		`--variant Kinoite \`
		`+ --variant Sericea \`
		`--variant Workstation \`
		`--link-dest="$RSYNCTARGET/Everything" --exclude=repodata`
		`$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \`
		`@@ -144,6 +145,7 @@`
		`--variant Spins \`
		`--variant Silverblue \`
		`--variant Kinoite \`
		`+ --variant Sericea \`
		`--variant Workstation \`
		`--link-dest="$RSYNCTARGET/Everything" --delete-after`

		`@@ -194,12 +196,12 @@`
		`# hardlink content (this will hardlink ppc64le/s390x)`
		`time hardlink -v "$RSYNCSECTARGET/.."`

		`- # sync Silverblue and Kinoite to the unified ostree repo`
		`+ # sync Silverblue, Kinoite and Sericea to the unified ostree repo`
		`# Set the umask to so directories can get group write`
		`# https://pagure.io/releng/issue/8811`
		`old_umask=$(umask)`
		`umask 0002`
		`- for variant in 'silverblue' 'kinoite'; do`
		`+ for variant in 'silverblue' 'kinoite' 'sericea'; do`
		`for arch in x86_64 ppc64le aarch64; do`
		`ref="fedora/rawhide/${arch}/${variant}"`
		`if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi`

variants-fedora.xml

file modified

		`@@ -93,6 +93,11 @@`
		`<arch>ppc64le</arch>`
		`</arches>`
		`</variant>`
		`+ <variant id="Sericea" name="Sericea" type="variant" is_empty="true">`
		`+ <arches>`
		`+ <arch>x86_64</arch>`
		`+ </arches>`
		`+ </variant>`
		`<variant id="Modular" name="Modular" type="variant">`
		`<arches>`
		`<arch>armhfp</arch>`