✨ release 6.0 to current

.github/actions/ci/action.yml

@@ -15,9 +15,9 @@ runs:
   using: "composite"
   steps:
       - if: ${{ inputs.branch != '' }}
-        run: git checkout ${{ inputs.branch }}
+        run: git fetch origin; git fetch --tags origin
         shell: bash
-      - run: git fetch --tags origin
+      - run: git checkout ${{ inputs.branch }}
         shell: bash
       - run: git submodule sync
         shell: bash
@@ -36,7 +36,7 @@ runs:
                   --vendor "sodaliterocks" \
                   --working-dir "$working_dir" \
                   --ex-container-hostname "$(hostname -f)" \
-                  --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
+                  --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:39")" \
                   --ex-override-starttime "$start_time"
               rm -rf "$working_dir"
           else
@@ -46,7 +46,7 @@ runs:
                   --vendor "sodaliterocks" \
                   --working-dir "/srv/store/variable/ostree" \
                   --ex-container-hostname "$(hostname -f)" \
-                  --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
+                  --ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:39")" \
                   --ex-override-starttime "$start_time" \
                   --ex-print-github-release-table-row
           fi

.github/workflows/update.manual.yml

@@ -10,15 +10,24 @@ on:
         type: choice
         options:
         - desktop
-        - desktop-budgie
-        - desktop-deepin
         - desktop-gnome
       dry_run:
         default: false
         description: "Dry Run"
         type: boolean
+      version:
+        default: current
+        description: "Version"
+        required: true
+        type: choice
+        options:
+        - "current"
+        - "long/4"
+        - "long/5"
+        - "long/6"
+        - "next"
       container_image:
-        default: fedora:37
+        default: fedora:39
         description: "Container Image"
         required: true
         type: choice
@@ -38,4 +47,6 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/ci
         with:
+          branch: release/${{ inputs.version }}
+          container_image: ${{ inputs.container_image }}
           tree: ${{ inputs.tree }}

.github/workflows/update.scheduled.long-5.yml

@@ -0,0 +1,16 @@
+name: "Update: Long (5)"
+
+on:
+  schedule:
+    - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
+
+jobs:
+  desktop:
+    name: "Desktop"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/ci
+        with:
+          branch: release/long/5
+          tree: desktop

.github/workflows/update.scheduled.long-6.yml

@@ -0,0 +1,16 @@
+name: "Update: Long (6)"
+
+on:
+  schedule:
+    - cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday
+
+jobs:
+  desktop:
+    name: "Desktop"
+    runs-on: self-hosted
+    steps:
+      - uses: actions/checkout@v3
+      - uses: ./.github/actions/ci
+        with:
+          branch: release/long/6
+          tree: desktop

.gitmodules

@@ -23,3 +23,6 @@
 [submodule "lib/workstation-ostree-config"]
 	path = lib/workstation-ostree-config
 	url = https://pagure.io/workstation-ostree-config
+[submodule "lib/workstation-ostree-config_f39"]
+	path = lib/workstation-ostree-config_f39
+	url = https://pagure.io/workstation-ostree-config

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2023 Sodalite contributors
+Copyright © 2021-2023 Sodalite contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.sh

