fix: linux-cachyos nev, pkgver=7.0.10 pkgrel=2, config frissites RaveOS javitasokkal

2 files changed, 19 insertions, 17 deletions

diff --git a/.forgejo/workflows/build-kernel.yml b/.forgejo/workflows/build-kernel.yml
index cce7f57..d2ba36a 100644
--- a/.forgejo/workflows/build-kernel.yml
+++ b/.forgejo/workflows/build-kernel.yml
@@ -44,23 +44,18 @@ jobs:
           CORE="/tmp/raveos-core-repo/x86_64"
           PKGVER=$(grep '^pkgver=' linux-raveos/PKGBUILD | cut -d= -f2)
           PKGREL=$(grep '^pkgrel=' linux-raveos/PKGBUILD | cut -d= -f2)
-          EPOCH=$(grep '^epoch=' linux-raveos/PKGBUILD | cut -d= -f2 || echo "")
-          if [ -n "$EPOCH" ]; then
-            FULLVER="${EPOCH}:${PKGVER}-${PKGREL}"
-          else
-            FULLVER="${PKGVER}-${PKGREL}"
-          fi
+          FULLVER="${PKGVER}-${PKGREL}"
           echo "PKGVER=$PKGVER" >> $GITHUB_OUTPUT
           echo "PKGREL=$PKGREL" >> $GITHUB_OUTPUT
-          if ls "$CORE"/linux-raveos-${PKGVER}-${PKGREL}-*.pkg.tar.zst 2>/dev/null | grep -q .; then
+          if ls "$CORE"/linux-cachyos-${PKGVER}-${PKGREL}-*.pkg.tar.zst 2>/dev/null | grep -q .; then
             echo "SKIP=yes" >> $GITHUB_OUTPUT
-            echo "linux-raveos ${FULLVER} mar bent van -> skip"
+            echo "linux-cachyos ${FULLVER} mar bent van -> skip"
           else
             echo "SKIP=no" >> $GITHUB_OUTPUT
-            echo "linux-raveos ${FULLVER} build indul..."
+            echo "linux-cachyos ${FULLVER} build indul..."
           fi
 
-      - name: Build linux-raveos
+      - name: Build linux-cachyos
         if: steps.check.outputs.SKIP == 'no'
         run: |
           set -euo pipefail
diff --git a/.forgejo/workflows/kernel-update-check.yml b/.forgejo/workflows/kernel-update-check.yml
index cf86930..5f915f0 100644
--- a/.forgejo/workflows/kernel-update-check.yml
+++ b/.forgejo/workflows/kernel-update-check.yml
@@ -92,10 +92,8 @@ jobs:
           OLD_PKGVER="${{ steps.current.outputs.PKGVER }}"
           CUR="${{ steps.current.outputs.MAJOR }}.${{ steps.current.outputs.MINOR }}-${{ steps.current.outputs.TAGREL }}"
 
-          # Csak a sajat pkgver utolso szamot noveli: X.Y.Z -> X.Y.Z+1
-          BASE="${OLD_PKGVER%.*}"
-          LAST="${OLD_PKGVER##*.}"
-          NEW_PKGVER="${BASE}.$((LAST + 1))"
+          # pkgver = kernel verzio (pl. 7.0.11), pkgrel mindig 2
+          NEW_PKGVER="${NEW_MAJOR}.${NEW_MINOR}"
 
           BRANCH="update/kernel-${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL}"
 
@@ -107,10 +105,19 @@ jobs:
           sed -i "s/^_minor=.*/_minor=${NEW_MINOR}/" linux-raveos/PKGBUILD
           sed -i "s/^_tagrel=.*/_tagrel=${NEW_TAGREL}/" linux-raveos/PKGBUILD
           sed -i "s/^pkgver=.*/pkgver=${NEW_PKGVER}/" linux-raveos/PKGBUILD
-          sed -i "s/^pkgrel=.*/pkgrel=1/" linux-raveos/PKGBUILD
+          sed -i "s/^pkgrel=.*/pkgrel=2/" linux-raveos/PKGBUILD
 
-          git add linux-raveos/PKGBUILD
-          git commit -m "update: linux-raveos kernel ${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL} (pkgver=${NEW_PKGVER})"
+          # Uj CachyOS config letoltese + RaveOS javitasok visszarakasa
+          curl -fsSL --retry 3 \
+            "https://raw.githubusercontent.com/CachyOS/linux-cachyos/master/linux-cachyos/config" \
+            -o linux-raveos/config
+          sed -i 's/^CONFIG_ZRAM=m$/CONFIG_ZRAM=y/' linux-raveos/config
+          sed -i 's/^# CONFIG_ZRAM is not set$/CONFIG_ZRAM=y/' linux-raveos/config
+          sed -i 's/^CONFIG_NTSYNC=m$/CONFIG_NTSYNC=y/' linux-raveos/config
+          sed -i 's/^# CONFIG_NTSYNC is not set$/CONFIG_NTSYNC=y/' linux-raveos/config
+
+          git add linux-raveos/PKGBUILD linux-raveos/config
+          git commit -m "update: linux-cachyos ${NEW_MAJOR}.${NEW_MINOR}-${NEW_TAGREL} (pkgver=${NEW_PKGVER}-2)"
 
           git remote set-url origin "https://bot:${{ secrets.FORGEJO_TOKEN }}@git.rp1.hu/RaveOS/RaveOS-PKGBUILD.git"
           git push origin "$BRANCH"