mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-20 17:42:10 +00:00
Upgrade buildroot to 2023.05 (from 2021.08.2), kernel is upgraded to 6.3 (from 5.13.19).
This commit is contained in:
PartialVolume
@@ -1,38 +0,0 @@
|
||||
From 604c931bc673c507254a84c0f423c9ec8ce6e3a1 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 10 Oct 2019 20:36:46 +0200
|
||||
Subject: [PATCH] include/Makefile.am: don't install lightning.h twice
|
||||
|
||||
Commit 17164ed32d8f3530153b9cad67a4399c65f24512 added lightning.h to
|
||||
nodist_include_HEADERS without removing it from include_HEADERS
|
||||
|
||||
This raises the following error on one of the buildroot autobuilders:
|
||||
/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include'
|
||||
/usr/bin/install -c -m 644 lightning.h '/home/test/autobuild/run/instance-3/output-1/target/usr/include'
|
||||
/usr/bin/install: cannot create regular file `/home/test/autobuild/run/instance-3/output-1/target/usr/include/lightning.h': File exists
|
||||
|
||||
Fix this by removing lightning.h from include_HEADERS
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/05ebc75598627d2a08e08e194f51cb8464f97b95
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
include/Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/include/Makefile.am b/include/Makefile.am
|
||||
index e754dd3..8f91594 100644
|
||||
--- a/include/Makefile.am
|
||||
+++ b/include/Makefile.am
|
||||
@@ -14,7 +14,6 @@
|
||||
# License for more details.
|
||||
#
|
||||
|
||||
-include_HEADERS = lightning.h
|
||||
SUBDIRS = \
|
||||
lightning
|
||||
|
||||
--
|
||||
2.23.0
|
||||
|
||||
42
package/lightning/0001-lib-jit_disasm.c-fix-build.patch
Normal file
42
package/lightning/0001-lib-jit_disasm.c-fix-build.patch
Normal file
@@ -0,0 +1,42 @@
|
||||
From 0d828c96c373c34b201ca7ea37b61c1e3b0485cd Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 19 Dec 2022 23:55:31 +0100
|
||||
Subject: [PATCH] lib/jit_disasm.c: fix build
|
||||
|
||||
Fix the following build failure raised since
|
||||
http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=837c7a1e8d08fb9294578dc84694077f4d6106f9:
|
||||
|
||||
jit_disasm.c: In function 'fprintf_styled':
|
||||
jit_disasm.c:57:27: error: parameter name omitted
|
||||
57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
|
||||
| ^~~~~~
|
||||
jit_disasm.c:57:35: error: parameter name omitted
|
||||
57 | static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
|
||||
| ^~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/e15e01e98e0d8c873efd3f512b671d98e4daf6c0
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[yann.morin.1998@free.fr: make it a backport now it's applied upstream]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
lib/jit_disasm.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c
|
||||
index 58a269b..68c966d 100644
|
||||
--- a/lib/jit_disasm.c
|
||||
+++ b/lib/jit_disasm.c
|
||||
@@ -54,7 +54,7 @@ static FILE *disasm_stream;
|
||||
#endif
|
||||
|
||||
#if BINUTILS_2_38
|
||||
-static int fprintf_styled(void *, enum disassembler_style, const char* fmt, ...)
|
||||
+static int fprintf_styled(void * stream, enum disassembler_style style, const char* fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
int r;
|
||||
--
|
||||
2.25.1
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
comment "lightning needs a toolchain w/ dynamic library"
|
||||
comment "lightning needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \
|
||||
BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64
|
||||
depends on BR2_STATIC_LIBS
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_LIGHTNING
|
||||
bool "lightning"
|
||||
depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \
|
||||
BR2_mipsel || BR2_arm || BR2_powerpc || BR2_RISCV_64
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
help
|
||||
GNU lightning is a library that generates
|
||||
assembly language code at run-time.
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 ed856b866dc6f68678dc1151579118fab1c65fad687cf847fc2d94ca045efdc9 lightning-2.1.3.tar.gz
|
||||
sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER
|
||||
sha256 4e3984ff1ccf0ba30a985211d40fc5c06b25f014ebdf3d80d0fe3d0c80dd7c0e lightning-2.2.0.tar.gz
|
||||
sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER
|
||||
|
||||
@@ -4,14 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIGHTNING_VERSION = 2.1.3
|
||||
LIGHTNING_VERSION = 2.2.0
|
||||
LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning
|
||||
LIGHTNING_LICENSE = LGPL-3.0+
|
||||
LIGHTNING_LICENSE_FILES = COPYING.LESSER
|
||||
LIGHTNING_INSTALL_STAGING = YES
|
||||
LIGHTNING_CPE_ID_VENDOR = gnu
|
||||
# We're patching include/Makefile.am
|
||||
LIGHTNING_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y)
|
||||
LIGHTNING_DEPENDENCIES += binutils zlib
|
||||
|
||||
Reference in New Issue
Block a user