diff options
-rw-r--r-- | .SRCINFO | 17 | ||||
-rw-r--r-- | PKGBUILD | 19 | ||||
-rw-r--r-- | bluetooth_firmware_fix.patch | 35 | ||||
-rw-r--r-- | config | 6 |
4 files changed, 18 insertions, 59 deletions
@@ -1,7 +1,7 @@ pkgbase = linux-amd-color pkgdesc = Linux with experimental AMD color management enabled - pkgver = 6.9.1 - pkgrel = 2 + pkgver = 6.9.2 + pkgrel = 1 url = https://github.com/archlinux/linux arch = x86_64 license = GPL-2.0-only @@ -16,21 +16,18 @@ pkgbase = linux-amd-color makedepends = xz options = !debug options = !strip - source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.9.1.tar.xz + source = https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.9.2.tar.xz source = config source = blend_lut.patch - source = bluetooth_firmware_fix.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E validpgpkeys = 83BC8889351B5DEBBB68416EB8AC08600F108CDF - sha256sums = 01b414ba98fd189ecd544435caf3860ae2a790e3ec48f5aa70fdf42dc4c5c04a - sha256sums = bbf3ebee5fcf2780a5f6b14fd13ceea809b0e332eebc452a63b5d0513747bf7e + sha256sums = d46c5bdf2c5961cc2a4dedefe0434d456865e95e4a7cd9f93fff054f9090e5f9 + sha256sums = bf33bb233f852dd27cd9970c348987aa32325d695c22e7a793f4dfbd8fd6dc4c sha256sums = 37b3c194bceacd0b10da26484f5740b3d92010099fba183dd0fad9b8266e6a83 - sha256sums = c9406e5559fbf05fd65e73edc9dac83c86f46eca82abeba7699c09243f815473 - b2sums = 388af1d13e78a424f72a961697f4b0b6a234e54ce1e4a2532fc73717301e048c6f4a6251b6e3c4541179d1382566c3f411baa6883818a10d178ef27d036b5379 - b2sums = 7834f8e796d188bad31689f85cad01fdd9311b1f40d37405bcf64b44245008e44cff09410690e6e9b67dc8f6281f02fcf60b355e5844eaffd4906a19a0cba6b8 + b2sums = ae19877e19239c2b521cdf04d182c0ee849228c9ecb4c9dddb626d85ed51faaa5215cc70b5c1ad203c346df85197cd5512894a27eba1c1fd6add9cd2fbaa2a3e + b2sums = b57ce6976d7ac63ad85a05e88c97023a37d230ab561af6cce19d7229e92db9ace0169410ff178649fb1dde192d70d32a7061031be8a5bb75da080579fe8effe1 b2sums = 393ef3c1f22899f2d6ed7a712f41e297cf38c64e4552d61fa138b8e67a0b897ddc5cbe0744b8cb0826a701ee8b68f3583d5e8df0de4b1cc1ed2e2c9291fdf2b1 - b2sums = 0b1f10f20bde021a6441598cc2d1c780dc71c0922eff33361bdbfa671fbab8af43a4132ef4cbe92126712b117e7d1335f6a1a3e5aae6c31df0f1dd4a5cbaed60 pkgname = linux-amd-color pkgdesc = The Linux with experimental AMD color management enabled kernel and modules @@ -2,8 +2,8 @@ # Based on Arch stock kernel build by Jan Alexander Steffens (heftig) <heftig@archlinux.org> pkgbase=linux-amd-color -pkgver=6.9.1 -pkgrel=2 +pkgver=6.9.2 +pkgrel=1 pkgdesc='Linux with experimental AMD color management enabled' url='https://github.com/archlinux/linux' arch=(x86_64) @@ -28,7 +28,6 @@ source=( https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.xz config # the main kernel config file blend_lut.patch - bluetooth_firmware_fix.patch ) validpgpkeys=( ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds @@ -36,14 +35,12 @@ validpgpkeys=( 83BC8889351B5DEBBB68416EB8AC08600F108CDF # Jan Alexander Steffens (heftig) ) -sha256sums=('01b414ba98fd189ecd544435caf3860ae2a790e3ec48f5aa70fdf42dc4c5c04a' - 'bbf3ebee5fcf2780a5f6b14fd13ceea809b0e332eebc452a63b5d0513747bf7e' - '37b3c194bceacd0b10da26484f5740b3d92010099fba183dd0fad9b8266e6a83' - 'c9406e5559fbf05fd65e73edc9dac83c86f46eca82abeba7699c09243f815473') -b2sums=('388af1d13e78a424f72a961697f4b0b6a234e54ce1e4a2532fc73717301e048c6f4a6251b6e3c4541179d1382566c3f411baa6883818a10d178ef27d036b5379' - '7834f8e796d188bad31689f85cad01fdd9311b1f40d37405bcf64b44245008e44cff09410690e6e9b67dc8f6281f02fcf60b355e5844eaffd4906a19a0cba6b8' - '393ef3c1f22899f2d6ed7a712f41e297cf38c64e4552d61fa138b8e67a0b897ddc5cbe0744b8cb0826a701ee8b68f3583d5e8df0de4b1cc1ed2e2c9291fdf2b1' - '0b1f10f20bde021a6441598cc2d1c780dc71c0922eff33361bdbfa671fbab8af43a4132ef4cbe92126712b117e7d1335f6a1a3e5aae6c31df0f1dd4a5cbaed60') +sha256sums=('d46c5bdf2c5961cc2a4dedefe0434d456865e95e4a7cd9f93fff054f9090e5f9' + 'bf33bb233f852dd27cd9970c348987aa32325d695c22e7a793f4dfbd8fd6dc4c' + '37b3c194bceacd0b10da26484f5740b3d92010099fba183dd0fad9b8266e6a83') +b2sums=('ae19877e19239c2b521cdf04d182c0ee849228c9ecb4c9dddb626d85ed51faaa5215cc70b5c1ad203c346df85197cd5512894a27eba1c1fd6add9cd2fbaa2a3e' + 'b57ce6976d7ac63ad85a05e88c97023a37d230ab561af6cce19d7229e92db9ace0169410ff178649fb1dde192d70d32a7061031be8a5bb75da080579fe8effe1' + '393ef3c1f22899f2d6ed7a712f41e297cf38c64e4552d61fa138b8e67a0b897ddc5cbe0744b8cb0826a701ee8b68f3583d5e8df0de4b1cc1ed2e2c9291fdf2b1') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase diff --git a/bluetooth_firmware_fix.patch b/bluetooth_firmware_fix.patch deleted file mode 100644 index 1524a0a0456a..000000000000 --- a/bluetooth_firmware_fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 958cd6beab693f395ffe07814ef77d2b45e8b0fc Mon Sep 17 00:00:00 2001 -From: Peter Tsao <peter.tsao@mediatek.com> -Date: Mon, 15 Apr 2024 22:19:22 +0800 -Subject: Bluetooth: btusb: Fix the patch for MT7920 the affected to MT7921 - -From: Peter Tsao <peter.tsao@mediatek.com> - -commit 958cd6beab693f395ffe07814ef77d2b45e8b0fc upstream. - -Because both MT7920 and MT7921 use the same chip ID. -We use the 8th bit of fw_flavor to distingush MT7920. -The original patch made a mistake to check whole fw_flavor, -that makes the condition both true (dev_id == 0x7961 && fw_flavor), -and makes MT7921 flow wrong. - -In this patch, we correct the flow to get the 8th bit value for MT7920. -And the patch is verified pass with both MT7920 and MT7921. - -Signed-off-by: Peter Tsao <peter.tsao@mediatek.com> -Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/bluetooth/btusb.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -3118,6 +3118,7 @@ static int btusb_mtk_setup(struct hci_de - bt_dev_err(hdev, "Failed to get fw flavor (%d)", err); - return err; - } -+ fw_flavor = (fw_flavor & 0x00000080) >> 7; - } - - mediatek = hci_get_priv(hdev); @@ -1,8 +1,8 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.9.1-arch1 Kernel Configuration +# Linux/x86 6.9.2-arch1 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240507" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.1.1 20240522" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=140101 CONFIG_CLANG_VERSION=0 @@ -748,7 +748,7 @@ CONFIG_AMD_NB=y # CONFIG_IA32_EMULATION=y # CONFIG_IA32_EMULATION_DEFAULT_DISABLED is not set -# CONFIG_X86_X32_ABI is not set +CONFIG_X86_X32_ABI=y CONFIG_COMPAT_32=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y |