mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-22 14:22:26 +00:00
fix patches to have the correct -p level
This commit is contained in:
parent
8194f2f477
commit
bda821dbb9
@ -1,6 +1,6 @@
|
|||||||
diff --recursive -u ../clean/dropbear-2016.74/svr-chansession.c ./dropbear-2016.74/svr-chansession.c
|
diff --recursive -u ../clean/dropbear-2016.74/svr-chansession.c ./dropbear-2016.74/svr-chansession.c
|
||||||
--- ../clean/dropbear-2016.74/svr-chansession.c 2016-07-21 11:17:09.000000000 -0400
|
--- ../clean/dropbear-2016.74/svr-chansession.c 2016-07-21 11:17:09.000000000 -0400
|
||||||
+++ ./dropbear-2016.74/svr-chansession.c 2017-09-19 11:01:34.889121503 -0400
|
+++ dropbear-2016.74/svr-chansession.c 2017-09-19 11:01:34.889121503 -0400
|
||||||
@@ -925,10 +925,10 @@
|
@@ -925,10 +925,10 @@
|
||||||
if ((setgid(ses.authstate.pw_gid) < 0) ||
|
if ((setgid(ses.authstate.pw_gid) < 0) ||
|
||||||
(initgroups(ses.authstate.pw_name,
|
(initgroups(ses.authstate.pw_name,
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
diff --recursive -u ../clean/linux-4.9.38/arch/x86/boot/compressed/eboot.c ./linux-4.9.38/arch/x86/boot/compressed/eboot.c
|
diff --recursive -u ../clean/linux-4.9.38/arch/x86/boot/compressed/eboot.c ./linux-4.9.38/arch/x86/boot/compressed/eboot.c
|
||||||
--- ../clean/linux-4.9.38/arch/x86/boot/compressed/eboot.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/arch/x86/boot/compressed/eboot.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/arch/x86/boot/compressed/eboot.c 2017-09-19 14:55:16.395027896 -0400
|
+++ linux-4.9.38/arch/x86/boot/compressed/eboot.c 2017-09-19 14:55:16.395027896 -0400
|
||||||
@@ -16,6 +16,73 @@
|
@@ -16,6 +16,73 @@
|
||||||
#include "../string.h"
|
#include "../string.h"
|
||||||
#include "eboot.h"
|
#include "eboot.h"
|
||||||
@ -146,7 +146,7 @@ diff --recursive -u ../clean/linux-4.9.38/arch/x86/boot/compressed/eboot.c ./lin
|
|||||||
}
|
}
|
||||||
diff --recursive -u ../clean/linux-4.9.38/arch/x86/boot/compressed/head_64.S ./linux-4.9.38/arch/x86/boot/compressed/head_64.S
|
diff --recursive -u ../clean/linux-4.9.38/arch/x86/boot/compressed/head_64.S ./linux-4.9.38/arch/x86/boot/compressed/head_64.S
|
||||||
--- ../clean/linux-4.9.38/arch/x86/boot/compressed/head_64.S 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/arch/x86/boot/compressed/head_64.S 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/arch/x86/boot/compressed/head_64.S 2017-09-19 13:41:47.715096617 -0400
|
+++ linux-4.9.38/arch/x86/boot/compressed/head_64.S 2017-09-19 13:41:47.715096617 -0400
|
||||||
@@ -294,8 +294,12 @@
|
@@ -294,8 +294,12 @@
|
||||||
jne 2f
|
jne 2f
|
||||||
fail:
|
fail:
|
||||||
@ -163,7 +163,7 @@ diff --recursive -u ../clean/linux-4.9.38/arch/x86/boot/compressed/head_64.S ./l
|
|||||||
leaq preferred_addr(%rax), %rax
|
leaq preferred_addr(%rax), %rax
|
||||||
diff --recursive -u ../clean/linux-4.9.38/arch/x86/realmode/init.c ./linux-4.9.38/arch/x86/realmode/init.c
|
diff --recursive -u ../clean/linux-4.9.38/arch/x86/realmode/init.c ./linux-4.9.38/arch/x86/realmode/init.c
|
||||||
--- ../clean/linux-4.9.38/arch/x86/realmode/init.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/arch/x86/realmode/init.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/arch/x86/realmode/init.c 2017-09-19 08:27:23.183585570 -0400
|
+++ linux-4.9.38/arch/x86/realmode/init.c 2017-09-19 08:27:23.183585570 -0400
|
||||||
@@ -35,8 +35,8 @@
|
@@ -35,8 +35,8 @@
|
||||||
/* Has to be under 1M so we can execute real-mode AP code. */
|
/* Has to be under 1M so we can execute real-mode AP code. */
|
||||||
mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
|
mem = memblock_find_in_range(0, 1<<20, size, PAGE_SIZE);
|
||||||
@ -191,7 +191,7 @@ diff --recursive -u ../clean/linux-4.9.38/arch/x86/realmode/init.c ./linux-4.9.3
|
|||||||
set_real_mode_permissions();
|
set_real_mode_permissions();
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/evxfevnt.c ./linux-4.9.38/drivers/acpi/acpica/evxfevnt.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/evxfevnt.c ./linux-4.9.38/drivers/acpi/acpica/evxfevnt.c
|
||||||
--- ../clean/linux-4.9.38/drivers/acpi/acpica/evxfevnt.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/acpi/acpica/evxfevnt.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/acpi/acpica/evxfevnt.c 2017-09-19 15:05:20.429486756 -0400
|
+++ linux-4.9.38/drivers/acpi/acpica/evxfevnt.c 2017-09-19 15:05:20.429486756 -0400
|
||||||
@@ -111,6 +111,8 @@
|
@@ -111,6 +111,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -203,7 +203,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/evxfevnt.c ./linux
|
|||||||
|
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/hwacpi.c ./linux-4.9.38/drivers/acpi/acpica/hwacpi.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/hwacpi.c ./linux-4.9.38/drivers/acpi/acpica/hwacpi.c
|
||||||
--- ../clean/linux-4.9.38/drivers/acpi/acpica/hwacpi.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/acpi/acpica/hwacpi.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/acpi/acpica/hwacpi.c 2017-09-19 15:04:43.229254898 -0400
|
+++ linux-4.9.38/drivers/acpi/acpica/hwacpi.c 2017-09-19 15:04:43.229254898 -0400
|
||||||
@@ -168,12 +168,16 @@
|
@@ -168,12 +168,16 @@
|
||||||
|
|
||||||
status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
|
status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
|
||||||
@ -223,7 +223,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/hwacpi.c ./linux-4
|
|||||||
}
|
}
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbfadt.c ./linux-4.9.38/drivers/acpi/acpica/tbfadt.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbfadt.c ./linux-4.9.38/drivers/acpi/acpica/tbfadt.c
|
||||||
--- ../clean/linux-4.9.38/drivers/acpi/acpica/tbfadt.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/acpi/acpica/tbfadt.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/acpi/acpica/tbfadt.c 2017-09-19 13:46:37.599809800 -0400
|
+++ linux-4.9.38/drivers/acpi/acpica/tbfadt.c 2017-09-19 13:46:37.599809800 -0400
|
||||||
@@ -344,6 +344,7 @@
|
@@ -344,6 +344,7 @@
|
||||||
|
|
||||||
/* Obtain the DSDT and FACS tables via their addresses within the FADT */
|
/* Obtain the DSDT and FACS tables via their addresses within the FADT */
|
||||||
@ -242,7 +242,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbfadt.c ./linux-4
|
|||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbxface.c ./linux-4.9.38/drivers/acpi/acpica/tbxface.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbxface.c ./linux-4.9.38/drivers/acpi/acpica/tbxface.c
|
||||||
--- ../clean/linux-4.9.38/drivers/acpi/acpica/tbxface.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/acpi/acpica/tbxface.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/acpi/acpica/tbxface.c 2017-09-19 13:47:44.572900070 -0400
|
+++ linux-4.9.38/drivers/acpi/acpica/tbxface.c 2017-09-19 13:47:44.572900070 -0400
|
||||||
@@ -136,7 +136,11 @@
|
@@ -136,7 +136,11 @@
|
||||||
|
|
||||||
rsdp_address = acpi_os_get_root_pointer();
|
rsdp_address = acpi_os_get_root_pointer();
|
||||||
@ -258,7 +258,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbxface.c ./linux-
|
|||||||
/*
|
/*
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbxfload.c ./linux-4.9.38/drivers/acpi/acpica/tbxfload.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbxfload.c ./linux-4.9.38/drivers/acpi/acpica/tbxfload.c
|
||||||
--- ../clean/linux-4.9.38/drivers/acpi/acpica/tbxfload.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/acpi/acpica/tbxfload.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/acpi/acpica/tbxfload.c 2017-09-19 13:49:14.358362302 -0400
|
+++ linux-4.9.38/drivers/acpi/acpica/tbxfload.c 2017-09-19 13:49:14.358362302 -0400
|
||||||
@@ -277,6 +277,7 @@
|
@@ -277,6 +277,7 @@
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
u8 flags;
|
u8 flags;
|
||||||
@ -300,7 +300,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/acpica/tbxfload.c ./linux
|
|||||||
|
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/tables.c ./linux-4.9.38/drivers/acpi/tables.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/tables.c ./linux-4.9.38/drivers/acpi/tables.c
|
||||||
--- ../clean/linux-4.9.38/drivers/acpi/tables.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/acpi/tables.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/acpi/tables.c 2017-09-19 13:50:47.511879998 -0400
|
+++ linux-4.9.38/drivers/acpi/tables.c 2017-09-19 13:50:47.511879998 -0400
|
||||||
@@ -475,7 +475,8 @@
|
@@ -475,7 +475,8 @@
|
||||||
ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI, ACPI_SIG_TCPA,
|
ACPI_SIG_SLIC, ACPI_SIG_SPCR, ACPI_SIG_SPMI, ACPI_SIG_TCPA,
|
||||||
ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT,
|
ACPI_SIG_UEFI, ACPI_SIG_WAET, ACPI_SIG_WDAT, ACPI_SIG_WDDT,
|
||||||
@ -345,7 +345,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/acpi/tables.c ./linux-4.9.38/d
|
|||||||
continue;
|
continue;
|
||||||
diff --recursive -u ../clean/linux-4.9.38/drivers/firmware/efi/vars.c ./linux-4.9.38/drivers/firmware/efi/vars.c
|
diff --recursive -u ../clean/linux-4.9.38/drivers/firmware/efi/vars.c ./linux-4.9.38/drivers/firmware/efi/vars.c
|
||||||
--- ../clean/linux-4.9.38/drivers/firmware/efi/vars.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/drivers/firmware/efi/vars.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/drivers/firmware/efi/vars.c 2017-09-19 13:52:01.141079970 -0400
|
+++ linux-4.9.38/drivers/firmware/efi/vars.c 2017-09-19 13:52:01.141079970 -0400
|
||||||
@@ -429,6 +429,12 @@
|
@@ -429,6 +429,12 @@
|
||||||
int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *),
|
int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *),
|
||||||
void *data, bool duplicates, struct list_head *head)
|
void *data, bool duplicates, struct list_head *head)
|
||||||
@ -361,7 +361,7 @@ diff --recursive -u ../clean/linux-4.9.38/drivers/firmware/efi/vars.c ./linux-4.
|
|||||||
efi_char16_t *variable_name;
|
efi_char16_t *variable_name;
|
||||||
diff --recursive -u ../clean/linux-4.9.38/init/initramfs.c ./linux-4.9.38/init/initramfs.c
|
diff --recursive -u ../clean/linux-4.9.38/init/initramfs.c ./linux-4.9.38/init/initramfs.c
|
||||||
--- ../clean/linux-4.9.38/init/initramfs.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/init/initramfs.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/init/initramfs.c 2017-09-19 13:53:34.002593777 -0400
|
+++ linux-4.9.38/init/initramfs.c 2017-09-19 13:53:34.002593777 -0400
|
||||||
@@ -609,7 +609,7 @@
|
@@ -609,7 +609,7 @@
|
||||||
{
|
{
|
||||||
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
|
char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
|
||||||
@ -373,7 +373,7 @@ diff --recursive -u ../clean/linux-4.9.38/init/initramfs.c ./linux-4.9.38/init/i
|
|||||||
int fd;
|
int fd;
|
||||||
diff --recursive -u ../clean/linux-4.9.38/init/main.c ./linux-4.9.38/init/main.c
|
diff --recursive -u ../clean/linux-4.9.38/init/main.c ./linux-4.9.38/init/main.c
|
||||||
--- ../clean/linux-4.9.38/init/main.c 2017-07-15 06:17:55.000000000 -0400
|
--- ../clean/linux-4.9.38/init/main.c 2017-07-15 06:17:55.000000000 -0400
|
||||||
+++ ./linux-4.9.38/init/main.c 2017-09-19 13:54:31.699534533 -0400
|
+++ linux-4.9.38/init/main.c 2017-09-19 13:54:31.699534533 -0400
|
||||||
@@ -954,7 +954,9 @@
|
@@ -954,7 +954,9 @@
|
||||||
if (ramdisk_execute_command) {
|
if (ramdisk_execute_command) {
|
||||||
ret = run_init_process(ramdisk_execute_command);
|
ret = run_init_process(ramdisk_execute_command);
|
||||||
|
Loading…
Reference in New Issue
Block a user