From 41c08d397b0bbc899cd38f28f0a43d469f02c80e Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:36:50 +0000 Subject: [PATCH 1/2] Remove unused config.ini Not used to build Silverblue anymore. --- diff --git a/config.ini b/config.ini deleted file mode 100644 index a64dd07..0000000 --- a/config.ini +++ /dev/null @@ -1,19 +0,0 @@ -[DEFAULT] - -outputdir = /home/fedora/workstation-ostree-config -# workdir = os.getcwd() -# srcdir = os.path.join(os.path.dirname(sys.argv[0], '..') -# rpmostree_cache_dir = %(workdir)s/%(release)s/cache -ostree_repo = %(outputdir)s/repo -os_name = fedora-ostree -os_pretty_name = Fedora ostree Workstation -tree_name = workstation -tree_file = %(os_name)s-%(tree_name)s.json -arch = x86_64 -release = 39 -ref = %(os_name)s/%(release)s/%(arch)s/%(tree_name)s -# Force use of a closeish and fastish HTTP mirror, so that the HTTP proxy works -yum_baseurl = https://download.fedoraproject.org/pub/fedora/linux/development/39/Everything/%(arch)s/os/ -# lorax_additional_repos = http://127.0.0.1/fedora-atomic/local-overrides -# lorax_include_packages = fedora-productimg-atomic -docker_os_name = fedora From 97ba9d162b94b778c3703d607d20c2f35a74533b Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Aug 09 2023 15:36:50 +0000 Subject: [PATCH 2/2] Unify manifest whitespace --- diff --git a/fedora-base.yaml b/fedora-base.yaml index e6bc667..c9e54ef 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-base summary: "Fedora base image for alternative DE" license: MIT + packages: # Generic release package for desktop variants - fedora-release diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index be269c9..0f6e618 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-deepin summary: "Fedora Deepin base image" license: MIT + packages: # Generic release package for desktop variants - fedora-release diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml index b2061d4..ade7a88 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-lxqt summary: "Fedora Lazurite (LXQt) base image" license: MIT + packages: # Generic release package for desktop variants - fedora-release diff --git a/fedora-mate.yaml b/fedora-mate.yaml index 205ab51..f05e237 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-mate summary: "Fedora Mate base image" license: MIT + packages: # Generic release sub package for desktop variants - fedora-release-ostree-desktop diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index ce0b464..8792be0 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -4,12 +4,15 @@ rojig: name: fedora-onyx summary: "Fedora Onyx (Budgie) base image" license: MIT + packages: - fedora-release-onyx + exclude-packages: # Not needed in Budgie Desktop - tracker - tracker-miners + repos: - fedora-39 - fedora-39-updates diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index 727fb53..6160f45 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -5,10 +5,12 @@ rojig: name: fedora-sericea summary: "Fedora Sericea (Sway) base image" license: MIT + packages: - fedora-release-sericea # explicitly list some defaults - firefox + exclude-packages: # already excluded in comps-sync-exclude-list - PackageKit-glib @@ -16,6 +18,7 @@ exclude-packages: # nothing in the tree would use these - tracker - tracker-miners + repos: - fedora-39 - fedora-39-updates diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index bf9b51d..89b27a8 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-silverblue summary: "Fedora Silverblue base image" license: MIT + packages: - fedora-release-silverblue - desktop-backgrounds-gnome diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index 09d1399..1d64145 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -4,6 +4,7 @@ rojig: name: fedora-vauxite summary: "Fedora Vauxite (XFCE) base image" license: MIT + packages: - fedora-release-xfce # Generic release sub package for desktop variants @@ -17,6 +18,7 @@ packages: - mousepad - ristretto - xarchiver + repos: - fedora-39 - fedora-39-updates