mirror of
https://github.com/ps5-linux/ps5-linux-patches.git
synced 2026-07-16 18:30:41 +00:00
Compare commits
4 Commits
kernel-7.1
...
kernel-7.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8fbb1b2057 | ||
|
|
935dc3e322 | ||
|
|
9ee33721e4 | ||
|
|
a57d783d89 |
2
.config
2
.config
@@ -1,6 +1,6 @@
|
||||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 7.1.1 Kernel Configuration
|
||||
# Linux/x86 7.1.2 Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 15.2.0-16ubuntu1) 15.2.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
||||
18
.github/workflows/build-kernel.yml
vendored
18
.github/workflows/build-kernel.yml
vendored
@@ -8,7 +8,7 @@ on:
|
||||
description: 'Package format'
|
||||
default: 'all'
|
||||
type: choice
|
||||
options: [deb, arch, all]
|
||||
options: [deb, arch, rpm, all]
|
||||
patches_ref:
|
||||
description: 'Patches branch/tag/SHA (empty = default)'
|
||||
default: ''
|
||||
@@ -43,6 +43,18 @@ jobs:
|
||||
bash image/build_image.sh --kernel-only \
|
||||
--distro "$FORMAT" \
|
||||
--patches-ref "$PATCHES_REF"
|
||||
# build_image.sh's --distro all skips the rpm packager, and each
|
||||
# kernel-build call wipes image/linux-bin/. Stash the deb + pkg.tar.zst
|
||||
# from the "all" run before firing the rpm-producing "fedora" run,
|
||||
# then restore so the release ships all three formats.
|
||||
if [ "$FORMAT" = "all" ]; then
|
||||
mkdir -p /tmp/kernel-stash
|
||||
cp image/linux-bin/*.deb image/linux-bin/*.pkg.tar.zst /tmp/kernel-stash/
|
||||
bash image/build_image.sh --kernel-only \
|
||||
--distro fedora \
|
||||
--patches-ref "$PATCHES_REF"
|
||||
cp /tmp/kernel-stash/*.deb /tmp/kernel-stash/*.pkg.tar.zst image/linux-bin/
|
||||
fi
|
||||
|
||||
- name: Read kernel and patches version
|
||||
id: version
|
||||
@@ -61,6 +73,7 @@ jobs:
|
||||
path: |
|
||||
image/linux-bin/*.deb
|
||||
image/linux-bin/*.pkg.tar.zst
|
||||
image/linux-bin/*.rpm
|
||||
retention-days: 7
|
||||
|
||||
- name: Compute checksums
|
||||
@@ -68,7 +81,7 @@ jobs:
|
||||
run: |
|
||||
{
|
||||
echo 'sums<<SHAEOF'
|
||||
sha256sum image/linux-bin/*.deb image/linux-bin/*.pkg.tar.zst | sed 's|image/linux-bin/||'
|
||||
sha256sum image/linux-bin/*.deb image/linux-bin/*.pkg.tar.zst image/linux-bin/*.rpm 2>/dev/null | sed 's|image/linux-bin/||'
|
||||
echo 'SHAEOF'
|
||||
} >> "$GITHUB_OUTPUT"
|
||||
|
||||
@@ -90,4 +103,5 @@ jobs:
|
||||
files: |
|
||||
image/linux-bin/*.deb
|
||||
image/linux-bin/*.pkg.tar.zst
|
||||
image/linux-bin/*.rpm
|
||||
make_latest: true
|
||||
|
||||
18
linux.patch
18
linux.patch
@@ -1091,7 +1091,7 @@ index 000000000000..39cc76f39e06
|
||||
+
|
||||
+#endif
|
||||
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
|
||||
index 830fefb342c6..f13155f049c4 100644
|
||||
index 830fefb342c6..380bc421583d 100644
|
||||
--- a/drivers/bluetooth/btusb.c
|
||||
+++ b/drivers/bluetooth/btusb.c
|
||||
@@ -67,6 +67,10 @@ static struct usb_driver btusb_driver;
|
||||
@@ -1112,10 +1112,10 @@ index 830fefb342c6..f13155f049c4 100644
|
||||
+ /* PS5 IW620 Bluetooth device */
|
||||
+ { USB_DEVICE(0x1286, 0x2059),
|
||||
+ .driver_info = BTUSB_MARVELL |
|
||||
+ BTUSB_IFNUM_0 |
|
||||
+ BTUSB_BROKEN_LE_DEFAULT_PHY |
|
||||
+ BTUSB_BROKEN_READ_LOCAL_NAME |
|
||||
+ BTUSB_NO_AUTOSUSPEND },
|
||||
+ BTUSB_IFNUM_0 |
|
||||
+ BTUSB_BROKEN_LE_DEFAULT_PHY |
|
||||
+ BTUSB_BROKEN_READ_LOCAL_NAME |
|
||||
+ BTUSB_NO_AUTOSUSPEND },
|
||||
+
|
||||
{ } /* Terminating entry */
|
||||
};
|
||||
@@ -1125,10 +1125,10 @@ index 830fefb342c6..f13155f049c4 100644
|
||||
{ USB_DEVICE(0x1286, 0x2046), .driver_info = BTUSB_MARVELL },
|
||||
{ USB_DEVICE(0x1286, 0x204e), .driver_info = BTUSB_MARVELL },
|
||||
+ { USB_DEVICE(0x1286, 0x2059), .driver_info = BTUSB_MARVELL |
|
||||
+ BTUSB_IFNUM_0 |
|
||||
+ BTUSB_BROKEN_LE_DEFAULT_PHY |
|
||||
+ BTUSB_BROKEN_READ_LOCAL_NAME |
|
||||
+ BTUSB_NO_AUTOSUSPEND },
|
||||
+ BTUSB_IFNUM_0 |
|
||||
+ BTUSB_BROKEN_LE_DEFAULT_PHY |
|
||||
+ BTUSB_BROKEN_READ_LOCAL_NAME |
|
||||
+ BTUSB_NO_AUTOSUSPEND },
|
||||
|
||||
/* Intel Bluetooth devices */
|
||||
{ USB_DEVICE(0x8087, 0x0025), .driver_info = BTUSB_INTEL_COMBINED },
|
||||
|
||||
Reference in New Issue
Block a user