Relabel SteamOS version variable.

SteamFork · Dec 6, 2024 · c99adbd · c99adbd
1 parent 072f6ba
commit c99adbd
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ export WORK_DIR		:= ${BUILD_DIR}/_work
 export IMAGE_DIR	:= ${BUILD_DIR}/release/images
 export REPO_DIR		:= ${BUILD_DIR}/release/repos
 export BUILD_VER	:= $(shell date +%Y%m%d.%H%M)
-export UPSTREAM_VERSION := 3.6
+export STEAMOS_VERSION := 3.6
 
 RUN_ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 $(eval $(RUN_ARGS):;@:)

diff --git a/PKGBUILD/steamfork-customizations/src/usr/share/post-update.d/003-mirrors.sh b/PKGBUILD/steamfork-customizations/src/usr/share/post-update.d/003-mirrors.sh
@@ -2,8 +2,10 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2024-present Fewtarius
 
+source /etc/os-release
+
 rm -f /etc/pacman.d/steamfork-mirrorlist
 steamfork-get-mirror random | while read line
 do
-  echo "Server = https://${line}/repos/rel" >>/etc/pacman.d/steamfork-mirrorlist
+  echo "Server = https://${line}/repos/${STEAMOS_VERSION}" >>/etc/pacman.d/steamfork-mirrorlist
 done
diff --git a/metadata/pacman.conf b/metadata/pacman.conf
@@ -76,25 +76,25 @@ LocalFileSigLevel = Optional
 [steamfork]
 Include = /etc/pacman.d/steamfork-mirrorlist
 
-[jupiter-@UPSTREAM_VERSION@]
+[jupiter-@STEAMOS_VERSION@]
 Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/$repo/os/$arch
 
-[holo-@UPSTREAM_VERSION@]
+[holo-@STEAMOS_VERSION@]
 Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/$repo/os/$arch
 
-[core-@UPSTREAM_VERSION@]
+[core-@STEAMOS_VERSION@]
 Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/$repo/os/$arch
 
-[extra-@UPSTREAM_VERSION@]
+[extra-@STEAMOS_VERSION@]
 Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/$repo/os/$arch
 
 #[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[community-@UPSTREAM_VERSION@]
+[community-@STEAMOS_VERSION@]
 Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/$repo/os/$arch
 
-[multilib-@UPSTREAM_VERSION@]
+[multilib-@STEAMOS_VERSION@]
 Server = https://steamdeck-packages.steamos.cloud/archlinux-mirror/$repo/os/$arch
 
 # An example of a custom package repository.  See the pacman manpage for

diff --git a/metadata/steamfork-mirrorlist b/metadata/steamfork-mirrorlist
@@ -1,6 +1,6 @@
-Server = https://www.steamfork.org/@UPSTREAM_VERSION@/@RELEASE_TYPE@
-Server = https://www1.ny.steamfork.org/@UPSTREAM_VERSION@/@RELEASE_TYPE@
-Server = https://www1.da.steamfork.org/@UPSTREAM_VERSION@/@RELEASE_TYPE@
-Server = https://www1.sj.steamfork.org/@UPSTREAM_VERSION@/@RELEASE_TYPE@
-Server = https://www1.as.steamfork.org/@UPSTREAM_VERSION@/@RELEASE_TYPE@
-Server = https://www2.as.steamfork.org/@UPSTREAM_VERSION@/@RELEASE_TYPE@
+Server = https://www.steamfork.org/@STEAMOS_VERSION@/@RELEASE_TYPE@
+Server = https://www1.ny.steamfork.org/@STEAMOS_VERSION@/@RELEASE_TYPE@
+Server = https://www1.da.steamfork.org/@STEAMOS_VERSION@/@RELEASE_TYPE@
+Server = https://www1.sj.steamfork.org/@STEAMOS_VERSION@/@RELEASE_TYPE@
+Server = https://www1.as.steamfork.org/@STEAMOS_VERSION@/@RELEASE_TYPE@
+Server = https://www2.as.steamfork.org/@STEAMOS_VERSION@/@RELEASE_TYPE@
diff --git a/rootfs/installer/package_lists/full.x86_64 b/rootfs/installer/package_lists/full.x86_64
@@ -36,7 +36,7 @@ gpm
 zenity
 gptfdisk
 grml-zsh-config
-core-@UPSTREAM_VERSION@/grub
+core-@STEAMOS_VERSION@/grub
 hdparm
 hyperv
 intel-ucode

diff --git a/rootfs/installer/package_lists/minimal.x86_64 b/rootfs/installer/package_lists/minimal.x86_64
@@ -36,7 +36,7 @@ gpm
 zenity
 gptfdisk
 grml-zsh-config
-core-${UPSTREAM_VERSION}/grub
+core-${STEAMOS_VERSION}/grub
 hdparm
 hyperv
 intel-ucode

diff --git a/rootfs/steamfork/build-image b/rootfs/steamfork/build-image
@@ -31,8 +31,8 @@ case $key in
 	shift
 	;;
 	--upstream_ver)
