bump to 6.1.13-1

3 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 316f5f98c58d..794984ebd069 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-aarch64-flippy
-	pkgver = 6.1.12
-	pkgrel = 2
+	pkgver = 6.1.13
+	pkgrel = 1
 	url = https://github.com/unifreq/linux-6.1.y
 	arch = aarch64
 	license = GPL2
@@ -9,11 +9,13 @@ pkgbase = linux-aarch64-flippy
 	makedepends = dtc
 	makedepends = uboot-tools
 	options = !strip
-	source = linux-6.1.y-29c263d9c3e5ce3c9099bd35d79dcb1eedbca99c.tar.gz::https://github.com/unifreq/linux-6.1.y/archive/29c263d9c3e5ce3c9099bd35d79dcb1eedbca99c.tar.gz
+	source = linux-6.1.y-d90ddfc6e81dc376224f1cc214a11a7be4e2bc2a.tar.gz::https://github.com/unifreq/linux-6.1.y/archive/d90ddfc6e81dc376224f1cc214a11a7be4e2bc2a.tar.gz
+	source = support-amlogic-proprietary-partition.patch::https://github.com/7Ji/linux-6.1.y/compare/54968e71b3d75d34117442db5fd1fc3f0761439e%5E...f51821c5dc09619495172afeeab2fd19d9d38787.patch
 	source = config
 	source = linux.preset
-	sha256sums = 2b287393501be50f6574a43f6eb56b3e001b11ab2aa8d43219de6de3fec18e51
-	sha256sums = 9d71748237b52a5ac977fdfb7589224194dfc396fe5f13c5f32355ace5efde5c
+	sha256sums = 7c65d89d66b71623402bbd306ea678c0ddbce1743137570d86d311c7472f0aef
+	sha256sums = 1501981431887686895a05e920b8954d93cfaca4d37116bd58d7c2ef9e6b6302
+	sha256sums = 5c18dc58fcd1e0201b035971cea49b972374cf60ddb53a1743885cff46c7bd9c
 	sha256sums = bdcd6cbf19284b60fac6d6772f1e0ec2e2fe03ce7fe3d7d16844dd6d2b5711f3
 
 pkgname = linux-aarch64-flippy
@@ -35,12 +37,12 @@ pkgname = linux-aarch64-flippy-headers
 
 pkgname = linux-aarch64-flippy-dtb-allwinner
 	pkgdesc = DTB files for Allwinner SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.12
+	provides = linux-aarch64-flippy-dtb=6.1.13
 
 pkgname = linux-aarch64-flippy-dtb-amlogic
 	pkgdesc = DTB files for Amlogic SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.12
+	provides = linux-aarch64-flippy-dtb=6.1.13
 
 pkgname = linux-aarch64-flippy-dtb-rockchip
 	pkgdesc = DTB files for Rockchip SoCs for flippy's AArch64 kernel
-	provides = linux-aarch64-flippy-dtb=6.1.12
+	provides = linux-aarch64-flippy-dtb=6.1.13
diff --git a/PKGBUILD b/PKGBUILD
index 6b518775a3a6..37b28e1939fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: 7Ji <pugokughin@gmail.com>
 
 _desc="flippy's AArch64-focused fork aiming to increase usability"
-_pkgver_main=6.1.12
+_pkgver_main=6.1.13
 _pkgver_suffix=flippy
 _pkgver_uname="${_pkgver_main}-${_pkgver_suffix}"
 _flippy_repo='linux-6.1.y'
-_flippy_commit='29c263d9c3e5ce3c9099bd35d79dcb1eedbca99c'
+_flippy_commit='d90ddfc6e81dc376224f1cc214a11a7be4e2bc2a'
 _srcname="${_flippy_repo}-${_flippy_commit}"
 
 pkgbase=linux-aarch64-flippy
@@ -17,7 +17,7 @@ pkgname=(
   "${pkgbase}-dtb-rockchip"
 )
 pkgver="${_pkgver_main}"
-pkgrel=2
+pkgrel=1
 arch=('aarch64')
 url="https://github.com/unifreq/${_flippy_repo}"
 license=('GPL2')
@@ -27,20 +27,22 @@ makedepends=( # Since we don't build the doc, most of the makedeps for other lin
 options=(!strip)
 source=(
   "${_srcname}.tar.gz::${url}/archive/${_flippy_commit}.tar.gz"
+  "support-amlogic-proprietary-partition.patch::https://github.com/7Ji/${_flippy_repo}/compare/54968e71b3d75d34117442db5fd1fc3f0761439e%5E...f51821c5dc09619495172afeeab2fd19d9d38787.patch"
   'config'
   'linux.preset'
 )
 sha256sums=(
-  '2b287393501be50f6574a43f6eb56b3e001b11ab2aa8d43219de6de3fec18e51'
-  '9d71748237b52a5ac977fdfb7589224194dfc396fe5f13c5f32355ace5efde5c'
+  '7c65d89d66b71623402bbd306ea678c0ddbce1743137570d86d311c7472f0aef'
+  '1501981431887686895a05e920b8954d93cfaca4d37116bd58d7c2ef9e6b6302'
+  '5c18dc58fcd1e0201b035971cea49b972374cf60ddb53a1743885cff46c7bd9c'
   'bdcd6cbf19284b60fac6d6772f1e0ec2e2fe03ce7fe3d7d16844dd6d2b5711f3'
 )
 
 prepare() {
   cd "${_srcname}"
 
-#   echo "Patching kernel..."
-#   git apply -v "../${source[3]}"
+  echo "Patching kernel..."
+  patch -p1 < '../support-amlogic-proprietary-partition.patch'
 
   echo "Setting version..."
   scripts/setlocalversion --save-scmversion
diff --git a/config b/config
index 747beeac06d6..30a74edf1fcc 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.1.12 Kernel Configuration
+# Linux/arm64 6.1.13 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0"
 CONFIG_CC_IS_GCC=y
@@ -811,6 +811,7 @@ CONFIG_MSDOS_PARTITION=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 CONFIG_CMDLINE_PARTITION=y
+CONFIG_AMLOGIC_PARTITION=y
 # end of Partition Types
 
 CONFIG_BLOCK_COMPAT=y
@@ -5142,7 +5143,6 @@ CONFIG_APERTURE_HELPERS=y
 CONFIG_DRM=y
 CONFIG_DRM_MIPI_DSI=y
 # CONFIG_DRM_DEBUG_MM is not set
-CONFIG_DRM_USE_DYNAMIC_DEBUG=y
 CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_DEBUG_DP_MST_TOPOLOGY_REFS is not set
 # CONFIG_DRM_DEBUG_MODESET_LOCK is not set