feat: unify tauOS and Ultramarine treefiles

.github/workflows/ostree.yml

@@ -18,11 +18,11 @@ jobs:
           - ubuntu-latest
           - ARM64
         variant:
-          - base
-          - flagship
-          - gnome
-          - pantheon
-          - plasma
+          - ultramarine/base
+          - ultramarine/flagship
+          - ultramarine/gnome
+          - ultramarine/pantheon
+          - ultramarine/plasma
     runs-on: ${{ matrix.os }}
     permissions:
       contents: read

.gitignore

@@ -1,5 +1,5 @@
 /out
-/ostree
+/ostree-repo
 /cache
 *.tar
-*.auth.json
+*.auth.json

ultramarine/common/common.yaml → common/common.yaml

@@ -83,11 +83,6 @@ packages:
   - bootupd
   - grub2
   - shim
-  - ultramarine-release
-  - ultramarine-repos
-  - ultramarine-logos
-  - ultramarine-logos-httpd
-  - ultramarine-repos-common
   - rpmfusion-free-release
   - rpmfusion-nonfree-release
   - plocate

ultramarine/common/desktop.yaml → common/desktop.yaml

@@ -1,3 +1,3 @@
-# Basically an extension of graphical with tools and utilities that would be useful for desktop users
+# Basically an extension of graphical with tools and utilities that would be useful for desktop users, for both UM and tau
 packages:
   - distrobox

common/graphical.yaml

@@ -0,0 +1,40 @@
+groups:
+  - id: guest-desktop-agents
+    blacklist:
+      - virtualbox-guest-additions
+  - id: fonts
+    optional: false
+    blacklist:
+      - google-noto-sans-cjk-ttc-fonts
+  - id: base-x
+    # TODO: see hardware.yaml
+    blacklist:
+      - xorg-x11-drv-armsoc
+      - xorg-x11-drv-intel
+      - xorg-x11-drv-openchrome
+      - xorg-x11-drv-vesa
+      - xorg-x11-drv-vmware
+  - id: multimedia
+    blacklist:
+      - gstreamer1-plugin-openh264
+      - gimp-heif-plugin
+      - PackageKit-gstreamer-plugin
+
+packages:
+  - glibc-all-langpacks
+    # Some symbols are missing in the default set of fonts, so we need to install these
+  - dejavu-sans-fonts
+  - dejavu-sans-mono-fonts
+  - dejavu-serif-fonts
+  - twitter-twemoji-fonts
+
+packages-aarch64:
+  - xorg-x11-drv-armsoc
+
+packages-x86_64:
+  - xorg-x11-drv-intel
+  - xorg-x11-drv-openchrome
+  - xorg-x11-drv-vesa
+  - xorg-x11-drv-vmware
+  - thermald
+  - virtualbox-guest-additions

justfile

@@ -1,9 +1,11 @@
 registry_auth := "auth.json"
 ostree_cache := "cache"
+ostree_repo := "ostree-repo"
 initialize := "--initialize"
 
 prep:
   [ -d {{ostree_cache}} ] || mkdir -p {{ostree_cache}}
+  [ -d {{ostree_repo}} ] || ostree init --repo={{ostree_repo}}
 
 clean-cache:
   sudo rm -rf {{ ostree_cache }}
@@ -14,20 +16,28 @@ clean-variant variant:
 clean-out:
   rm -rf ./out
 
-clean: clean-cache clean-out
+clean-repo:
+  rm -rf ./{{ostree_repo}}
+
+clean: clean-cache clean-out clean-repo
 
 compile variant: (clean-variant variant)
-  melody compile ultramarine/{{variant}}.yaml out/{{variant}}
+  melody compile {{variant}}.yaml out/{{variant}}
+
+compose-tree variant:
+  sudo rpm-ostree compose tree --cachedir={{ostree_cache}} --repo={{ostree_repo}} --unified-core out/{{variant}}/0.yaml
 
-compose variant:
+compose-image variant:
   sudo rpm-ostree compose image --cachedir={{ostree_cache}} {{initialize}} out/{{variant}}/0.yaml image
 
 compose-registry variant:
   sudo rpm-ostree compose image --format=registry --cachedir={{ostree_cache}} --copy-retry-times=20 --authfile={{registry_auth}} {{initialize}} out/{{variant}}/0.yaml ghcr.io/ultramarine-linux/{{variant}}-ostree:38
 
-build variant: prep (compile variant) (compose variant)
+build-tree variant: prep (compile variant) (compose-tree variant)
+build-image variant: prep (compile variant) (compose-image variant)
 build-registry variant: prep (compile variant) (compose-registry variant)
 
