From cb7b5389f2bc4f77abf74e06e67cef838d6d8d3b Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Aug 19 2018 00:54:06 +0000 Subject: [PATCH 1/2] move repos to toplevel json file pungi can't substitute in any included files so we end up with errors because 'fedora-rawhide' repo isn't accessible during the pungi run. Signed-off-by: Dusty Mabe --- diff --git a/fedora-common-ostree.json b/fedora-common-ostree.json index 2801e84..20d4470 100644 --- a/fedora-common-ostree.json +++ b/fedora-common-ostree.json @@ -1,6 +1,5 @@ { "ref": "fedora/rawhide/${basearch}/ostree-base", - "repos": ["fedora-rawhide"], "automatic_version_prefix": "29", "mutate-os-release": "29", diff --git a/silverblue.json b/silverblue.json index b7217e6..4247dc8 100644 --- a/silverblue.json +++ b/silverblue.json @@ -1,5 +1,6 @@ { "ref": "fedora/rawhide/${basearch}/workstation", + "repos": ["fedora-rawhide"], "include": "gnome-desktop-pkgs.json", From 4ec8cfa1b712ea7c06f21ee812c6fef1ced050aa Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Aug 19 2018 00:54:10 +0000 Subject: [PATCH 2/2] Rawhide being F30 Signed-off-by: Dusty Mabe --- diff --git a/comps-sync.py b/comps-sync.py index 68a8a4c..fd0f0d6 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# Usage: ./comps-sync.py /path/to/comps-f29.xml.in +# Usage: ./comps-sync.py /path/to/comps-f30.xml.in # # Can both remove packages from the manifest # which are not mentioned in comps, and add packages from diff --git a/fedora-common-ostree.json b/fedora-common-ostree.json index 20d4470..ea5cd1f 100644 --- a/fedora-common-ostree.json +++ b/fedora-common-ostree.json @@ -1,8 +1,8 @@ { "ref": "fedora/rawhide/${basearch}/ostree-base", - "automatic_version_prefix": "29", - "mutate-os-release": "29", + "automatic_version_prefix": "30", + "mutate-os-release": "30", "include": "fedora-common-ostree-pkgs.json",