-	UPSTREAM_VERSION=$2
-	echo "Upstream Version: ${UPSTREAM_VERSION}"
+	STEAMOS_VERSION=$2
+	echo "Upstream Version: ${STEAMOS_VERSION}"
 	shift
 	shift
 	;;
@@ -137,12 +137,12 @@ mkdir -p ${WORKDIR}
 
 PACCFG_SOURCE="metadata/pacman.conf"
 cp -f ${PACCFG_SOURCE} ${WORKDIR}
-sed -i 's~@UPSTREAM_VERSION@~'${UPSTREAM_VERSION}'~g' ${WORKDIR}/pacman.conf
+sed -i 's~@STEAMOS_VERSION@~'${STEAMOS_VERSION}'~g' ${WORKDIR}/pacman.conf
 PACCFG=${WORKDIR}/pacman.conf
 
 SF_PACCFG_SOURCE="metadata/steamfork-mirrorlist"
 cp -f ${SF_PACCFG_SOURCE} ${WORKDIR}
-sed -i 's~@UPSTREAM_VERSION@~'${UPSTREAM_VERSION}'~g' ${WORKDIR}/steamfork-mirrorlist
+sed -i 's~@STEAMOS_VERSION@~'${STEAMOS_VERSION}'~g' ${WORKDIR}/steamfork-mirrorlist
 SF_PACCFG=${WORKDIR}/steamfork-mirrorlist
 
 mkdir -p ${OUTPUT}
@@ -209,6 +209,7 @@ LOGO=steamos
 VERSION_ID="${RELEASE_TAG}"
 VARIANT_ID="${RELEASE_TYPE}"
 BUILD_ID="${RELEASE_TAG}"
+STEAMOS_VERSION="${STEAMOS_VERSION}"
 EOF
 
 echo "Write steamfork-release"

diff --git a/rootfs/steamfork/presets/minimal.sh b/rootfs/steamfork/presets/minimal.sh
@@ -39,7 +39,7 @@ export DISABLED_SERVICES=()
 export PLYMOUTH_THEME=""
 export FINAL_DISTRIB_IMAGE=${BUILDVER}
 export KERNELCHOICE="linux"
-export BASE_BOOTSTRAP_PKGS="base base-devel linux-firmware intel-ucode amd-ucode dkms jq btrfs-progs core-${UPSTREAM_VERSION}/grub efibootmgr openssh"
+export BASE_BOOTSTRAP_PKGS="base base-devel linux-firmware intel-ucode amd-ucode dkms jq btrfs-progs core-${STEAMOS_VERSION}/grub efibootmgr openssh"
 export STEAMOS_PKGS="acl
                     accountsservice
                     adobe-source-code-pro-fonts
@@ -259,7 +259,7 @@ export STEAMOS_PKGS="acl
                     linux-api-headers
                     linux-firmware
                     linux-firmware-whence
-		    extra-${UPSTREAM_VERSION}/llvm
+		    extra-${STEAMOS_VERSION}/llvm
                     lsof
                     lz4
                     lzo

diff --git a/rootfs/steamfork/presets/rel.sh b/rootfs/steamfork/presets/rel.sh
@@ -45,7 +45,7 @@ export DISABLED_SERVICES=(jupiter-controller-update.service
 export PLYMOUTH_THEME="steamos"
 export FINAL_DISTRIB_IMAGE=${BUILDVER}
 export KERNELCHOICE="linux"
-export BASE_BOOTSTRAP_PKGS="base base-devel linux-firmware amd-ucode intel-ucode sddm-wayland dkms jq btrfs-progs core-${UPSTREAM_VERSION}/grub efibootmgr openssh plymouth"
+export BASE_BOOTSTRAP_PKGS="base base-devel linux-firmware amd-ucode intel-ucode sddm-wayland dkms jq btrfs-progs core-${STEAMOS_VERSION}/grub efibootmgr openssh plymouth"
 export STEAMOS_PKGS="accounts-qml-module
                     accountsservice
                     acl

diff --git a/scripts/mkimage b/scripts/mkimage
@@ -75,10 +75,10 @@ else
 fi
 
 cp -f ${INSTALLER_DIR}/package_lists/${PACKAGESET}.x86_64 ${INSTALLER_DIR}/packages.x86_64
-sed -i 's~@UPSTREAM_VERSION@~'${UPSTREAM_VERSION}'~g' ${INSTALLER_DIR}/packages.x86_64
+sed -i 's~@STEAMOS_VERSION@~'${STEAMOS_VERSION}'~g' ${INSTALLER_DIR}/packages.x86_64
 
 # Build the SteamFork image
-sudo rootfs/steamfork/build-image --flavor ${RELEASE_TYPE} --deployment_rel ${RELEASE_TYPE} --upstream_ver "${UPSTREAM_VERSION}" --snapshot_ver "${BUILD_VER}" --workdir "${WORK_DIR}" --output-dir "${IMAGE_DIR}" --add-release
+sudo rootfs/steamfork/build-image --flavor ${RELEASE_TYPE} --deployment_rel ${RELEASE_TYPE} --upstream_ver "${STEAMOS_VERSION}" --snapshot_ver "${BUILD_VER}" --workdir "${WORK_DIR}" --output-dir "${IMAGE_DIR}" --add-release
 
 # Prep for the installation image
 source ${IMAGE_DIR}/latest_${RELEASE_TYPE}.releasemeta

diff --git a/scripts/mkpackage b/scripts/mkpackage
@@ -30,7 +30,7 @@ do
   KEY="$1"
   case ${KEY} in
       --branch)
