Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
commit
890454eaa4
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .134
|
LINUX_VERSION-5.15 = .135
|
||||||
LINUX_KERNEL_HASH-5.15.134 = f37182aecb57ed6853d01e1074d3a60a653331e35f3115728381e08be050b9d3
|
LINUX_KERNEL_HASH-5.15.135 = 14835e629e237f136cfed484fdb533c95242429809bdcdb2a2d66dfcb7447170
|
||||||
|
|||||||
@ -8,12 +8,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=json-c
|
PKG_NAME:=json-c
|
||||||
PKG_VERSION:=0.16
|
PKG_VERSION:=0.17
|
||||||
PKG_RELEASE:=3
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-nodoc.tar.gz
|
||||||
PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
|
PKG_SOURCE_URL:=https://s3.amazonaws.com/json-c_releases/releases/
|
||||||
PKG_HASH:=ac8a3dd6820daaca579b23fbc74664310fbc3d67f52f6707cda67d21dde5570f
|
PKG_HASH:=8df3b66597333dd365762cab2de2ff68e41e3808a04b692e696e0550648eefaa
|
||||||
|
|
||||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||||
PKG_LICENSE:=MIT
|
PKG_LICENSE:=MIT
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -433,8 +433,6 @@ configure_file(json.h.cmakein ${PROJECT_
|
@@ -451,8 +451,6 @@ configure_file(json.h.cmakein ${PROJECT_
|
||||||
include_directories(${PROJECT_SOURCE_DIR})
|
include_directories(${PROJECT_SOURCE_DIR})
|
||||||
include_directories(${PROJECT_BINARY_DIR})
|
include_directories(${PROJECT_BINARY_DIR})
|
||||||
|
|
||||||
|
|||||||
@ -1,184 +0,0 @@
|
|||||||
From 6eca65617aacd19f4928acd5766b8dd20eda0b34 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Sat, 13 Aug 2022 20:37:03 -0700
|
|
||||||
Subject: [PATCH] Fix build with clang-15+
|
|
||||||
|
|
||||||
Fixes
|
|
||||||
json_util.c:63:35: error: a function declaration without a prototype is deprecated in all versions of C [-We
|
|
||||||
rror,-Wstrict-prototypes]
|
|
||||||
const char *json_util_get_last_err()
|
|
||||||
^
|
|
||||||
void
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
json_util.c | 2 +-
|
|
||||||
tests/test1.c | 6 +++---
|
|
||||||
tests/test4.c | 2 +-
|
|
||||||
tests/test_cast.c | 2 +-
|
|
||||||
tests/test_charcase.c | 2 +-
|
|
||||||
tests/test_parse.c | 8 ++++----
|
|
||||||
tests/test_printbuf.c | 4 ++--
|
|
||||||
tests/test_util_file.c | 6 +++---
|
|
||||||
8 files changed, 16 insertions(+), 16 deletions(-)
|
|
||||||
|
|
||||||
--- a/json_util.c
|
|
||||||
+++ b/json_util.c
|
|
||||||
@@ -60,7 +60,7 @@ static int _json_object_to_fd(int fd, st
|
|
||||||
|
|
||||||
static char _last_err[256] = "";
|
|
||||||
|
|
||||||
-const char *json_util_get_last_err()
|
|
||||||
+const char *json_util_get_last_err(void)
|
|
||||||
{
|
|
||||||
if (_last_err[0] == '\0')
|
|
||||||
return NULL;
|
|
||||||
--- a/tests/test1.c
|
|
||||||
+++ b/tests/test1.c
|
|
||||||
@@ -58,7 +58,7 @@ static const char *to_json_string(json_o
|
|
||||||
#endif
|
|
||||||
|
|
||||||
json_object *make_array(void);
|
|
||||||
-json_object *make_array()
|
|
||||||
+json_object *make_array(void)
|
|
||||||
{
|
|
||||||
json_object *my_array;
|
|
||||||
|
|
||||||
@@ -74,7 +74,7 @@ json_object *make_array()
|
|
||||||
}
|
|
||||||
|
|
||||||
void test_array_del_idx(void);
|
|
||||||
-void test_array_del_idx()
|
|
||||||
+void test_array_del_idx(void)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
size_t ii;
|
|
||||||
@@ -140,7 +140,7 @@ void test_array_del_idx()
|
|
||||||
}
|
|
||||||
|
|
||||||
void test_array_list_expand_internal(void);
|
|
||||||
-void test_array_list_expand_internal()
|
|
||||||
+void test_array_list_expand_internal(void)
|
|
||||||
{
|
|
||||||
int rc;
|
|
||||||
size_t ii;
|
|
||||||
--- a/tests/test4.c
|
|
||||||
+++ b/tests/test4.c
|
|
||||||
@@ -28,7 +28,7 @@ void print_hex(const char *s)
|
|
||||||
}
|
|
||||||
|
|
||||||
static void test_lot_of_adds(void);
|
|
||||||
-static void test_lot_of_adds()
|
|
||||||
+static void test_lot_of_adds(void)
|
|
||||||
{
|
|
||||||
int ii;
|
|
||||||
char key[50];
|
|
||||||
--- a/tests/test_cast.c
|
|
||||||
+++ b/tests/test_cast.c
|
|
||||||
@@ -94,7 +94,7 @@ static void getit(struct json_object *ne
|
|
||||||
printf("new_obj.%s json_object_get_double()=%f\n", field, json_object_get_double(o));
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void checktype_header()
|
|
||||||
+static void checktype_header(void)
|
|
||||||
{
|
|
||||||
printf("json_object_is_type: %s,%s,%s,%s,%s,%s,%s\n", json_type_to_name(json_type_null),
|
|
||||||
json_type_to_name(json_type_boolean), json_type_to_name(json_type_double),
|
|
||||||
--- a/tests/test_charcase.c
|
|
||||||
+++ b/tests/test_charcase.c
|
|
||||||
@@ -19,7 +19,7 @@ int main(int argc, char **argv)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* make sure only lowercase forms are parsed in strict mode */
|
|
||||||
-static void test_case_parse()
|
|
||||||
+static void test_case_parse(void)
|
|
||||||
{
|
|
||||||
struct json_tokener *tok;
|
|
||||||
json_object *new_obj;
|
|
||||||
--- a/tests/test_parse.c
|
|
||||||
+++ b/tests/test_parse.c
|
|
||||||
@@ -92,7 +92,7 @@ static void single_basic_parse(const cha
|
|
||||||
if (getenv("TEST_PARSE_CHUNKSIZE") != NULL)
|
|
||||||
single_incremental_parse(test_string, clear_serializer);
|
|
||||||
}
|
|
||||||
-static void test_basic_parse()
|
|
||||||
+static void test_basic_parse(void)
|
|
||||||
{
|
|
||||||
single_basic_parse("\"\003\"", 0);
|
|
||||||
single_basic_parse("/* hello */\"foo\"", 0);
|
|
||||||
@@ -195,7 +195,7 @@ static void test_basic_parse()
|
|
||||||
single_basic_parse("[18446744073709551616]", 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void test_utf8_parse()
|
|
||||||
+static void test_utf8_parse(void)
|
|
||||||
{
|
|
||||||
// json_tokener_parse doesn't support checking for byte order marks.
|
|
||||||
// It's the responsibility of the caller to detect and skip a BOM.
|
|
||||||
@@ -222,7 +222,7 @@ static int clear_serializer(json_object
|
|
||||||
return JSON_C_VISIT_RETURN_CONTINUE;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void test_verbose_parse()
|
|
||||||
+static void test_verbose_parse(void)
|
|
||||||
{
|
|
||||||
json_object *new_obj;
|
|
||||||
enum json_tokener_error error = json_tokener_success;
|
|
||||||
@@ -562,7 +562,7 @@ struct incremental_step
|
|
||||||
{NULL, -1, -1, json_tokener_success, 0},
|
|
||||||
};
|
|
||||||
|
|
||||||
-static void test_incremental_parse()
|
|
||||||
+static void test_incremental_parse(void)
|
|
||||||
{
|
|
||||||
json_object *new_obj;
|
|
||||||
enum json_tokener_error jerr;
|
|
||||||
--- a/tests/test_printbuf.c
|
|
||||||
+++ b/tests/test_printbuf.c
|
|
||||||
@@ -16,7 +16,7 @@ static void test_printbuf_memset_length(
|
|
||||||
#define __func__ __FUNCTION__
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-static void test_basic_printbuf_memset()
|
|
||||||
+static void test_basic_printbuf_memset(void)
|
|
||||||
{
|
|
||||||
struct printbuf *pb;
|
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ static void test_basic_printbuf_memset()
|
|
||||||
printf("%s: end test\n", __func__);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void test_printbuf_memset_length()
|
|
||||||
+static void test_printbuf_memset_length(void)
|
|
||||||
{
|
|
||||||
struct printbuf *pb;
|
|
||||||
|
|
||||||
--- a/tests/test_util_file.c
|
|
||||||
+++ b/tests/test_util_file.c
|
|
||||||
@@ -35,7 +35,7 @@ static void test_read_fd_equal(const cha
|
|
||||||
#define PATH_MAX 256
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-static void test_write_to_file()
|
|
||||||
+static void test_write_to_file(void)
|
|
||||||
{
|
|
||||||
json_object *jso;
|
|
||||||
|
|
||||||
@@ -231,7 +231,7 @@ static void test_read_valid_nested_with_
|
|
||||||
close(d);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void test_read_nonexistant()
|
|
||||||
+static void test_read_nonexistant(void)
|
|
||||||
{
|
|
||||||
const char *filename = "./not_present.json";
|
|
||||||
|
|
||||||
@@ -249,7 +249,7 @@ static void test_read_nonexistant()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void test_read_closed()
|
|
||||||
+static void test_read_closed(void)
|
|
||||||
{
|
|
||||||
// Test reading from a closed fd
|
|
||||||
int d = open("/dev/null", O_RDONLY, 0);
|
|
||||||
@ -1,12 +1,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libmd
|
PKG_NAME:=libmd
|
||||||
PKG_VERSION:=1.0.4
|
PKG_VERSION:=1.1.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://archive.hadrons.org/software/libmd/
|
PKG_SOURCE_URL:=https://archive.hadrons.org/software/libmd/
|
||||||
PKG_HASH:=f51c921042e34beddeded4b75557656559cf5b1f2448033b4c1eec11c07e530f
|
PKG_HASH:=1bd6aa42275313af3141c7cf2e5b964e8b1fd488025caf2f971f43b00776b332
|
||||||
|
|
||||||
PKG_LICENSE:=BSD-3-Clause
|
PKG_LICENSE:=BSD-3-Clause
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|||||||
@ -6,12 +6,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libnl
|
PKG_NAME:=libnl
|
||||||
PKG_VERSION:=3.7.0
|
PKG_VERSION:=3.8.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(PKG_VERSION))
|
PKG_SOURCE_URL:=https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(PKG_VERSION))
|
||||||
PKG_HASH:=9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939
|
PKG_HASH:=bb726c6d7a08b121978d73ff98425bf313fa26a27a331d465e4f1d7ec5b838c6
|
||||||
|
|
||||||
PKG_LICENSE:=LGPL-2.1
|
PKG_LICENSE:=LGPL-2.1
|
||||||
PKG_LICENSE_FILES:=COPYING
|
PKG_LICENSE_FILES:=COPYING
|
||||||
|
|||||||
@ -8,12 +8,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=util-linux
|
PKG_NAME:=util-linux
|
||||||
PKG_VERSION:=2.39
|
PKG_VERSION:=2.39.2
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39
|
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.39
|
||||||
PKG_HASH:=32b30a336cda903182ed61feb3e9b908b762a5e66fe14e43efb88d37162075cb
|
PKG_HASH:=87abdfaa8e490f8be6dde976f7c80b9b5ff9f301e1b67e3899e1f05a59a1531f
|
||||||
PKG_CPE_ID:=cpe:/a:kernel:util-linux
|
PKG_CPE_ID:=cpe:/a:kernel:util-linux
|
||||||
|
|
||||||
PKG_LICENSE:=GPL-2.0-only
|
PKG_LICENSE:=GPL-2.0-only
|
||||||
|
|||||||
@ -1,36 +0,0 @@
|
|||||||
From 2558932c65524d953e4c86d7fda2282a582aa5ec Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
|
|
||||||
Date: Wed, 17 May 2023 16:50:47 +0200
|
|
||||||
Subject: [PATCH] test_enosys: add support for mips, powerpc and arc
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
|
|
||||||
---
|
|
||||||
tests/helpers/test_enosys.c | 14 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
--- a/tests/helpers/test_enosys.c
|
|
||||||
+++ b/tests/helpers/test_enosys.c
|
|
||||||
@@ -53,6 +53,20 @@
|
|
||||||
# else
|
|
||||||
# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC64LE
|
|
||||||
# endif
|
|
||||||
+#elif __powerpc__
|
|
||||||
+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_PPC
|
|
||||||
+#elif __mips__
|
|
||||||
+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
|
||||||
+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPS
|
|
||||||
+# else
|
|
||||||
+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_MIPSEL
|
|
||||||
+# endif
|
|
||||||
+#elif __arc__
|
|
||||||
+# if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
|
||||||
+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARCV2BE
|
|
||||||
+# else
|
|
||||||
+# define SECCOMP_ARCH_NATIVE AUDIT_ARCH_ARCV2
|
|
||||||
+# endif
|
|
||||||
#else
|
|
||||||
# error Unknown target architecture
|
|
||||||
#endif
|
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
From b8bed37a1493b913bf5bda938487ae0c06c11ce7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
|
||||||
|
Date: Sat, 5 Aug 2023 08:57:28 +0200
|
||||||
|
Subject: [PATCH] meson: properly handle gettext non-existence
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Commit e91a49c9747f ("meson: don't build po if no gettext")
|
||||||
|
tried to add the possibility to build util-linux without gettext.
|
||||||
|
|
||||||
|
Unfortunately by default the call to find_program() would abort the
|
||||||
|
build if the program is not found.
|
||||||
|
Avoid aborting the build.
|
||||||
|
|
||||||
|
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
|
||||||
|
---
|
||||||
|
po/meson.build | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
--- a/po/meson.build
|
||||||
|
+++ b/po/meson.build
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-if not find_program('gettext').found()
|
||||||
|
+if not find_program('gettext', required : false).found()
|
||||||
|
subdir_done()
|
||||||
|
endif
|
||||||
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -874,7 +874,6 @@ subdir('disk-utils')
|
|
||||||
subdir('misc-utils')
|
|
||||||
subdir('text-utils')
|
|
||||||
subdir('term-utils')
|
|
||||||
-subdir('po')
|
|
||||||
|
|
||||||
includes = [dir_include,
|
|
||||||
dir_libblkid,
|
|
||||||
@ -130,6 +130,14 @@
|
|||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
&usb_phy1 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
|
&usb1 {
|
||||||
|
status = "okay";
|
||||||
|
};
|
||||||
|
|
||||||
&wmac {
|
&wmac {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
|
|
||||||
|
|||||||
@ -349,7 +349,7 @@ SVN-Revision: 35130
|
|||||||
list_for_each_entry(p, head, list) {
|
list_for_each_entry(p, head, list) {
|
||||||
--- a/net/ipv4/tcp_output.c
|
--- a/net/ipv4/tcp_output.c
|
||||||
+++ b/net/ipv4/tcp_output.c
|
+++ b/net/ipv4/tcp_output.c
|
||||||
@@ -610,48 +610,53 @@ static void tcp_options_write(__be32 *pt
|
@@ -609,48 +609,53 @@ static void tcp_options_write(__be32 *pt
|
||||||
u16 options = opts->options; /* mungable copy */
|
u16 options = opts->options; /* mungable copy */
|
||||||
|
|
||||||
if (unlikely(OPTION_MD5 & options)) {
|
if (unlikely(OPTION_MD5 & options)) {
|
||||||
@ -426,7 +426,7 @@ SVN-Revision: 35130
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (unlikely(opts->num_sack_blocks)) {
|
if (unlikely(opts->num_sack_blocks)) {
|
||||||
@@ -659,16 +664,17 @@ static void tcp_options_write(__be32 *pt
|
@@ -658,16 +663,17 @@ static void tcp_options_write(__be32 *pt
|
||||||
tp->duplicate_sack : tp->selective_acks;
|
tp->duplicate_sack : tp->selective_acks;
|
||||||
int this_sack;
|
int this_sack;
|
||||||
|
|
||||||
@ -450,7 +450,7 @@ SVN-Revision: 35130
|
|||||||
}
|
}
|
||||||
|
|
||||||
tp->rx_opt.dsack = 0;
|
tp->rx_opt.dsack = 0;
|
||||||
@@ -681,13 +687,14 @@ static void tcp_options_write(__be32 *pt
|
@@ -680,13 +686,14 @@ static void tcp_options_write(__be32 *pt
|
||||||
|
|
||||||
if (foc->exp) {
|
if (foc->exp) {
|
||||||
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
|
len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len;
|
||||||
@ -750,7 +750,7 @@ SVN-Revision: 35130
|
|||||||
EXPORT_SYMBOL(xfrm_parse_spi);
|
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||||
--- a/net/ipv4/tcp_input.c
|
--- a/net/ipv4/tcp_input.c
|
||||||
+++ b/net/ipv4/tcp_input.c
|
+++ b/net/ipv4/tcp_input.c
|
||||||
@@ -4157,14 +4157,16 @@ static bool tcp_parse_aligned_timestamp(
|
@@ -4170,14 +4170,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||||
{
|
{
|
||||||
const __be32 *ptr = (const __be32 *)(th + 1);
|
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||||
|
|
||||||
|
|||||||
@ -143,6 +143,7 @@ USB2_PACKAGES += kmod-usb-ledtrig-usbport
|
|||||||
USB3_PACKAGES := $(USB2_PACKAGES) kmod-usb3 kmod-phy-bcm-ns-usb3
|
USB3_PACKAGES := $(USB2_PACKAGES) kmod-usb3 kmod-phy-bcm-ns-usb3
|
||||||
|
|
||||||
define Device/Default
|
define Device/Default
|
||||||
|
PROFILES = Generic $$(DEVICE_NAME)
|
||||||
# .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names
|
# .dtb files are prefixed by SoC type, e.g. bcm4708- which is not included in device/image names
|
||||||
# extract the full dtb name based on the device info
|
# extract the full dtb name based on the device info
|
||||||
DEVICE_DTS := $(patsubst %.dtb,%,$(notdir $(wildcard $(if $(IB),$(KDIR),$(DTS_DIR))/*-$(subst _,-,$(1)).dtb)))
|
DEVICE_DTS := $(patsubst %.dtb,%,$(notdir $(wildcard $(if $(IB),$(KDIR),$(DTS_DIR))/*-$(subst _,-,$(1)).dtb)))
|
||||||
|
|||||||
@ -20,7 +20,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -5370,7 +5370,8 @@ static const struct mv88e6xxx_info mv88e
|
@@ -5372,7 +5372,8 @@ static const struct mv88e6xxx_info mv88e
|
||||||
.name = "Marvell 88E6191X",
|
.name = "Marvell 88E6191X",
|
||||||
.num_databases = 4096,
|
.num_databases = 4096,
|
||||||
.num_ports = 11, /* 10 + Z80 */
|
.num_ports = 11, /* 10 + Z80 */
|
||||||
@ -30,7 +30,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
.max_vid = 8191,
|
.max_vid = 8191,
|
||||||
.port_base_addr = 0x0,
|
.port_base_addr = 0x0,
|
||||||
.phy_base_addr = 0x0,
|
.phy_base_addr = 0x0,
|
||||||
@@ -5392,7 +5393,8 @@ static const struct mv88e6xxx_info mv88e
|
@@ -5394,7 +5395,8 @@ static const struct mv88e6xxx_info mv88e
|
||||||
.name = "Marvell 88E6193X",
|
.name = "Marvell 88E6193X",
|
||||||
.num_databases = 4096,
|
.num_databases = 4096,
|
||||||
.num_ports = 11, /* 10 + Z80 */
|
.num_ports = 11, /* 10 + Z80 */
|
||||||
@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
.max_vid = 8191,
|
.max_vid = 8191,
|
||||||
.port_base_addr = 0x0,
|
.port_base_addr = 0x0,
|
||||||
.phy_base_addr = 0x0,
|
.phy_base_addr = 0x0,
|
||||||
@@ -5702,7 +5704,8 @@ static const struct mv88e6xxx_info mv88e
|
@@ -5704,7 +5706,8 @@ static const struct mv88e6xxx_info mv88e
|
||||||
.name = "Marvell 88E6393X",
|
.name = "Marvell 88E6393X",
|
||||||
.num_databases = 4096,
|
.num_databases = 4096,
|
||||||
.num_ports = 11, /* 10 + Z80 */
|
.num_ports = 11, /* 10 + Z80 */
|
||||||
|
|||||||
@ -71,7 +71,7 @@ Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|||||||
|
|
||||||
mv88e6065_phylink_validate(chip, port, mask, state);
|
mv88e6065_phylink_validate(chip, port, mask, state);
|
||||||
}
|
}
|
||||||
@@ -5649,6 +5671,31 @@ static const struct mv88e6xxx_info mv88e
|
@@ -5651,6 +5673,31 @@ static const struct mv88e6xxx_info mv88e
|
||||||
.ptp_support = true,
|
.ptp_support = true,
|
||||||
.ops = &mv88e6352_ops,
|
.ops = &mv88e6352_ops,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -3015,6 +3015,9 @@ static int mv88e6xxx_setup_port(struct m
|
@@ -3017,6 +3017,9 @@ static int mv88e6xxx_setup_port(struct m
|
||||||
else
|
else
|
||||||
reg = 1 << port;
|
reg = 1 << port;
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||||||
|
|
||||||
--- a/drivers/mtd/ubi/build.c
|
--- a/drivers/mtd/ubi/build.c
|
||||||
+++ b/drivers/mtd/ubi/build.c
|
+++ b/drivers/mtd/ubi/build.c
|
||||||
@@ -1200,6 +1200,73 @@ static struct mtd_info * __init open_mtd
|
@@ -1207,6 +1207,73 @@ static struct mtd_info * __init open_mtd
|
||||||
return mtd;
|
return mtd;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||||||
static int __init ubi_init(void)
|
static int __init ubi_init(void)
|
||||||
{
|
{
|
||||||
int err, i, k;
|
int err, i, k;
|
||||||
@@ -1283,6 +1350,12 @@ static int __init ubi_init(void)
|
@@ -1290,6 +1357,12 @@ static int __init ubi_init(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
|
|||||||
|
|
||||||
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
--- a/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
|
||||||
@@ -6391,6 +6391,7 @@ static int mv88e6xxx_register_switch(str
|
@@ -6393,6 +6393,7 @@ static int mv88e6xxx_register_switch(str
|
||||||
ds->ops = &mv88e6xxx_switch_ops;
|
ds->ops = &mv88e6xxx_switch_ops;
|
||||||
ds->ageing_time_min = chip->info->age_time_coeff;
|
ds->ageing_time_min = chip->info->age_time_coeff;
|
||||||
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX;
|
||||||
|
|||||||
@ -7,11 +7,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=ccache
|
PKG_NAME:=ccache
|
||||||
PKG_VERSION:=4.8.2
|
PKG_VERSION:=4.8.3
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
|
||||||
PKG_HASH:=3d3fb3f888a5b16c4fa7ee5214cca76348afd6130e8443de5f6f2424f2076a49
|
PKG_HASH:=e47374c810b248cfca3665ee1d86c7c763ffd68d9944bc422d9c1872611f2b11
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
include $(INCLUDE_DIR)/cmake.mk
|
include $(INCLUDE_DIR)/cmake.mk
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=cmake
|
PKG_NAME:=cmake
|
||||||
PKG_VERSION:=3.27.4
|
PKG_VERSION:=3.27.7
|
||||||
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
|
PKG_VERSION_MAJOR:=$(word 1,$(subst ., ,$(PKG_VERSION))).$(word 2,$(subst ., ,$(PKG_VERSION)))
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
PKG_CPE_ID:=cpe:/a:kitware:cmake
|
PKG_CPE_ID:=cpe:/a:kitware:cmake
|
||||||
@ -15,7 +15,7 @@ PKG_CPE_ID:=cpe:/a:kitware:cmake
|
|||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||||
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
|
PKG_SOURCE_URL:=https://github.com/Kitware/CMake/releases/download/v$(PKG_VERSION)/ \
|
||||||
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
|
https://cmake.org/files/v$(PKG_VERSION_MAJOR)/
|
||||||
PKG_HASH:=0a905ca8635ca81aa152e123bdde7e54cbe764fdd9a70d62af44cad8b92967af
|
PKG_HASH:=08f71a106036bf051f692760ef9558c0577c42ac39e96ba097e7662bd4158d8e
|
||||||
|
|
||||||
HOST_BUILD_PARALLEL:=1
|
HOST_BUILD_PARALLEL:=1
|
||||||
HOST_CONFIGURE_PARALLEL:=1
|
HOST_CONFIGURE_PARALLEL:=1
|
||||||
@ -30,6 +30,7 @@ HOST_CONFIGURE_VARS += \
|
|||||||
MAKE="$(STAGING_DIR_HOST)/bin/ninja"
|
MAKE="$(STAGING_DIR_HOST)/bin/ninja"
|
||||||
|
|
||||||
HOST_CONFIGURE_ARGS := \
|
HOST_CONFIGURE_ARGS := \
|
||||||
|
--no-debugger \
|
||||||
$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
|
$(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)") \
|
||||||
--prefix="$(STAGING_DIR_HOST)" \
|
--prefix="$(STAGING_DIR_HOST)" \
|
||||||
--system-expat \
|
--system-expat \
|
||||||
|
|||||||
@ -7,11 +7,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=gmp
|
PKG_NAME:=gmp
|
||||||
PKG_VERSION:=6.2.1
|
PKG_VERSION:=6.3.0
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=@GNU/gmp/
|
PKG_SOURCE_URL:=@GNU/gmp/
|
||||||
PKG_HASH:=fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
|
PKG_HASH:=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
|
||||||
PKG_CPE_ID:=cpe:/a:gmplib:gmp
|
PKG_CPE_ID:=cpe:/a:gmplib:gmp
|
||||||
|
|
||||||
HOST_FIXUP:=autoreconf
|
HOST_FIXUP:=autoreconf
|
||||||
|
|||||||
@ -7,13 +7,13 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=libdeflate
|
PKG_NAME:=libdeflate
|
||||||
PKG_VERSION:=1.18
|
PKG_VERSION:=1.19
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate.git
|
PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate.git
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
PKG_SOURCE_VERSION:=v$(PKG_VERSION)
|
||||||
PKG_MIRROR_HASH:=015cbd33b1382b812f7c035640709186bc5d3d6a0ab177bffa7948f26f64edf9
|
PKG_MIRROR_HASH:=5aac9801815384a5e417c8345d25d07547648e28403566ef73a46295ec26b6c4
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/host-build.mk
|
include $(INCLUDE_DIR)/host-build.mk
|
||||||
|
|
||||||
|
|||||||
@ -7,11 +7,11 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=pkgconf
|
PKG_NAME:=pkgconf
|
||||||
PKG_VERSION:=2.0.1
|
PKG_VERSION:=2.0.3
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
|
PKG_SOURCE_URL:=https://distfiles.dereferenced.org/pkgconf
|
||||||
PKG_HASH:=3238af7473740844e5159dd8fb6540603e3fbcebf60beb3c8a426cdca2e29c51
|
PKG_HASH:=cabdf3c474529854f7ccce8573c5ac68ad34a7e621037535cbc3981f6b23836c
|
||||||
|
|
||||||
PKG_CPE_ID:=cpe:/a:pkgconf:pkgconf
|
PKG_CPE_ID:=cpe:/a:pkgconf:pkgconf
|
||||||
|
|
||||||
|
|||||||
@ -8,12 +8,12 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=zlib
|
PKG_NAME:=zlib
|
||||||
PKG_VERSION:=1.2.13
|
PKG_VERSION:=1.3
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=1
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||||
PKG_SOURCE_URL:=https://github.com/madler/zlib/releases/download/v$(PKG_VERSION)
|
PKG_SOURCE_URL:=https://github.com/madler/zlib/releases/download/v$(PKG_VERSION)
|
||||||
PKG_HASH:=d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
|
PKG_HASH:=8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
|
||||||
|
|
||||||
PKG_LICENSE:=Zlib
|
PKG_LICENSE:=Zlib
|
||||||
PKG_LICENSE_FILES:=README
|
PKG_LICENSE_FILES:=README
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user