@@ -461,7 +461,7 @@ function main() {
 
             container_name="sodalite-build_$(echo $RANDOM | md5sum | head -c 6; echo;)"
             container_hostname="$(echo $container_name | sed s/_/-/g)"
-            container_image="fedora:38"
+            container_image="fedora:39"
 
             container_build_args="--working-dir /wd/out"
             [[ $ex_log != "" ]] && container_build_args+=" --ex-log $ex_log"

src/cores/bases/f39.yaml

@@ -0,0 +1,40 @@
+include: [
+  "../../../lib/workstation-ostree-config_f39/fedora-common-ostree-pkgs.yaml"
+]
+
+releasever: "39"
+
+packages:
+ - distribution-gpg-keys
+ - fedora-release
+ - fedora-release-ostree-desktop
+ - fedora-repos-archive
+ - fedora-repos-ostree
+ - elfutils-libelf-devel
+ - firewalld
+ - glibc-devel
+ - hfsplus-tools
+ - kernel-devel
+ - lvm2
+ - rpm-ostree
+ - xdg-user-dirs-gtk
+packages-x86_64:
+ - efibootmgr
+ - grub2-efi-ia32
+ - grub2-efi-x64
+ - grub2-pc
+ - hyperv-daemons
+ - mcelog
+ - microcode_ctl
+ - open-vm-tools-desktop
+ - ostree-grub2
+ - shim-ia32
+ - shim-x64
+ - thermald
+ - virtualbox-guest-additions
+ - xorg-x11-drv-amdgpu
+ - xorg-x11-drv-intel
+ - xorg-x11-drv-vesa
+ - xorg-x11-drv-vmware
+exclude-packages:
+ - PackageKit

src/cores/common.yaml

@@ -1,12 +1,12 @@
 include: [
-  "bases/f38.yaml",
+  "bases/f39.yaml",
   "../packages/flatpak.yaml",
   "../packages/fonts.yaml",
   "../packages/tools.yaml",
 ]
 
-releasever: "38"
-automatic-version-prefix: "5.0-<date:%y%j>"
+releasever: "39"
+automatic-version-prefix: "6.0-<date:%y%j>"
 automatic-version-suffix: "."
 mutate-os-release: "${releasever}"
 
@@ -23,18 +23,10 @@ add-files: [
   ["../sysroot/common/etc/issue", "/etc/issue"],
   ["../sysroot/common/etc/tlp.d/50-vm-writeback.conf", "/etc/tlp.d/50-vm-writeback.conf"],
 
-  # /etc/fonts
-  ["../sysroot/common/etc/fonts/conf.d/63-inter.conf", "/etc/fonts/conf.d/63-inter.conf"],
-
   # /etc/skel
   ["../sysroot/common/etc/skel/dot.bashrc", "/etc/skel/.bashrc"],
   ["../sysroot/common/etc/skel/dot.config/touchegg/touchegg.conf", "/etc/skel/.config/touchegg/touchegg.conf"],
 
-  # /etc/systemd
-  ["../sysroot/common/etc/systemd/system/generate-oemconf.service", "/etc/systemd/system/generate-oemconf.service"],
-  ["../sysroot/common/etc/systemd/system/sodalite-auto-update.service", "/etc/systemd/system/sodalite-auto-update.service"],
-  ["../sysroot/common/etc/systemd/system/sodalite-migrate.service", "/etc/systemd/system/sodalite-migrate.service"],
-
   # /etc/xdg
   #["../sysroot/common/etc/xdg/autostart/appimaged.desktop", "/etc/xdg/autostart/appimaged.desktop"], # BUG: https://github.com/sodaliterocks/sodalite/issues/42
   ["../sysroot/common/etc/xdg/autostart/rocks.sodalite.user-daemon.desktop", "/etc/xdg/autostart/rocks.sodalite.user-daemon.desktop"],
@@ -57,6 +49,11 @@ add-files: [
   # /usr/lib
   ["../sysroot/common/usr/lib/sodalite-buildinfo", "/usr/lib/sodalite-buildinfo"],
 
+  # /usr/lib/systemd
+  ["../sysroot/common/usr/lib/systemd/system/generate-oemconf.service", "/usr/lib/systemd/system/generate-oemconf.service"],
+  ["../sysroot/common/usr/lib/systemd/system/sodalite-auto-update.service", "/usr/lib/systemd/system/sodalite-auto-update.service"],
+  ["../sysroot/common/usr/lib/systemd/system/sodalite-migrate.service", "/usr/lib/systemd/system/sodalite-migrate.service"],
+
   # /usr/libexec
   ["../../lib/sodaliterocks.hacks/src/plugins/auto-update.sh", "/usr/libexec/rocks.sodalite.hacks/plugins/auto-update.sh"],
   ["../../lib/sodaliterocks.hacks/src/plugins/cleanup.sh", "/usr/libexec/rocks.sodalite.hacks/plugins/cleanup.sh"],

src/packages/tools.yaml

@@ -3,9 +3,10 @@ packages:
  - buildah
  - dbus-x11
  - distrobox
- - ffmpeg
+ #- ffmpeg # temporary (package resolve errors currently with f39)
  - git-core
  - git-core-doc
+ - git-lfs
  - gstreamer1-plugins-good-gtk
  - lm_sensors
  - meson

src/scripts/10-version.sh

@@ -28,8 +28,9 @@ function get_codename() {
         "4.0"*) echo "Nubia" ;;
         "4.1"*) echo "Toniki" ;;
         "4.2"*) echo "Bantu" ;;
-        "4.3"*) echo "Wari" ;;
         "5.0"*) echo "Iberia" ;;
+        "6.0"*) echo "Kutai" ;;
+        "7.0"*) echo "Nazca" ;;
     esac
 }
 
@@ -122,8 +123,8 @@ if [[ $version_v_major != "" ]]; then
 
         pretty_version="$version"
 
-        mkdir -p /etc/apt/sources.list.d/
-        echo "daily" > /etc/apt/sources.list.d/elementary.list
+        #mkdir -p /etc/apt/sources.list.d/
+        #echo "daily" > /etc/apt/sources.list.d/elementary.list
     fi
 
     if [[ $channel != "" ]]; then

