Point steamos-atomupd-client to our instance.

SteamFork · Jul 27, 2024 · 9773973 · 9773973
1 parent 8d71ff8
commit 9773973
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/PKGBUILD/steamfork-customizations-jupiter/PKGBUILD b/PKGBUILD/steamfork-customizations-jupiter/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Fewtarius
 
 pkgname=steamfork-customizations-jupiter
-pkgver=2024.07.26
-pkgrel=10
+pkgver=2024.07.27
+pkgrel=1
 pkgdesc='SteamFork customizations provider.'
 arch=('any')
 url='http://www.steamfork.org'
 license=('LGPLv2+')
-provides=('steamos-customizations-jupiter' 'atomupd-daemon-git' 'steamos-atomupd-client-git' 'steamos-reset')
+provides=('steamos-customizations-jupiter')
 depends=('base')
 makedepends=('file')
 

diff --git a/PKGBUILD/steamfork-customizations-jupiter/src/etc/steamos-atomupd/client.conf b/PKGBUILD/steamfork-customizations-jupiter/src/etc/steamos-atomupd/client.conf
@@ -1,6 +1,6 @@
 [Server]
-QueryUrl = https://steamdeck-atomupd.steamos.cloud/updates
-ImagesUrl = https://steamdeck-images.steamos.cloud/
-MetaUrl = https://steamdeck-atomupd.steamos.cloud/meta
+QueryUrl = https://www.steamfork.org/updates
+ImagesUrl = https://www.steamfork.org/
+MetaUrl = https://www.steamfork.org/meta
 Variants = rel;rc;beta;bc;main
 Branches = stable;rc;beta;bc;main
diff --git a/rootfs/steamfork/build-image b/rootfs/steamfork/build-image
@@ -290,6 +290,7 @@ ln -sf /run/systemd/resolve/stub-resolv.conf ${ROOT_WORKDIR}/etc/resolv.conf
 echo "(4.12/6) Delete conflicting files..."
 # Delete conflicting files
 for CONFLICT in etc/X11/Xsession.d/50rotate-screen \
+		usr/lib/qt/plugins/discover/steamos-backend.so \
                 etc/sddm.conf.d/steamdeck.conf
 do
   if [ -e "${ROOT_WORKDIR}/${CONFLICT}" ]

diff --git a/rootfs/steamfork/presets/rel.sh b/rootfs/steamfork/presets/rel.sh
@@ -71,6 +71,7 @@ export STEAMOS_PKGS="accounts-qml-module
                     aspell-en
                     assimp
                     at-spi2-core
+		    atomupd-daemon-git
                     atkmm
                     attr
                     audit
@@ -818,12 +819,14 @@ export STEAMOS_PKGS="accounts-qml-module
                     steam_notif_daemon
                     steamdeck-dsp
                     steamdeck-kde-presets
+		    steamos-atomupd-client-git
                     steamos-devkit-service
                     steamos-efi
                     steamos-kdumpst-layer
                     steamos-log-submitter
                     steamos-manager
                     steamos-networking-tools
+		    steamos-reset
                     steamos-systemreport
                     steamos-tweak-mtu-probing
                     strace
@@ -1021,10 +1024,6 @@ export STEAMOS_PKGS="accounts-qml-module
 # xorg-xwayland-jupiter
 # zenity-light
 
-# Conflicts with SteamFork update tooling
-# atomupd-daemon-git
-# steamos-atomupd-client-git
-# steamos-reset
 # packagekit-qt5
 
 export UI_BOOTSTRAP="${STEAMOS_PKGS}

diff --git a/scripts/sync b/scripts/sync
@@ -84,6 +84,7 @@ EOF
     scp /tmp/index.html ${WWWUSER}@${WWWHOST}:${WWWROOT}/images-new/installer/
     ssh -tt ${WWWUSER}@${WWWHOST} "chown -R www-data:www-data ${WWWROOT}/images-new"
     ssh -tt ${WWWUSER}@${WWWHOST} "mv ${WWWROOT}/images ${WWWROOT}/images-old; mv ${WWWROOT}/images-new/ ${WWWROOT}/images; rm -rf ${WWWROOT}/images-old"
+    ssh -tt ${WWWUSER}@${WWWHOST} "mkdir -p ${WWWROOT}/meta/steamos/amd64/${STAGING_OS_TAG}/steamdeck; echo "{ }" >${WWWROOT}/meta/steamos/amd64/${STAGING_OS_TAG}/steamdeck/${STAGING_OS_TAG}.json"
   ;;
   mirrors)
     for MIRROR_HOST in ${MIRROR_HOSTS}