This lets the recently-merged improved arch-specific package
support handle all the arch-specific packages which were
previously excluded in `comps-sync-exclude-list.yml` and listed
manually in `fedora-common-ostree.yaml`. As the diff shows,
the sync script now correctly includes the same packages for
the same arches in `fedora-common-ostree-pkgs.yaml`, plus a few
appropriate additions of things that should be there but had
been left out, on ppc64le and aarch64.
We also drop the `packages-armhfp` and `packages-ppc64` lists,
as we no longer build for either of those arches. This allows
us to move `ostree-grub2` into the non-arch-specific list, since
it's no longer left out on any arch we care about.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
This includes corrections for per-arch packages, thanks to the
improvements to comps-sync.py in the previous commit.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
As with mcelog and microcode_ctl, add it to the blocklist and
list it manually in packages-x86_64 in fedora-common-ostree.yaml
instead. This should fix non-x86_64 arches which are failing
because they can't find it.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
./comps-sync.py ../fedora-comps/comps-f33.xml.in --save
Syncing packages common to all desktops:
- 2 packages not in workstation-product-environment:
paratype-pt-sans-fonts
zram
- 4 packages not in manifest:
fedora-repos-modular (default, groups: core)
opensc (default, groups: workstation-product)
pt-sans-fonts (default, groups: fonts)
zram-generator-defaults (default, groups: workstation-product)
Wrote fedora-common-ostree-pkgs.yaml
Syncing packages for xfce-desktop:
- 10 packages not in xfce-desktop comps group:
NetworkManager-adsl
NetworkManager-ppp
NetworkManager-wwan
albatross-gtk2-theme
albatross-gtk3-theme
albatross-xfwm4-theme
bluebird-gtk2-theme
bluebird-gtk3-theme
bluebird-xfwm4-theme
fedora-icon-theme
- All comps packages are already listed in manifest.
Wrote xfce-desktop-pkgs.yaml
Syncing packages for lxqt-desktop:
- 2 packages not in lxqt-desktop comps group:
falkon-kwallet
fedora-icon-theme
- All comps packages are already listed in manifest.
Wrote lxqt-desktop-pkgs.yaml
Syncing packages for deepin-desktop:
- 1 packages not in deepin-desktop comps group:
fedora-icon-theme
- 1 packages not in deepin-desktop manifest:
deepin-icon-theme
Wrote deepin-desktop-pkgs.yaml
Syncing packages for pantheon-desktop:
- 1 packages not in pantheon-desktop comps group:
wingpanel-indicator-ayatana
- All comps packages are already listed in manifest.
Wrote pantheon-desktop-pkgs.yaml
./comps-sync.py ../fedora-comps/comps-f33.xml.in --save
Syncing packages common to all desktops:
- All manifest packages are already listed in comps.
- 1 packages not in manifest:
opensc (default, groups: workstation-product)
Wrote fedora-common-ostree-pkgs.yaml
Syncing packages for pantheon-desktop:
- 1 packages not in pantheon-desktop comps group:
cerbere
- All comps packages are already listed in manifest.
Wrote pantheon-desktop-pkgs.yaml
./comps-sync.py ../fedora-comps/comps-f33.xml.in --save
Syncing packages common to all desktops:
- 2 packages not in workstation-product-environment:
ibus-gtk2
scl-utils
- All comps packages are already listed in manifest.
Wrote fedora-common-ostree-pkgs.yaml
./comps-sync.py ../fedora-comps/comps-f33.xml.in --save
Syncing packages common to all desktops:
- 7 packages not in workstation-product-environment:
fedora-user-agent-chrome
gnu-free-mono-fonts
gnu-free-sans-fonts
gnu-free-serif-fonts
google-noto-sans-sinhala-fonts
google-noto-serif-cjk-ttc-fonts
lohit-gurmukhi-fonts
- 6 packages not in manifest:
earlyoom (default, groups: workstation-product)
fedora-chromium-config (default, groups: workstation-product)
google-noto-sans-gurmukhi-fonts (default, groups: fonts)
google-noto-sans-sinhala-vf-fonts (default, groups: fonts)
nano (default, groups: workstation-product)
xorg-x11-drv-armada (mandatory, groups: base-x)
Wrote fedora-common-ostree-pkgs.yaml
Syncing packages for gnome-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for kde-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for xfce-desktop:
- 2 packages not in xfce-desktop comps group:
greybird-gtk2-theme
greybird-gtk3-theme
- 2 packages not in xfce-desktop manifest:
greybird-dark-theme
greybird-light-theme
Wrote xfce-desktop-pkgs.yaml
Syncing packages for lxqt-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for deepin-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for pantheon-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
./comps-sync.py ../fedora-comps/comps-f31.xml.in --save
Syncing packages common to all desktops:
- All manifest packages are already listed in comps.
- 1 packages not in manifest:
zram (mandatory, groups: workstation-product)
Wrote fedora-common-ostree-pkgs.yaml
Syncing packages for gnome-desktop:
- All manifest packages are already listed in comps.
- 1 packages not in gnome-desktop manifest:
orca
Wrote gnome-desktop-pkgs.yaml
Syncing packages for kde-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for xfce-desktop:
- 1 packages not in xfce-desktop comps group:
xfce4-session-engines
- All comps packages are already listed in manifest.
Wrote xfce-desktop-pkgs.yaml
Syncing packages for lxqt-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for deepin-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
Syncing packages for pantheon-desktop:
- All manifest packages are already listed in comps.
- All comps packages are already listed in manifest.
We were trying to be accurate by filtering by group but
PackageKit is spread across all of them and has various subpackages,
so just add a global regexp-based blacklist.
This doesn't actually drop PK yet because `gnome-software` hard
requires it, but is prep for fixing that.
This conversion can be validated using this script:
#!/bin/bash
mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd ..
variants=('silverblue' 'kinoite' 'xfce' 'lxqt')
for v in ${variants[@]}; do
sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out
done
git checkout --quiet HEAD~
for v in ${variants[@]}; do
sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out
done
for v in ${variants[@]}; do
if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then
echo ""
echo "$v: JSON != YAML"
diff $v.json.out $v.yaml.out
echo ""
has_diff="true"
fi
done
git checkout --quiet master
rm -rf ./repo
for v in ${variants[@]}; do
rm ./$v.json.out ./$v.yaml.out
done
if [[ $has_diff == "true" ]]; then
echo "Found some diff!"
else
echo "OK!"
fi