-compile-all: (compile "base") (compile "flagship") (compile "gnome") (compile "pantheon") (compile "plasma")
-build-all: (build "base") (build "flagship") (build "gnome") (build "pantheon") (build "plasma")
-build-all-registry: (build-registry "base") (build-registry "flagship") (build-registry "gnome") (build-registry "pantheon") (build-registry "plasma")
+compile-all: (compile "ultramarine/base") (compile "ultramarine/flagship") (compile "ultramarine/gnome") (compile "ultramarine/pantheon") (compile "ultramarine/plasma") (compile "tau/home")
+build-all-tree: (build-tree "ultramarine/base") (build-tree "ultramarine/flagship") (build-tree "ultramarine/gnome") (build-tree "ultramarine/pantheon") (build-tree "ultramarine/plasma") (build-tree "tau/home")
+build-all-image: (build-image "ultramarine/base") (build-image "ultramarine/flagship") (build-image "ultramarine/gnome") (build-image "ultramarine/pantheon") (build-image "ultramarine/plasma") (build-image "tau/home")
+build-all-registry: (build-registry "ultramarine/base") (build-registry "ultramarine/flagship") (build-registry "ultramarine/gnome") (build-registry "ultramarine/pantheon") (build-registry "ultramarine/plasma") (build-registry "tau/home")

tau/common/desktop.yaml

@@ -0,0 +1,52 @@
+groups:
+  - id: gnome-desktop
+    blacklist:
+      - PackageKit-command-not-found
+      - PackageKit-gtk3-module
+      - xdg-desktop-portal-gnome
+      - gnome-backgrounds
+      - gnome-boxes
+      - gnome-connections
+      - evince-nautilus
+      - libproxy-webkitgtk4
+      - baobab
+      - gnome-calculator
+      - gnome-calendar
+      - gnome-characters
+      - gnome-clocks
+      - gnome-contacts
+      - gnome-font-viewer
+      - gnome-maps
+      - gnome-photos
+      - gnome-weather
+      - cheese
+    optional: false
+
+# TODO: Migrate core GNOME apps to preinstalled flatpak
+
+packages:
+  - gnome-tweaks
+  - file-roller
+  - tau-dash-to-dock
+  - gnome-shell-extension-appindicator
+  - gnome-shell-extension-user-theme
+  - tau-wallpapers
+  - tau-helium
+  - tau-dash-to-dock
+  - tau-hydrogen
+  - tau-manrope-fonts
+  - tau-notification-manager
+  - tau-top-bar
+  # - tau-arcmenu
+  - tau-gsettings-schemas
+  - xdg-desktop-portal-gnome-tau
+  - tau-settings # remove this when fusebox is done
+  -  #libbismuth-devel
+  - libhelium-devel
+  - fusebox
+  - tumbler
+  - tumbler-extras
+
+exclude-packages:
+  - xdg-desktop-portal-gnome
+  - gnome-control-center

tau/common/release.yaml

@@ -0,0 +1,8 @@
+packages:
+  - tau-release
+  - tau-repos
+  - tau-repos-ostree
+  - tau-gpg-keys
+  - tau-logos
+  - tau-logos-httpd
+  - tau-plymouth

tau/home.yaml

@@ -0,0 +1,26 @@
+ref: tau/1/home/${basearch}
+releasever: "38"
+
+include:
+  - ../common/desktop.yaml
+  - ../common/graphical.yaml
+  - ../common/common.yaml
+  - common/release.yaml
+
+repos:
+  - tau
+  - terra
+  - rpmfusion-free
+  - rpmfusion-nonfree
+  - rpmfusion-free-updates
+  - rpmfusion-nonfree-updates
+  - fedora
+  - fedora-updates
+
+packages:
+  - distrobox
+  - chromium
+  - starship
+  - tau-release-desktop
+  - tau-starship
+  # - catalogue

tau/tau.repo