src/scripts/30-hacks.sh

@@ -1,30 +1,32 @@
 #!/usr/bin/env bash
 
-# TODO: Work out if we even need some of these, as the related issues are
-#       pretty old.
-
-# BUG: https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
+if [[ $_os_base_version == "38" ]]; then
+    # BUG: https://github.com/projectatomic/rpm-ostree/issues/1542#issuecomment-419684977
 for x in /etc/yum.repos.d/*modular.repo; do
     sed -i -e 's,enabled=[01],enabled=0,' ${x}
 done
 
-# BUG: https://bugzilla.redhat.com/show_bug.cgi?id=1265295
-if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then
-    (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new
-    mv /etc/systemd.journald.conf{.new,}
-fi
+    # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
+    # From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf
+    install -dm0755 /usr/lib/systemd/journald.conf.d/
+    echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf
 
-# SEE: https://src.fedoraproject.org/rpms/glibc/pull-request/4
-# Basically that program handles deleting old shared library directories
-# mid-transaction, which never applies to rpm-ostree. This is structured as a
-# loop/glob to avoid hardcoding (or trying to match) the architecture.
-for x in /usr/sbin/glibc_post_upgrade.*; do
-    if test -f ${x}; then
-        ln -srf /usr/bin/true ${x}
-    fi
-done
+    # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4
+    # Basically that program handles deleting old shared library directories
+    # mid-transaction, which never applies to rpm-ostree. This is structured as a
+    # loop/glob to avoid hardcoding (or trying to match) the architecture.
+    for x in /usr/sbin/glibc_post_upgrade.*; do
+        if test -f ${x}; then
+            ln -srf /usr/bin/true ${x}
+        fi
+    done
 
-if [[ $_os_base_version == "38" ]]; then
+    # Remove loader directory causing issues in Anaconda in unified core mode
+    # Will be obsolete once we start using bootupd
+    rm -rf /usr/lib/ostree-boot/loader
+fi
+
+if [[ $_os_base_version == "39" ]]; then
     # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295
     # From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf
     install -dm0755 /usr/lib/systemd/journald.conf.d/
@@ -43,4 +45,14 @@ if [[ $_os_base_version == "38" ]]; then
     # Remove loader directory causing issues in Anaconda in unified core mode
     # Will be obsolete once we start using bootupd
     rm -rf /usr/lib/ostree-boot/loader
+
+    # Undo RPM scripts enabling units; we want the presets to be canonical
+    # https://github.com/projectatomic/rpm-ostree/issues/1803
+    rm -rf /etc/systemd/system/*
+    systemctl preset-all
+    rm -rf /etc/systemd/user/*
+    systemctl --user --global preset-all
+
+    # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2218006
+    systemctl enable nfs-client.target
 fi

src/scripts/70-wallpaper.sh

@@ -10,14 +10,14 @@ case $_os_version_id in
     "4.0"*) wallpaper="jeremy-gerritsen-_iviuukstI4-unsplash" ;;
     "4.1"*) wallpaper="dustin-humes-OrO_HSqlZMY-unsplash" ;;
     "4.2"*) wallpaper="piermanuele-sberni-9jVmJ_mBRE8-unsplash~3967x2645" ;;
-    "4.3"*)
-        wallpaper="marek-piwnicki-fIxvIQ6mH-E-unsplash"
-        pantheon_accent="bubblegum"
-        ;;
     "5.0"*)
         wallpaper="zara-walker-_pC5hT6aXfs-unsplash"
         pantheon_accent="cocoa"
         ;;
+    "6.0"*)
+        wallpaper="marek-piwnicki-fIxvIQ6mH-E-unsplash"
+        pantheon_accent="bubblegum"
+        ;;
     *) wallpaper="$_fallback_wallpaper" ;;
 esac
 

src/scripts/80-tweaks-pantheon.sh

@@ -7,6 +7,7 @@ if [[ $_os_core == "pantheon" ]]; then
     fi
 
     systemctl disable gdm
+
     systemctl enable generate-oemconf
     systemctl enable lightdm
     systemctl enable touchegg

src/scripts/80-tweaks.sh

@@ -2,8 +2,10 @@
 
 ln -s /usr/bin/rocks.sodalite.hacks /usr/bin/sodalite-hacks
 ln -s /usr/bin/firefox /usr/bin/rocks.sodalite.firefox
+ln -s /usr/share/fontconfig/conf.avail/63-inter.conf /etc/fonts/conf.d/63-inter.conf
 
 glib-compile-schemas /usr/share/glib-2.0/schemas
 dconf update
+fc-cache -f -v
 
 systemctl enable sodalite-migrate