diff --git a/PKGBUILDS/pine64/linux-megi/PKGBUILD b/PKGBUILDS/pine64/linux-megi/PKGBUILD index aa658bf8..0b3eb014 100644 --- a/PKGBUILDS/pine64/linux-megi/PKGBUILD +++ b/PKGBUILDS/pine64/linux-megi/PKGBUILD @@ -5,8 +5,8 @@ buildarch=8 pkgbase=linux-megi _desc="Megous Kernel" -pkgver=6.7.4 -pkgrel=2 +pkgver=6.7.7 +pkgrel=1 arch=('aarch64') url="https://codeberg.org/megi/linux" license=('GPL2') @@ -14,7 +14,7 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'dtc' 'python3' options=('!strip') # Source -_tag="orange-pi-6.7-20240205-2255" +_tag="orange-pi-6.7-20240301-1414" source=("linux-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/${_tag}.tar.gz" 'config' 'linux.preset' @@ -24,8 +24,6 @@ source=("linux-$_tag.tar.gz::https://codeberg.org/megi/linux/archive/${_tag}.tar 'ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch' # Sleep Mode '0001-arm64-dts-allwinner-a64-h5-Add-CPU-idle-states.patch' - # TEMP: Remove this when USB-C Host bug is fixed on PinePhone Pro - 'Revert-usb-typec-tcpm-reset-counter-when-enter-into-.patch' # PinePhone Patches 'dts-pinephone-drop-modem-power-node.patch' 'dts-pinephone-pro-remove-modem-node.patch' @@ -241,14 +239,13 @@ for _p in "${pkgname[@]}"; do }" done -md5sums=('bba05d08bcd51a328e42abc400e49f74' - '39f22179859372827321f938283c1651' +md5sums=('bb31ab7eefad436d37ebc80e7ee191e9' + '06410c1fa6678b14ffaf72924b64b14b' '86d4a35722b5410e3b29fc92dae15d4b' 'ce6c81ad1ad1f8b333fd6077d47abdaf' '3dc88030a8f2f5a5f97266d99b149f77' '13e2d2a903493e858473c61279355987' '081b35c2970e3fec444b32f941a26e1d' - '5838e950dbd7e0ef6a18dd1bd047f5a1' '10d200e0a964f24cdb744678a758e22b' 'ed972b8da2887aef963e63268b055cd3' '7d80f76f1647afa00de320f5866484a1' diff --git a/PKGBUILDS/pine64/linux-megi/Revert-usb-typec-tcpm-reset-counter-when-enter-into-.patch b/PKGBUILDS/pine64/linux-megi/Revert-usb-typec-tcpm-reset-counter-when-enter-into-.patch deleted file mode 100644 index 73e87a9f..00000000 --- a/PKGBUILDS/pine64/linux-megi/Revert-usb-typec-tcpm-reset-counter-when-enter-into-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b6e597fb5914c061b8bf0f2aa90bc2a7a664360d Mon Sep 17 00:00:00 2001 -From: Danct12 -Date: Sat, 10 Feb 2024 19:55:50 +0000 -Subject: [PATCH] Revert "usb: typec: tcpm: reset counter when enter into - unattached state after try role" - -This reverts commit 2d6d80127006ae3da26b1f21a65eccf957f2d1e5. ---- - drivers/usb/typec/tcpm/tcpm.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c -index bfb6f9481e87..a8e03cfde9dd 100644 ---- a/drivers/usb/typec/tcpm/tcpm.c -+++ b/drivers/usb/typec/tcpm/tcpm.c -@@ -3730,9 +3730,6 @@ static void tcpm_detach(struct tcpm_port *port) - if (tcpm_port_is_disconnected(port)) - port->hard_reset_count = 0; - -- port->try_src_count = 0; -- port->try_snk_count = 0; -- - if (!port->attached) - return; - --- -2.43.0 - diff --git a/PKGBUILDS/pine64/linux-megi/config b/PKGBUILDS/pine64/linux-megi/config index 1c1a81e8..9441b908 100644 --- a/PKGBUILDS/pine64/linux-megi/config +++ b/PKGBUILDS/pine64/linux-megi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.7.4-2 Kernel Configuration +# Linux/arm64 6.7.7-1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-unknown-linux-gnu-gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -15,6 +15,7 @@ CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_GCC_ASM_GOTO_OUTPUT_WORKAROUND=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y CONFIG_PAHOLE_VERSION=0