@@ -0,0 +1,71 @@
+[tau]
+name=tauOS Packages
+baseurl=https://repos.fyralabs.com/tau1/
+type=rpm
+gpgcheck=1
+enable=1
+gpgkey=https://repos.fyralabs.com/tau1/key.asc
+repo_gpgcheck=0
+enabled_metadata=1
+
+[terra]
+name=Terra Packages
+baseurl=https://repos.fyralabs.com/terra$releasever/
+type=rpm
+gpgcheck=1
+enable=1
+gpgkey=https://repos.fyralabs.com/terra$releasever/key.asc
+repo_gpgcheck=0
+enabled_metadata=0
+
+[fedora]
+name=Fedora $releasever $basearch
+#baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/$releasever/$basearch/os/
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
+enabled=0
+gpgcheck=0
+metadata_expire=1d
+enabled_metadata=0
+
+
+[fedora-updates]
+name=Fedora $releasever $basearch Updates
+mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
+enabled=1
+gpgcheck=1
+metadata_expire=1d
+enabled_metadata=0
+
+
+
+[rpmfusion-free]
+name=RPM Fusion - Free
+#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
+enabled=0
+gpgcheck=0
+metadata_expire=1
+
+[rpmfusion-free-updates]
+name=RPM Fusion - Free - Updates
+#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
+enabled=0
+gpgcheck=0
+metadata_expire=1d
+
+[rpmfusion-nonfree]
+name=RPM Fusion - Nonfree
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases$releasever/Everything/$basearch/os/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
+enabled=0
+gpgcheck=0
+metadata_expire=1d
+
+[rpmfusion-nonfree-updates]
+name=RPM Fusion - Nonfree - Updates
+#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+enabled=0
+gpgcheck=0
+metadata_expire=1d

ultramarine/base.yaml

@@ -2,7 +2,8 @@ ref: ultramarine/38/base/${basearch}
 releasever: "38"
 
 include:
-  - common/common.yaml
+  - ../common/common.yaml
+  - common/release.yaml
 
 repos:
   - ultramarine

ultramarine/common/graphical.yaml

@@ -1,7 +1,4 @@
 groups:
-  - id: guest-desktop-agents
-    blacklist:
-      - virtualbox-guest-additions
   - id: flagship-product
     blacklist:
       - psacct
@@ -12,39 +9,3 @@ groups:
       - mcelog
       - microcode_ctl
       - thermald
-  - id: fonts
-    optional: false
-    blacklist:
-      - google-noto-sans-cjk-ttc-fonts
-  - id: base-x
-    # TODO: see hardware.yaml
-    blacklist:
-      - xorg-x11-drv-armsoc
-      - xorg-x11-drv-intel
-      - xorg-x11-drv-openchrome
-      - xorg-x11-drv-vesa
-      - xorg-x11-drv-vmware
-  - id: multimedia
-    blacklist:
-      - gstreamer1-plugin-openh264
-      - gimp-heif-plugin
-      - PackageKit-gstreamer-plugin
-
-packages:
-  - glibc-all-langpacks
-    # Some symbols are missing in the default set of fonts, so we need to install these
-  - dejavu-sans-fonts
-  - dejavu-sans-mono-fonts
-  - dejavu-serif-fonts
-  - twitter-twemoji-fonts
-
-packages-aarch64:
-  - xorg-x11-drv-armsoc
-
-packages-x86_64:
-  - xorg-x11-drv-intel
-  - xorg-x11-drv-openchrome
-  - xorg-x11-drv-vesa
-  - xorg-x11-drv-vmware
-  - thermald
-  - virtualbox-guest-additions

ultramarine/common/release.yaml

@@ -0,0 +1,6 @@
+packages:
+  - ultramarine-release
+  - ultramarine-repos
+  - ultramarine-logos
+  - ultramarine-logos-httpd
+  - ultramarine-repos-common

ultramarine/flagship.yaml

@@ -2,9 +2,11 @@ ref: ultramarine/38/flagship/${basearch}
 releasever: "38"
 
 include:
-  - common/desktop.yaml
+  - ../common/desktop.yaml
+  - ../common/graphical.yaml
+  - ../common/common.yaml
+  - common/release.yaml
   - common/graphical.yaml
-  - common/common.yaml
 
 repos:
   - ultramarine

ultramarine/gnome.yaml

@@ -2,9 +2,11 @@ ref: ultramarine/38/gnome/${basearch}
 releasever: "38"
 
 include:
-  - common/desktop.yaml
+  - ../common/desktop.yaml
+  - ../common/graphical.yaml
+  - ../common/common.yaml
+  - common/release.yaml
   - common/graphical.yaml
-  - common/common.yaml
 
 repos:
   - ultramarine

ultramarine/pantheon.yaml

@@ -2,9 +2,11 @@ ref: ultramarine/38/pantheon/${basearch}
 releasever: "38"
 
 include:
-  - common/desktop.yaml
+  - ../common/desktop.yaml
+  - ../common/graphical.yaml
+  - ../common/common.yaml
+  - common/release.yaml
   - common/graphical.yaml
-  - common/common.yaml
 
 repos:
   - ultramarine