Commit graph

177 commits

Author SHA1 Message Date
Colin Walters
87b6aac201 comps-sync: Blacklist PackageKit globally
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.
2019-04-13 12:26:22 +00:00
Timothée Ravier
d2b8aa6080 Add Pantheon & DeepinDE variants 2019-04-07 14:22:26 +02:00
Timothée Ravier
ebf129e4f8 Add some minor comments 2019-04-07 13:41:24 +02:00
Timothée Ravier
b461398aef Move packages needed for all variants to common manifest 2019-04-07 13:41:06 +02:00
Timothée Ravier
7c611d9d0d Convert all remaining json manifests to yaml
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
2019-04-07 13:41:06 +02:00
Timothée Ravier
49f86462ec comps-sync.py: remove unused varaibles and minor renaming 2019-04-07 12:41:05 +02:00
Timothée Ravier
af221374f2 comps-sync.py: cosmetic changes for clearer result output 2019-04-07 12:41:05 +02:00
Timothée Ravier
09669b418d comps-sync.py: use yaml format only
Do not use yaml.dump() as it does not use the same indentation logic as
the one we currently have in comps-sync-blacklist.yml.
2019-04-07 12:41:05 +02:00
Sinny Kumari
131a1ef86d Include fedora-repos-ostree package in Silverblue ostree compose
Provides default ostree remote config

Signed-off-by: Sinny Kumari <sinny@redhat.com>
2019-03-29 01:13:46 +00:00
Timothée Ravier
55ae6ad005 Add LXQt variant 2019-03-21 09:14:57 +01:00
Timothée Ravier
6ee56832ef Convert fedora-xfce.json to fedora-xfce.yaml 2019-03-21 09:14:57 +01:00
Timothée Ravier
a1ccdf7604 Convert kinoite.json to fedora-kinoite.yaml 2019-03-21 09:14:57 +01:00
Dusty Mabe
a1db40bf9b Merge #129 README.md: point to Silverblue docs 2019-03-14 01:44:58 +00:00
Mark Otaris
5b574d39c6
Add gnome-characters to blacklist 2019-03-09 15:52:34 -05:00
Tomas Popela
baabbc7c2f comps-sync rawhide 06-03-2019
Output from `./comps-sync.py ../fedora-comps/comps-f31.xml.in --save

Syncing packages common to all ostree based desktop versions:
All manifest packages are already listed in comps.
1 packages not in manifest:
  psmisc (default, groups: workstation-product)
Wrote fedora-common-ostree-pkgs.json

Syncing packages for gnome-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.

Syncing packages for kde-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.

Syncing packages for xfce-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.
2019-03-06 14:54:12 +01:00
Debarshi Ray
2b852bc708 common-ostree: Replace fedora-toolbox with toolbox
The project and the command line tool were renamed. A renamed toolbox
RPM has now passed review:
https://bugzilla.redhat.com/show_bug.cgi?id=1680043

https://pagure.io/workstation-ostree-config/pull-request/130
2019-03-01 22:21:49 +01:00
Jonathan Lebon
9bfe308569 README.md: point to Silverblue docs
Let's keep the canonical copy of the install-inside instructions on the
Silverblue docs website.
2019-02-28 09:18:58 -05:00
Kalev Lember
9a826df727 comps-sync rawhide 2019-02-28
Output from `./comps-sync.py ../fedora-comps/comps-f31.xml.in --save`

```
Syncing packages common to all ostree based desktop versions:
All manifest packages are already listed in comps.
2 packages not in manifest:
  NetworkManager-config-connectivity-fedora (default, groups: workstation-product)
  gamemode (default, groups: workstation-product)
Wrote fedora-common-ostree-pkgs.json

Syncing packages for gnome-desktop specific version:
All manifest packages are already listed in comps.
1 packages not in manifest:
  adobe-source-code-pro-fonts
Wrote gnome-desktop-pkgs.json

Syncing packages for kde-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.

Syncing packages for xfce-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.
```
2019-02-28 09:22:02 +01:00
9e1d930e99 Rawhide is f31
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2019-02-19 09:06:02 +01:00
Alexander Larsson
31ad6acced Add minimal -devel packages as needed to build kernel modules
As discussed in the forum[1], package layering can work for building kernel
modules, such as the nvidia driver. However, there are some problems
with the -devel packages needed, as they need to match the exact version
in the base image, and once the version bumps in the yum repo the old
version isn't even available.

So, this adds the minimal set of -devel packages needed to build a a kmod.
This isn't enough to build a kernel module, but the rest needed can much
more easily be layered.

Given the current rawhide dependencies this adds the following packages:
 * elfutils-libelf-devel
 * glibc-devel
 * glibc-headers
 * kernel-devel
 * kernel-headers
 * libxcrypt-devel
 * zlib-devel

This adds about 100 megs to a 4 gigabyte image, which I think is a fair
compromise in order to be able to build kernel modules and support
the nvidia drivers.

[1] https://discussion.fedoraproject.org/t/supporting-the-nvidia-drivers-on-silverblue/849/6
2018-12-20 09:02:39 +01:00
Dusty Mabe
93e89c4c5c Merge #106 common-ostree: Add fedora-toolbox 2018-12-06 03:04:47 +00:00
Dusty Mabe
90fa1bcea1
comps-sync rawhide 2018-11-27
Output from `./comps-sync.py ../fedora-comps/comps-f30.xml.in --save`

```
Syncing packages common to all ostree based desktop versions:
All manifest packages are already listed in comps.
1 packages not in manifest:
  policycoreutils-python-utils (default, groups: workstation-product)
Wrote fedora-common-ostree-pkgs.json

Syncing packages for gnome-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.

Syncing packages for kde-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.

Syncing packages for xfce-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.
```
2018-11-27 13:14:42 -05:00
Dusty Mabe
37a8bd288b
Add grubby-deprecated to blacklist
See https://pagure.io/workstation-ostree-config/pull-request/117#comment-69691
2018-11-27 12:00:22 -05:00
Dusty Mabe
b8e155bf83
comps-sync rawhide 2018-11-19
Output from `./comps-sync.py ../fedora-comps/comps-f30.xml.in --save`
```
Syncing packages common to all ostree based desktop versions:
4 packages not in workstation-product-environment:
  gstreamer1-plugin-mpg123
  ibus-rawcode
  initscripts
  polkit
1 packages not in manifest:
  mesa-vulkan-drivers (mandatory, groups: base-x)
Wrote fedora-common-ostree-pkgs.json

Syncing packages for gnome-desktop specific version:
All manifest packages are already listed in comps.
3 packages not in manifest:
  chrome-gnome-shell
  gnome-remote-desktop
  gnome-terminal-nautilus
Wrote gnome-desktop-pkgs.json

Syncing packages for kde-desktop specific version:
All manifest packages are already listed in comps.
All comps packages are already listed in manifest.

Syncing packages for xfce-desktop specific version:
All manifest packages are already listed in comps.
2 packages not in manifest:
  gnome-keyring-pam
  gvfs-mtp
