core/linux-raspberrypi4 to 5.10.10-1

core/linux-raspberrypi4/PKGBUILD

@@ -6,12 +6,12 @@
 buildarch=12
 
 pkgbase=linux-raspberrypi4
-_commit=08ae2dd9e7dc89c20bff823a3ef045de09bfd090
+_commit=900790847a10954e7dcaeb4fe86d37ba0d7e73a2
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi 4"
-pkgver=5.4.83
-pkgrel=7
+pkgver=5.10.10
+pkgrel=1
 arch=('armv7h' 'aarch64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -22,21 +22,19 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         'linux.preset'
         '60-linux.hook'
         '90-linux.hook'
-        0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
-        PR4002.patch::https://patch-diff.githubusercontent.com/raw/raspberrypi/linux/pull/4002.patch)
+        0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch)
 source_armv7h=('config' 'config.txt')
 source_aarch64=('config8' 'config8.txt')
-md5sums=('8b3e37e161cfbdf01b65ed1e03c8e59f'
-         '60bc3624123c183305677097bcd56212'
+md5sums=('07072d35903171dbd14cc56abb84d805'
+         'ae9fa2a98aca88cb8d38e76110aa77e1'
          '86d4a35722b5410e3b29fc92dae15d4b'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '69e1db90d78f691dc446fe2ab94727eb'
-         'f66a7ea3feb708d398ef57e4da4815e9'
-         'efb1191fd272d3db49fc19e034408a1c')
-md5sums_armv7h=('0d7ea1b402c256a5021b7b445c5f186f'
-                '7c6b37a1353caccf6d3786bb4161c218')
-md5sums_aarch64=('58509ed6e23d8ef14bfb07181cc1b40d'
-                 '84a781813024e320245be08b9e260902')
+         'f66a7ea3feb708d398ef57e4da4815e9')
+md5sums_armv7h=('b445041ace8c39c473fb85f0745281eb'
+                '9669d916a5929a2eedbd64477f83d99e')
+md5sums_aarch64=('1be72ecb0440cab1509d510366f77a38'
+                 '9669d916a5929a2eedbd64477f83d99e')
 
 # setup vars
 [[ $CARCH == "armv7h" ]] && _kernel=kernel7.img KARCH=arm _image=zImage _config=config _bconfig=config.txt
@@ -54,10 +52,6 @@ prepare() {
   sed -i '2iexit 0' scripts/depmod.sh
 
   patch -Np1 -i ../0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
-
-  # this PR is required for correct seeking of non-HEVC videos on 5.4.y kernels
-  # see: https://github.com/popcornmix/xbmc/commit/579551ef130f80963a857f0af3a2a984b112d26c
-  patch -Np1 -i ../PR4002.patch
 }
 
 build() {
@@ -175,8 +169,7 @@ _package-headers() {
   cp -t "${_builddir}" -a include scripts
 
   install -Dt "${_builddir}/arch/${KARCH}" -m644 arch/${KARCH}/Makefile
-  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s arch/$KARCH/kernel/module.lds
-  #install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s
+  install -Dt "${_builddir}/arch/${KARCH}/kernel" -m644 arch/${KARCH}/kernel/asm-offsets.s scripts/module.lds
 
   cp -t "${_builddir}/arch/${KARCH}" -a arch/${KARCH}/include
 

core/linux-raspberrypi4/cmdline.txt

@@ -1 +1 @@
-root=/dev/mmcblk0p2 rw rootwait console=ttyAMA0,115200 console=tty1 selinux=0 plymouth.enable=0 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 kgdboc=ttyAMA0,115200 elevator=noop
+root=/dev/mmcblk0p2 rw rootwait console=ttyAMA0,115200 console=tty1 selinux=0 plymouth.enable=0 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 kgdboc=ttyAMA0,115200

core/linux-raspberrypi4/config.txt

@@ -1,4 +1,4 @@
 # See /boot/overlays/README for all available options
 
-gpu_mem=64
+dtoverlay=vc4-kms-v3d
 initramfs initramfs-linux.img followkernel

core/linux-raspberrypi4/config8.txt

@@ -1,7 +1,4 @@
 # See /boot/overlays/README for all available options
 
-gpu_mem=64
+dtoverlay=vc4-kms-v3d
 initramfs initramfs-linux.img followkernel
-kernel=kernel8.img
-arm_64bit=1
-enable_gic=1

core/linux-raspberrypi4/linux-raspberrypi4.install

@@ -10,7 +10,7 @@ disable_cma() {
 correct_fstab() {
   # starting with v5.10.y, fstab requires a padded zero in the path to /boot
   if [[ -f /etc/fstab ]]; then
-    if grep -q mmcblk1p1 /scratch/fstab; then
+    if grep -q mmcblk1p1 /etc/fstab; then
       sed -i 's/mmcblk1p1/mmcblk01p1/' /etc/fstab
     fi
   fi
@@ -39,6 +39,10 @@ post_upgrade() {
     echo "________________________________________________________________________________"
     echo ""
   fi
+
+  if [ "$(vercmp $2 5.10.0)" -lt 0 ]; then
+    correct_fstab
+  fi
 }
 
 post_remove() {