funkey/FunKey-OS
1
0
Fork 0
mirror of https://github.com/FunKey-Project/FunKey-OS.git synced 2025-12-12 23:58:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed build on Ubuntu 22.04

Browse Source
This commit is contained in:
DrUm78 2025-03-12 14:51:21 +01:00
parent 3a9357bbc5
commit a01196d55d
10 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "buildroot"]
path = buildroot
url = https://github.com/FunKey-Project/buildroot.git
url = https://github.com/DrUm78/buildroot.git

11
FunKey/board/funkey/patches/linux/0000_Makefile.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Makefile 2024-02-16 14:58:29.220126035 +0000
+++ b/Makefile 2024-02-16 14:58:46.572468923 +0000
@@ -393,7 +393,7 @@
KBUILD_AFLAGS := -D__ASSEMBLY__
KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
- -fno-strict-aliasing -fno-common -fshort-wchar \
+ -fno-strict-aliasing -fcommon -fshort-wchar \
-Werror-implicit-function-declaration \
-Wno-format-security \
-std=gnu89

11
FunKey/board/funkey/patches/linux/0002_dtc-lexer.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/scripts/dtc/dtc-lexer.l 2024-02-16 09:12:07.182655128 +0000
+++ b/scripts/dtc/dtc-lexer.l 2024-02-16 09:12:18.870713228 +0000
@@ -38,7 +38,7 @@
#include "srcpos.h"
#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
extern bool treesource_error;
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */

11
FunKey/board/funkey/patches/linux/0003_shipped.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/scripts/dtc/dtc-lexer.lex.c_shipped 2024-02-16 15:05:07.227705986 +0000
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped 2024-02-16 15:05:35.040218551 +0000
@@ -631,7 +631,7 @@
#include "srcpos.h"
#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
extern bool treesource_error;
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */

1
FunKey/configs/funkey_defconfig
View File

@ -122,3 +122,4 @@ BR2_PACKAGE_COMMANDER=y
BR2_PACKAGE_P7ZIP=y
BR2_PACKAGE_UNRAR=y
BR2_PACKAGE_FILE=y
BR2_PACKAGE_HOST_PYTHON3=y

11
Recovery/board/funkey/patches/linux/0000_Makefile.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/Makefile 2024-02-16 14:58:29.220126035 +0000
+++ b/Makefile 2024-02-16 14:58:46.572468923 +0000
@@ -393,7 +393,7 @@
KBUILD_AFLAGS := -D__ASSEMBLY__
KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
- -fno-strict-aliasing -fno-common -fshort-wchar \
+ -fno-strict-aliasing -fcommon -fshort-wchar \
-Werror-implicit-function-declaration \
-Wno-format-security \
-std=gnu89

11
Recovery/board/funkey/patches/linux/0002_dtc-lexer.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/scripts/dtc/dtc-lexer.l 2024-02-16 09:12:07.182655128 +0000
+++ b/scripts/dtc/dtc-lexer.l 2024-02-16 09:12:18.870713228 +0000
@@ -38,7 +38,7 @@
#include "srcpos.h"
#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
extern bool treesource_error;
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */

11
Recovery/board/funkey/patches/linux/0003_shipped.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/scripts/dtc/dtc-lexer.lex.c_shipped 2024-02-16 15:05:07.227705986 +0000
+++ b/scripts/dtc/dtc-lexer.lex.c_shipped 2024-02-16 15:05:35.040218551 +0000
@@ -631,7 +631,7 @@
#include "srcpos.h"
#include "dtc-parser.tab.h"
-YYLTYPE yylloc;
+extern YYLTYPE yylloc;
extern bool treesource_error;
/* CAUTION: this will stop working if we ever use yyless() or yyunput() */

1
Recovery/configs/recovery_defconfig
View File

@ -83,3 +83,4 @@ BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
BR2_PACKAGE_HOST_PYTHON3=y

2
buildroot

@ -1 +1 @@
Subproject commit a9b038158e13fa2b0037e9318ef310d35fe7e720
Subproject commit c9f9ab47e17f5084fa815c36400bc2848ee72cee