✨ release 5.0 to current

README.md

@@ -191,18 +191,6 @@ On WSL2, do not build to any `/mnt/<drive-letter>` directories as these will be
 
 Most rpm-ostree distros can be built just be simply doing `rpm-ostree compose`, but `build.sh` provided with Sodalite does some extra steps which are required for the post-build script (which **will** fail without these being ran). It is therefore not recommended to do it this way: any issues building the distro this way will be closed and marked as invalid.
 
-##### Without `--unified-core` deprecation warning
-
-During the build you will face this warning:
-
-```sh
-NOTICE: Running rpm-ostree compose tree without --unified-core is deprecated.
- Please add --unified-core to the command line and ensure your content
- works with it.  For more information, see https://github.com/coreos/rpm-ostree/issues/729
-```
-
-You can safely ignore this: Sodalite builds without `--unified-core` due to historical reasons. To test building with the option, append `--unified-core` to `build.sh`'s options.
-
 #### Cleaning Up
 
 Build contents is located at `./build/` (or whatever you set `<working-dir>` to), which can be deleted to start afresh. Specifically this holds the following files/directories (of which can be individually deleted instead):

build.sh

@@ -12,13 +12,13 @@ _PLUGIN_OPTIONS=(
     "serve-port;;\tPort to serve on when using --serve (default: 8080);int"
     "skip-cleanup;;Skip cleaning up on exit"
     "skip-tests;;\tSkip executing tests"
-    "unified-core;;Use --unified-core option with rpm-ostree"
     "vendor;;\tVendor to use in CPE (default: \$USER);string"
     "ex-container-args;;"
     "ex-container-hostname;;"
     "ex-container-image;;"
     "ex-git-version-branch;;"
     "ex-log;;"
+    "ex-no-unified-core;;Do not use --unified-core option with rpm-ostree"
     "ex-ntfy;;"
     "ex-ntfy-endpoint;;"
     "ex-ntfy-password;;"
@@ -231,10 +231,10 @@ function build_sodalite() {
         treefile="$(get_treefile)"
     fi
 
-    if [[ $unified_core == "true" ]]; then
-        unified="true"
-    else
+    if [[ $ex_no_unified_core == "true" ]]; then
         unified="false"
+    else
+        unified="true"
     fi
 
     buildinfo_file="$src_dir/src/sysroot/common/usr/lib/sodalite-buildinfo"
@@ -461,10 +461,11 @@ function main() {
 
             container_name="sodalite-build_$(echo $RANDOM | md5sum | head -c 6; echo;)"
             container_hostname="$(echo $container_name | sed s/_/-/g)"
-            container_image="fedora:37"
+            container_image="fedora:38"
 
             container_build_args="--working-dir /wd/out"
             [[ $ex_log != "" ]] && container_build_args+=" --ex-log $ex_log"
+            [[ $ex_no_unified_core != "" ]] && container_build_args+=" --ex-no-unified-core $ex_no_unified_core"
             [[ $ex_ntfy != "" ]] && container_build_args+=" --ex-ntfy $ex_ntfy"
             [[ $ex_ntfy_endpoint != "" ]] && container_build_args+=" --ex-ntfy-endpoint $ex_ntfy_endpoint"
             [[ $ex_ntfy_password != "" ]] && container_build_args+=" --ex-ntfy-password $ex_ntfy_password"
@@ -474,7 +475,6 @@ function main() {
             [[ $skip_cleanup != "" ]] && container_build_args+=" --skip-cleanup $skip_cleanup"
             [[ $skip_test != "" ]] && container_build_args+=" --skip-test $skip_test"
             [[ $tree != "" ]] && container_build_args+=" --tree $tree"
-            [[ $unified_core != "" ]] && container_build_args+=" --unified-core $unified_core"
             [[ $vendor != "" ]] && container_build_args+=" --vendor $vendor"
 
             if [[ $ex_override_starttime != "" ]]; then

src/cores/common.yaml

@@ -1,12 +1,12 @@
 include: [
-  "bases/f37.yaml",
+  "bases/f38.yaml",
   "../packages/flatpak.yaml",
   "../packages/fonts.yaml",
   "../packages/tools.yaml",
 ]
 
-releasever: "37"
-automatic-version-prefix: "4.2-<date:%y%j>"
+releasever: "38"
+automatic-version-prefix: "5.0-<date:%y%j>"
 automatic-version-suffix: "."
 mutate-os-release: "${releasever}"
 

src/scripts/10-version.sh

@@ -28,6 +28,7 @@ function get_codename() {
         "4.0"*) echo "Nubia" ;;
         "4.1"*) echo "Toniki" ;;
         "4.2"*) echo "Bantu" ;;
+        "4.3"*) echo "Wari" ;;
         "5.0"*) echo "Iberia" ;;
     esac
 }

src/scripts/30-hacks.sh

@@ -23,3 +23,24 @@ for x in /usr/sbin/glibc_post_upgrade.*; do
         ln -srf /usr/bin/true ${x}
     fi
 done
+
+if [[ $_os_base_version == "38" ]]; 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/
+    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
+
+    # 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

src/scripts/70-wallpaper.sh

@@ -4,12 +4,20 @@ _fallback_wallpaper="phil-botha-a0TJ3hy-UD8-unsplash"
 _wallpaper_dir="/usr/share/backgrounds/default"
 
 wallpaper=""
+pantheon_accent=""
 
 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" ;;
-    "5.0"*) wallpaper="zara-walker-_pC5hT6aXfs-unsplash" ;;
+    "4.3"*)
+        wallpaper="marek-piwnicki-fIxvIQ6mH-E-unsplash"
+        pantheon_accent="bubblegum"
+        ;;
+    "5.0"*)
+        wallpaper="zara-walker-_pC5hT6aXfs-unsplash"
+        pantheon_accent="cocoa"
+        ;;
     *) wallpaper="$_fallback_wallpaper" ;;
 esac
 
@@ -18,5 +26,15 @@ if [[ -f "${_wallpaper_dir}/$wallpaper.jpg" ]]; then
 
     if [[ $_os_core == "pantheon" ]]; then
         ln -s "${_wallpaper_dir}/$wallpaper.jpg" /usr/share/backgrounds/elementaryos-default
+
+        if [[ $pantheon_accent != "" ]]; then
+            pantheon_stylesheet="io.elementary.stylesheet.$pantheon_accent"
+
+            if [[ -d "/usr/share/themes/$pantheon_stylesheet" ]]; then
+                set_property /usr/share/glib-2.0/schemas/00_sodalite.gschema.override gtk-theme "'$pantheon_stylesheet'"
+
+                sed -i "s/gtk-theme-name.*/gtk-theme-name = $pantheon_stylesheet/g" /etc/gtk-3.0/settings.ini
+            fi
+        fi
     fi
 fi