Update to 5.18.6.p2-3

- Rename generic package to -generic
- Set kernel config CONFIG_$CPU for generic variants properly. Fixes #7

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

1 files changed, 17 insertions, 12 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2ed45fe256a9..f6d6db2af551 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -519,12 +519,15 @@ build() {
     if [[ "$LCPU" ]] ; then
       case $LCPU in
         *generic*) LCPU=${LCPU/generic-v/generic_cpu} ;;
+        generic) : ;;
         *) LCPU=m${LCPU} ;;
       esac
-      CPU=${LCPU^^}
-      sed -e "s|# CONFIG_M$CPU is not set|CONFIG_M$CPU=y|" \
-          -e '/CONFIG_GENERIC_CPU=y/d' \
-          -i "$srcdir/linux-${_basekernel}/.config"
+      if [ ! $LCPU = "generic" ] ; then
+        CPU=${LCPU^^}
+        sed -e "s|# CONFIG_$CPU is not set|CONFIG_$CPU=y|" \
+            -e '/CONFIG_GENERIC_CPU=y/d' \
+            -i "$srcdir/linux-${_basekernel}/.config"
+      fi
       export _PKGOPT=y
     fi
 
@@ -820,19 +823,15 @@ _set_variant_appendix()
         pkgname="${_pkg}-generic-v4"
         pkgdesc="${pkgdesc} Generic-x86-64-v4 optimized."
         ;;
-      *)
-        # Workaround against mksrcinfo getting the $pkdesc wrong
-        pkgname="${_pkg}"
+      *|generic)
+        pkgname="${_pkg}-generic"
         pkgdesc="${pkgdesc}"
         ;;
     esac
 
+    conflicts=("$_pkg")
+    provides+=(${_pkg}=$pkgver)
 
-    if [[ "$pkgname" != "${_pkg}" ]]; then
-      # If optimized build, conflict with generic
-      conflicts=("$_pkg")
-      provides+=(${_pkg}=$pkgver)
-    fi
   fi
 
   echo
@@ -865,6 +864,12 @@ _package() {
 
   _set_variant_appendix "${pkgbase}"
 
+  case "$pkgname" in
+    *generic)
+      replaces=('<linux-pf=5.18.6.pf2-2')
+      ;;
+  esac
+
   ### package_linux-pf
 
   ### c/p from linux-ARCH