diff options
Diffstat (limited to 'target/linux/generic/hack-5.4')
-rw-r--r-- | target/linux/generic/hack-5.4/204-module_strip.patch | 12 | ||||
-rw-r--r-- | target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch | 5 |
2 files changed, 6 insertions, 11 deletions
diff --git a/target/linux/generic/hack-5.4/204-module_strip.patch b/target/linux/generic/hack-5.4/204-module_strip.patch index d37dfd4f98..8b84ddd7f0 100644 --- a/target/linux/generic/hack-5.4/204-module_strip.patch +++ b/target/linux/generic/hack-5.4/204-module_strip.patch @@ -135,7 +135,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -2051,7 +2051,9 @@ static void read_symbols(const char *mod +@@ -2056,7 +2056,9 @@ static void read_symbols(const char *mod symname = remove_dot(info.strtab + sym->st_name); handle_modversions(mod, &info, sym, symname); @@ -145,7 +145,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /* Apply symbol namespaces from __kstrtabns_<symbol> entries. */ -@@ -2265,8 +2267,10 @@ static void add_header(struct buffer *b, +@@ -2270,8 +2272,10 @@ static void add_header(struct buffer *b, buf_printf(b, "\n"); buf_printf(b, "BUILD_SALT;\n"); buf_printf(b, "\n"); @@ -156,7 +156,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__section(.gnu.linkonce.this_module) = {\n"); -@@ -2283,8 +2287,10 @@ static void add_header(struct buffer *b, +@@ -2288,8 +2292,10 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -167,7 +167,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /* Cannot check for assembler */ -@@ -2297,8 +2303,10 @@ static void add_retpoline(struct buffer +@@ -2302,8 +2308,10 @@ static void add_retpoline(struct buffer static void add_staging_flag(struct buffer *b, const char *name) { @@ -178,7 +178,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /** -@@ -2382,11 +2390,13 @@ static void add_depends(struct buffer *b +@@ -2387,11 +2395,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -192,7 +192,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } static void write_if_changed(struct buffer *b, const char *fname) -@@ -2656,7 +2666,9 @@ int main(int argc, char **argv) +@@ -2661,7 +2671,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch b/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch index 4a424c99c1..50a6227148 100644 --- a/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch +++ b/target/linux/generic/hack-5.4/211-darwin-uuid-typedef-clash.patch @@ -8,8 +8,6 @@ Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> scripts/mod/file2alias.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c -index c91eba751804..e756fd80b721 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -38,6 +38,9 @@ typedef struct { @@ -22,6 +20,3 @@ index c91eba751804..e756fd80b721 100644 /* backwards compatibility, don't use in new code */ typedef struct { __u8 b[16]; --- -2.21.1 (Apple Git-122.3) - |