FOGProject/fos
1
0
Fork 0
mirror of https://github.com/FOGProject/fos.git synced 2026-04-30 15:45:51 -05:00
Code Issues Packages Projects Releases 20 Wiki Activity

Change build to not look for a specific version patch file but use a single one and remove old patch file versions

Browse Source
This commit is contained in:
Sebastian Roth
2021-01-31 10:14:42 -06:00
parent 8d310f51d7
commit 3b97e6d600
10 changed files with 4 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
build.sh
View File

@@ -296,24 +296,16 @@ function buildKernel() {
make mrproper
cp ../configs/kernel$arch.config .config
echo "Done"
if [[ -f ../patch/kernel/linux-$KERNEL_VERSION.patch ]]; then
dots "Applying patch(es)"
if [[ -f ../patch/kernel/linux.patch ]]; then
dots " * Applying patch"
echo
patch -p1 < ../patch/kernel/linux-$KERNEL_VERSION.patch
patch -p1 < ../patch/kernel/linux.patch
if [[ $? -ne 0 ]]; then
echo "Failed"
exit 1
fi
else
echo " * Did not find a patch file matching the exact kernel version $KERNEL_VERSION."
latest=$(ls -1 ../patch/kernel/linux*.patch | sort -Vr | head -1)
dots "Trying to apply $latest"
echo
patch -p1 < $latest
if [[ $? -ne 0 ]]; then
echo "Failed"
exit 1
fi
echo " * WARNING: Did not find a patch file building vanilla kernel without patches!"
fi
dots "Cloning Linux firmware repository"
git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git >/dev/null 2>&1

28
patch/kernel/linux-4.19.1.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.1/drivers/net/usb/r8152.c kernelsourcex64/drivers/net/usb/r8152.c
--- linux-4.19.1/drivers/net/usb/r8152.c 2018-12-05 12:32:14.000000000 -0600
+++ kernelsourcex64/drivers/net/usb/r8152.c 2018-12-16 05:44:25.347161835 -0600
@@ -5330,6 +5330,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.1/drivers/scsi/storvsc_drv.c kernelsourcex64/drivers/scsi/storvsc_drv.c
--- linux-4.19.1/drivers/scsi/storvsc_drv.c 2018-12-05 12:32:14.000000000 -0600
+++ kernelsourcex64/drivers/scsi/storvsc_drv.c 2018-12-16 05:44:25.347161835 -0600
@@ -1426,7 +1426,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.101.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.90/drivers/net/usb/r8152.c kernelsourcex86/drivers/net/usb/r8152.c
--- linux-4.19.90/drivers/net/usb/r8152.c 2019-12-17 20:22:00.000000000 -0500
+++ kernelsourcex86/drivers/net/usb/r8152.c 2019-12-20 17:44:00.000000000 -0500
@@ -5335,6 +5335,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.90/drivers/scsi/storvsc_drv.c kernelsourcex86/drivers/scsi/storvsc_drv.c
--- linux-4.19.90/drivers/scsi/storvsc_drv.c 2019-12-17 20:22:00.000000000 -0500
+++ kernelsourcex86/drivers/scsi/storvsc_drv.c 2019-12-20 17:44:00.000000000 -0500
@@ -1435,7 +1435,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.118.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.90/drivers/net/usb/r8152.c kernelsourcex86/drivers/net/usb/r8152.c
--- linux-4.19.90/drivers/net/usb/r8152.c 2019-12-17 20:22:00.000000000 -0500
+++ kernelsourcex86/drivers/net/usb/r8152.c 2019-12-20 17:44:00.000000000 -0500
@@ -5344,6 +5344,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.90/drivers/scsi/storvsc_drv.c kernelsourcex86/drivers/scsi/storvsc_drv.c
--- linux-4.19.90/drivers/scsi/storvsc_drv.c 2019-12-17 20:22:00.000000000 -0500
+++ kernelsourcex86/drivers/scsi/storvsc_drv.c 2019-12-20 17:44:00.000000000 -0500
@@ -1435,7 +1435,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.36.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.36/drivers/net/usb/r8152.c kernelsourcex86/drivers/net/usb/r8152.c
--- linux-4.19.36/drivers/net/usb/r8152.c 2019-04-20 02:16:05.000000000 -0500
+++ kernelsourcex86/drivers/net/usb/r8152.c 2019-04-26 23:52:21.653795404 -0500
@@ -5330,6 +5330,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.36/drivers/scsi/storvsc_drv.c kernelsourcex86/drivers/scsi/storvsc_drv.c
--- linux-4.19.36/drivers/scsi/storvsc_drv.c 2019-04-20 02:16:05.000000000 -0500
+++ kernelsourcex86/drivers/scsi/storvsc_drv.c 2019-04-26 23:52:21.653795404 -0500
@@ -1426,7 +1426,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.48.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.48/drivers/net/usb/r8152.c kernelsourcex86/drivers/net/usb/r8152.c
--- linux-4.19.48/drivers/net/usb/r8152.c 2019-04-20 02:16:05.000000000 -0500
+++ kernelsourcex86/drivers/net/usb/r8152.c 2019-04-26 23:52:21.653795404 -0500
@@ -5330,6 +5330,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.48/drivers/scsi/storvsc_drv.c kernelsourcex86/drivers/scsi/storvsc_drv.c
--- linux-4.19.48/drivers/scsi/storvsc_drv.c 2019-04-20 02:16:05.000000000 -0500
+++ kernelsourcex86/drivers/scsi/storvsc_drv.c 2019-04-26 23:52:21.653795404 -0500
@@ -1435,7 +1435,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.6.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.6/drivers/net/usb/r8152.c kernelsourcex64/drivers/net/usb/r8152.c
--- linux-4.19.6/drivers/net/usb/r8152.c 2018-12-05 12:32:14.000000000 -0600
+++ kernelsourcex64/drivers/net/usb/r8152.c 2018-12-16 05:44:25.347161835 -0600
@@ -5330,6 +5330,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.6/drivers/scsi/storvsc_drv.c kernelsourcex64/drivers/scsi/storvsc_drv.c
--- linux-4.19.6/drivers/scsi/storvsc_drv.c 2018-12-05 12:32:14.000000000 -0600
+++ kernelsourcex64/drivers/scsi/storvsc_drv.c 2018-12-16 05:44:25.347161835 -0600
@@ -1426,7 +1426,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.64.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.64/drivers/net/usb/r8152.c kernelsourcex86/drivers/net/usb/r8152.c
--- linux-4.19.64/drivers/net/usb/r8152.c 2019-04-20 02:16:05.000000000 -0500
+++ kernelsourcex86/drivers/net/usb/r8152.c 2019-04-26 23:52:21.653795404 -0500
@@ -5330,6 +5330,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.64/drivers/scsi/storvsc_drv.c kernelsourcex86/drivers/scsi/storvsc_drv.c
--- linux-4.19.64/drivers/scsi/storvsc_drv.c 2019-04-20 02:16:05.000000000 -0500
+++ kernelsourcex86/drivers/scsi/storvsc_drv.c 2019-04-26 23:52:21.653795404 -0500
@@ -1435,7 +1435,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

28
patch/kernel/linux-4.19.90.patch
View File

@@ -1,28 +0,0 @@
diff -Nur linux-4.19.90/drivers/net/usb/r8152.c kernelsourcex86/drivers/net/usb/r8152.c
--- linux-4.19.90/drivers/net/usb/r8152.c 2019-12-17 20:22:00.000000000 -0500
+++ kernelsourcex86/drivers/net/usb/r8152.c 2019-12-20 17:44:00.000000000 -0500
@@ -5332,6 +5332,7 @@
{REALTEK_USB_DEVICE(VENDOR_ID_REALTEK, 0x8153)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07ab)},
{REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x07c6)},
+ {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)},
{REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)},
{REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)},
diff -Nur linux-4.19.90/drivers/scsi/storvsc_drv.c kernelsourcex86/drivers/scsi/storvsc_drv.c
--- linux-4.19.90/drivers/scsi/storvsc_drv.c 2019-12-17 20:22:00.000000000 -0500
+++ kernelsourcex86/drivers/scsi/storvsc_drv.c 2019-12-20 17:44:00.000000000 -0500
@@ -1435,7 +1435,12 @@
blk_queue_rq_timeout(sdevice->request_queue, (storvsc_timeout * HZ));
/* Ensure there are no gaps in presented sgls */
- blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ if (PAGE_SIZE - 1 < 4096) {
+ blk_queue_virt_boundary(sdevice->request_queue, 4096);
+ }
+ else {
+ blk_queue_virt_boundary(sdevice->request_queue, PAGE_SIZE - 1);
+ }
sdevice->no_write_same = 1;

0
patch/kernel/linux-4.19.143.patch → patch/kernel/linux.patch
View File