-      UPSTREAM_VERSION="$2"
+      STEAMOS_VERSION="$2"
       shift # past argument
       shift # past value
       ;;
@@ -53,7 +53,7 @@ fi
 
 BUILDUSER=${USER}
 WORK_DIR="${WORK_DIR}/packages/${1}"
-REPO_DIR="${REPO_DIR}/${UPSTREAM_VERSION}"
+REPO_DIR="${REPO_DIR}/${STEAMOS_VERSION}"
 
 sudo steamos-readonly disable
 sudo rm -rf /var/lib/pacman/db.lck ${WORK_DIR}

diff --git a/scripts/modules/github-tag b/scripts/modules/github-tag
@@ -7,7 +7,7 @@ PACKAGE="${1}"
 DATA_SOURCE="https://api.github.com/repos/${2}/tags"
 WORK_DIR="${HOME}/.update_tmp/${PACKAGE}"
 
-UPSTREAM_VERSION=$(curl --url "${DATA_SOURCE}" 2>/dev/null | jq -r '.[0].name')
+STEAMOS_VERSION=$(curl --url "${DATA_SOURCE}" 2>/dev/null | jq -r '.[0].name')
 if [ ! -d "${DATA_DIR}" ]
 then
 	mkdir -p ${DATA_DIR}
@@ -18,7 +18,7 @@ then
 	DOWNSTREAM_VERSION="$(cat ${DATA_DIR}/${PACKAGE})"
 fi
 
-if [ ! "${UPSTREAM_VERSION}" = "${DOWNSTREAM_VERSION}" ]
+if [ ! "${STEAMOS_VERSION}" = "${DOWNSTREAM_VERSION}" ]
 then
-	echo "${UPSTREAM_VERSION}" | tee ${DATA_DIR}/${PACKAGE}
+	echo "${STEAMOS_VERSION}" | tee ${DATA_DIR}/${PACKAGE}
 fi
diff --git a/scripts/modules/gitlab-tag b/scripts/modules/gitlab-tag
@@ -13,7 +13,7 @@ fi
 DATA_SOURCE="https://${BASE_URL}/api/v4/projects/${2}/repository/tags"
 WORK_DIR="${HOME}/.update_tmp/${PACKAGE}"
 
-UPSTREAM_VERSION=$(curl --url "${DATA_SOURCE}" 2>/dev/null | jq -r '.[0] | .name')
+STEAMOS_VERSION=$(curl --url "${DATA_SOURCE}" 2>/dev/null | jq -r '.[0] | .name')
 if [ ! -d "${DATA_DIR}" ]
 then
 	mkdir -p ${DATA_DIR}
@@ -24,7 +24,7 @@ then
 	DOWNSTREAM_VERSION="$(cat ${DATA_DIR}/${PACKAGE})"
 fi
 
-if [ ! "${UPSTREAM_VERSION#*-}" = "${DOWNSTREAM_VERSION}" ]
+if [ ! "${STEAMOS_VERSION#*-}" = "${DOWNSTREAM_VERSION}" ]
 then
-	echo "${UPSTREAM_VERSION#*-}" | tee ${DATA_DIR}/${PACKAGE}
+	echo "${STEAMOS_VERSION#*-}" | tee ${DATA_DIR}/${PACKAGE}
 fi
diff --git a/scripts/modules/linux-tag b/scripts/modules/linux-tag
@@ -23,7 +23,7 @@ else
 fi
 
 cd ${WORK_DIR}/${PACKAGE}
-UPSTREAM_VERSION="$(git tag | sort -V | grep -v 'rc' | tail -n 1)"
+STEAMOS_VERSION="$(git tag | sort -V | grep -v 'rc' | tail -n 1)"
 
 if [ ! -d "${DATA_DIR}" ]
 then
@@ -35,7 +35,7 @@ then
         DOWNSTREAM_VERSION="$(cat ${DATA_DIR}/${PACKAGE})"
 fi
 
-if [ ! "${UPSTREAM_VERSION}" = "${DOWNSTREAM_VERSION}" ]
+if [ ! "${STEAMOS_VERSION}" = "${DOWNSTREAM_VERSION}" ]
 then
-	echo "${UPSTREAM_VERSION}" | tee ${DATA_DIR}/${PACKAGE}
+	echo "${STEAMOS_VERSION}" | tee ${DATA_DIR}/${PACKAGE}
 fi