Wrote xfce-desktop-pkgs.json
```
2018-11-19 16:38:55 -05:00
Dusty Mabe
ece0b04473
add in hfsplus-tools rpm for HFS filesystem on Macs
See https://github.com/projectatomic/rpm-ostree/issues/1380
2018-11-16 08:21:05 -05:00
Dusty Mabe
0cbd671fd5
Remove extraneous symlink 2018-11-15 09:52:25 -05:00
Colin Walters
2fe083091f Migrate Silverblue definition to YAML, add rojig
Prep for adding a rojig build.
2018-11-13 12:56:04 -05:00
Milos Vyletel
9cb8e83eb2 fix build for xfce and kde variant
in cb7b538 Dusty moved repos from common to silverblue what was
essentially partial revert 61d907b and therefore breaking xfce/kde
builds. this fixes it by adding repos back
2018-11-09 15:33:59 +00:00
Debarshi Ray
60f4a4089a common-ostree: Add fedora-toolbox
A fedora-toolbox RPM has now passed review:
https://bugzilla.redhat.com/show_bug.cgi?id=1641697

https://pagure.io/workstation-ostree-config/pull-request/106
2018-10-25 16:06:29 +00:00
Colin Walters
1ff6019594 post: Disable modular repositories
See https://github.com/projectatomic/rpm-ostree/issues/1435
and https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
2018-09-09 09:04:48 -04:00
Matthias Clasen
5de5f5c7f3 Bring yelp back, run comps sync
Until we can preinstall flatpaks, we need the apps in the
base image that are needed for first login. Thats yelp, which
is used for the "welcome tour" part of the inial setup experience.

This sync also pulls in the new backgrounds package.
2018-09-06 00:07:47 +00:00
Colin Walters
75314ee3d7 common-ostree: Explicitly list lvm2
Surprisingly in comps, it's just part of the anaconda group,
and so it ends up on workstation systems indirectly because
anaconda is part of the livecd.

For Fedora Atomic Host, we list it explicitly.

It turns out that when we dropped `docker/atomic`, nothing else
was pulling in `lvm2`.
2018-09-04 16:49:35 -04:00
Colin Walters
f132615192 Merge #101 manifest: Drop the atomic command 2018-08-29 21:54:55 +00:00
Dusty Mabe
131765c6b7
rename silverblue -> fedora-silverblue.json 2018-08-29 14:44:54 -04:00
Colin Walters
28a1c24e2b manifest: Drop the atomic command
It's no longer a focus of development, and in particular
for standalone workstation systems, the "system containers"
approach in particular was never a real target.
2018-08-29 10:12:47 -04:00
Colin Walters
82f2f89d91 Merge #98 manifest: Drop docker by default 2018-08-29 14:11:00 +00:00
Colin Walters
d9afb39e2a manifest: Drop docker by default
We'll point people at podman, or if they want docker they can
either use the projectatomic version or upstream.
2018-08-26 14:46:17 -04:00
Colin Walters
932d338596 Rename ref to silverblue
Followup to https://pagure.io/pungi-fedora/pull-request/631

Signed-off-by: Colin Walters <walters@verbum.org>
2018-08-26 08:55:32 -04:00
Dusty Mabe
4ec8cfa1b7
Rawhide being F30
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2018-08-18 20:54:10 -04:00
Dusty Mabe
cb7b5389f2
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 <dusty@dustymabe.com>
2018-08-18 20:54:06 -04:00
Colin Walters
adf7192912 Merge #94 silverblue: Blacklist setuptool`` 2018-08-14 13:27:51 +00:00
Colin Walters
310f04be0a silverblue: Blacklist setuptool
At some point I want to add a `usr_bin_sbin_unification: true`
option or so to rpm-ostree, and having `usermode` blocks that.

Also this is a weird legacy Red Hat-ism tool.
2018-08-08 21:52:30 -04:00
Timothée Ravier
f2a3641d22 silverblue: xdg-desktop-portal-gtk is already in gnome-desktop-pkgs 2018-08-07 21:12:54 +02:00
Timothée Ravier
0f7891cfdc silverblue: re-add GNOME specific packages that were blacklisted for common treefile 2018-08-07 21:12:25 +02:00
Timothée Ravier
7ab8d493db Remove unused ref & repos from *-desktop-pkgs.json treefiles 2018-08-07 21:04:56 +02:00
Timothée Ravier
61d907b88b Move repos, automatic_version_prefix & mutate-os-release to common treefile 2018-08-07 21:00:00 +02:00
Timothée Ravier
96bdd4b055 comps-sync-blacklist.yml: minor category fixup (cosmetic change) 2018-08-07 21:00:00 +02:00
Timothée Ravier
bb65154f10 comps-sync-blacklist.yml: re-add sssd-kcm to common (not KDE specific) 2018-08-07 21:00:00 +02:00
Timothée Ravier
78432354e3 comps-sync.py: remove deplicate func def & fixup comment 2018-08-07 20:56:47 +02:00
Colin Walters
194a8da4fb Drop gnome-boxes (and libvirt)
Originally from https://pagure.io/workstation-ostree-config/pull-request/74
2018-08-04 16:05:43 -04:00