mirror of
https://github.com/fosslinux/live-bootstrap.git
synced 2026-03-02 01:18:08 +01:00
Make patches relative to where tarballs are extracted
Ever since an old patch version, it has (for reasonable security reasons) not supported patched with ../ in the filename. Many of our patches have been relying on this behaviour being OK, because we start off with an ancient patch version that didn't perform such checks. As soon as we need this behaviour after we build a newer patch though, we will have problems. So, let's change the policy. Patches are relative to where tarballs are extracted, rather than the "working directory" - e.g. have patches for `coreutils-9.4/src/cp.c` instead of `src/cp.c`. Keeping this consistent has a few implications; - patches are applied from the build/ directory in bash era now, with `-p0` - when patches are manually applied in the bash era, use `-p` as required, usually `-p1` - in kaem era where patches are always manually applied, `-p1` is used
This commit is contained in:
fosslinux
parent
749b2bfe37
commit
a67db8fcbd
156 changed files with 1265 additions and 1263 deletions
|
|
@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
Disable features unsupported by Autoconf 2.52
|
||||
|
||||
--- configure.ac Wed Mar 17 19:53:06 2021
|
||||
+++ configure.ac.new Wed Mar 17 19:52:53 2021
|
||||
--- autoconf-2.53/configure.ac Wed Mar 17 19:53:06 2021
|
||||
+++ autoconf-2.53/configure.ac.new Wed Mar 17 19:52:53 2021
|
||||
@@ -19,8 +19,7 @@
|
||||
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
# 02111-1307, USA.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Fixes aclocal-1.10 to work with our Perl
|
||||
|
||||
--- aclocal.in 2021-03-25 19:18:10.489134059 +0000
|
||||
+++ aclocal.in 2021-03-25 19:18:20.159389339 +0000
|
||||
--- automake-1.10.3/aclocal.in 2021-03-25 19:18:10.489134059 +0000
|
||||
+++ automake-1.10.3/aclocal.in 2021-03-25 19:18:20.159389339 +0000
|
||||
@@ -45,6 +45,7 @@
|
||||
use Automake::FileUtils;
|
||||
use File::Basename;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Fixes aclocal-1.10 to work with our Perl
|
||||
|
||||
--- aclocal.in 2021-03-25 19:18:10.489134059 +0000
|
||||
+++ aclocal.in 2021-03-25 19:18:20.159389339 +0000
|
||||
--- automake-1.11.2/aclocal.in 2021-03-25 19:18:10.489134059 +0000
|
||||
+++ automake-1.11.2/aclocal.in 2021-03-25 19:18:20.159389339 +0000
|
||||
@@ -44,6 +44,7 @@
|
||||
use Automake::FileUtils;
|
||||
use File::Basename;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Fixes aclocal to work with our Perl
|
||||
|
||||
--- bin/aclocal.in 2021-03-31 18:19:50.665806225 +0100
|
||||
+++ bin/aclocal.in 2021-03-31 18:20:02.836132739 +0100
|
||||
--- automake-1.15.1/bin/aclocal.in 2021-03-31 18:19:50.665806225 +0100
|
||||
+++ automake-1.15.1/bin/aclocal.in 2021-03-31 18:20:02.836132739 +0100
|
||||
@@ -42,6 +42,7 @@
|
||||
use Automake::XFile;
|
||||
use Automake::FileUtils;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Fixes dependency of bootstrapping script
|
||||
|
||||
--- gen-testsuite-part 2017-06-16 21:46:16.000000000 +0100
|
||||
+++ gen-testsuite-part 2021-04-01 00:02:46.801098617 +0100
|
||||
--- automake-1.15.1/gen-testsuite-part 2017-06-16 21:46:16.000000000 +0100
|
||||
+++ automake-1.15.1/gen-testsuite-part 2021-04-01 00:02:46.801098617 +0100
|
||||
@@ -64,8 +64,6 @@
|
||||
$func->($fh);
|
||||
close $fh
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
Fixes configure script to work with older bash
|
||||
|
||||
|
||||
--- configure.ac.bak 2023-03-08 14:34:57.009268432 +1100
|
||||
+++ configure.ac 2023-03-08 14:35:27.947964581 +1100
|
||||
--- automake-1.15.1/configure.ac.bak 2023-03-08 14:34:57.009268432 +1100
|
||||
+++ automake-1.15.1/configure.ac 2023-03-08 14:35:27.947964581 +1100
|
||||
@@ -272,14 +272,6 @@
|
||||
[], [am_score=1; break])
|
||||
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ touch include/pipesize.h
|
|||
rm y.tab.c y.tab.h
|
||||
|
||||
# Patch
|
||||
patch -Np0 -i ../../patches/mes-libc.patch
|
||||
patch -Np0 -i ../../patches/tinycc.patch
|
||||
patch -Np0 -i ../../patches/missing-defines.patch
|
||||
patch -Np0 -i ../../patches/locale.patch
|
||||
patch -Np0 -i ../../patches/dev-tty.patch
|
||||
patch -Np1 -i ../../patches/mes-libc.patch
|
||||
patch -Np1 -i ../../patches/tinycc.patch
|
||||
patch -Np1 -i ../../patches/missing-defines.patch
|
||||
patch -Np1 -i ../../patches/locale.patch
|
||||
patch -Np1 -i ../../patches/dev-tty.patch
|
||||
|
||||
# Compile
|
||||
make mkbuiltins
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ some reason, bash has a fixation on /dev/tty, even though we are not
|
|||
interactive. Removing this check entirely fixes this issue.
|
||||
|
||||
diff --color -ru shell.c
|
||||
--- shell.c 2002-07-02 01:27:11.000000000 +1000
|
||||
+++ shell.c 2021-01-16 11:23:36.407287955 +1100
|
||||
--- bash-2.05b/shell.c 2002-07-02 01:27:11.000000000 +1000
|
||||
+++ bash-2.05b/shell.c 2021-01-16 11:23:36.407287955 +1100
|
||||
@@ -342,8 +342,6 @@
|
||||
# endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
tinycc's extern support is bad. i.e. these externs don't propagate through.
|
||||
|
||||
--- builtins/common.c 2021-01-15 21:32:56.938683418 +1100
|
||||
+++ builtins/common.c 2021-01-15 21:34:09.102153806 +1100
|
||||
--- bash-2.05b/builtins/common.c 2021-01-15 21:32:56.938683418 +1100
|
||||
+++ bash-2.05b/builtins/common.c 2021-01-15 21:34:09.102153806 +1100
|
||||
@@ -46,6 +46,9 @@
|
||||
#include "../flags.h"
|
||||
#include "../jobs.h"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
mes libc + setting locale = not worky.
|
||||
|
||||
--- locale.c 2021-01-15 09:38:55.729307629 +1100
|
||||
+++ locale.c 2021-01-15 11:19:01.929391346 +1100
|
||||
--- bash-2.05b/locale.c 2021-01-15 09:38:55.729307629 +1100
|
||||
+++ bash-2.05b/locale.c 2021-01-15 11:19:01.929391346 +1100
|
||||
@@ -190,7 +190,7 @@
|
||||
set_lang (var, value)
|
||||
char *var, *value;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ mes libc does not have locale support...
|
|||
|
||||
diff --git lib/sh/snprintf.c lib/sh/snprintf.c
|
||||
index 7669576..747aeba 100644
|
||||
--- lib/sh/snprintf.c
|
||||
+++ lib/sh/snprintf.c
|
||||
--- bash-2.05b/lib/sh/snprintf.c
|
||||
+++ bash-2.05b/lib/sh/snprintf.c
|
||||
@@ -376,7 +376,7 @@ static void xfree __P((void *));
|
||||
if ((p)->flags & PF_STAR_P) \
|
||||
(p)->precision = GETARG (int)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ We don't actually want any of these things, which should really be hidden
|
|||
behind the ifdefs given here to disable them when they are not being
|
||||
used (as we do).
|
||||
|
||||
--- execute_cmd.c 2021-01-15 09:38:55.730307635 +1100
|
||||
+++ execute_cmd.c 2021-01-15 09:43:41.046896754 +1100
|
||||
--- bash-2.05b/execute_cmd.c 2021-01-15 09:38:55.730307635 +1100
|
||||
+++ bash-2.05b/execute_cmd.c 2021-01-15 09:43:41.046896754 +1100
|
||||
@@ -286,12 +286,18 @@
|
||||
{
|
||||
if (currently_executing_command->type == cm_simple)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
We don't yet have the size command.
|
||||
|
||||
--- Makefile.in 2023-03-11 15:41:13.297307977 +1100
|
||||
+++ Makefile.in 2023-03-11 15:43:51.677298993 +1100
|
||||
--- bash-2.05b/Makefile.in 2023-03-11 15:41:13.297307977 +1100
|
||||
+++ bash-2.05b/Makefile.in 2023-03-11 15:43:51.677298993 +1100
|
||||
@@ -471,7 +471,6 @@
|
||||
$(RM) $@
|
||||
$(PURIFY) $(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) -o $(Program) $(OBJECTS) $(LIBS)
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ to reflect this.
|
|||
|
||||
diff --git lib/sh/oslib.c lib/sh/oslib.c
|
||||
index 90d7be9..37fdf2a 100644
|
||||
--- lib/sh/oslib.c
|
||||
+++ lib/sh/oslib.c
|
||||
--- bash-2.05b/lib/sh/oslib.c
|
||||
+++ bash-2.05b/lib/sh/oslib.c
|
||||
@@ -192,8 +192,7 @@ bzero (s, n)
|
||||
# include <sys/utsname.h>
|
||||
int
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ Add missing AC_CONFIG_MACRO_DIR.
|
|||
|
||||
Required by autoreconf to create aclocal.m4 correctly.
|
||||
|
||||
--- /libiberty/configure.ac 2022-01-22 14:14:09.000000000 +0200
|
||||
+++ libiberty/configure.ac 2022-09-04 00:01:02.941738129 +0300
|
||||
--- binutils-2.30//libiberty/configure.ac 2022-01-22 14:14:09.000000000 +0200
|
||||
+++ binutils-2.30/libiberty/configure.ac 2022-09-04 00:01:02.941738129 +0300
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
AC_INIT
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
In new gettext external is required for AM_GNU_GETTEXT.
|
||||
|
||||
--- intl/configure.ac 2023-02-07 18:57:56.350832016 +1100
|
||||
+++ intl/configure.ac 2023-02-07 18:58:07.310054484 +1100
|
||||
--- binutils-2.30/intl/configure.ac 2023-02-07 18:57:56.350832016 +1100
|
||||
+++ binutils-2.30/intl/configure.ac 2023-02-07 18:58:07.310054484 +1100
|
||||
@@ -4,7 +4,7 @@
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_MACRO_DIR(../config)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
Ensure i386-init.h dependencies are satisfied.
|
||||
|
||||
--- opcodes/Makefile.am 2022-01-22 14:14:09.000000000 +0200
|
||||
+++ opcodes/Makefile.am 2022-09-13 21:09:04.353324699 +0300
|
||||
--- binutils-2.30/opcodes/Makefile.am 2022-01-22 14:14:09.000000000 +0200
|
||||
+++ binutils-2.30/opcodes/Makefile.am 2022-09-13 21:09:04.353324699 +0300
|
||||
@@ -575,7 +575,7 @@ i386-gen.o: i386-gen.c i386-opc.h $(srcd
|
||||
$(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h
|
||||
@echo $@
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
In new gettext external is required for AM_GNU_GETTEXT.
|
||||
|
||||
--- intl/configure.ac 2023-02-07 18:57:56.350832016 +1100
|
||||
+++ intl/configure.ac 2023-02-07 18:58:07.310054484 +1100
|
||||
--- binutils-2.41/intl/configure.ac 2023-02-07 18:57:56.350832016 +1100
|
||||
+++ binutils-2.41/intl/configure.ac 2023-02-07 18:58:07.310054484 +1100
|
||||
@@ -4,7 +4,7 @@
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_MACRO_DIR(../config)
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
Ensure functions.texi dependencies are satisfied.
|
||||
|
||||
--- libiberty/Makefile.in 2023-12-08 15:18:57.985791235 +1100
|
||||
+++ libiberty/Makefile.in 2023-12-08 15:19:15.391252344 +1100
|
||||
--- binutils-2.41/libiberty/Makefile.in 2023-12-08 15:18:57.985791235 +1100
|
||||
+++ binutils-2.41/libiberty/Makefile.in 2023-12-08 15:19:15.391252344 +1100
|
||||
@@ -368,12 +368,12 @@
|
||||
libiberty.html : $(srcdir)/libiberty.texi $(TEXISRC)
|
||||
$(MAKEINFO) --no-split --html -I$(srcdir) -o $@ $<
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
Ensure i386-tbl.h dependencies are satisfied.
|
||||
|
||||
--- opcodes/Makefile.am 2023-12-08 17:13:05.669136957 +1100
|
||||
+++ opcodes/Makefile.am 2023-12-08 17:13:18.410480026 +1100
|
||||
--- binutils-2.41/opcodes/Makefile.am 2023-12-08 17:13:05.669136957 +1100
|
||||
+++ binutils-2.41/opcodes/Makefile.am 2023-12-08 17:13:18.410480026 +1100
|
||||
@@ -540,7 +540,7 @@
|
||||
# i386-gen will generate all headers in one go. Use a pattern rule to properly
|
||||
# express this, with the inner dash ('-') arbitrarily chosen to be the stem.
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
This macro does not exist in newer versions of autoconf and is unrequired.
|
||||
There is no version of autoconf supporting this project + gnulib + this macro.
|
||||
|
||||
--- m4/po_gl.m4 2021-04-11 18:39:53.353069610 +1000
|
||||
+++ m4/po_gl.m4 2021-04-11 18:40:20.422242498 +1000
|
||||
--- bison-2.3/m4/po_gl.m4 2021-04-11 18:39:53.353069610 +1000
|
||||
+++ bison-2.3/m4/po_gl.m4 2021-04-11 18:40:20.422242498 +1000
|
||||
@@ -24,7 +24,6 @@
|
||||
[
|
||||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
fopen-safer.c for whatever reason does not exist when added by gnulib.
|
||||
|
||||
--- lib/Makefile.am 2021-04-11 19:01:01.265993928 +1000
|
||||
+++ lib/Makefile.am 2021-04-11 19:01:40.413232722 +1000
|
||||
--- bison-2.3/lib/Makefile.am 2021-04-11 19:01:01.265993928 +1000
|
||||
+++ bison-2.3/lib/Makefile.am 2021-04-11 19:01:40.413232722 +1000
|
||||
@@ -31,7 +31,8 @@
|
||||
lib_SOURCES = \
|
||||
get-errno.h get-errno.c \
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
This should be declared for gnulib, but for some reason is not, most likely
|
||||
use of a different version (but CVS history no longer exists).
|
||||
|
||||
--- lib/Makefile.am 2021-04-11 13:49:09.414805465 +1000
|
||||
+++ lib/Makefile.am 2021-04-11 13:49:26.418916036 +1000
|
||||
--- bison-2.3/lib/Makefile.am 2021-04-11 13:49:09.414805465 +1000
|
||||
+++ bison-2.3/lib/Makefile.am 2021-04-11 13:49:26.418916036 +1000
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
BUILT_SOURCES =
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
This doesn't actually make sense, you can't use the built bison to bootstrap
|
||||
itself. Make it use our bison instead.
|
||||
|
||||
--- src/Makefile.am 2021-04-10 21:37:11.570390316 +1000
|
||||
+++ src/Makefile.am 2021-04-10 21:38:01.805804332 +1000
|
||||
--- bison-2.3/src/Makefile.am 2021-04-10 21:37:11.570390316 +1000
|
||||
+++ bison-2.3/src/Makefile.am 2021-04-10 21:38:01.805804332 +1000
|
||||
@@ -23,10 +23,6 @@
|
||||
|
||||
LDADD = ../lib/libbison.a $(LIBINTL)
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ Date: Thu Mar 26 18:02:01 2020 +0100
|
|||
|
||||
diff --git lib/fseterr.c lib/fseterr.c
|
||||
index 8cd68e8..0ec7e2c 100644
|
||||
--- lib/fseterr.c
|
||||
+++ lib/fseterr.c
|
||||
--- bison-3.4.1/lib/fseterr.c
|
||||
+++ bison-3.4.1/lib/fseterr.c
|
||||
@@ -53,7 +53,7 @@ fseterr (FILE *fp)
|
||||
#elif defined EPLAN9 /* Plan9 */
|
||||
if (fp->state != 0 /* CLOSED */)
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ Date: Thu Mar 26 18:02:01 2020 +0100
|
|||
|
||||
diff --git src/scan-code.l src/scan-code.l
|
||||
index 73a3b2d..f348b20 100644
|
||||
--- src/scan-code.l
|
||||
+++ src/scan-code.l
|
||||
--- bison-3.4.1/src/scan-code.l
|
||||
+++ bison-3.4.1/src/scan-code.l
|
||||
@@ -21,6 +21,7 @@
|
||||
%option prefix="code_" outfile="lex.yy.c"
|
||||
|
||||
|
|
@ -30,8 +30,8 @@ index 73a3b2d..f348b20 100644
|
|||
#include <src/flex-scanner.h>
|
||||
diff --git src/scan-gram.l src/scan-gram.l
|
||||
index 66a8caa..efa391a 100644
|
||||
--- src/scan-gram.l
|
||||
+++ src/scan-gram.l
|
||||
--- bison-3.4.1/src/scan-gram.l
|
||||
+++ bison-3.4.1/src/scan-gram.l
|
||||
@@ -21,6 +21,7 @@
|
||||
%option prefix="gram_" outfile="lex.yy.c"
|
||||
|
||||
|
|
@ -50,8 +50,8 @@ index 66a8caa..efa391a 100644
|
|||
#include <src/flex-scanner.h>
|
||||
diff --git src/scan-skel.l src/scan-skel.l
|
||||
index 487e9f5..19f4832 100644
|
||||
--- src/scan-skel.l
|
||||
+++ src/scan-skel.l
|
||||
--- bison-3.4.1/src/scan-skel.l
|
||||
+++ bison-3.4.1/src/scan-skel.l
|
||||
@@ -21,6 +21,7 @@
|
||||
%option prefix="skel_" outfile="lex.yy.c"
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
Again, same as bison 2.3. I cannot figure out what gnulib/bison are doing
|
||||
that makes this required...
|
||||
|
||||
--- Makefile.am 2021-04-15 12:18:34.371818904 +1000
|
||||
+++ Makefile.am 2021-04-15 12:18:39.055851647 +1000
|
||||
--- bison-3.4.2/Makefile.am 2021-04-15 12:18:34.371818904 +1000
|
||||
+++ bison-3.4.2/Makefile.am 2021-04-15 12:18:39.055851647 +1000
|
||||
@@ -63,6 +63,7 @@
|
||||
check_SCRIPTS =
|
||||
dist_TESTS =
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
Why do they insist on using themselves to bootstrap themselves? It doesn't
|
||||
exist...
|
||||
|
||||
--- Makefile.am 2021-04-15 21:29:36.596205032 +1000
|
||||
+++ Makefile.am 2021-04-15 21:30:00.367365897 +1000
|
||||
--- bison-3.4.2/Makefile.am 2021-04-15 21:29:36.596205032 +1000
|
||||
+++ bison-3.4.2/Makefile.am 2021-04-15 21:30:00.367365897 +1000
|
||||
@@ -39,7 +39,7 @@
|
||||
## Running the bison from this tarball. To generate our own parser,
|
||||
## but also to run the tests. Of course, you ought to keep a sane
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
We don't have network access at this stage to "Fetch PO files".
|
||||
|
||||
--- ../gnulib-672663a/gnulib-tool 2021-04-15 21:07:04.538055553 +1000
|
||||
+++ ../gnulib-672663a/gnulib-tool 2021-04-15 21:07:16.424135984 +1000
|
||||
--- gnulib-672663a/gnulib-tool 2021-04-15 21:07:04.538055553 +1000
|
||||
+++ gnulib-672663a/gnulib-tool 2021-04-15 21:07:16.424135984 +1000
|
||||
@@ -5564,16 +5564,6 @@
|
||||
fi
|
||||
func_append added_files "$pobase/POTFILES.in$nl"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ cd ${pkg}
|
|||
|
||||
# Prepare and patch
|
||||
cp ../../files/Makefile .
|
||||
patch -Np0 -i ../../patches/meslibc.patch
|
||||
patch -Np1 -i ../../patches/meslibc.patch
|
||||
|
||||
# Build yacc
|
||||
make CC=tcc AR=tcc\ -ar CFLAGS=-DMAXPATHLEN=100\ -DEILSEQ=84\ -DMB_LEN_MAX=100 LDFLAGS=-lgetopt\ -static RANLIB=true
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ License note: Berkeley Yacc is in the public domain, but it's linked with
|
|||
meslibc, which is GPL-3.0-or-later, so we apply that license here too.
|
||||
|
||||
diff -ru ../byacc-20240109.bak/main.c ./main.c
|
||||
--- ../byacc-20240109.bak/main.c 2024-04-14 16:06:09.646465507 +0200
|
||||
+++ ./main.c 2024-04-14 20:41:56.227083399 +0200
|
||||
--- byacc-20240109/main.c 2024-04-14 16:06:09.646465507 +0200
|
||||
+++ byacc-20240109/main.c 2024-04-14 20:41:56.227083399 +0200
|
||||
@@ -788,7 +788,7 @@
|
||||
(void)umask(save_umask);
|
||||
}
|
||||
|
|
@ -21,8 +21,8 @@ diff -ru ../byacc-20240109.bak/main.c ./main.c
|
|||
|
||||
if (result == 0)
|
||||
diff -ru ../byacc-20240109.bak/output.c ./output.c
|
||||
--- ../byacc-20240109.bak/output.c 2024-04-14 16:06:09.646465507 +0200
|
||||
+++ ./output.c 2024-04-14 16:06:24.636465897 +0200
|
||||
--- byacc-20240109/output.c 2024-04-14 16:06:09.646465507 +0200
|
||||
+++ byacc-20240109/output.c 2024-04-14 16:06:24.636465897 +0200
|
||||
@@ -1289,7 +1289,7 @@
|
||||
{
|
||||
if (union_file != 0)
|
||||
|
|
@ -51,8 +51,8 @@ diff -ru ../byacc-20240109.bak/output.c ./output.c
|
|||
return;
|
||||
|
||||
diff -ru ../byacc-20240109.bak/reader.c ./reader.c
|
||||
--- ../byacc-20240109.bak/reader.c 2024-04-14 16:06:09.646465507 +0200
|
||||
+++ ./reader.c 2024-04-14 20:40:58.387082748 +0200
|
||||
--- byacc-20240109/reader.c 2024-04-14 16:06:09.646465507 +0200
|
||||
+++ byacc-20240109/reader.c 2024-04-14 20:40:58.387082748 +0200
|
||||
@@ -70,7 +70,7 @@
|
||||
char *line_data; /* saved input-line */
|
||||
size_t line_used; /* position within saved input-line */
|
||||
|
|
|
|||
|
|
@ -22,8 +22,8 @@ rm -r ../src
|
|||
cd ${pkg}
|
||||
|
||||
# Patch
|
||||
patch -Np0 -i ../../patches/mes-libc.patch
|
||||
patch -Np0 -i ../../patches/coreutils.patch
|
||||
patch -Np1 -i ../../patches/mes-libc.patch
|
||||
patch -Np1 -i ../../patches/coreutils.patch
|
||||
|
||||
# Build
|
||||
make CC=tcc AR="tcc -ar" LDFLAGS="-static" bzip2
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ point of the bootstrap. ranlib can be unconditionally disabled as we do not
|
|||
have it either.
|
||||
|
||||
diff -r -N -U3 Makefile Makefile
|
||||
--- Makefile 2019-07-13 18:50:05.000000000 +0100
|
||||
+++ Makefile 2021-01-14 15:45:17.558516299 +0000
|
||||
--- bzip2-1.0.8/Makefile 2019-07-13 18:50:05.000000000 +0100
|
||||
+++ bzip2-1.0.8/Makefile 2021-01-14 15:45:17.558516299 +0000
|
||||
@@ -21,7 +21,7 @@
|
||||
LDFLAGS=
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ It also does not have fch{own,mod}, which we don't care about in the bootstrap
|
|||
anyway, so we can null-op those calls.
|
||||
|
||||
diff -r -N -U3 bzip2.c bzip2.c
|
||||
--- bzip2.c 2019-07-13 18:50:05.000000000 +0100
|
||||
+++ bzip2.c 2021-01-14 14:11:40.160213521 +0000
|
||||
--- bzip2-1.0.8/bzip2.c 2019-07-13 18:50:05.000000000 +0100
|
||||
+++ bzip2-1.0.8/bzip2.c 2021-01-14 14:11:40.160213521 +0000
|
||||
@@ -1051,12 +1051,9 @@
|
||||
{
|
||||
# if BZ_UNIX
|
||||
|
|
@ -26,8 +26,8 @@ diff -r -N -U3 bzip2.c bzip2.c
|
|||
# endif
|
||||
}
|
||||
diff -r -N -U3 utime.h utime.h
|
||||
--- utime.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ utime.h 2021-01-14 18:11:11.253825037 +0000
|
||||
--- bzip2-1.0.8/utime.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ bzip2-1.0.8/utime.h 2021-01-14 18:11:11.253825037 +0000
|
||||
@@ -0,0 +1,2 @@
|
||||
+#define fchown(filedes, owner, group) 0
|
||||
+#define fchmod(filedes, mode) 0
|
||||
|
|
|
|||
|
|
@ -35,15 +35,15 @@ rm src/false.c
|
|||
|
||||
rm src/dircolors.h
|
||||
|
||||
patch -Np0 -i ../../patches/modechange.patch
|
||||
patch -Np0 -i ../../patches/mbstate.patch
|
||||
patch -Np0 -i ../../patches/ls-strcmp.patch
|
||||
patch -Np0 -i ../../patches/touch-getdate.patch
|
||||
patch -Np0 -i ../../patches/touch-dereference.patch
|
||||
patch -Np0 -i ../../patches/tac-uint64.patch
|
||||
patch -Np0 -i ../../patches/expr-strcmp.patch
|
||||
patch -Np0 -i ../../patches/sort-locale.patch
|
||||
patch -Np0 -i ../../patches/uniq-fopen.patch
|
||||
patch -Np1 -i ../../patches/modechange.patch
|
||||
patch -Np1 -i ../../patches/mbstate.patch
|
||||
patch -Np1 -i ../../patches/ls-strcmp.patch
|
||||
patch -Np1 -i ../../patches/touch-getdate.patch
|
||||
patch -Np1 -i ../../patches/touch-dereference.patch
|
||||
patch -Np1 -i ../../patches/tac-uint64.patch
|
||||
patch -Np1 -i ../../patches/expr-strcmp.patch
|
||||
patch -Np1 -i ../../patches/sort-locale.patch
|
||||
patch -Np1 -i ../../patches/uniq-fopen.patch
|
||||
|
||||
# Build and install
|
||||
make -f Makefile PREFIX=${PREFIX}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
strcoll() does not exist in mes libc, change it to strcmp.
|
||||
|
||||
--- src/expr.c
|
||||
+++ src/expr.c
|
||||
--- coreutils-5.0/src/expr.c
|
||||
+++ coreutils-5.0/src/expr.c
|
||||
@@ -332,7 +332,7 @@ nextarg (char *str)
|
||||
return 0;
|
||||
else
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
strcoll() does not exist in mes libc, change it to strcmp.
|
||||
|
||||
--- src/ls.c
|
||||
+++ src/ls.c
|
||||
--- coreutils-5.0/src/ls.c
|
||||
+++ coreutils-5.0/src/ls.c
|
||||
@@ -2597,7 +2597,7 @@ xstrcoll (char const *a, char const *b)
|
||||
{
|
||||
int diff;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
mbstate_t is a struct that is required. However, it is not defined by mes libc.
|
||||
This implementation was taken from glibc 2.32.
|
||||
|
||||
--- lib/quotearg.c 2002-11-23 07:08:10.000000000 +0000
|
||||
+++ lib/quotearg.c 2021-01-17 19:41:59.461095532 +0000
|
||||
--- coreutils-5.0/lib/quotearg.c 2002-11-23 07:08:10.000000000 +0000
|
||||
+++ coreutils-5.0/lib/quotearg.c 2021-01-17 19:41:59.461095532 +0000
|
||||
@@ -21,6 +21,7 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
|
@ -16,8 +16,8 @@ This implementation was taken from glibc 2.32.
|
|||
#include "quotearg.h"
|
||||
|
||||
#include "xalloc.h"
|
||||
--- lib/mbstate_t.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ lib/mbstate_t.h 2021-01-17 19:42:21.341658668 +0000
|
||||
--- coreutils-5.0/lib/mbstate_t.h 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ coreutils-5.0/lib/mbstate_t.h 2021-01-17 19:42:21.341658668 +0000
|
||||
@@ -0,0 +1,23 @@
|
||||
+#ifndef ____mbstate_t_defined
|
||||
+#define ____mbstate_t_defined 1
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
modechange.h uses functions defined in sys/stat.h, so we need to move it to
|
||||
after sys/stat.h include.
|
||||
|
||||
--- lib/modechange.c 2001-12-09 22:54:19.000000000 +0000
|
||||
+++ lib/modechange.c 2021-01-17 18:34:22.016427148 +0000
|
||||
--- coreutils-5.0/lib/modechange.c 2001-12-09 22:54:19.000000000 +0000
|
||||
+++ coreutils-5.0/lib/modechange.c 2021-01-17 18:34:22.016427148 +0000
|
||||
@@ -28,8 +28,8 @@
|
||||
# include <config.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
strcoll() does not exist in mes libc, change it to strcmp.
|
||||
hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset.
|
||||
|
||||
--- lib/memcoll.c
|
||||
+++ lib/memcoll.c
|
||||
--- coreutils-5.0/lib/memcoll.c
|
||||
+++ coreutils-5.0/lib/memcoll.c
|
||||
@@ -47,7 +47,7 @@ memcoll (char *s1, size_t s1len, char *s2, size_t s2len)
|
||||
s1[s1len++] = '\0';
|
||||
s2[s2len++] = '\0';
|
||||
|
|
@ -17,8 +17,8 @@ hard_LC_COLLATE is used but not declared when HAVE_SETLOCALE is unset.
|
|||
/* strcoll found no difference, but perhaps it was fooled by NUL
|
||||
characters in the data. Work around this problem by advancing
|
||||
|
||||
--- src/sort.c
|
||||
+++ src/sort.c
|
||||
--- coreutils-5.0/src/sort.c
|
||||
+++ coreutils-5.0/src/sort.c
|
||||
@@ -91,13 +91,13 @@ double strtod ();
|
||||
#define NEGATION_SIGN '-'
|
||||
#define NUMERIC_ZERO '0'
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ SPDX-FileCopyrightText: 2022 Andrius Štikonas <andrius@stikonas.eu>
|
|||
SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
uint64_t is not supported in tcc 0.9.27
|
||||
--- lib/tempname.c 2002-12-01 10:40:32.000000000 +0000
|
||||
+++ lib/tempname.c 2022-06-22 20:57:37.449423973 +0100
|
||||
--- coreutils-5.0/lib/tempname.c 2002-12-01 10:40:32.000000000 +0000
|
||||
+++ coreutils-5.0/lib/tempname.c 2022-06-22 20:57:37.449423973 +0100
|
||||
@@ -231,8 +231,8 @@
|
||||
{
|
||||
int len;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
touch: add -h to change symlink timestamps, where supported
|
||||
|
||||
diff -r -U3 coreutils-5.0.orig/src/touch.c coreutils-5.0/src/touch.c
|
||||
--- src/touch.c 2002-12-20 20:09:22.000000000 +0000
|
||||
+++ src/touch.c 2022-05-16 20:31:37.801988595 +0100
|
||||
--- coreutils-5.0/src/touch.c 2002-12-20 20:09:22.000000000 +0000
|
||||
+++ coreutils-5.0/src/touch.c 2022-05-16 20:31:37.801988595 +0100
|
||||
@@ -77,6 +77,9 @@
|
||||
/* (-r) If nonzero, use times from a reference file. */
|
||||
static int use_ref;
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ getdate.c is pre-compiled from getdate.y
|
|||
At this point we don't have bison yet and in any case getdate.y does not
|
||||
compile when generated with modern bison.
|
||||
|
||||
--- src/touch.c.orig 2021-03-13 18:16:05.344355958 +0000
|
||||
+++ src/touch.c 2021-03-13 18:16:26.204891355 +0000
|
||||
--- coreutils-5.0/src/touch.c.orig 2021-03-13 18:16:05.344355958 +0000
|
||||
+++ coreutils-5.0/src/touch.c 2021-03-13 18:16:26.204891355 +0000
|
||||
@@ -306,7 +306,7 @@
|
||||
|
||||
case 'd':
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
uniq: don't assume fopen cannot return stdin or stdout.
|
||||
Backport of https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=786ebb2ceca72f69aa2de701671fb41f53cb1489
|
||||
|
||||
--- src/uniq.c
|
||||
+++ src/uniq.c
|
||||
--- coreutils-5.0/src/uniq.c
|
||||
+++ coreutils-5.0/src/uniq.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include "error.h"
|
||||
#include "hard-locale.h"
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ We always assume that kernel doesn't have correct implementation and
|
|||
instead use function from gnulib with fix. That fixes reproducibility
|
||||
problem across different kernels.
|
||||
|
||||
--- ../gnulib-bb5bb43/m4/nanosleep.m4
|
||||
+++ ../gnulib-bb5bb43/m4/nanosleep.m4
|
||||
--- gnulib-bb5bb43/m4/nanosleep.m4
|
||||
+++ gnulib-bb5bb43/m4/nanosleep.m4
|
||||
@@ -85,23 +85,9 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
|
||||
ts_sleep.tv_nsec = 1;
|
||||
#if HAVE_DECL_ALARM
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
Remove dependency on gettext, because we don't have it at this stage
|
||||
of the build.
|
||||
|
||||
--- ./configure.ac
|
||||
+++ ./configure.ac
|
||||
--- coreutils-9.4/configure.ac
|
||||
+++ coreutils-9.4/configure.ac
|
||||
@@ -624,8 +624,8 @@ AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes])
|
||||
|
||||
# As long as "grep 'PRI[diouxX]' po/*.pot" reports matches in
|
||||
|
|
@ -18,8 +18,8 @@ of the build.
|
|||
|
||||
# For a test of uniq: it uses the $LOCALE_FR envvar.
|
||||
gt_LOCALE_FR
|
||||
--- ./Makefile.am
|
||||
+++ ./Makefile.am
|
||||
--- coreutils-9.4/Makefile.am
|
||||
+++ coreutils-9.4/Makefile.am
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
ALL_RECURSIVE_TARGETS =
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ Regenerating help is not trivial. Help is unnecessary.
|
|||
Disable help.
|
||||
|
||||
diff -ru src/Makefile.inc src/Makefile.inc
|
||||
--- src/Makefile.inc
|
||||
+++ src/Makefile.inc
|
||||
--- curl-8.5.0/src/Makefile.inc
|
||||
+++ curl-8.5.0/src/Makefile.inc
|
||||
@@ -76,12 +76,10 @@
|
||||
tool_formparse.c \
|
||||
tool_getparam.c \
|
||||
|
|
@ -30,8 +30,8 @@ diff -ru src/Makefile.inc src/Makefile.inc
|
|||
tool_hugehelp.h \
|
||||
tool_ipfs.h \
|
||||
diff -ru src/tool_operate.c src/tool_operate.c
|
||||
--- src/tool_operate.c
|
||||
+++ src/tool_operate.c
|
||||
--- curl-8.5.0/src/tool_operate.c
|
||||
+++ curl-8.5.0/src/tool_operate.c
|
||||
@@ -78,7 +78,6 @@
|
||||
#include "tool_writeout.h"
|
||||
#include "tool_xattr.h"
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ Disables checking current date in mk-ca-bundle script, so it produces
|
|||
reproducible bundles.
|
||||
|
||||
diff -ru scripts/mk-ca-bundle.pl scripts/mk-ca-bundle.pl
|
||||
--- scripts/mk-ca-bundle.pl
|
||||
+++ scripts/mk-ca-bundle.pl
|
||||
--- curl-8.5.0/scripts/mk-ca-bundle.pl
|
||||
+++ curl-8.5.0/scripts/mk-ca-bundle.pl
|
||||
@@ -499,19 +499,7 @@
|
||||
if($main_block) {
|
||||
push @precert, $_ if not /^#$/;
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
__CTASSERT macro does not work properly on our older GCC.
|
||||
|
||||
diff -ru src/arp.c src/arp.c
|
||||
--- src/arp.c
|
||||
+++ src/arp.c
|
||||
--- dhcpcd-10.0.1/src/arp.c
|
||||
+++ dhcpcd-10.0.1/src/arp.c
|
||||
@@ -63,9 +63,6 @@
|
||||
/* ARP debugging can be quite noisy. Enable this for more noise! */
|
||||
//#define ARP_DEBUG
|
||||
|
|
@ -18,8 +18,8 @@ diff -ru src/arp.c src/arp.c
|
|||
arp_request(const struct arp_state *astate,
|
||||
const struct in_addr *sip)
|
||||
diff -ru src/auth.c src/auth.c
|
||||
--- src/auth.c
|
||||
+++ src/auth.c
|
||||
--- dhcpcd-10.0.1/src/auth.c
|
||||
+++ dhcpcd-10.0.1/src/auth.c
|
||||
@@ -343,9 +343,6 @@
|
||||
|
||||
/* RFC3318, section 5.2 - zero giaddr and hops */
|
||||
|
|
@ -31,8 +31,8 @@ diff -ru src/auth.c src/auth.c
|
|||
memset(mm + offsetof(struct bootp, giaddr), 0, 4);
|
||||
}
|
||||
diff -ru src/dhcp6.c src/dhcp6.c
|
||||
--- src/dhcp6.c
|
||||
+++ src/dhcp6.c
|
||||
--- dhcpcd-10.0.1/src/dhcp6.c
|
||||
+++ dhcpcd-10.0.1/src/dhcp6.c
|
||||
@@ -84,33 +84,28 @@
|
||||
uint8_t xid[3];
|
||||
/* followed by options */
|
||||
|
|
@ -76,8 +76,8 @@ diff -ru src/dhcp6.c src/dhcp6.c
|
|||
struct dhcp6_op {
|
||||
uint16_t type;
|
||||
diff -ru src/dhcp.c src/dhcp.c
|
||||
--- src/dhcp.c
|
||||
+++ src/dhcp.c
|
||||
--- dhcpcd-10.0.1/src/dhcp.c
|
||||
+++ dhcpcd-10.0.1/src/dhcp.c
|
||||
@@ -98,11 +98,6 @@
|
||||
#define IP_RECVPKTINFO IP_PKTINFO
|
||||
#endif
|
||||
|
|
@ -91,8 +91,8 @@ diff -ru src/dhcp.c src/dhcp.c
|
|||
uint8_t value;
|
||||
const char *name;
|
||||
diff -ru src/if-bsd.c src/if-bsd.c
|
||||
--- src/if-bsd.c
|
||||
+++ src/if-bsd.c
|
||||
--- dhcpcd-10.0.1/src/if-bsd.c
|
||||
+++ dhcpcd-10.0.1/src/if-bsd.c
|
||||
@@ -1600,7 +1600,6 @@
|
||||
#endif
|
||||
}
|
||||
|
|
@ -102,8 +102,8 @@ diff -ru src/if-bsd.c src/if-bsd.c
|
|||
if_handlelink(struct dhcpcd_ctx *ctx)
|
||||
{
|
||||
diff -ru src/ipv6nd.c src/ipv6nd.c
|
||||
--- src/ipv6nd.c
|
||||
+++ src/ipv6nd.c
|
||||
--- dhcpcd-10.0.1/src/ipv6nd.c
|
||||
+++ dhcpcd-10.0.1/src/ipv6nd.c
|
||||
@@ -80,7 +80,6 @@
|
||||
uint32_t nd_opt_rdnss_lifetime;
|
||||
/* followed by list of IP prefixes */
|
||||
|
|
@ -121,8 +121,8 @@ diff -ru src/ipv6nd.c src/ipv6nd.c
|
|||
|
||||
/* Impossible options, so we can easily add extras */
|
||||
diff -ru src/privsep-root.c src/privsep-root.c
|
||||
--- src/privsep-root.c
|
||||
+++ src/privsep-root.c
|
||||
--- dhcpcd-10.0.1/src/privsep-root.c
|
||||
+++ dhcpcd-10.0.1/src/privsep-root.c
|
||||
@@ -56,8 +56,6 @@
|
||||
#include "sa.h"
|
||||
#include "script.h"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
|||
|
||||
SPDX-License-Identifier: Artistic-1.0
|
||||
|
||||
--- bin/perload 2021-04-21 19:01:35.803767498 +1000
|
||||
+++ bin/perload 2021-04-21 19:01:47.959850217 +1000
|
||||
--- dist-3.5-236/bin/perload 2021-04-21 19:01:35.803767498 +1000
|
||||
+++ dist-3.5-236/bin/perload 2021-04-21 19:01:47.959850217 +1000
|
||||
@@ -450,8 +450,6 @@
|
||||
:# This perl program uses dynamic loading [generated by perload]
|
||||
:#
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ Our version of gawk does not seem to like printing, at least in the way that
|
|||
this attempts to use it. Instead, make it print to console and use working
|
||||
bash redirects.
|
||||
|
||||
--- lib/et/compile_et.sh.in 2022-05-18 19:26:17.182054784 +1000
|
||||
+++ lib/et/compile_et.sh.in 2022-05-18 19:30:16.489294776 +1000
|
||||
--- e2fsprogs-1.45.7/lib/et/compile_et.sh.in 2022-05-18 19:26:17.182054784 +1000
|
||||
+++ e2fsprogs-1.45.7/lib/et/compile_et.sh.in 2022-05-18 19:30:16.489294776 +1000
|
||||
@@ -44,14 +44,14 @@
|
||||
exit 1;
|
||||
fi
|
||||
|
|
@ -25,8 +25,8 @@ bash redirects.
|
|||
if test -f ${BASE}.c && cmp -s ${BASE}.c.$$ ${BASE}.c ; then
|
||||
rm -f ${BASE}.c.$$
|
||||
else
|
||||
--- lib/ss/mk_cmds.sh.in 2022-05-18 19:33:16.024962919 +1000
|
||||
+++ lib/ss/mk_cmds.sh.in 2022-05-18 19:33:39.650576476 +1000
|
||||
--- e2fsprogs-1.45.7/lib/ss/mk_cmds.sh.in 2022-05-18 19:33:16.024962919 +1000
|
||||
+++ e2fsprogs-1.45.7/lib/ss/mk_cmds.sh.in 2022-05-18 19:33:39.650576476 +1000
|
||||
@@ -43,7 +43,7 @@
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
Disable gettext, which we do not have at this time, along with pkg-config.
|
||||
|
||||
--- configure.ac 2022-05-18 15:12:53.633061872 +1000
|
||||
+++ configure.ac 2022-05-18 19:09:13.351790066 +1000
|
||||
--- e2fsprogs-1.45.7/configure.ac 2022-05-18 15:12:53.633061872 +1000
|
||||
+++ e2fsprogs-1.45.7/configure.ac 2022-05-18 19:09:13.351790066 +1000
|
||||
@@ -860,20 +860,7 @@
|
||||
dnl
|
||||
MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
|
||||
|
|
@ -60,8 +60,8 @@ Disable gettext, which we do not have at this time, along with pkg-config.
|
|||
AC_MSG_CHECKING([for systemd system unit dir])
|
||||
systemd_system_unit_dir="${with_systemd_unit_dir}"
|
||||
AS_IF([test -n "${systemd_system_unit_dir}"],
|
||||
--- Makefile.in 2022-05-18 19:41:37.596959349 +1000
|
||||
+++ Makefile.in 2022-05-18 19:41:41.109050161 +1000
|
||||
--- e2fsprogs-1.45.7/Makefile.in 2022-05-18 19:41:37.596959349 +1000
|
||||
+++ e2fsprogs-1.45.7/Makefile.in 2022-05-18 19:41:41.109050161 +1000
|
||||
@@ -20,7 +20,7 @@
|
||||
@ALL_CMT@EXT2FS_LIB_SUBDIR= lib/ext2fs
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
Use the fallback implementations of getcwd to get the same /usr/bin/find
|
||||
checksum when building across FUSE and non-FUSE filesystems.
|
||||
|
||||
--- gnulib/m4/getcwd-path-max.m4 2022-01-08 13:16:54.412709192 +0200
|
||||
+++ gnulib/m4/getcwd-path-max.m4 2022-01-16 11:38:02.658606802 +0200
|
||||
--- findutils-4.2.33/gnulib/m4/getcwd-path-max.m4 2022-01-08 13:16:54.412709192 +0200
|
||||
+++ findutils-4.2.33/gnulib/m4/getcwd-path-max.m4 2022-01-16 11:38:02.658606802 +0200
|
||||
@@ -81,7 +81,7 @@
|
||||
char *cwd = getcwd (buf, PATH_MAX);
|
||||
size_t initial_cwd_len;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ Comments are unsupported by our flex.
|
|||
|
||||
diff --git scan.l scan.l
|
||||
index 18d0de8..c251a5e 100644
|
||||
--- scan.l
|
||||
+++ scan.l
|
||||
--- flex-2.5.11/scan.l
|
||||
+++ flex-2.5.11/scan.l
|
||||
@@ -335,8 +335,8 @@ LEXOPT [aceknopr]
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ acidentally re-declare it.
|
|||
|
||||
diff --git flexdef.h flexdef.h
|
||||
index 3eb710a..94ef024 100644
|
||||
--- flexdef.h
|
||||
+++ flexdef.h
|
||||
--- flex-2.5.11/flexdef.h
|
||||
+++ flex-2.5.11/flexdef.h
|
||||
@@ -421,7 +421,7 @@ extern int yymore_really_used, reject_really_used;
|
||||
*/
|
||||
|
||||
|
|
@ -31,8 +31,8 @@ index 3eb710a..94ef024 100644
|
|||
extern char *action_array;
|
||||
extern int action_size;
|
||||
extern int defs1_offset, prolog_offset, action_offset, action_index;
|
||||
--- scan.l
|
||||
+++ scan.l
|
||||
--- flex-2.5.11/scan.l
|
||||
+++ flex-2.5.11/scan.l
|
||||
@@ -32,6 +32,7 @@
|
||||
/* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR */
|
||||
/* PURPOSE. */
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ the applicable combination of 'aclocal', 'autoconf', 'autoheader'.
|
|||
|
||||
See also 'AC_CONFIG_MACRO_DIRS'/'AC_CONFIG_MACRO_DIR' usage elsewhere.
|
||||
|
||||
--- gcc/configure.ac 2023-01-22 16:22:57.833166450 +1100
|
||||
+++ gcc/configure.ac 2023-01-22 16:23:08.971274603 +1100
|
||||
--- gcc-10.4.0/gcc/configure.ac 2023-01-22 16:22:57.833166450 +1100
|
||||
+++ gcc-10.4.0/gcc/configure.ac 2023-01-22 16:23:08.971274603 +1100
|
||||
@@ -25,6 +25,7 @@
|
||||
|
||||
AC_INIT
|
||||
|
|
@ -25,8 +25,8 @@ See also 'AC_CONFIG_MACRO_DIRS'/'AC_CONFIG_MACRO_DIR' usage elsewhere.
|
|||
AC_CONFIG_HEADER(auto-host.h:config.in)
|
||||
|
||||
gcc_version=`cat $srcdir/BASE-VER`
|
||||
--- libobjc/configure.ac 2023-01-22 16:23:42.648601085 +1100
|
||||
+++ libobjc/configure.ac 2023-01-22 16:23:28.937468262 +1100
|
||||
--- gcc-10.4.0/libobjc/configure.ac 2023-01-22 16:23:42.648601085 +1100
|
||||
+++ gcc-10.4.0/libobjc/configure.ac 2023-01-22 16:23:28.937468262 +1100
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
AC_INIT(package-unused, version-unused,, libobjc)
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ https://stackoverflow.com/questions/22160093/inconsistent-operand-constraints-in
|
|||
Pre-5.0 GCC does not support PIC inline ASM that touches ebx (as
|
||||
presumably the cpuid call does); so we must disable PIC.
|
||||
|
||||
--- libgcc/Makefile.in 2023-01-25 16:03:45.928059755 +1100
|
||||
+++ libgcc/Makefile.in 2023-01-25 16:04:06.711464255 +1100
|
||||
--- gcc-10.4.0/libgcc/Makefile.in 2023-01-25 16:03:45.928059755 +1100
|
||||
+++ gcc-10.4.0/libgcc/Makefile.in 2023-01-25 16:04:06.711464255 +1100
|
||||
@@ -282,7 +282,7 @@
|
||||
# subdirectory rather than in the source directory.
|
||||
# -I$(@D) and -I$(srcdir)/$(@D) cause the subdirectory of the file
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ __LIBGCC_HAS_XF_MODE__ is not defined.
|
|||
|
||||
diff --git libgcc/config/libbid/_dd_to_xf.c libgcc/config/libbid/_dd_to_xf.c
|
||||
index 5a2abbbb1f4..e4b12e8ac4f 100644
|
||||
--- libgcc/config/libbid/_dd_to_xf.c
|
||||
+++ libgcc/config/libbid/_dd_to_xf.c
|
||||
--- gcc-10.4.0/libgcc/config/libbid/_dd_to_xf.c
|
||||
+++ gcc-10.4.0/libgcc/config/libbid/_dd_to_xf.c
|
||||
@@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#include "bid_functions.h"
|
||||
#include "bid_gcc_intrinsics.h"
|
||||
|
|
@ -35,8 +35,8 @@ index 5a2abbbb1f4..e4b12e8ac4f 100644
|
|||
+#endif
|
||||
diff --git libgcc/config/libbid/_sd_to_xf.c libgcc/config/libbid/_sd_to_xf.c
|
||||
index 9af09913684..288ccb25075 100644
|
||||
--- libgcc/config/libbid/_sd_to_xf.c
|
||||
+++ libgcc/config/libbid/_sd_to_xf.c
|
||||
--- gcc-10.4.0/libgcc/config/libbid/_sd_to_xf.c
|
||||
+++ gcc-10.4.0/libgcc/config/libbid/_sd_to_xf.c
|
||||
@@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#include "bid_functions.h"
|
||||
#include "bid_gcc_intrinsics.h"
|
||||
|
|
@ -52,8 +52,8 @@ index 9af09913684..288ccb25075 100644
|
|||
+#endif
|
||||
diff --git libgcc/config/libbid/_td_to_xf.c libgcc/config/libbid/_td_to_xf.c
|
||||
index b0c76a71497..e990282162d 100644
|
||||
--- libgcc/config/libbid/_td_to_xf.c
|
||||
+++ libgcc/config/libbid/_td_to_xf.c
|
||||
--- gcc-10.4.0/libgcc/config/libbid/_td_to_xf.c
|
||||
+++ gcc-10.4.0/libgcc/config/libbid/_td_to_xf.c
|
||||
@@ -25,6 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#include "bid_functions.h"
|
||||
#include "bid_gcc_intrinsics.h"
|
||||
|
|
@ -69,8 +69,8 @@ index b0c76a71497..e990282162d 100644
|
|||
+#endif
|
||||
diff --git libgcc/config/libbid/_xf_to_dd.c libgcc/config/libbid/_xf_to_dd.c
|
||||
index 9feb0f2c3d6..e3246a1c2e1 100644
|
||||
--- libgcc/config/libbid/_xf_to_dd.c
|
||||
+++ libgcc/config/libbid/_xf_to_dd.c
|
||||
--- gcc-10.4.0/libgcc/config/libbid/_xf_to_dd.c
|
||||
+++ gcc-10.4.0/libgcc/config/libbid/_xf_to_dd.c
|
||||
@@ -25,9 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#include "bid_functions.h"
|
||||
#include "bid_gcc_intrinsics.h"
|
||||
|
|
@ -85,8 +85,8 @@ index 9feb0f2c3d6..e3246a1c2e1 100644
|
|||
+#endif
|
||||
diff --git libgcc/config/libbid/_xf_to_sd.c libgcc/config/libbid/_xf_to_sd.c
|
||||
index 7d46548af6c..9147e979182 100644
|
||||
--- libgcc/config/libbid/_xf_to_sd.c
|
||||
+++ libgcc/config/libbid/_xf_to_sd.c
|
||||
--- gcc-10.4.0/libgcc/config/libbid/_xf_to_sd.c
|
||||
+++ gcc-10.4.0/libgcc/config/libbid/_xf_to_sd.c
|
||||
@@ -25,9 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#include "bid_functions.h"
|
||||
#include "bid_gcc_intrinsics.h"
|
||||
|
|
@ -101,8 +101,8 @@ index 7d46548af6c..9147e979182 100644
|
|||
+#endif
|
||||
diff --git libgcc/config/libbid/_xf_to_td.c libgcc/config/libbid/_xf_to_td.c
|
||||
index 07987fdcc3a..c8d102b0b7f 100644
|
||||
--- libgcc/config/libbid/_xf_to_td.c
|
||||
+++ libgcc/config/libbid/_xf_to_td.c
|
||||
--- gcc-10.4.0/libgcc/config/libbid/_xf_to_td.c
|
||||
+++ gcc-10.4.0/libgcc/config/libbid/_xf_to_td.c
|
||||
@@ -25,9 +25,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#include "bid_functions.h"
|
||||
#include "bid_gcc_intrinsics.h"
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
In new gettext external is required for AM_GNU_GETTEXT.
|
||||
|
||||
--- intl/configure.ac 2023-02-07 18:43:58.989786230 +1100
|
||||
+++ intl/configure.ac 2023-02-07 18:43:02.182632631 +1100
|
||||
--- gcc-10.4.0/intl/configure.ac 2023-02-07 18:43:58.989786230 +1100
|
||||
+++ gcc-10.4.0/intl/configure.ac 2023-02-07 18:43:02.182632631 +1100
|
||||
@@ -4,7 +4,7 @@
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_MACRO_DIR(../config)
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
GCC 4.7 doesn't have fisolate-erroneous-paths-dereference. Hence
|
||||
this line does nothing.
|
||||
|
||||
--- libgcc/generic-morestack.c 2023-01-25 16:52:35.382471998 +1100
|
||||
+++ libgcc/generic-morestack.c 2023-01-25 16:52:40.773585043 +1100
|
||||
--- gcc-10.4.0/libgcc/generic-morestack.c 2023-01-25 16:52:35.382471998 +1100
|
||||
+++ gcc-10.4.0/libgcc/generic-morestack.c 2023-01-25 16:52:40.773585043 +1100
|
||||
@@ -23,8 +23,6 @@
|
||||
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
In new gettext external is required for AM_GNU_GETTEXT.
|
||||
|
||||
--- intl/configure.ac 2023-02-07 18:43:58.989786230 +1100
|
||||
+++ intl/configure.ac 2023-02-07 18:43:02.182632631 +1100
|
||||
--- gcc-13.1.0/intl/configure.ac 2023-02-07 18:43:58.989786230 +1100
|
||||
+++ gcc-13.1.0/intl/configure.ac 2023-02-07 18:43:02.182632631 +1100
|
||||
@@ -4,7 +4,7 @@
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
AC_CONFIG_MACRO_DIR(../config)
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ libitm fixes for musl support
|
|||
|
||||
From-SVN: r222325
|
||||
|
||||
--- libitm/config/arm/hwcap.cc
|
||||
+++ libitm/config/arm/hwcap.cc
|
||||
--- gcc-4.7.4/libitm/config/arm/hwcap.cc
|
||||
+++ gcc-4.7.4/libitm/config/arm/hwcap.cc
|
||||
@@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0
|
||||
|
||||
#ifdef __linux__
|
||||
|
|
@ -25,8 +25,8 @@ From-SVN: r222325
|
|||
#include <elf.h>
|
||||
|
||||
static void __attribute__((constructor))
|
||||
--- libitm/config/linux/x86/tls.h
|
||||
+++ libitm/config/linux/x86/tls.h
|
||||
--- gcc-4.7.4/libitm/config/linux/x86/tls.h
|
||||
+++ gcc-4.7.4/libitm/config/linux/x86/tls.h
|
||||
@@ -25,16 +25,19 @@
|
||||
#ifndef LIBITM_X86_TLS_H
|
||||
#define LIBITM_X86_TLS_H 1
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ fixincludes update for musl support
|
|||
|
||||
From-SVN: r222327
|
||||
|
||||
--- fixincludes/mkfixinc.sh
|
||||
+++ fixincludes/mkfixinc.sh
|
||||
--- gcc-4.7.4/fixincludes/mkfixinc.sh
|
||||
+++ gcc-4.7.4/fixincludes/mkfixinc.sh
|
||||
@@ -20,7 +20,8 @@ case $machine in
|
||||
powerpc-*-eabi* | \
|
||||
powerpc-*-rtems* | \
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@ Co-Authored-By: Szabolcs Nagy <szabolcs.nagy@arm.com>
|
|||
|
||||
From-SVN: r222328
|
||||
|
||||
--- libgcc/unwind-dw2-fde-dip.c
|
||||
+++ libgcc/unwind-dw2-fde-dip.c
|
||||
--- gcc-4.7.4/libgcc/unwind-dw2-fde-dip.c
|
||||
+++ gcc-4.7.4/libgcc/unwind-dw2-fde-dip.c
|
||||
@@ -53,6 +53,12 @@
|
||||
# define USE_PT_GNU_EH_FRAME
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ libstdc++ gthr workaround for musl
|
|||
|
||||
From-SVN: r222329
|
||||
|
||||
--- libstdc++-v3/config/os/generic/os_defines.h
|
||||
+++ libstdc++-v3/config/os/generic/os_defines.h
|
||||
--- gcc-4.7.4/libstdc++-v3/config/os/generic/os_defines.h
|
||||
+++ gcc-4.7.4/libstdc++-v3/config/os/generic/os_defines.h
|
||||
@@ -33,4 +33,9 @@
|
||||
// System-specific #define, typedefs, corrections, etc, go here. This
|
||||
// file will come before all others.
|
||||
|
|
@ -27,8 +27,8 @@ From-SVN: r222329
|
|||
+#define _GLIBCXX_GTHREAD_USE_WEAK 0
|
||||
+
|
||||
#endif
|
||||
--- libstdc++-v3/configure.host
|
||||
+++ libstdc++-v3/configure.host
|
||||
--- gcc-4.7.4/libstdc++-v3/configure.host
|
||||
+++ gcc-4.7.4/libstdc++-v3/configure.host
|
||||
@@ -242,6 +242,9 @@ case "${host_os}" in
|
||||
freebsd*)
|
||||
os_include_dir="os/bsd/freebsd"
|
||||
|
|
|
|||
|
|
@ -28,8 +28,8 @@ Co-Authored-By: Szabolcs Nagy <szabolcs.nagy@arm.com>
|
|||
|
||||
From-SVN: r222904
|
||||
|
||||
--- gcc/config.gcc
|
||||
+++ gcc/config.gcc
|
||||
--- gcc-4.7.4/gcc/config.gcc
|
||||
+++ gcc-4.7.4/gcc/config.gcc
|
||||
@@ -522,7 +522,7 @@ case ${target} in
|
||||
esac
|
||||
|
||||
|
|
@ -49,8 +49,8 @@ From-SVN: r222904
|
|||
*)
|
||||
tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC"
|
||||
;;
|
||||
--- gcc/config/linux.h
|
||||
+++ gcc/config/linux.h
|
||||
--- gcc-4.7.4/gcc/config/linux.h
|
||||
+++ gcc-4.7.4/gcc/config/linux.h
|
||||
@@ -33,10 +33,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
||||
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
||||
|
|
@ -204,8 +204,8 @@ From-SVN: r222904
|
|||
+ { 0, 0, 0, 0, 0, 0 } \
|
||||
+ }
|
||||
+#endif
|
||||
--- gcc/config/linux.opt
|
||||
+++ gcc/config/linux.opt
|
||||
--- gcc-4.7.4/gcc/config/linux.opt
|
||||
+++ gcc-4.7.4/gcc/config/linux.opt
|
||||
@@ -28,5 +28,9 @@ Target Report RejectNegative Var(linux_libc,LIBC_GLIBC) Negative(muclibc)
|
||||
Use GNU C library
|
||||
|
||||
|
|
@ -217,8 +217,8 @@ From-SVN: r222904
|
|||
+mmusl
|
||||
+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic)
|
||||
+Use musl C library
|
||||
--- gcc/configure.ac
|
||||
+++ gcc/configure.ac
|
||||
--- gcc-4.7.4/gcc/configure.ac
|
||||
+++ gcc-4.7.4/gcc/configure.ac
|
||||
@@ -4669,6 +4669,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
|
||||
gcc_cv_libc_provides_ssp,
|
||||
[gcc_cv_libc_provides_ssp=no
|
||||
|
|
@ -247,8 +247,8 @@ From-SVN: r222904
|
|||
esac
|
||||
GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR])
|
||||
if test x$gcc_cv_target_dl_iterate_phdr = xyes; then
|
||||
--- gcc/doc/invoke.texi
|
||||
+++ gcc/doc/invoke.texi
|
||||
--- gcc-4.7.4/gcc/doc/invoke.texi
|
||||
+++ gcc-4.7.4/gcc/doc/invoke.texi
|
||||
@@ -595,7 +595,7 @@ Objective-C and Objective-C++ Dialects}.
|
||||
-mcpu=@var{cpu}}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@ Add musl support to GCC
|
|||
|
||||
From-SVN: r222905
|
||||
|
||||
--- gcc/config/glibc-stdint.h
|
||||
+++ gcc/config/glibc-stdint.h
|
||||
--- gcc-4.7.4/gcc/config/glibc-stdint.h
|
||||
+++ gcc-4.7.4/gcc/config/glibc-stdint.h
|
||||
@@ -22,6 +22,12 @@ a copy of the GCC Runtime Library Exception along with this program;
|
||||
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
|
@ -51,8 +51,8 @@ From-SVN: r222905
|
|||
#define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
|
||||
|
||||
#define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int")
|
||||
--- gcc/config/linux.h
|
||||
+++ gcc/config/linux.h
|
||||
--- gcc-4.7.4/gcc/config/linux.h
|
||||
+++ gcc-4.7.4/gcc/config/linux.h
|
||||
@@ -33,11 +33,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC)
|
||||
#define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ x86 musl support
|
|||
|
||||
From-SVN: r223218
|
||||
|
||||
--- gcc/config/i386/linux.h
|
||||
+++ gcc/config/i386/linux.h
|
||||
--- gcc-4.7.4/gcc/config/i386/linux.h
|
||||
+++ gcc-4.7.4/gcc/config/i386/linux.h
|
||||
@@ -22,3 +22,6 @@ along with GCC; see the file COPYING3. If not see
|
||||
|
||||
#define GNU_USER_LINK_EMULATION "elf_i386"
|
||||
|
|
@ -24,8 +24,8 @@ From-SVN: r223218
|
|||
+
|
||||
+#undef MUSL_DYNAMIC_LINKER
|
||||
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
|
||||
--- gcc/config/i386/linux64.h
|
||||
+++ gcc/config/i386/linux64.h
|
||||
--- gcc-4.7.4/gcc/config/i386/linux64.h
|
||||
+++ gcc-4.7.4/gcc/config/i386/linux64.h
|
||||
@@ -31,3 +31,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
||||
#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ config/linux.h (INCLUDE_DEFAULTS): Add INCLUDE_DEFAULTS_MUSL_LOCAL.
|
|||
|
||||
From-SVN: r229392
|
||||
|
||||
--- gcc/config/linux.h
|
||||
+++ gcc/config/linux.h
|
||||
--- gcc-4.7.4/gcc/config/linux.h
|
||||
+++ gcc-4.7.4/gcc/config/linux.h
|
||||
@@ -184,6 +184,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||
#define INCLUDE_DEFAULTS \
|
||||
{ \
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ In GCC 10, fself-test is run on every GCC used in the
|
|||
build process to ensure correctness. However this is not
|
||||
yet introduced in GCC 4.7, so we no-op it.
|
||||
|
||||
--- gcc/common.opt 2023-01-23 21:22:23.630919284 +1100
|
||||
+++ gcc/common.opt 2023-01-23 21:23:33.030143958 +1100
|
||||
--- gcc-4.7.4/gcc/common.opt 2023-01-23 21:22:23.630919284 +1100
|
||||
+++ gcc-4.7.4/gcc/common.opt 2023-01-23 21:23:33.030143958 +1100
|
||||
@@ -1701,6 +1701,10 @@
|
||||
Common Report Var(flag_selective_scheduling2) Optimization
|
||||
Run selective scheduling after reload
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ These macros do not exist in GCC 4.7, so we add them in.
|
|||
(We could -D them in GCC 10, but this is a simpler unobtrusive
|
||||
solution, and is arguably more correct).
|
||||
|
||||
--- gcc/c-family/c-cppbuiltin.c 2023-01-25 16:56:44.122222376 +1100
|
||||
+++ gcc/c-family/c-cppbuiltin.c 2023-01-25 17:01:52.500855016 +1100
|
||||
--- gcc-4.7.4/gcc/c-family/c-cppbuiltin.c 2023-01-25 16:56:44.122222376 +1100
|
||||
+++ gcc-4.7.4/gcc/c-family/c-cppbuiltin.c 2023-01-25 17:01:52.500855016 +1100
|
||||
@@ -850,6 +850,30 @@
|
||||
builtin_define_with_int_value ("__LIBGCC_TRAMPOLINE_SIZE__",
|
||||
TRAMPOLINE_SIZE);
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ makes more sense to simply add in support to GCC 4.7.
|
|||
|
||||
diff --git gcc/config/i386/i386-c.c gcc/config/i386/i386-c.c
|
||||
index d00e0ba54b939..edd64ff7ae388 100644
|
||||
--- gcc/config/i386/i386-c.c
|
||||
+++ gcc/config/i386/i386-c.c
|
||||
--- gcc-4.7.4/gcc/config/i386/i386-c.c
|
||||
+++ gcc-4.7.4/gcc/config/i386/i386-c.c
|
||||
@@ -418,6 +418,9 @@
|
||||
builtin_define_std ("i386");
|
||||
}
|
||||
|
|
@ -29,8 +29,8 @@ index d00e0ba54b939..edd64ff7ae388 100644
|
|||
ix86_tune,
|
||||
diff --git gcc/config/i386/i386.c gcc/config/i386/i386.c
|
||||
index a6fc45b047a94..da931ee153745 100644
|
||||
--- gcc/config/i386/i386.c
|
||||
+++ gcc/config/i386/i386.c
|
||||
--- gcc-4.7.4/gcc/config/i386/i386.c
|
||||
+++ gcc-4.7.4/gcc/config/i386/i386.c
|
||||
@@ -2786,6 +2786,7 @@ ix86_target_string (HOST_WIDE_INT isa, int flags, const char *arch,
|
||||
static struct ix86_target_opts flag_opts[] =
|
||||
{
|
||||
|
|
@ -53,8 +53,8 @@ index a6fc45b047a94..da931ee153745 100644
|
|||
if (main_args_p)
|
||||
diff --git gcc/config/i386/i386.h gcc/config/i386/i386.h
|
||||
index 11f79e3f670af..3a41a43e308bf 100644
|
||||
--- gcc/config/i386/i386.h
|
||||
+++ gcc/config/i386/i386.h
|
||||
--- gcc-4.7.4/gcc/config/i386/i386.h
|
||||
+++ gcc-4.7.4/gcc/config/i386/i386.h
|
||||
@@ -671,9 +671,17 @@ enum target_cpu_default
|
||||
#define LONG_LONG_TYPE_SIZE 64
|
||||
#define FLOAT_TYPE_SIZE 32
|
||||
|
|
@ -77,8 +77,8 @@ index 11f79e3f670af..3a41a43e308bf 100644
|
|||
#define MAX_BITS_PER_WORD 64
|
||||
diff --git gcc/config/i386/i386.opt gcc/config/i386/i386.opt
|
||||
index e4f78f3ce50f3..6a389947d904e 100644
|
||||
--- gcc/config/i386/i386.opt
|
||||
+++ gcc/config/i386/i386.opt
|
||||
--- gcc-4.7.4/gcc/config/i386/i386.opt
|
||||
+++ gcc-4.7.4/gcc/config/i386/i386.opt
|
||||
@@ -86,6 +86,14 @@ m96bit-long-double
|
||||
Target RejectNegative Report InverseMask(128BIT_LONG_DOUBLE) Save
|
||||
sizeof(long double) is 12
|
||||
|
|
@ -98,7 +98,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-1.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..cf933796f8aea
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-64-1.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-1.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O2 -mlong-double-64" } */
|
||||
|
|
@ -114,7 +114,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-2.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..ddf4fe656d099
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-64-2.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-2.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile { target *-*-linux* } } */
|
||||
+/* { dg-options "-O2 -mbionic" } */
|
||||
|
|
@ -130,7 +130,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-3.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..e748fab2edd3c
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-64-3.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-3.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile { target *-*-linux* } } */
|
||||
+/* { dg-options "-O2 -mandroid" } */
|
||||
|
|
@ -146,7 +146,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-64-4.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..d9c25aaec080c
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-64-4.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-64-4.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O2 -mlong-double-80 -mlong-double-64" } */
|
||||
|
|
@ -162,7 +162,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-1.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..d3b75a0be21de
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-1.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-1.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O2 -mlong-double-80" } */
|
||||
|
|
@ -178,7 +178,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-2.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..954dfd15d4271
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-2.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-2.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile { target *-*-linux* } } */
|
||||
+/* { dg-options "-O2 -mlong-double-80 -mbionic" } */
|
||||
|
|
@ -194,7 +194,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-3.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..e0e8365e32c4a
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-3.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-3.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile { target *-*-linux* } } */
|
||||
+/* { dg-options "-O2 -mlong-double-80 -mandroid" } */
|
||||
|
|
@ -210,7 +210,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-4.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..cac2d55bc166c
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-4.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-4.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O2 -mlong-double-64 -mlong-double-80" } */
|
||||
|
|
@ -226,7 +226,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-5.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..4aa606fd1ba05
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-5.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-5.c
|
||||
@@ -0,0 +1,10 @@
|
||||
+/* { dg-do compile } */
|
||||
+/* { dg-options "-O2 -mlong-double-64" } */
|
||||
|
|
@ -242,7 +242,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-6.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..a395a265942c1
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-6.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-6.c
|
||||
@@ -0,0 +1,11 @@
|
||||
+/* { dg-do run } */
|
||||
+/* { dg-options "-O0 -mlong-double-64 -mfpmath=387" } */
|
||||
|
|
@ -259,7 +259,7 @@ diff --git gcc/testsuite/gcc.target/i386/long-double-80-7.c gcc/testsuite/gcc.ta
|
|||
new file mode 100644
|
||||
index 0000000000000..9b30fe8856786
|
||||
--- /dev/null
|
||||
+++ gcc/testsuite/gcc.target/i386/long-double-80-7.c
|
||||
+++ gcc-4.7.4/gcc/testsuite/gcc.target/i386/long-double-80-7.c
|
||||
@@ -0,0 +1,13 @@
|
||||
+/* { dg-do run } */
|
||||
+/* { dg-options "-O0 -mlong-double-64 -mfpmath=sse" } */
|
||||
|
|
@ -276,8 +276,8 @@ index 0000000000000..9b30fe8856786
|
|||
+}
|
||||
diff --git libgcc/config/i386/t-linux libgcc/config/i386/t-linux
|
||||
index 29b4c22398346..4f47f7bfa59cf 100644
|
||||
--- libgcc/config/i386/t-linux
|
||||
+++ libgcc/config/i386/t-linux
|
||||
--- gcc-4.7.4/libgcc/config/i386/t-linux
|
||||
+++ gcc-4.7.4/libgcc/config/i386/t-linux
|
||||
@@ -2,3 +2,5 @@
|
||||
# Need to support TImode for x86. Override the settings from
|
||||
# t-slibgcc-elf-ver and t-linux
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||
|
||||
Remove dependency on gperf.
|
||||
|
||||
--- gcc/cp/except.c 2021-07-07 18:24:36.561530121 +0100
|
||||
+++ gcc/cp/except.c 2021-07-07 18:27:18.035681929 +0100
|
||||
--- gcc-4.7.4/gcc/cp/except.c 2021-07-07 18:24:36.561530121 +0100
|
||||
+++ gcc-4.7.4/gcc/cp/except.c 2021-07-07 18:27:18.035681929 +0100
|
||||
@@ -987,8 +987,6 @@
|
||||
exception, unless it calls a program-supplied function that
|
||||
throws an exception. */
|
||||
|
|
@ -23,8 +23,8 @@ Remove dependency on gperf.
|
|||
}
|
||||
|
||||
/* Returns nonzero if an exception of type FROM will be caught by a
|
||||
--- gcc/cp/Make-lang.in 2021-07-07 18:24:36.571530380 +0100
|
||||
+++ gcc/cp/Make-lang.in 2021-07-07 18:26:47.154887799 +0100
|
||||
--- gcc-4.7.4/gcc/cp/Make-lang.in 2021-07-07 18:24:36.571530380 +0100
|
||||
+++ gcc-4.7.4/gcc/cp/Make-lang.in 2021-07-07 18:26:47.154887799 +0100
|
||||
@@ -313,7 +313,7 @@
|
||||
cp/rtti.o: cp/rtti.c $(CXX_TREE_H) $(TM_H) $(FLAGS_H) convert.h \
|
||||
$(TARGET_H) $(C_PRAGMA_H) gt-cp-rtti.h intl.h
|
||||
|
|
|
|||
|
|
@ -27,11 +27,11 @@ catm gzip.c.new ../../files/stat_override.c gzip.c
|
|||
cp gzip.c.new gzip.c
|
||||
|
||||
# Remove generated crc table from util.c
|
||||
patch -Np0 -i ../../patches/removecrc.patch
|
||||
patch -Np1 -i ../../patches/removecrc.patch
|
||||
|
||||
# Since IO redirection is not available yet, patch makecrc.c so that it writes
|
||||
# C code to file crc.c that can be appended to util.c
|
||||
patch -Np0 -i ../../patches/makecrc-write-to-file.patch
|
||||
patch -Np1 -i ../../patches/makecrc-write-to-file.patch
|
||||
|
||||
tcc -static -o makecrc sample/makecrc.c
|
||||
./makecrc
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
Modify makecrc so that it outputs C code to a file that
|
||||
can be appended to util.c
|
||||
|
||||
--- sample/makecrc.c
|
||||
+++ sample/makecrc.c
|
||||
--- gzip-1.2.4/sample/makecrc.c
|
||||
+++ gzip-1.2.4/sample/makecrc.c
|
||||
@@ -47,7 +47,9 @@ main()
|
||||
e |= 1L << (31 - p[i]);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Remove generated CRC table
|
||||
|
||||
--- util.c
|
||||
+++ util.c
|
||||
--- gzip-1.2.4/util.c
|
||||
+++ gzip-1.2.4/util.c
|
||||
@@ -406,57 +406,3 @@ voidp xmalloc (size)
|
||||
/* ========================================================================
|
||||
* Table of CRC-32's of all single-byte values (made by makecrc.c)
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ manpage.
|
|||
This makes manpages not reproducible.
|
||||
|
||||
diff --color -ru help2man.PL help2man.PL
|
||||
--- help2man.PL 2022-04-02 10:20:20.100234930 +1100
|
||||
+++ help2man.PL 2022-04-02 10:20:21.866247540 +1100
|
||||
--- help2man-1.36.4/help2man.PL 2022-04-02 10:20:20.100234930 +1100
|
||||
+++ help2man-1.36.4/help2man.PL 2022-04-02 10:20:21.866247540 +1100
|
||||
@@ -303,7 +303,7 @@
|
||||
$_, $ARGV[0]
|
||||
} $help_option, $version_option;
|
||||
|
|
|
|||
|
|
@ -369,13 +369,14 @@ default_src_unpack() {
|
|||
|
||||
# Default function to prepare source code.
|
||||
# It applies all patches from patch_dir (at the moment only -p0 patches are supported).
|
||||
# Patches are applied from the parent directory.
|
||||
# Then it copies our custom makefile and any other custom files from files directory.
|
||||
default_src_prepare() {
|
||||
if test -d "${patch_dir}"; then
|
||||
if ls "${patch_dir}"/*.patch >/dev/null 2>&1; then
|
||||
for p in "${patch_dir}"/*.patch; do
|
||||
echo "Applying patch: ${p}"
|
||||
patch -Np0 < "${p}"
|
||||
patch -d.. -Np0 < "${p}"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Add missing fcntl header.
|
||||
|
||||
--- src/kbdrate.c 2021-07-22 22:35:53.671970814 +1000
|
||||
+++ src/kbdrate.c 2021-07-22 22:36:10.038096797 +1000
|
||||
--- kbd-1.15/src/kbdrate.c 2021-07-22 22:35:53.671970814 +1000
|
||||
+++ kbd-1.15/src/kbdrate.c 2021-07-22 22:36:10.038096797 +1000
|
||||
@@ -94,6 +94,7 @@
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Don't build resizecons (will not build in chroot).
|
||||
|
||||
--- src/Makefile.am 2022-02-26 14:11:22.577168053 +1100
|
||||
+++ src/Makefile.am 2022-02-26 14:11:34.641835790 +1100
|
||||
--- kbd-1.15/src/Makefile.am 2022-02-26 14:11:22.577168053 +1100
|
||||
+++ kbd-1.15/src/Makefile.am 2022-02-26 14:11:34.641835790 +1100
|
||||
@@ -10,10 +10,6 @@
|
||||
PROGS += getkeycodes setkeycodes
|
||||
endif
|
||||
|
|
@ -17,8 +17,8 @@ Don't build resizecons (will not build in chroot).
|
|||
if OPTIONAL_PROGS
|
||||
PROGS += \
|
||||
screendump setlogcons setvesablank spawn_console spawn_login \
|
||||
--- configure.ac 2022-02-26 14:10:50.047367229 +1100
|
||||
+++ configure.ac 2022-02-26 14:11:15.310765839 +1100
|
||||
--- kbd-1.15/configure.ac 2022-02-26 14:10:50.047367229 +1100
|
||||
+++ kbd-1.15/configure.ac 2022-02-26 14:11:15.310765839 +1100
|
||||
@@ -53,12 +53,6 @@
|
||||
esac
|
||||
AM_CONDITIONAL(KEYCODES_PROGS, test "$KEYCODES_PROGS" = "yes")
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
GCC 4 does not recognise -fno-stack-protector.
|
||||
|
||||
--- purgatory/Makefile 2021-06-03 17:03:41.534638295 +1000
|
||||
+++ purgatory/Makefile 2021-06-03 17:03:50.489716136 +1000
|
||||
--- kexec-tools-2.0.22/purgatory/Makefile 2021-06-03 17:03:41.534638295 +1000
|
||||
+++ kexec-tools-2.0.22/purgatory/Makefile 2021-06-03 17:03:50.489716136 +1000
|
||||
@@ -49,7 +49,7 @@
|
||||
$($(ARCH)_PURGATORY_EXTRA_CFLAGS) \
|
||||
-Os -fno-builtin -ffreestanding \
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30
|
||||
|
||||
--- libltdl/config/ltmain.m4sh 2008-05-04 22:09:52.000000000 +0300
|
||||
+++ libltdl/config/ltmain.m4sh 2022-05-14 14:24:15.506913405 +0300
|
||||
--- libtool-2.2.4/libltdl/config/ltmain.m4sh 2008-05-04 22:09:52.000000000 +0300
|
||||
+++ libtool-2.2.4/libltdl/config/ltmain.m4sh 2022-05-14 14:24:15.506913405 +0300
|
||||
@@ -2226,7 +2226,7 @@
|
||||
darwin_file=
|
||||
darwin_files=
|
||||
|
|
@ -25,8 +25,8 @@ Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30
|
|||
done
|
||||
|
||||
func_extract_archives_result="$my_oldobjs"
|
||||
--- libltdl/config/ltmain.sh 2008-05-04 22:23:13.000000000 +0300
|
||||
+++ libltdl/config/ltmain.sh 2022-05-14 14:25:15.314266819 +0300
|
||||
--- libtool-2.2.4/libltdl/config/ltmain.sh 2008-05-04 22:23:13.000000000 +0300
|
||||
+++ libtool-2.2.4/libltdl/config/ltmain.sh 2022-05-14 14:25:15.314266819 +0300
|
||||
@@ -2668,7 +2668,7 @@
|
||||
darwin_file=
|
||||
darwin_files=
|
||||
|
|
@ -45,8 +45,8 @@ Backported from upstream commit 74c8993c178a1386ea5e2363a01d919738402f30
|
|||
done
|
||||
|
||||
func_extract_archives_result="$my_oldobjs"
|
||||
--- libltdl/m4/libtool.m4 2008-05-04 19:34:02.000000000 +0300
|
||||
+++ libltdl/m4/libtool.m4 2022-05-14 14:24:15.507913411 +0300
|
||||
--- libtool-2.2.4/libltdl/m4/libtool.m4 2008-05-04 19:34:02.000000000 +0300
|
||||
+++ libtool-2.2.4/libltdl/m4/libtool.m4 2022-05-14 14:24:15.507913411 +0300
|
||||
@@ -5864,20 +5864,20 @@
|
||||
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
|
||||
rm -rf $tpldir~
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
|
|||
|
||||
Remove hostname from libtool script.
|
||||
|
||||
--- libltdl/m4/libtool.m4 2022-02-26 10:27:30.649198752 +1100
|
||||
+++ libltdl/m4/libtool.m4 2022-02-26 10:28:39.458342624 +1100
|
||||
--- libtool-2.2.4/libltdl/m4/libtool.m4 2022-02-26 10:27:30.649198752 +1100
|
||||
+++ libtool-2.2.4/libltdl/m4/libtool.m4 2022-02-26 10:28:39.458342624 +1100
|
||||
@@ -684,7 +684,6 @@
|
||||
|
||||
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
Remove hostname from libtool script.
|
||||
|
||||
--- m4/libtool.m4 2022-03-17 04:43:39.000000000 +0200
|
||||
+++ m4/libtool.m4 2022-09-03 20:04:29.687049292 +0300
|
||||
--- libtool-2.4.7/m4/libtool.m4 2022-03-17 04:43:39.000000000 +0200
|
||||
+++ libtool-2.4.7/m4/libtool.m4 2022-09-03 20:04:29.687049292 +0300
|
||||
@@ -730,7 +730,6 @@
|
||||
cat <<_LT_EOF >> "$cfgfile"
|
||||
#! $SHELL
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -33,8 +33,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|||
|
||||
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h
|
||||
index 0116b2ee9e64f..4699acd602af4 100644
|
||||
--- arch/x86/include/asm/virtext.h
|
||||
+++ arch/x86/include/asm/virtext.h
|
||||
--- linux-4.14.336/arch/x86/include/asm/virtext.h
|
||||
+++ linux-4.14.336/arch/x86/include/asm/virtext.h
|
||||
@@ -114,21 +114,7 @@ static inline void cpu_svm_disable(void)
|
||||
|
||||
wrmsrl(MSR_VM_HSAVE_PA, 0);
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
Remove drivers containing embedded blobs
|
||||
|
||||
diff -ruN ../linux-4.14.336/Documentation/networking/cops.txt ./Documentation/networking/cops.txt
|
||||
--- ../linux-4.14.336/Documentation/networking/cops.txt 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./Documentation/networking/cops.txt 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/Documentation/networking/cops.txt 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./Documentation/networking/cops.txt 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,63 +0,0 @@
|
||||
-Text File for the COPS LocalTalk Linux driver (cops.c).
|
||||
- By Jay Schulist <jschlst@samba.org>
|
||||
|
|
@ -72,8 +72,8 @@ diff -ruN ../linux-4.14.336/Documentation/networking/cops.txt ./Documentation/ne
|
|||
-lt1 -seed -phase 1 -net 2000 -addr 2000.20 -zone "LocalTalk2"
|
||||
-eth0 -seed -phase 2 -net 3000 -addr 3000.30 -zone "EtherTalk"
|
||||
diff -ruN ../linux-4.14.336/arch/powerpc/include/asm/cpm1.h ./arch/powerpc/include/asm/cpm1.h
|
||||
--- ../linux-4.14.336/arch/powerpc/include/asm/cpm1.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./arch/powerpc/include/asm/cpm1.h 2024-02-14 20:39:09.131692114 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/arch/powerpc/include/asm/cpm1.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./arch/powerpc/include/asm/cpm1.h 2024-02-14 20:39:09.131692114 +0100
|
||||
@@ -56,8 +56,6 @@
|
||||
|
||||
extern void cpm_setbrg(uint brg, uint rate);
|
||||
|
|
@ -84,8 +84,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/include/asm/cpm1.h ./arch/powerpc/inclu
|
|||
|
||||
/* Parameter RAM offsets.
|
||||
diff -ruN ../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig ./arch/powerpc/platforms/8xx/Kconfig
|
||||
--- ../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./arch/powerpc/platforms/8xx/Kconfig 2024-02-14 21:00:16.561611905 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./arch/powerpc/platforms/8xx/Kconfig 2024-02-14 21:00:16.561611905 +0100
|
||||
@@ -145,35 +145,4 @@
|
||||
|
||||
If in doubt, say Y here.
|
||||
|
|
@ -123,8 +123,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/platforms/8xx/Kconfig ./arch/powerpc/pl
|
|||
-
|
||||
endmenu
|
||||
diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/Makefile ./arch/powerpc/sysdev/Makefile
|
||||
--- ../linux-4.14.336/arch/powerpc/sysdev/Makefile 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./arch/powerpc/sysdev/Makefile 2024-02-14 20:37:04.311700569 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/arch/powerpc/sysdev/Makefile 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./arch/powerpc/sysdev/Makefile 2024-02-14 20:37:04.311700569 +0100
|
||||
@@ -46,7 +46,6 @@
|
||||
obj-$(CONFIG_CPM2) += cpm2.o cpm2_pic.o
|
||||
obj-$(CONFIG_QUICC_ENGINE) += cpm_common.o
|
||||
|
|
@ -134,8 +134,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/Makefile ./arch/powerpc/sysdev/M
|
|||
obj-$(CONFIG_PPC_MPC512x) += mpc5xxx_clocks.o
|
||||
obj-$(CONFIG_PPC_MPC52xx) += mpc5xxx_clocks.o
|
||||
diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/cpm1.c ./arch/powerpc/sysdev/cpm1.c
|
||||
--- ../linux-4.14.336/arch/powerpc/sysdev/cpm1.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./arch/powerpc/sysdev/cpm1.c 2024-02-14 20:38:38.041694200 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/arch/powerpc/sysdev/cpm1.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./arch/powerpc/sysdev/cpm1.c 2024-02-14 20:38:38.041694200 +0100
|
||||
@@ -218,10 +218,6 @@
|
||||
while (in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG);
|
||||
#endif
|
||||
|
|
@ -148,8 +148,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/cpm1.c ./arch/powerpc/sysdev/cpm
|
|||
* On 860T, this also enables FEC priority 6. I am not sure
|
||||
* this is what we really want for some applications, but the
|
||||
diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/micropatch.c ./arch/powerpc/sysdev/micropatch.c
|
||||
--- ../linux-4.14.336/arch/powerpc/sysdev/micropatch.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./arch/powerpc/sysdev/micropatch.c 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/arch/powerpc/sysdev/micropatch.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./arch/powerpc/sysdev/micropatch.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,749 +0,0 @@
|
||||
-// SPDX-License-Identifier: GPL-2.0
|
||||
-
|
||||
|
|
@ -901,8 +901,8 @@ diff -ruN ../linux-4.14.336/arch/powerpc/sysdev/micropatch.c ./arch/powerpc/sysd
|
|||
-}
|
||||
-#endif
|
||||
diff -ruN ../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c ./drivers/i2c/busses/i2c-cpm.c
|
||||
--- ../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/i2c/busses/i2c-cpm.c 2024-02-14 20:42:10.901680998 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/i2c/busses/i2c-cpm.c 2024-02-14 20:42:10.901680998 +0100
|
||||
@@ -461,20 +461,9 @@
|
||||
}
|
||||
|
||||
|
|
@ -925,8 +925,8 @@ diff -ruN ../linux-4.14.336/drivers/i2c/busses/i2c-cpm.c ./drivers/i2c/busses/i2
|
|||
|
||||
} else if (of_device_is_compatible(ofdev->dev.of_node, "fsl,cpm2-i2c")) {
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig ./drivers/media/usb/dvb-usb/Kconfig
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/Kconfig 2024-02-14 21:41:13.341455995 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/Kconfig 2024-02-14 21:41:13.341455995 +0100
|
||||
@@ -242,22 +242,6 @@
|
||||
help
|
||||
Say Y here to support the Opera DVB-S USB2.0 receiver.
|
||||
|
|
@ -951,8 +951,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Kconfig ./drivers/media/us
|
|||
tristate "Pinnacle PCTV HDTV Pro USB device/TT Connect S2-3600"
|
||||
depends on DVB_USB
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile ./drivers/media/usb/dvb-usb/Makefile
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/Makefile 2024-02-14 21:40:58.271457116 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/Makefile 2024-02-14 21:40:58.271457116 +0100
|
||||
@@ -53,12 +53,6 @@
|
||||
dvb-usb-opera-objs := opera1.o
|
||||
obj-$(CONFIG_DVB_USB_OPERA1) += dvb-usb-opera.o
|
||||
|
|
@ -967,8 +967,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/Makefile ./drivers/media/u
|
|||
obj-$(CONFIG_DVB_USB_PCTV452E) += dvb-usb-pctv452e.o
|
||||
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c ./drivers/media/usb/dvb-usb/af9005-fe.c
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/af9005-fe.c 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005-fe.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,1484 +0,0 @@
|
||||
-/* Frontend part of the Linux driver for the Afatech 9005
|
||||
- * USB1.1 DVB-T receiver.
|
||||
|
|
@ -2455,8 +2455,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-fe.c ./drivers/medi
|
|||
- .read_ucblocks = af9005_fe_read_unc_blocks,
|
||||
-};
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c ./drivers/media/usb/dvb-usb/af9005-remote.c
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/af9005-remote.c 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005-remote.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,153 +0,0 @@
|
||||
-/* DVB USB compliant Linux driver for the Afatech 9005
|
||||
- * USB1.1 DVB-T receiver.
|
||||
|
|
@ -2612,8 +2612,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-remote.c ./drivers/
|
|||
-MODULE_VERSION("1.0");
|
||||
-MODULE_LICENSE("GPL");
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h ./drivers/media/usb/dvb-usb/af9005-script.h
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/af9005-script.h 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005-script.h 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,204 +0,0 @@
|
||||
-/* SPDX-License-Identifier: GPL-2.0 */
|
||||
-/*
|
||||
|
|
@ -2820,8 +2820,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005-script.h ./drivers/
|
|||
- {0xa349, 0x0, 0x6, 0x2},
|
||||
-};
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c ./drivers/media/usb/dvb-usb/af9005.c
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/af9005.c 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,1151 +0,0 @@
|
||||
-/* DVB USB compliant Linux driver for the Afatech 9005
|
||||
- * USB1.1 DVB-T receiver.
|
||||
|
|
@ -3975,8 +3975,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.c ./drivers/media/u
|
|||
-MODULE_VERSION("1.0");
|
||||
-MODULE_LICENSE("GPL");
|
||||
diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h ./drivers/media/usb/dvb-usb/af9005.h
|
||||
--- ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/media/usb/dvb-usb/af9005.h 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/media/usb/dvb-usb/af9005.h 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,3492 +0,0 @@
|
||||
-/* Common header-file of the Linux driver for the Afatech 9005
|
||||
- * USB1.1 DVB-T receiver.
|
||||
|
|
@ -7471,8 +7471,8 @@ diff -ruN ../linux-4.14.336/drivers/media/usb/dvb-usb/af9005.h ./drivers/media/u
|
|||
-
|
||||
-#endif
|
||||
diff -ruN ../linux-4.14.336/drivers/net/Space.c ./drivers/net/Space.c
|
||||
--- ../linux-4.14.336/drivers/net/Space.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/Space.c 2024-02-14 21:04:46.981594989 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/Space.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/Space.c 2024-02-14 21:04:46.981594989 +0100
|
||||
@@ -150,11 +150,6 @@
|
||||
for (num = 0; num < 8; ++num)
|
||||
ethif_probe2(num);
|
||||
|
|
@ -7486,8 +7486,8 @@ diff -ruN ../linux-4.14.336/drivers/net/Space.c ./drivers/net/Space.c
|
|||
ltpc_probe();
|
||||
#endif
|
||||
diff -ruN ../linux-4.14.336/drivers/net/appletalk/Kconfig ./drivers/net/appletalk/Kconfig
|
||||
--- ../linux-4.14.336/drivers/net/appletalk/Kconfig 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/appletalk/Kconfig 2024-02-14 21:04:25.861596249 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/Kconfig 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/appletalk/Kconfig 2024-02-14 21:04:25.861596249 +0100
|
||||
@@ -49,32 +49,6 @@
|
||||
This driver is experimental, which means that it may not work.
|
||||
See the file <file:Documentation/networking/ltpc.txt>.
|
||||
|
|
@ -7522,8 +7522,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/Kconfig ./drivers/net/appletal
|
|||
tristate "Appletalk-IP driver support"
|
||||
depends on DEV_APPLETALK && ATALK
|
||||
diff -ruN ../linux-4.14.336/drivers/net/appletalk/Makefile ./drivers/net/appletalk/Makefile
|
||||
--- ../linux-4.14.336/drivers/net/appletalk/Makefile 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/appletalk/Makefile 2024-02-14 21:04:05.191597490 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/Makefile 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/appletalk/Makefile 2024-02-14 21:04:05.191597490 +0100
|
||||
@@ -3,5 +3,4 @@
|
||||
#
|
||||
|
||||
|
|
@ -7531,8 +7531,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/Makefile ./drivers/net/appleta
|
|||
-obj-$(CONFIG_COPS) += cops.o
|
||||
obj-$(CONFIG_LTPC) += ltpc.o
|
||||
diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.c ./drivers/net/appletalk/cops.c
|
||||
--- ../linux-4.14.336/drivers/net/appletalk/cops.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/appletalk/cops.c 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops.c 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/appletalk/cops.c 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,1010 +0,0 @@
|
||||
-/* cops.c: LocalTalk driver for Linux.
|
||||
- *
|
||||
|
|
@ -8545,8 +8545,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.c ./drivers/net/appletalk
|
|||
-module_exit(cops_module_exit);
|
||||
-#endif /* MODULE */
|
||||
diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.h ./drivers/net/appletalk/cops.h
|
||||
--- ../linux-4.14.336/drivers/net/appletalk/cops.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/appletalk/cops.h 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/appletalk/cops.h 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,61 +0,0 @@
|
||||
-/* SPDX-License-Identifier: GPL-2.0 */
|
||||
-/* cops.h: LocalTalk driver for Linux.
|
||||
|
|
@ -8610,8 +8610,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops.h ./drivers/net/appletalk
|
|||
-
|
||||
-#endif
|
||||
diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h ./drivers/net/appletalk/cops_ffdrv.h
|
||||
--- ../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/appletalk/cops_ffdrv.h 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/appletalk/cops_ffdrv.h 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,532 +0,0 @@
|
||||
-
|
||||
-/*
|
||||
|
|
@ -9146,8 +9146,8 @@ diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops_ffdrv.h ./drivers/net/app
|
|||
-
|
||||
-#endif
|
||||
diff -ruN ../linux-4.14.336/drivers/net/appletalk/cops_ltdrv.h ./drivers/net/appletalk/cops_ltdrv.h
|
||||
--- ../linux-4.14.336/drivers/net/appletalk/cops_ltdrv.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ ./drivers/net/appletalk/cops_ltdrv.h 1970-01-01 01:00:00.000000000 +0100
|
||||
--- linux-4.14.336/../linux-4.14.336/drivers/net/appletalk/cops_ltdrv.h 2024-01-10 14:45:41.000000000 +0100
|
||||
+++ linux-4.14.336/./drivers/net/appletalk/cops_ltdrv.h 1970-01-01 01:00:00.000000000 +0100
|
||||
@@ -1,241 +0,0 @@
|
||||
-/*
|
||||
- * The firmware this driver downloads into the Localtalk card is a
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ a result of the dodgy installation of linux-headers. However, there is no
|
|||
problem with this, and it is verified that BITS_PER_LONG __BITS_PER_LONG
|
||||
have functional and correct values.
|
||||
|
||||
--- tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:26.616768608 +1000
|
||||
+++ tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:36.786847443 +1000
|
||||
--- linux-4.14.336/tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:26.616768608 +1000
|
||||
+++ linux-4.14.336/tools/include/asm-generic/bitsperlong.h 2021-07-31 11:50:36.786847443 +1000
|
||||
@@ -9,10 +9,6 @@
|
||||
#define BITS_PER_LONG __WORDSIZE
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
Remove BUILD_BUG_ON check as it causes a link error
|
||||
|
||||
--- drivers/gpu/drm/drm_edid.c.bak 2024-02-16 08:36:01.168832650 +0100
|
||||
+++ drivers/gpu/drm/drm_edid.c 2024-02-16 08:36:58.148828524 +0100
|
||||
--- linux-4.14.336/drivers/gpu/drm/drm_edid.c.bak 2024-02-16 08:36:01.168832650 +0100
|
||||
+++ linux-4.14.336/drivers/gpu/drm/drm_edid.c 2024-02-16 08:36:58.148828524 +0100
|
||||
@@ -2879,15 +2879,6 @@
|
||||
* get the other variants by simply increasing the
|
||||
* vertical front porch length.
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
Name the union in i2c_hid_desc_override, to avoid unknown field error
|
||||
|
||||
--- drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c.bak 2024-02-15 13:27:20.177877726 +0100
|
||||
+++ drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c 2024-02-15 15:11:15.787482938 +0100
|
||||
--- linux-4.14.336/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c.bak 2024-02-15 13:27:20.177877726 +0100
|
||||
+++ linux-4.14.336/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c 2024-02-15 15:11:15.787482938 +0100
|
||||
@@ -18,7 +18,7 @@
|
||||
union {
|
||||
struct i2c_hid_desc *i2c_hid_desc;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
Neuter the __i915_sw_fence_call define, which our gcc can't understand
|
||||
|
||||
--- drivers/gpu/drm/i915/i915_sw_fence.h.bak 2024-02-15 12:21:07.758127759 +0100
|
||||
+++ drivers/gpu/drm/i915/i915_sw_fence.h 2024-02-15 12:22:04.498124232 +0100
|
||||
--- linux-4.14.336/drivers/gpu/drm/i915/i915_sw_fence.h.bak 2024-02-15 12:21:07.758127759 +0100
|
||||
+++ linux-4.14.336/drivers/gpu/drm/i915/i915_sw_fence.h 2024-02-15 12:22:04.498124232 +0100
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
typedef int (*i915_sw_fence_notify_t)(struct i915_sw_fence *,
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
Use gen_initramfs_list.sh from outside kernel source tree.
|
||||
|
||||
--- scripts/gen_initramfs_list.sh 2021-10-10 20:37:12.220231015 +1100
|
||||
+++ scripts/gen_initramfs_list.sh 2021-10-10 20:37:22.694296140 +1100
|
||||
--- linux-4.14.336/scripts/gen_initramfs_list.sh 2021-10-10 20:37:12.220231015 +1100
|
||||
+++ linux-4.14.336/scripts/gen_initramfs_list.sh 2021-10-10 20:37:22.694296140 +1100
|
||||
@@ -310,7 +310,7 @@
|
||||
fi
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
This seemingly useless statement (redefined a couple of lines later) is
|
||||
not liked by our version of binutils.
|
||||
|
||||
--- arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:45:14.787124887 +1000
|
||||
+++ arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:43:16.234180449 +1000
|
||||
--- linux-4.14.336/arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:45:14.787124887 +1000
|
||||
+++ linux-4.14.336/arch/x86/kernel/vmlinux.lds.S 2021-07-31 18:43:16.234180449 +1000
|
||||
@@ -170,7 +170,6 @@
|
||||
. = __vvar_beginning_hack + PAGE_SIZE;
|
||||
} :data
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
We do not use the _shipped version of the keymap generated using loadkeys.
|
||||
For some reason the makefile needs to be patched for this to work...
|
||||
|
||||
--- drivers/tty/vt/Makefile 2021-07-27 21:11:24.743104498 +1000
|
||||
+++ drivers/tty/vt/Makefile 2021-07-27 21:11:34.261186200 +1000
|
||||
--- linux-4.14.336/drivers/tty/vt/Makefile 2021-07-27 21:11:24.743104498 +1000
|
||||
+++ linux-4.14.336/drivers/tty/vt/Makefile 2021-07-27 21:11:34.261186200 +1000
|
||||
@@ -22,7 +22,7 @@
|
||||
# Uncomment if you're changing the keymap and have an appropriate
|
||||
# loadkeys version for the map. By default, we'll use the shipped
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ couple of edgecase macros. It seems that ALTERNATIVE is one of these. As we
|
|||
know what your system will be (not Xen), we can manually evaluate and write
|
||||
out the ALTERNATIVEs.
|
||||
|
||||
--- arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000
|
||||
+++ arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000
|
||||
--- linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:07.458032771 +1000
|
||||
+++ linux-4.14.336/arch/x86/entry/entry_32.S 2021-07-31 11:40:42.835298841 +1000
|
||||
@@ -412,9 +412,8 @@
|
||||
|
||||
movl %esp, %eax
|
||||
|
|
@ -21,8 +21,8 @@ out the ALTERNATIVEs.
|
|||
|
||||
/* Opportunistic SYSEXIT */
|
||||
TRACE_IRQS_ON /* User mode traces as IRQs on. */
|
||||
--- arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000
|
||||
+++ arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000
|
||||
--- linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:41:40.379731622 +1000
|
||||
+++ linux-4.14.336/arch/x86/entry/vdso/vdso32/system_call.S 2021-07-31 11:43:40.294633506 +1000
|
||||
@@ -55,8 +55,6 @@
|
||||
/* If SYSENTER (Intel) or SYSCALL32 (AMD) is available, use it. */
|
||||
ALTERNATIVE_2 "", SYSENTER_SEQUENCE, X86_FEATURE_SYSENTER32, \
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ kconfig uses gperf, which we don't have at this stage. We manually generate
|
|||
everything (in the actual script) that is actually required within kconfig,
|
||||
and forgo everything that is not really required for the build.
|
||||
|
||||
--- Makefile 2021-07-30 21:25:43.577592065 +1000
|
||||
+++ Makefile 2021-07-30 21:26:40.349015612 +1000
|
||||
--- linux-4.14.336/Makefile 2021-07-30 21:25:43.577592065 +1000
|
||||
+++ linux-4.14.336/Makefile 2021-07-30 21:26:40.349015612 +1000
|
||||
@@ -547,10 +547,10 @@
|
||||
export KBUILD_DEFCONFIG KBUILD_KCONFIG
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ SPDX-License-Identifier: GPL-2.0-only
|
|||
|
||||
Remove -Wno-array-bounds which gcc-4.0.4 doesn't recognize
|
||||
|
||||
--- drivers/net/ethernet/broadcom/Makefile.bak 2024-02-15 17:05:34.617050047 +0100
|
||||
+++ drivers/net/ethernet/broadcom/Makefile 2024-02-15 17:06:06.097047984 +0100
|
||||
--- linux-4.14.336/drivers/net/ethernet/broadcom/Makefile.bak 2024-02-15 17:05:34.617050047 +0100
|
||||
+++ linux-4.14.336/drivers/net/ethernet/broadcom/Makefile 2024-02-15 17:06:06.097047984 +0100
|
||||
@@ -16,8 +16,3 @@
|
||||
obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o
|
||||
obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ Patch kernel headers up to 4.14.341-openela
|
|||
|
||||
diff --git include/crypto/if_alg.h include/crypto/if_alg.h
|
||||
index 2ea6a95ca825..f803dc8c45ad 100644
|
||||
--- include/crypto/if_alg.h
|
||||
+++ include/crypto/if_alg.h
|
||||
--- linux-4.14.336/include/crypto/if_alg.h
|
||||
+++ linux-4.14.336/include/crypto/if_alg.h
|
||||
@@ -146,6 +146,7 @@ struct af_alg_async_req {
|
||||
* @enc: Cryptographic operation to be performed when
|
||||
* recvmsg is invoked.
|
||||
|
|
@ -28,8 +28,8 @@ index 2ea6a95ca825..f803dc8c45ad 100644
|
|||
int af_alg_register_type(const struct af_alg_type *type);
|
||||
diff --git include/drm/drm_bridge.h include/drm/drm_bridge.h
|
||||
index 6522d4cbc9d9..bfbd38c0b609 100644
|
||||
--- include/drm/drm_bridge.h
|
||||
+++ include/drm/drm_bridge.h
|
||||
--- linux-4.14.336/include/drm/drm_bridge.h
|
||||
+++ linux-4.14.336/include/drm/drm_bridge.h
|
||||
@@ -161,7 +161,7 @@ struct drm_bridge_funcs {
|
||||
* or &drm_encoder_helper_funcs.dpms hook.
|
||||
*
|
||||
|
|
@ -41,8 +41,8 @@ index 6522d4cbc9d9..bfbd38c0b609 100644
|
|||
* The post_disable callback is optional.
|
||||
diff --git include/drm/drm_mipi_dsi.h include/drm/drm_mipi_dsi.h
|
||||
index 689f615471ab..a059f1d968b7 100644
|
||||
--- include/drm/drm_mipi_dsi.h
|
||||
+++ include/drm/drm_mipi_dsi.h
|
||||
--- linux-4.14.336/include/drm/drm_mipi_dsi.h
|
||||
+++ linux-4.14.336/include/drm/drm_mipi_dsi.h
|
||||
@@ -163,6 +163,7 @@ struct mipi_dsi_device_info {
|
||||
* struct mipi_dsi_device - DSI peripheral device
|
||||
* @host: DSI host for this peripheral
|
||||
|
|
@ -61,8 +61,8 @@ index 689f615471ab..a059f1d968b7 100644
|
|||
unsigned int channel;
|
||||
diff --git include/linux/bpf.h include/linux/bpf.h
|
||||
index 3aa05ea79ba1..0d7a61df056b 100644
|
||||
--- include/linux/bpf.h
|
||||
+++ include/linux/bpf.h
|
||||
--- linux-4.14.336/include/linux/bpf.h
|
||||
+++ linux-4.14.336/include/linux/bpf.h
|
||||
@@ -38,7 +38,11 @@ struct bpf_map_ops {
|
||||
/* funcs called by prog_array and perf_event_array map */
|
||||
void *(*map_fd_get_ptr)(struct bpf_map *map, struct file *map_file,
|
||||
|
|
@ -78,8 +78,8 @@ index 3aa05ea79ba1..0d7a61df056b 100644
|
|||
};
|
||||
diff --git include/linux/device.h include/linux/device.h
|
||||
index 65e06a066b67..27b70b810463 100644
|
||||
--- include/linux/device.h
|
||||
+++ include/linux/device.h
|
||||
--- linux-4.14.336/include/linux/device.h
|
||||
+++ linux-4.14.336/include/linux/device.h
|
||||
@@ -1474,6 +1474,9 @@ do { \
|
||||
WARN_ONCE(condition, "%s %s: " format, \
|
||||
dev_driver_string(dev), dev_name(dev), ## arg)
|
||||
|
|
@ -92,8 +92,8 @@ index 65e06a066b67..27b70b810463 100644
|
|||
MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor))
|
||||
diff --git include/linux/dmaengine.h include/linux/dmaengine.h
|
||||
index 8089e28539f1..d5a7d320e05c 100644
|
||||
--- include/linux/dmaengine.h
|
||||
+++ include/linux/dmaengine.h
|
||||
--- linux-4.14.336/include/linux/dmaengine.h
|
||||
+++ linux-4.14.336/include/linux/dmaengine.h
|
||||
@@ -816,7 +816,8 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
|
||||
|
||||
static inline bool is_slave_direction(enum dma_transfer_direction direction)
|
||||
|
|
@ -106,8 +106,8 @@ index 8089e28539f1..d5a7d320e05c 100644
|
|||
static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
|
||||
diff --git include/linux/fs.h include/linux/fs.h
|
||||
index ff0a992846a3..bd6072556269 100644
|
||||
--- include/linux/fs.h
|
||||
+++ include/linux/fs.h
|
||||
--- linux-4.14.336/include/linux/fs.h
|
||||
+++ linux-4.14.336/include/linux/fs.h
|
||||
@@ -296,6 +296,8 @@ enum rw_hint {
|
||||
#define IOCB_SYNC (1 << 5)
|
||||
#define IOCB_WRITE (1 << 6)
|
||||
|
|
@ -119,8 +119,8 @@ index ff0a992846a3..bd6072556269 100644
|
|||
struct file *ki_filp;
|
||||
diff --git include/linux/lsm_hooks.h include/linux/lsm_hooks.h
|
||||
index 569debc49f3d..28ff40daccff 100644
|
||||
--- include/linux/lsm_hooks.h
|
||||
+++ include/linux/lsm_hooks.h
|
||||
--- linux-4.14.336/include/linux/lsm_hooks.h
|
||||
+++ linux-4.14.336/include/linux/lsm_hooks.h
|
||||
@@ -466,6 +466,12 @@
|
||||
* simple integer value. When @arg represents a user space pointer, it
|
||||
* should never be used by the security module.
|
||||
|
|
@ -153,8 +153,8 @@ index 569debc49f3d..28ff40daccff 100644
|
|||
struct list_head file_mprotect;
|
||||
diff --git include/linux/pci_ids.h include/linux/pci_ids.h
|
||||
index 83f576d45d78..c977e636a1dd 100644
|
||||
--- include/linux/pci_ids.h
|
||||
+++ include/linux/pci_ids.h
|
||||
--- linux-4.14.336/include/linux/pci_ids.h
|
||||
+++ linux-4.14.336/include/linux/pci_ids.h
|
||||
@@ -2953,6 +2953,7 @@
|
||||
#define PCI_DEVICE_ID_INTEL_82443GX_0 0x71a0
|
||||
#define PCI_DEVICE_ID_INTEL_82443GX_2 0x71a2
|
||||
|
|
@ -165,8 +165,8 @@ index 83f576d45d78..c977e636a1dd 100644
|
|||
#define PCI_DEVICE_ID_INTEL_E6XX_CU 0x8183
|
||||
diff --git include/linux/security.h include/linux/security.h
|
||||
index 1c8968a267c2..cf77cd971795 100644
|
||||
--- include/linux/security.h
|
||||
+++ include/linux/security.h
|
||||
--- linux-4.14.336/include/linux/security.h
|
||||
+++ linux-4.14.336/include/linux/security.h
|
||||
@@ -306,6 +306,8 @@ int security_file_permission(struct file *file, int mask);
|
||||
int security_file_alloc(struct file *file);
|
||||
void security_file_free(struct file *file);
|
||||
|
|
@ -192,8 +192,8 @@ index 1c8968a267c2..cf77cd971795 100644
|
|||
{
|
||||
diff --git include/linux/spi/spi.h include/linux/spi/spi.h
|
||||
index a8f6606dd498..5c7741ca3b99 100644
|
||||
--- include/linux/spi/spi.h
|
||||
+++ include/linux/spi/spi.h
|
||||
--- linux-4.14.336/include/linux/spi/spi.h
|
||||
+++ linux-4.14.336/include/linux/spi/spi.h
|
||||
@@ -153,6 +153,7 @@ struct spi_device {
|
||||
#define SPI_MODE_1 (0|SPI_CPHA)
|
||||
#define SPI_MODE_2 (SPI_CPOL|0)
|
||||
|
|
@ -206,7 +206,7 @@ diff --git include/linux/units.h include/linux/units.h
|
|||
new file mode 100644
|
||||
index 000000000000..a0af6d2ef4e5
|
||||
--- /dev/null
|
||||
+++ include/linux/units.h
|
||||
+++ linux-4.14.336/include/linux/units.h
|
||||
@@ -0,0 +1,92 @@
|
||||
+/* SPDX-License-Identifier: GPL-2.0 */
|
||||
+#ifndef _LINUX_UNITS_H
|
||||
|
|
@ -302,8 +302,8 @@ index 000000000000..a0af6d2ef4e5
|
|||
+#endif /* _LINUX_UNITS_H */
|
||||
diff --git include/net/af_unix.h include/net/af_unix.h
|
||||
index 7ec1cdb66be8..e514508bdc92 100644
|
||||
--- include/net/af_unix.h
|
||||
+++ include/net/af_unix.h
|
||||
--- linux-4.14.336/include/net/af_unix.h
|
||||
+++ linux-4.14.336/include/net/af_unix.h
|
||||
@@ -43,12 +43,6 @@ struct unix_skb_parms {
|
||||
|
||||
#define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
|
||||
|
|
@ -340,10 +340,10 @@ index 7ec1cdb66be8..e514508bdc92 100644
|
|||
long unix_inq_len(struct sock *sk);
|
||||
diff --git include/net/bluetooth/hci_core.h include/net/bluetooth/hci_core.h
|
||||
index 8f899ad4a754..bac3d79139b2 100644
|
||||
--- include/net/bluetooth/hci_core.h
|
||||
+++ include/net/bluetooth/hci_core.h
|
||||
--- linux-4.14.336/include/net/bluetooth/hci_core.h
|
||||
+++ linux-4.14.336/include/net/bluetooth/hci_core.h
|
||||
@@ -647,7 +647,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev);
|
||||
/* ----- HCI Connections ----- */
|
||||
/* ----- linux-4.14.336/HCI Connections ----- */
|
||||
enum {
|
||||
HCI_CONN_AUTH_PEND,
|
||||
- HCI_CONN_REAUTH_PEND,
|
||||
|
|
@ -352,8 +352,8 @@ index 8f899ad4a754..bac3d79139b2 100644
|
|||
HCI_CONN_MODE_CHANGE_PEND,
|
||||
diff --git include/net/dst_ops.h include/net/dst_ops.h
|
||||
index 443863c7b8da..632086b2f644 100644
|
||||
--- include/net/dst_ops.h
|
||||
+++ include/net/dst_ops.h
|
||||
--- linux-4.14.336/include/net/dst_ops.h
|
||||
+++ linux-4.14.336/include/net/dst_ops.h
|
||||
@@ -16,7 +16,7 @@ struct dst_ops {
|
||||
unsigned short family;
|
||||
unsigned int gc_thresh;
|
||||
|
|
@ -378,8 +378,8 @@ index 443863c7b8da..632086b2f644 100644
|
|||
static inline int dst_entries_init(struct dst_ops *dst)
|
||||
diff --git include/net/llc_pdu.h include/net/llc_pdu.h
|
||||
index 49aa79c7b278..581cd37aa98b 100644
|
||||
--- include/net/llc_pdu.h
|
||||
+++ include/net/llc_pdu.h
|
||||
--- linux-4.14.336/include/net/llc_pdu.h
|
||||
+++ linux-4.14.336/include/net/llc_pdu.h
|
||||
@@ -262,8 +262,7 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
|
||||
*/
|
||||
static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
|
||||
|
|
@ -402,8 +402,8 @@ index 49aa79c7b278..581cd37aa98b 100644
|
|||
/**
|
||||
diff --git include/net/netns/ipv6.h include/net/netns/ipv6.h
|
||||
index c004d051c2d3..290ca18589ee 100644
|
||||
--- include/net/netns/ipv6.h
|
||||
+++ include/net/netns/ipv6.h
|
||||
--- linux-4.14.336/include/net/netns/ipv6.h
|
||||
+++ linux-4.14.336/include/net/netns/ipv6.h
|
||||
@@ -64,8 +64,8 @@ struct netns_ipv6 {
|
||||
struct dst_ops ip6_dst_ops;
|
||||
rwlock_t fib6_walker_lock;
|
||||
|
|
@ -417,8 +417,8 @@ index c004d051c2d3..290ca18589ee 100644
|
|||
struct rt6_info *ip6_prohibit_entry;
|
||||
diff --git include/uapi/linux/btrfs.h include/uapi/linux/btrfs.h
|
||||
index 86d2a52b4665..ee7a34c237a5 100644
|
||||
--- include/uapi/linux/btrfs.h
|
||||
+++ include/uapi/linux/btrfs.h
|
||||
--- linux-4.14.336/include/uapi/linux/btrfs.h
|
||||
+++ linux-4.14.336/include/uapi/linux/btrfs.h
|
||||
@@ -522,6 +522,9 @@ struct btrfs_ioctl_clone_range_args {
|
||||
*/
|
||||
#define BTRFS_DEFRAG_RANGE_COMPRESS 1
|
||||
|
|
@ -431,8 +431,8 @@ index 86d2a52b4665..ee7a34c237a5 100644
|
|||
__u64 start;
|
||||
diff --git include/uapi/linux/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h
|
||||
index c7bb18ea4962..835e9f345f35 100644
|
||||
--- include/uapi/linux/netfilter/nf_tables.h
|
||||
+++ include/uapi/linux/netfilter/nf_tables.h
|
||||
--- linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h
|
||||
+++ linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h
|
||||
@@ -229,9 +229,11 @@ enum nft_rule_attributes {
|
||||
/**
|
||||
* enum nft_rule_compat_flags - nf_tables rule compat flags
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ SPDX-FileCopyrightText: 2021 fosslinux <fosslinux@aussies.space>
|
|||
|
||||
SPDX-License-Identifier: GPL-2.0-only
|
||||
|
||||
--- include/uapi/asm-generic/termios.h.bak 2021-07-23 14:23:51.330460544 +1000
|
||||
+++ include/uapi/asm-generic/termios.h 2021-07-23 19:08:27.112810109 +1000
|
||||
--- linux-4.14.336/include/uapi/asm-generic/termios.h.bak 2021-07-23 14:23:51.330460544 +1000
|
||||
+++ linux-4.14.336/include/uapi/asm-generic/termios.h 2021-07-23 19:08:27.112810109 +1000
|
||||
@@ -12,13 +12,6 @@
|
||||
#include <asm/termbits.h>
|
||||
#include <asm/ioctls.h>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# SPDX-FileCopyrightText: 2023 Richard Masters <grick23@gmail.com>
|
||||
# SPDX-License-Identifier: MIT
|
||||
diff -r -u musl-1.1.24.orig/arch/i386/pthread_arch.h musl-1.1.24/arch/i386/pthread_arch.h
|
||||
--- arch/i386/pthread_arch.h 2019-10-13 21:58:27.000000000 +0000
|
||||
+++ arch/i386/pthread_arch.h 2023-04-07 11:56:04.649119523 +0000
|
||||
--- musl-1.1.24/arch/i386/pthread_arch.h 2019-10-13 21:58:27.000000000 +0000
|
||||
+++ musl-1.1.24/arch/i386/pthread_arch.h 2023-04-07 11:56:04.649119523 +0000
|
||||
@@ -1,8 +1,8 @@
|
||||
+extern pthread_t g_pthread;
|
||||
+
|
||||
|
|
@ -16,8 +16,8 @@ diff -r -u musl-1.1.24.orig/arch/i386/pthread_arch.h musl-1.1.24/arch/i386/pthre
|
|||
|
||||
#define TP_ADJ(p) (p)
|
||||
diff -r -u musl-1.1.24.orig/src/env/__init_tls.c musl-1.1.24/src/env/__init_tls.c
|
||||
--- src/env/__init_tls.c 2019-10-13 21:58:27.000000000 +0000
|
||||
+++ src/env/__init_tls.c 2023-04-07 11:56:43.565120289 +0000
|
||||
--- musl-1.1.24/src/env/__init_tls.c 2019-10-13 21:58:27.000000000 +0000
|
||||
+++ musl-1.1.24/src/env/__init_tls.c 2023-04-07 11:56:43.565120289 +0000
|
||||
@@ -10,20 +10,19 @@
|
||||
#include "syscall.h"
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue