core/linux-rpi to 6.1.10-1

core/linux-rpi/PKGBUILD

@@ -5,10 +5,11 @@
 # Contributer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux-rpi
-_commit=c113cf128749d17b6262d76769a6ad0e0e1f33c3
+_commit=eaf07c3a977e7210896bf66e65969252741b9d74
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
-pkgver=5.15.92
+_regen=
+pkgver=6.1.10
 pkgrel=1
 pkgdesc='Linux'
 url="http://www.kernel.org/"
@@ -26,23 +27,25 @@ source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/li
         linux.preset
         60-linux.hook
         90-linux.hook
+        archarm.diffconfig
 )
-md5sums=('8397aac8a94f0db9705dd36ce16b016d'
+md5sums=('b81151ff5e317f1afdfa37a45702fd2d'
          '3bab7426d8c8818dda8353da3892a41f'
          'f66a7ea3feb708d398ef57e4da4815e9'
          '86d4a35722b5410e3b29fc92dae15d4b'
          '0a5f16bfec6ad982a2f6782724cca8ba'
-         '441ec084c47cddc53e592fb0cbce4edf')
-md5sums_armv7h=('dc02ee6afd5b17e0e1ab761f87ade643'
+         '441ec084c47cddc53e592fb0cbce4edf'
+         'd1a9b105e3d6b8c4cf2a8411258f7fdf')
+md5sums_armv7h=('fdc793419a6e980efce95aa70f58a9fb'
                 '177bbdbe1baa46a04dcba86352cfa3fe')
-md5sums_aarch64=('c0287cde6ccb6b207fbd846a37619ccd'
+md5sums_aarch64=('a38dce60d48211728bbe23e67b86f68d'
                  '7e4403dea857e40005bf76beda9927ff')
 
 # setup vars
 if [[ $CARCH == "armv7h" ]]; then
-  _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt
+  _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt _name='-v7l'
 elif [[ $CARCH == "aarch64" ]]; then
-  _kernel=kernel8.img KARCH=arm64 _image=Image _config=config8 _bconfig=config8.txt
+  _kernel=kernel8.img KARCH=arm64 _image=Image _config=config8 _bconfig=config8.txt _name='-v8'
 fi
 
 prepare() {
@@ -56,12 +59,22 @@ prepare() {
   echo "-$pkgrel" > localversion.10-pkgrel
   echo "${pkgbase#linux}" > localversion.20-pkgname
 
-  echo "Setting config..."
-  cp ../"$_config" .config
-  make olddefconfig
-
-  make -s kernelrelease > version
-  echo "Prepared $pkgbase version $(<version)"
+  if [[ $_regen -eq 1 ]]; then
+    # useful on two point releases to keep shit straight
+    echo "Applying custom shit to bcm2711_defconfig"
+    make bcm2711_defconfig
+    cat ../archarm.diffconfig >> .config
+    make oldconfig
+    sed "s/$_name/-ARCH/" .config >$startdir/newconfig.$_config
+    echo "verify that newconfig.$_config is fit for purpose then redefine $_config"
+    exit
+  else
+    echo "Setting config..."
+    cp ../"$_config" .config
+    make olddefconfig
+    make -s kernelrelease > version
+    echo "Prepared $pkgbase version $(<version)"
+  fi
 }
 
 build() {
@@ -180,6 +193,12 @@ _package-headers() {
     rm -r "$_arch"
   done
 
+  echo "Symlinking common aliases..."
+  # https://archlinuxarm.org/forum/viewtopic.php?f=60&t=16354
+  ln -sr arm "$builddir/arch/armv7h"
+  ln -sr arm "$builddir/arch/armv7l"
+  ln -sr arm64 "$builddir/arch/aarch64"
+
   echo "Removing documentation..."
   rm -r "$builddir/Documentation"
 
@@ -189,11 +208,6 @@ _package-headers() {
   echo "Removing loose objects..."
   find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
 
-  echo "Symlinking common aliases..."
-  # https://archlinuxarm.org/forum/viewtopic.php?f=60&t=16354
-  [[ -d "$builddir/arch/arm" ]] && ln -sr "$builddir/arch/arm" "$builddir/arch/armv7l"
-  [[ -d "$builddir/arch/arm64" ]] && ln -sr "$builddir/arch/arm64" "$builddir/arch/aarch64"
-
   echo "Stripping build tools..."
   local file
   while read -rd '' file; do