initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,43 @@
|
||||
From cef3fc90f02ef4fc49515745194bac3d81a2265b Mon Sep 17 00:00:00 2001
|
||||
From: "Jose E. Marchesi" <jose.marchesi@oracle.com>
|
||||
Date: Fri, 30 Apr 2021 13:17:05 +0200
|
||||
Subject: [PATCH] build: do not check for Tcl/Tk if --disable-gui is specified
|
||||
|
||||
2021-04-30 Jose E. Marchesi <jemarch@gnu.org>
|
||||
|
||||
* configure.ac: Do not check for tcl/tk if --disable-gui is
|
||||
specified at configure time.
|
||||
|
||||
(cherry picked from commit 280a5e154287e43c0a40d9530a9cc658a7367a9c)
|
||||
[Romain: remove Changelog entry]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
configure.ac | 9 ++++++---
|
||||
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c7205513..c2f0760a 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -214,12 +214,15 @@ fi
|
||||
dnl The GUI is optional, and depends on the availability of Tcl and
|
||||
dnl Tk.
|
||||
|
||||
-POKE_TCLTK
|
||||
-
|
||||
AC_ARG_ENABLE([gui],
|
||||
AS_HELP_STRING([--enable-gui],
|
||||
[Enable the GUI (default is YES)]),
|
||||
- [gui_enabled=$enableval], [gui_enabled=$has_tcltk])
|
||||
+ [gui_enabled=$enableval], [gui_enabled=yes])
|
||||
+
|
||||
+if test "x$gui_enabled" = "xyes"; then
|
||||
+ POKE_TCLTK
|
||||
+ gui_enabled=$has_tcltk
|
||||
+fi
|
||||
|
||||
AM_CONDITIONAL([GUI], [test "x$gui_enabled" = "xyes"])
|
||||
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
From ac9d057895f1e61f63cbecafcc3e3820fdb10f84 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Saiu <positron@gnu.org>
|
||||
Date: Fri, 30 Apr 2021 22:42:57 +0200
|
||||
Subject: [PATCH] tentatively change --cppflags to omit -I prefix on
|
||||
cross-compilation
|
||||
|
||||
The autoconf macros defined from jitter --cppflags get automatically changed, of
|
||||
course.
|
||||
|
||||
* configure.ac (JITTER_CROSS_COMPILING): New substitution.
|
||||
|
||||
* bin/jitter-config.in.m4sh (main loop) <--cppflags>: Introduce conditional on
|
||||
the new substitution.
|
||||
|
||||
Suggested by Romain Naour, after his difficulties with building GNU poke with
|
||||
buildroot.
|
||||
|
||||
(cherry picked from commit 428406c7b8d4c20f3472d41ed57c12c1a88ad37e)
|
||||
[Romain:
|
||||
patch jitter-config.in instead of jitter-config.in.m4sh since
|
||||
there is an issue while converting the M4sh m4sh script ( .in.m4sh )
|
||||
into a portable shell script ( .in ) ready to be processed by aclocal
|
||||
for @-substitutions.]
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
jitter/bin/jitter-config.in | 10 +++++++---
|
||||
jitter/configure.ac | 1 +
|
||||
2 files changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/jitter/bin/jitter-config.in b/jitter/bin/jitter-config.in
|
||||
index 5e124f0..4bc508d 100644
|
||||
--- a/jitter/bin/jitter-config.in
|
||||
+++ b/jitter/bin/jitter-config.in
|
||||
@@ -999,10 +999,14 @@ while test "$#" != "0"; do
|
||||
--cppflags)
|
||||
no_option_argument
|
||||
append_to_output cppflags
|
||||
- # Append a -I argument. This is defined separately from the rest,
|
||||
- # as the installation prefix can be decided very late, at Jitter
|
||||
+ # Unless cross-compiling, append a -I argument referring the
|
||||
+ # installation path. This is defined separately from the rest, as
|
||||
+ # the installation prefix can be decided very late, at Jitter
|
||||
# installation time.
|
||||
- output="$output -I $includedir";;
|
||||
+ # (When cross-compiling this would be difficult to do correctly.)
|
||||
+ if test "x@JITTER_CROSS_COMPILING@" != 'xyes'; then
|
||||
+ output="$output -I $includedir"
|
||||
+ fi;;
|
||||
--ldadd)
|
||||
no_option_argument
|
||||
append_to_output ldadd;;
|
||||
diff --git a/jitter/configure.ac b/jitter/configure.ac
|
||||
index 21d6937..fb12349 100644
|
||||
--- a/jitter/configure.ac
|
||||
+++ b/jitter/configure.ac
|
||||
@@ -308,6 +308,7 @@ else
|
||||
AC_MSG_RESULT([yes, cross-compiling from $build to $host .])
|
||||
jitter_cross_compiling=yes
|
||||
fi
|
||||
+AC_SUBST([JITTER_CROSS_COMPILING], [$jitter_cross_compiling])
|
||||
|
||||
# I never test on weird systems not supporting shebangs.
|
||||
AC_SYS_INTERPRETER
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From 8ba76a5a7ce311f67890199c5595bc1f626495ad Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Fri, 30 Apr 2021 15:43:59 +0200
|
||||
Subject: [PATCH] configure.ac: HELP2MAN replace ':' by 'true' when
|
||||
cross-compiling
|
||||
|
||||
Avoid:
|
||||
/usr/bin/make ./../poke/poke
|
||||
../run \
|
||||
: -p poke --name="The GNU extensible binary editor" \
|
||||
./../poke/poke -o ./poke.1
|
||||
../run: line 51: exec: :: not found
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index c2f0760a..93769ef9 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -74,7 +74,7 @@ gl_LIBTEXTSTYLE_OPTIONAL([0.20.5])
|
||||
if test $cross_compiling = no; then
|
||||
AM_MISSING_PROG(HELP2MAN, help2man)
|
||||
else
|
||||
- HELP2MAN=:
|
||||
+ HELP2MAN=true
|
||||
fi
|
||||
|
||||
dnl recfix is part of the GNU recutils suite, and is used in cfg.mk to
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
From a0594387565e1e6b4a8a8ba04ad13b135cc1f0b5 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 1 Apr 2021 07:49:46 +0200
|
||||
Subject: [PATCH] lib/getrandom.c: fix build with uclibc < 1.0.35
|
||||
|
||||
Fix the following build failure with uclibc < 1.0.35 which is raised
|
||||
since the addition of getrandom module in
|
||||
https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=682cc4e678aceff32dea2a84b6e5147bdf5a20a7:
|
||||
|
||||
In file included from ./sys/random.h:40,
|
||||
from getrandom.c:22:
|
||||
/tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:27:35: error: unknown type name 'size_t'
|
||||
27 | extern int getrandom(void *__buf, size_t count, unsigned int flags)
|
||||
| ^~~~~~
|
||||
/tmp/instance-0/output-1/host/x86_64-buildroot-linux-uclibc/sysroot/usr/include/sys/random.h:8:1: note: 'size_t' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
|
||||
7 | #include <features.h>
|
||||
+++ |+#include <stddef.h>
|
||||
8 |
|
||||
|
||||
This patch is not upstreamable as it is only a workaround for
|
||||
uclibc < 1.0.35, upstream uclibc has been patched with
|
||||
https://github.com/wbx-github/uclibc-ng/commit/00972c02c2b6e0a95d5def4a71bdfb188e091782
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/30105094e39374ec6d4e47e2fb5e99696f7f7981
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
jitter/gnulib-local/getrandom.c | 1 +
|
||||
gl/getrandom.c | 1 +
|
||||
gl-libpoke/getrandom.c | 1 +
|
||||
3 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/jitter/gnulib-local/getrandom.c b/jitter/gnulib-local/getrandom.c
|
||||
index 41212fb32..0ad3f9648 100644
|
||||
--- a/jitter/gnulib-local/getrandom.c
|
||||
+++ b/jitter/gnulib-local/getrandom.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#include <stddef.h>
|
||||
#include <sys/random.h>
|
||||
|
||||
#include <errno.h>
|
||||
diff --git a/gl/getrandom.c b/gl/getrandom.c
|
||||
index 41212fb32..0ad3f9648 100644
|
||||
--- a/gl/getrandom.c
|
||||
+++ b/gl/getrandom.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#include <stddef.h>
|
||||
#include <sys/random.h>
|
||||
|
||||
#include <errno.h>
|
||||
diff --git a/gl-libpoke/getrandom.c b/gl-libpoke/getrandom.c
|
||||
index 41212fb32..0ad3f9648 100644
|
||||
--- a/gl-libpoke/getrandom.c
|
||||
+++ b/gl-libpoke/getrandom.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
+#include <stddef.h>
|
||||
#include <sys/random.h>
|
||||
|
||||
#include <errno.h>
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
config BR2_PACKAGE_POKE
|
||||
bool "poke"
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc
|
||||
depends on BR2_USE_WCHAR # needs wctomb
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # less
|
||||
select BR2_PACKAGE_BDWGC
|
||||
select BR2_PACKAGE_LESS # runtime
|
||||
select BR2_PACKAGE_READLINE
|
||||
help
|
||||
GNU poke is a new interactive editor for binary data. Not
|
||||
limited to editing basic entities such as bits and bytes,
|
||||
it provides a full-fledged procedural, interactive
|
||||
programming language designed to describe data structures
|
||||
and to operate on them. Once a user has defined a structure
|
||||
for binary data (usually matching some file format) she can
|
||||
search, inspect, create, shuffle and modify abstract entities
|
||||
such as ELF relocations, MP3 tags, DWARF expressions,
|
||||
partition table entries, and so on, with primitives
|
||||
resembling simple editing of bits and bytes. The program
|
||||
comes with a library of already written descriptions (or
|
||||
"pickles" in poke parlance) for many binary formats.
|
||||
|
||||
https://www.gnu.org/software/poke/
|
||||
|
||||
comment "poke needs a toolchain w/ NPTL, wchar"
|
||||
depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR
|
||||
@@ -0,0 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 f61cf8da5b64c01a1359373725aad1ca257f35c1c9269e4d50dd0664183ddf62 poke-1.2.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 jitter/COPYING
|
||||
@@ -0,0 +1,56 @@
|
||||
################################################################################
|
||||
#
|
||||
# poke
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POKE_VERSION = 1.2
|
||||
POKE_SITE = $(BR2_GNU_MIRROR)/poke
|
||||
# gnulib license is a mix/mess of public-domain and various GPL and LGPL versions.
|
||||
POKE_LICENSE = GPL-3.0+, GPL-3.0+ (jitter), gnulib license (gnulib)
|
||||
POKE_LICENSE_FILES = COPYING jitter/COPYING
|
||||
|
||||
# 0001-build-do-not-check-for-Tcl-Tk-if-disable-gui-is-spec.patch
|
||||
# 0003-configure.ac-HELP2MAN-replace-by-false-when-cross-co.patch
|
||||
POKE_AUTORECONF = YES
|
||||
|
||||
POKE_DEPENDENCIES = host-flex host-bison host-pkgconf bdwgc readline
|
||||
|
||||
# poke bundle gnulib that doesn't support the case where
|
||||
# host_os='linux-uclibc'. When cross-compiling, the guessed
|
||||
# answers are mostly wrong and gnulib will try to replace
|
||||
# snprintf with rpl_snprintf. This lead to "undefined reference
|
||||
# to `rpl_snprintf'" errors.
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
POKE_CONF_ENV = gl_cv_func_printf_positions=yes \
|
||||
gl_cv_func_snprintf_retval_c99=yes \
|
||||
gl_cv_func_printf_sizes_c99=yes \
|
||||
gl_cv_func_printf_infinite_long_double=yes \
|
||||
gl_cv_func_snprintf_retval_c99=yes \
|
||||
gl_cv_func_snprintf_truncation_c99=yes \
|
||||
gl_cv_func_snprintf_usable=yes \
|
||||
gl_cv_func_strerror_0_works=yes \
|
||||
gl_cv_header_working_stdint_h=yes \
|
||||
gl_cv_func_printf_infinite=yes \
|
||||
gl_cv_func_printf_flag_zero=yes \
|
||||
gl_cv_func_printf_enomem=yes \
|
||||
gl_cv_func_printf_directive_f=yes \
|
||||
gl_cv_func_printf_directive_a=yes \
|
||||
gl_cv_func_snprintf_directive_n=yes \
|
||||
gl_cv_func_vsnprintf_posix=yes \
|
||||
gl_cv_func_vsnprintf_zerosize_c99=yes
|
||||
endif
|
||||
|
||||
POKE_CONF_OPTS = \
|
||||
--disable-gui \
|
||||
--disable-libnbd \
|
||||
--with-libreadline-prefix=$(STAGING_DIR)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JSON_C),y)
|
||||
POKE_DEPENDENCIES += json-c
|
||||
POKE_CONF_OPTS += --enable-mi
|
||||
else
|
||||
POKE_CONF_OPTS += --disable-mi
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user