From d164b642789055c953914f29d3fd272e3930559c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Fri, 30 Jul 2021 13:02:41 +0200 Subject: [PATCH 01/29] otrx: use firmware-utils.git to avoid code duplication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki --- package/utils/otrx/Makefile | 14 +- package/utils/otrx/src/Makefile | 7 - package/utils/otrx/src/otrx.c | 592 -------------------------------- 3 files changed, 10 insertions(+), 603 deletions(-) delete mode 100644 package/utils/otrx/src/Makefile delete mode 100644 package/utils/otrx/src/otrx.c diff --git a/package/utils/otrx/Makefile b/package/utils/otrx/Makefile index fd10b0e924..883f7f717b 100644 --- a/package/utils/otrx/Makefile +++ b/package/utils/otrx/Makefile @@ -10,7 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=otrx PKG_RELEASE:=1 -PKG_FLAGS:=nonshared +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware-utils.git +PKG_SOURCE_DATE:=2021-07-30 +PKG_SOURCE_VERSION:=a5c65fa1192e174e9e895637aaf93945959aa029 +PKG_MIRROR_HASH:=8ef94e74f50b21fd226dd5311962f8bdbd3aa55da11026b2cf2a4b35556350af include $(INCLUDE_DIR)/package.mk @@ -26,10 +30,12 @@ define Package/otrx/description This package contains an utility that allows validating TRX images. endef +TARGET_CFLAGS += -Wall + define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -Wall" + $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ + -o $(PKG_BUILD_DIR)/otrx \ + $(PKG_BUILD_DIR)/src/otrx.c endef define Package/otrx/install diff --git a/package/utils/otrx/src/Makefile b/package/utils/otrx/src/Makefile deleted file mode 100644 index df50ea446d..0000000000 --- a/package/utils/otrx/src/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -all: otrx - -otrx: - $(CC) $(CFLAGS) -o $@ otrx.c -Wall - -clean: - rm -f otrx diff --git a/package/utils/otrx/src/otrx.c b/package/utils/otrx/src/otrx.c deleted file mode 100644 index 223e032f2b..0000000000 --- a/package/utils/otrx/src/otrx.c +++ /dev/null @@ -1,592 +0,0 @@ -/* - * otrx - * - * Copyright (C) 2015-2017 Rafał Miłecki - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the Free - * Software Foundation; either version 2 of the License, or (at your option) - * any later version. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#if !defined(__BYTE_ORDER) -#error "Unknown byte order" -#endif - -#if __BYTE_ORDER == __BIG_ENDIAN -#define cpu_to_le32(x) bswap_32(x) -#define le32_to_cpu(x) bswap_32(x) -#elif __BYTE_ORDER == __LITTLE_ENDIAN -#define cpu_to_le32(x) (x) -#define le32_to_cpu(x) (x) -#else -#error "Unsupported endianness" -#endif - -#define TRX_MAGIC 0x30524448 -#define TRX_FLAGS_OFFSET 12 -#define TRX_MAX_PARTS 3 - -struct trx_header { - uint32_t magic; - uint32_t length; - uint32_t crc32; - uint16_t flags; - uint16_t version; - uint32_t offset[3]; -}; - -char *trx_path; -size_t trx_offset = 0; -char *partition[TRX_MAX_PARTS] = {}; - -static inline size_t otrx_min(size_t x, size_t y) { - return x < y ? x : y; -} - -/************************************************** - * CRC32 - **************************************************/ - -static const uint32_t crc32_tbl[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, - 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, - 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, - 0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, - 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, - 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5, - 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, - 0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, - 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, - 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f, - 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, - 0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, - 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, - 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01, - 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, - 0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, - 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, - 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb, - 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, - 0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, - 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, - 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad, - 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, - 0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, - 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, - 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7, - 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, - 0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, - 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, - 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79, - 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, - 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, - 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, - 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713, - 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, - 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, - 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, - 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45, - 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, - 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, - 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, - 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, - 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d, -}; - -uint32_t otrx_crc32(uint32_t crc, uint8_t *buf, size_t len) { - while (len) { - crc = crc32_tbl[(crc ^ *buf) & 0xff] ^ (crc >> 8); - buf++; - len--; - } - - return crc; -} - -/************************************************** - * Check - **************************************************/ - -static void otrx_check_parse_options(int argc, char **argv) { - int c; - - while ((c = getopt(argc, argv, "o:")) != -1) { - switch (c) { - case 'o': - trx_offset = atoi(optarg); - break; - } - } -} - -static int otrx_check(int argc, char **argv) { - FILE *trx; - struct trx_header hdr; - size_t bytes, length; - uint8_t buf[1024]; - uint32_t crc32; - int err = 0; - - if (argc < 3) { - fprintf(stderr, "No TRX file passed\n"); - err = -EINVAL; - goto out; - } - trx_path = argv[2]; - - optind = 3; - otrx_check_parse_options(argc, argv); - - trx = fopen(trx_path, "r"); - if (!trx) { - fprintf(stderr, "Couldn't open %s\n", trx_path); - err = -EACCES; - goto out; - } - - fseek(trx, trx_offset, SEEK_SET); - bytes = fread(&hdr, 1, sizeof(hdr), trx); - if (bytes != sizeof(hdr)) { - fprintf(stderr, "Couldn't read %s header\n", trx_path); - err = -EIO; - goto err_close; - } - - if (le32_to_cpu(hdr.magic) != TRX_MAGIC) { - fprintf(stderr, "Invalid TRX magic: 0x%08x\n", le32_to_cpu(hdr.magic)); - err = -EINVAL; - goto err_close; - } - - length = le32_to_cpu(hdr.length); - if (length < sizeof(hdr)) { - fprintf(stderr, "Length read from TRX too low (%zu B)\n", length); - err = -EINVAL; - goto err_close; - } - - crc32 = 0xffffffff; - fseek(trx, trx_offset + TRX_FLAGS_OFFSET, SEEK_SET); - length -= TRX_FLAGS_OFFSET; - while ((bytes = fread(buf, 1, otrx_min(sizeof(buf), length), trx)) > 0) { - crc32 = otrx_crc32(crc32, buf, bytes); - length -= bytes; - } - - if (length) { - fprintf(stderr, "Couldn't read last %zd B of data from %s\n", length, trx_path); - err = -EIO; - goto err_close; - } - - if (crc32 != le32_to_cpu(hdr.crc32)) { - fprintf(stderr, "Invalid data crc32: 0x%08x instead of 0x%08x\n", crc32, le32_to_cpu(hdr.crc32)); - err = -EINVAL; - goto err_close; - } - - printf("Found a valid TRX version %d\n", le32_to_cpu(hdr.version)); - -err_close: - fclose(trx); -out: - return err; -} - -/************************************************** - * Create - **************************************************/ - -static ssize_t otrx_create_append_file(FILE *trx, const char *in_path) { - FILE *in; - size_t bytes; - ssize_t length = 0; - uint8_t buf[1024]; - - in = fopen(in_path, "r"); - if (!in) { - fprintf(stderr, "Couldn't open %s\n", in_path); - return -EACCES; - } - - while ((bytes = fread(buf, 1, sizeof(buf), in)) > 0) { - if (fwrite(buf, 1, bytes, trx) != bytes) { - fprintf(stderr, "Couldn't write %zu B to %s\n", bytes, trx_path); - length = -EIO; - break; - } - length += bytes; - } - - fclose(in); - - return length; -} - -static ssize_t otrx_create_append_zeros(FILE *trx, size_t length) { - uint8_t *buf; - - buf = malloc(length); - if (!buf) - return -ENOMEM; - memset(buf, 0, length); - - if (fwrite(buf, 1, length, trx) != length) { - fprintf(stderr, "Couldn't write %zu B to %s\n", length, trx_path); - free(buf); - return -EIO; - } - - free(buf); - - return length; -} - -static ssize_t otrx_create_align(FILE *trx, size_t curr_offset, size_t alignment) { - if (curr_offset & (alignment - 1)) { - size_t length = alignment - (curr_offset % alignment); - return otrx_create_append_zeros(trx, length); - } - - return 0; -} - -static int otrx_create_write_hdr(FILE *trx, struct trx_header *hdr) { - size_t bytes, length; - uint8_t buf[1024]; - uint32_t crc32; - - hdr->magic = cpu_to_le32(TRX_MAGIC); - hdr->version = 1; - - fseek(trx, 0, SEEK_SET); - bytes = fwrite(hdr, 1, sizeof(struct trx_header), trx); - if (bytes != sizeof(struct trx_header)) { - fprintf(stderr, "Couldn't write TRX header to %s\n", trx_path); - return -EIO; - } - - length = le32_to_cpu(hdr->length); - - crc32 = 0xffffffff; - fseek(trx, TRX_FLAGS_OFFSET, SEEK_SET); - length -= TRX_FLAGS_OFFSET; - while ((bytes = fread(buf, 1, otrx_min(sizeof(buf), length), trx)) > 0) { - crc32 = otrx_crc32(crc32, buf, bytes); - length -= bytes; - } - hdr->crc32 = cpu_to_le32(crc32); - - fseek(trx, 0, SEEK_SET); - bytes = fwrite(hdr, 1, sizeof(struct trx_header), trx); - if (bytes != sizeof(struct trx_header)) { - fprintf(stderr, "Couldn't write TRX header to %s\n", trx_path); - return -EIO; - } - - return 0; -} - -static int otrx_create(int argc, char **argv) { - FILE *trx; - struct trx_header hdr = {}; - ssize_t sbytes; - size_t curr_idx = 0; - size_t curr_offset = sizeof(hdr); - int c; - int err = 0; - - if (argc < 3) { - fprintf(stderr, "No TRX file passed\n"); - err = -EINVAL; - goto out; - } - trx_path = argv[2]; - - trx = fopen(trx_path, "w+"); - if (!trx) { - fprintf(stderr, "Couldn't open %s\n", trx_path); - err = -EACCES; - goto out; - } - fseek(trx, curr_offset, SEEK_SET); - - optind = 3; - while ((c = getopt(argc, argv, "f:A:a:b:")) != -1) { - switch (c) { - case 'f': - if (curr_idx >= TRX_MAX_PARTS) { - err = -ENOSPC; - fprintf(stderr, "Reached TRX partitions limit, no place for %s\n", optarg); - goto err_close; - } - - sbytes = otrx_create_append_file(trx, optarg); - if (sbytes < 0) { - fprintf(stderr, "Failed to append file %s\n", optarg); - } else { - hdr.offset[curr_idx++] = curr_offset; - curr_offset += sbytes; - } - - sbytes = otrx_create_align(trx, curr_offset, 4); - if (sbytes < 0) - fprintf(stderr, "Failed to append zeros\n"); - else - curr_offset += sbytes; - - break; - case 'A': - sbytes = otrx_create_append_file(trx, optarg); - if (sbytes < 0) { - fprintf(stderr, "Failed to append file %s\n", optarg); - } else { - curr_offset += sbytes; - } - - sbytes = otrx_create_align(trx, curr_offset, 4); - if (sbytes < 0) - fprintf(stderr, "Failed to append zeros\n"); - else - curr_offset += sbytes; - break; - case 'a': - sbytes = otrx_create_align(trx, curr_offset, strtol(optarg, NULL, 0)); - if (sbytes < 0) - fprintf(stderr, "Failed to append zeros\n"); - else - curr_offset += sbytes; - break; - case 'b': - sbytes = strtol(optarg, NULL, 0) - curr_offset; - if (sbytes < 0) { - fprintf(stderr, "Current TRX length is 0x%zx, can't pad it with zeros to 0x%lx\n", curr_offset, strtol(optarg, NULL, 0)); - } else { - sbytes = otrx_create_append_zeros(trx, sbytes); - if (sbytes < 0) - fprintf(stderr, "Failed to append zeros\n"); - else - curr_offset += sbytes; - } - break; - } - if (err) - break; - } - - sbytes = otrx_create_align(trx, curr_offset, 0x1000); - if (sbytes < 0) - fprintf(stderr, "Failed to append zeros\n"); - else - curr_offset += sbytes; - - hdr.length = curr_offset; - otrx_create_write_hdr(trx, &hdr); -err_close: - fclose(trx); -out: - return err; -} - -/************************************************** - * Extract - **************************************************/ - -static void otrx_extract_parse_options(int argc, char **argv) { - int c; - - while ((c = getopt(argc, argv, "c:e:o:1:2:3:")) != -1) { - switch (c) { - case 'o': - trx_offset = atoi(optarg); - break; - case '1': - partition[0] = optarg; - break; - case '2': - partition[1] = optarg; - break; - case '3': - partition[2] = optarg; - break; - } - } -} - -static int otrx_extract_copy(FILE *trx, size_t offset, size_t length, char *out_path) { - FILE *out; - size_t bytes; - uint8_t *buf; - int err = 0; - - out = fopen(out_path, "w"); - if (!out) { - fprintf(stderr, "Couldn't open %s\n", out_path); - err = -EACCES; - goto out; - } - - buf = malloc(length); - if (!buf) { - fprintf(stderr, "Couldn't alloc %zu B buffer\n", length); - err = -ENOMEM; - goto err_close; - } - - fseek(trx, offset, SEEK_SET); - bytes = fread(buf, 1, length, trx); - if (bytes != length) { - fprintf(stderr, "Couldn't read %zu B of data from %s\n", length, trx_path); - err = -ENOMEM; - goto err_free_buf; - }; - - bytes = fwrite(buf, 1, length, out); - if (bytes != length) { - fprintf(stderr, "Couldn't write %zu B to %s\n", length, out_path); - err = -ENOMEM; - goto err_free_buf; - } - - printf("Extracted 0x%zx bytes into %s\n", length, out_path); - -err_free_buf: - free(buf); -err_close: - fclose(out); -out: - return err; -} - -static int otrx_extract(int argc, char **argv) { - FILE *trx; - struct trx_header hdr; - size_t bytes; - int i; - int err = 0; - - if (argc < 3) { - fprintf(stderr, "No TRX file passed\n"); - err = -EINVAL; - goto out; - } - trx_path = argv[2]; - - optind = 3; - otrx_extract_parse_options(argc, argv); - - trx = fopen(trx_path, "r"); - if (!trx) { - fprintf(stderr, "Couldn't open %s\n", trx_path); - err = -EACCES; - goto out; - } - - fseek(trx, trx_offset, SEEK_SET); - bytes = fread(&hdr, 1, sizeof(hdr), trx); - if (bytes != sizeof(hdr)) { - fprintf(stderr, "Couldn't read %s header\n", trx_path); - err = -EIO; - goto err_close; - } - - if (le32_to_cpu(hdr.magic) != TRX_MAGIC) { - fprintf(stderr, "Invalid TRX magic: 0x%08x\n", le32_to_cpu(hdr.magic)); - err = -EINVAL; - goto err_close; - } - - for (i = 0; i < TRX_MAX_PARTS; i++) { - size_t length; - - if (!partition[i]) - continue; - if (!hdr.offset[i]) { - printf("TRX doesn't contain partition %d, can't extract %s\n", i + 1, partition[i]); - continue; - } - - if (i + 1 >= TRX_MAX_PARTS || !hdr.offset[i + 1]) - length = le32_to_cpu(hdr.length) - le32_to_cpu(hdr.offset[i]); - else - length = le32_to_cpu(hdr.offset[i + 1]) - le32_to_cpu(hdr.offset[i]); - - otrx_extract_copy(trx, trx_offset + le32_to_cpu(hdr.offset[i]), length, partition[i]); - } - -err_close: - fclose(trx); -out: - return err; -} - -/************************************************** - * Start - **************************************************/ - -static void usage() { - printf("Usage:\n"); - printf("\n"); - printf("Checking TRX file:\n"); - printf("\totrx check [options]\tcheck if file is a valid TRX\n"); - printf("\t-o offset\t\t\toffset of TRX data in file (default: 0)\n"); - printf("\n"); - printf("Creating new TRX file:\n"); - printf("\totrx create [options] [partitions]\n"); - printf("\t-f file\t\t\t\t[partition] start new partition with content copied from file\n"); - printf("\t-A file\t\t\t\t[partition] append current partition with content copied from file\n"); - printf("\t-a alignment\t\t\t[partition] align current partition\n"); - printf("\t-b offset\t\t\t[partition] append zeros to partition till reaching absolute offset\n"); - printf("\n"); - printf("Extracting from TRX file:\n"); - printf("\totrx extract [options]\textract partitions from TRX file\n"); - printf("\t-o offset\t\t\toffset of TRX data in file (default: 0)\n"); - printf("\t-1 file\t\t\t\tfile to extract 1st partition to (optional)\n"); - printf("\t-2 file\t\t\t\tfile to extract 2nd partition to (optional)\n"); - printf("\t-3 file\t\t\t\tfile to extract 3rd partition to (optional)\n"); -} - -int main(int argc, char **argv) { - if (argc > 1) { - if (!strcmp(argv[1], "check")) - return otrx_check(argc, argv); - else if (!strcmp(argv[1], "create")) - return otrx_create(argc, argv); - else if (!strcmp(argv[1], "extract")) - return otrx_extract(argc, argv); - } - - usage(); - return 0; -} From cfcef1b8054f3de3078209ed3103c432c05abb9d Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 1 Aug 2021 03:33:52 +0100 Subject: [PATCH 02/29] dnsmasq: rework jail mounts * split into multiple lines to improve readability * use EXTRA_MOUNT for addnhosts instead of blindly adding /tmp/hosts * remove no longer needed mount for /sbin/hotplug-call * add dhcp-script.sh dependencies (jshn, ubus) Fixes: 3a94c2ca5c ("dnsmasq: add /tmp/hosts/ to jail_mount") Fixes: aed95c4cb8 ("dnsmasq: switch to ubus-based hotplug call") Reported-by: Stijn Tintel Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/files/dnsmasq.init | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 7fe8faa1cb..bffb0ce255 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -19,6 +19,7 @@ BASEDHCPSTAMPFILE="/var/run/dnsmasq" DHCPBOGUSHOSTNAMEFILE="/usr/share/dnsmasq/dhcpbogushostname.conf" RFC6761FILE="/usr/share/dnsmasq/rfc6761.conf" DHCPSCRIPT="/usr/lib/dnsmasq/dhcp-script.sh" +DHCPSCRIPT_DEPENDS="/usr/share/libubox/jshn.sh /usr/bin/jshn /bin/ubus" DNSMASQ_DHCP_VER=4 @@ -187,6 +188,7 @@ append_notinterface() { } append_addnhosts() { + append EXTRA_MOUNT "$1" xappend "--addn-hosts=$1" } @@ -1122,7 +1124,11 @@ dnsmasq_start() procd_set_param respawn procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT /tmp/hosts/ + procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE + procd_add_jail_mount $EXTRA_MOUNT $DHCPBOGUSHOSTNAMEFILE $DHCPSCRIPT $DHCPSCRIPT_DEPENDS + procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript + procd_add_jail_mount /dev/null /dev/urandom + procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile procd_close_instance From aa28cafeef46f937868db2741a07c3ceea307255 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 1 Aug 2021 11:25:41 +0100 Subject: [PATCH 03/29] dnsmasq: fix more dnsmasq jail issues * remove superflus mounts of /dev/null and /dev/urandom * reset EXTRA_MOUNTS at the beginning of the script * add mount according to ignore_hosts_dir * don't add mount for file which is inside a directory already in the EXTRA_MOUNTS list Fixes: 59c63224e1 ("dnsmasq: rework jail mounts") Reported-by: Hartmut Birr Signed-off-by: Daniel Golle --- .../services/dnsmasq/files/dnsmasq.init | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index bffb0ce255..d2bc897307 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -10,6 +10,7 @@ ADD_LOCAL_DOMAIN=1 ADD_LOCAL_HOSTNAME=1 ADD_WAN_FQDN=0 ADD_LOCAL_FQDN="" +EXTRA_MOUNT="" BASECONFIGFILE="/var/etc/dnsmasq.conf" BASEHOSTFILE="/tmp/hosts/dhcp" @@ -187,8 +188,22 @@ append_notinterface() { xappend "--except-interface=$ifname" } +ismounted() { + local filename="$1" + local dirname + for dirname in $EXTRA_MOUNT ; do + case "$filename" in + "${dirname}/"* | "${dirname}" ) + return 1 + ;; + esac + done + + return 0 +} + append_addnhosts() { - append EXTRA_MOUNT "$1" + ismounted "$1" || append EXTRA_MOUNT "$1" xappend "--addn-hosts=$1" } @@ -931,6 +946,14 @@ dnsmasq_start() config_list_foreach "$cfg" "interface" append_interface config_list_foreach "$cfg" "notinterface" append_notinterface } + config_get_bool ignore_hosts_dir "$cfg" ignore_hosts_dir 0 + if [ "$ignore_hosts_dir" = "1" ]; then + xappend "--addn-hosts=$HOSTFILE" + append EXTRA_MOUNT "$HOSTFILE" + else + xappend "--addn-hosts=$(dirname $HOSTFILE)" + append EXTRA_MOUNT "$(dirname $HOSTFILE)" + fi config_list_foreach "$cfg" "addnhosts" append_addnhosts config_list_foreach "$cfg" "bogusnxdomain" append_bogusnxdomain append_parm "$cfg" "leasefile" "--dhcp-leasefile" "/tmp/dhcp.leases" @@ -1026,12 +1049,6 @@ dnsmasq_start() xappend "--dhcp-broadcast=tag:needs-broadcast" - config_get_bool ignore_hosts_dir "$cfg" ignore_hosts_dir 0 - if [ "$ignore_hosts_dir" = "1" ]; then - xappend "--addn-hosts=$HOSTFILE" - else - xappend "--addn-hosts=$(dirname $HOSTFILE)" - fi config_get dnsmasqconfdir "$cfg" confdir "/tmp/dnsmasq.d" xappend "--conf-dir=$dnsmasqconfdir" @@ -1124,10 +1141,9 @@ dnsmasq_start() procd_set_param respawn procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE - procd_add_jail_mount $EXTRA_MOUNT $DHCPBOGUSHOSTNAMEFILE $DHCPSCRIPT $DHCPSCRIPT_DEPENDS + procd_add_jail_mount $CONFIGFILE $DHCPBOGUSHOSTNAMEFILE $DHCPSCRIPT $DHCPSCRIPT_DEPENDS + procd_add_jail_mount $EXTRA_MOUNT $RFC6761FILE $TRUSTANCHORSFILE procd_add_jail_mount $dnsmasqconffile $dnsmasqconfdir $resolvdir $user_dhcpscript - procd_add_jail_mount /dev/null /dev/urandom procd_add_jail_mount /etc/passwd /etc/group /etc/TZ /etc/hosts /etc/ethers procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile From f6d21afc8be381df52c30ed047c5d6416b4e11b8 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Sun, 1 Aug 2021 15:05:18 +0100 Subject: [PATCH 04/29] dnsmasq: reset EXTRA_MOUNT in the right place EXTRA_MOUNT variable should be reset in dnsmasq_start() rather than just once at the beginning of the script. Fixes: ac4e8aa2f8 ("dnsmasq: fix more dnsmasq jail issues") Reported-by: Hartmut Birr Signed-off-by: Daniel Golle --- package/network/services/dnsmasq/files/dnsmasq.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index d2bc897307..d178072e61 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -10,7 +10,6 @@ ADD_LOCAL_DOMAIN=1 ADD_LOCAL_HOSTNAME=1 ADD_WAN_FQDN=0 ADD_LOCAL_FQDN="" -EXTRA_MOUNT="" BASECONFIGFILE="/var/etc/dnsmasq.conf" BASEHOSTFILE="/tmp/hosts/dhcp" @@ -818,9 +817,10 @@ dnsmasq_start() config_get_bool disabled "$cfg" disabled 0 [ "$disabled" -gt 0 ] && return 0 - # reset list of DOMAINS and DNS servers (for each dnsmasq instance) + # reset list of DOMAINS, DNS servers and EXTRA mounts (for each dnsmasq instance) DNS_SERVERS="" DOMAIN="" + EXTRA_MOUNT="" CONFIGFILE="${BASECONFIGFILE}.${cfg}" CONFIGFILE_TMP="${CONFIGFILE}.$$" HOSTFILE="${BASEHOSTFILE}.${cfg}" From eeac725e3316f9a863fc7a31b1b4b469c4f863e6 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Sun, 1 Aug 2021 21:10:05 +0200 Subject: [PATCH 05/29] nat46: fix translation of ICMP protocols parameter problem and unreachable 9b3a819 nat46-core: Fix translation of ICMP protocols parameter problem and unreachable (#27) Signed-off-by: Hans Dedecker --- package/kernel/nat46/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile index ef1a90ed8c..7289101037 100644 --- a/package/kernel/nat46/Makefile +++ b/package/kernel/nat46/Makefile @@ -3,11 +3,11 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=nat46 -PKG_MIRROR_HASH:=3b424241de42b96d47217decf6f9071153cd0c11651f1ee006700836c6660fe8 +PKG_MIRROR_HASH:=a74a9a84605bac6186adf37025b3880eb9cf5931791bb61d47e69b8898cac411 PKG_SOURCE_URL:=https://github.com/ayourtch/nat46.git -PKG_SOURCE_DATE:=2021-05-17 +PKG_SOURCE_DATE:=2021-06-24 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=0d5860d63a8037e001e293091ebf6219cc2f9255 +PKG_SOURCE_VERSION:=9b3a8197421d987d77e1b9df4159cfe0b9820ee9 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 From b3437ac7a39bff7cbbea78f198f191b0e47fe708 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Mon, 2 Aug 2021 20:14:53 +0200 Subject: [PATCH 06/29] images: squashfs: xattrs should not depend on buld host Enable xattr for the generated squashfs only if needed for SELinux. This eliminates warnings during boot on target when building (non-SELinux) OpenWrt on SELinux-enabled hosts like Fedora. Reported-by: fda77 Signed-off-by: Daniel Golle --- include/image.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/image.mk b/include/image.mk index 00235daeb3..db9c1e621e 100644 --- a/include/image.mk +++ b/include/image.mk @@ -76,6 +76,7 @@ JFFS2OPTS += $(MKFS_DEVTABLE_OPT) SQUASHFS_BLOCKSIZE := $(CONFIG_TARGET_SQUASHFS_BLOCK_SIZE)k SQUASHFSOPT := -b $(SQUASHFS_BLOCKSIZE) SQUASHFSOPT += -p '/dev d 755 0 0' -p '/dev/console c 600 0 0 5 1' +SQUASHFSOPT += $(if $(CONFIG_SELINUX),-xattr,-no-xattrs) SQUASHFSCOMP := gzip LZMA_XZ_OPTIONS := -Xpreset 9 -Xe -Xlc 0 -Xlp 2 -Xpb 2 ifeq ($(CONFIG_SQUASHFS_XZ),y) From c4e946cd46f583fc4a483f1fb8e05bb77b28a797 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 4 Mar 2021 00:11:31 +0100 Subject: [PATCH 07/29] ethtool: introduce ethtool-full build variant Netlink support is required for using the virtual cable tester functionality. Remove the pretty print build option and instead create a second package variant ethtool-full. This allows users to install the full ethtool featureset using opkg. Signed-off-by: David Bauer --- package/network/utils/ethtool/Makefile | 31 +++++++++++++++----------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index d645cf9bbb..dde8ff077c 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool PKG_VERSION:=5.12 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -23,8 +23,6 @@ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_CONFIG_DEPENDS:=CONFIG_ETHTOOL_PRETTY_DUMP - include $(INCLUDE_DIR)/package.mk define Package/ethtool @@ -32,6 +30,16 @@ define Package/ethtool CATEGORY:=Network TITLE:=Display or change ethernet card settings URL:=http://www.kernel.org/pub/software/network/ethtool/ + VARIANT:=tiny +endef + +define Package/ethtool-full + $(Package/ethtool) + TITLE += (full) + VARIANT:=full + PROVIDES:=ethtool + CONFLICTS:=ethtool + DEPENDS:=+libmnl endef define Package/ethtool/description @@ -39,18 +47,12 @@ define Package/ethtool/description network interface endef -define Package/ethtool/config - config ETHTOOL_PRETTY_DUMP - depends on PACKAGE_ethtool - bool "Enable pretty printing" -endef +Package/ethtool-full/description:=$(Package/ethtool/description) -CONFIGURE_ARGS += --disable-netlink - -ifeq ($(CONFIG_ETHTOOL_PRETTY_DUMP),y) -CONFIGURE_ARGS += --enable-pretty-dump +ifeq ($(BUILD_VARIANT),full) +CONFIGURE_ARGS += --enable-netlink --enable-pretty-dump else -CONFIGURE_ARGS += --disable-pretty-dump +CONFIGURE_ARGS += --disable-netlink --disable-pretty-dump endif define Package/ethtool/install @@ -58,4 +60,7 @@ define Package/ethtool/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/ethtool $(1)/usr/sbin endef +Package/ethtool-full/install=$(Package/ethtool/install) + $(eval $(call BuildPackage,ethtool)) +$(eval $(call BuildPackage,ethtool-full)) From f0f195928cfdb81772ceae6110dba67a08deb0f2 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 31 Jul 2021 12:07:10 +0200 Subject: [PATCH 08/29] ethtool: update to v5.13 Signed-off-by: David Bauer --- package/network/utils/ethtool/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/network/utils/ethtool/Makefile b/package/network/utils/ethtool/Makefile index dde8ff077c..a82e5c92fa 100644 --- a/package/network/utils/ethtool/Makefile +++ b/package/network/utils/ethtool/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool -PKG_VERSION:=5.12 -PKG_RELEASE:=2 +PKG_VERSION:=5.13 +PKG_RELEASE:=1 PKG_MAINTAINER:=Felix Fietkau PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/ethtool -PKG_HASH:=f5ddfa9c75053d8011b8c8c99ec4e2d3c83cd1972f638692d62e37fa3ef36f07 +PKG_HASH:=e63a7254c6cf2e443d9989c8c34a94e136d789ae1cf5da55397439b055e48cf3 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 2bc0124b7494ce9c3752f5e44bb090f8059099a1 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 6 Aug 2021 10:45:40 +0800 Subject: [PATCH 09/29] target: drop some default packages Signed-off-by: Tianling Shen --- target/linux/ipq40xx/Makefile | 4 ++-- target/linux/ipq806x/Makefile | 4 ++-- target/linux/x86/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 46e5321f3f..dd4392215c 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,8 +19,8 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ath10k wpad-openssl uboot-envtools \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \ - autocore-arm automount autosamba shadowsocksr-libev-server \ - luci-app-ipsec-vpnd luci-app-zerotier openssh-sftp-server \ + autocore-arm automount autosamba luci-app-ipsec-vpnd \ + luci-app-zerotier openssh-sftp-server \ e2fsprogs ethtool htop $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index b3ed146fb1..b6104da036 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -24,7 +24,7 @@ DEFAULT_PACKAGES += \ kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \ kmod-ath10k-ct wpad uboot-envtools e2fsprogs htop \ - autocore-arm automount autosamba shadowsocksr-libev-server \ - luci-app-ipsec-vpnd luci-app-zerotier openssh-sftp-server + autocore-arm automount autosamba luci-app-ipsec-vpnd \ + luci-app-zerotier openssh-sftp-server $(eval $(call BuildTarget)) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 0802327b44..99b223b7f4 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -21,8 +21,8 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k \ kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs \ -htop lm-sensors autocore-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-xlnetacc luci-app-unblockmusic luci-app-zerotier openssh-sftp-server \ -ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie ca-certificates ddns-scripts_aliyun ddns-scripts_dnspod \ +htop lm-sensors autocore-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier openssh-sftp-server \ +ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie ddns-scripts_aliyun ddns-scripts_dnspod \ kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \ kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-mlx4-core kmod-mlx5-core From c7251e55940d774ca81a355bb7246574a0177b1c Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 6 Aug 2021 21:43:54 +0800 Subject: [PATCH 10/29] x86: upgrade from img.gz error picked from https://github.com/openwrt/openwrt/commit/bb107ad9c13d244bf4aed255da913d6000c28833 --- package/base-files/files/lib/functions.sh | 10 +++ .../base-files/files/lib/upgrade/common.sh | 71 ++++++++----------- 2 files changed, 39 insertions(+), 42 deletions(-) mode change 100755 => 100644 package/base-files/files/lib/upgrade/common.sh diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 9561bd0502..a8d340f32e 100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -357,4 +357,14 @@ board_name() { [ -e /tmp/sysinfo/board_name ] && cat /tmp/sysinfo/board_name || echo "generic" } +cmdline_get_var() { + local var=$1 + local cmdlinevar tmp + + for cmdlinevar in $(cat /proc/cmdline); do + tmp=${cmdlinevar##${var}} + [ "=" = "${tmp:0:1}" ] && echo ${tmp:1} + done +} + [ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh old mode 100755 new mode 100644 index b116f7acca..708320fb23 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -59,8 +59,13 @@ ask_bool() { [ "$answer" -gt 0 ] } +_v() { + [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo "$*" >&2 +} + v() { - [ -n "$VERBOSE" ] && [ "$VERBOSE" -ge 1 ] && echo "$@" + _v "$(date) upgrade: $@" + logger -p info -t upgrade "$@" } json_string() { @@ -86,7 +91,7 @@ get_image() { # [ ] esac fi - cat "$from" 2>/dev/null | $cmd + $cmd <"$from" } get_image_dd() { @@ -127,47 +132,18 @@ part_magic_fat() { } export_bootdevice() { - local cmdline uuid disk uevent line + local cmdline uuid blockdev uevent line class local MAJOR MINOR DEVNAME DEVTYPE + local rootpart="$(cmdline_get_var root)" - if read cmdline < /proc/cmdline; then - case "$cmdline" in - *block2mtd=*) - disk="${cmdline##*block2mtd=}" - disk="${disk%%,*}" - ;; - *root=*) - disk="${cmdline##*root=}" - disk="${disk%% *}" - ;; - esac - - case "$disk" in - PARTUUID=[A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9]-[A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9][A-F0-9]0002) - uuid="${disk#PARTUUID=}" - uuid="${uuid%0002}0002" - for disk in $(find /dev -type b); do - set -- $(dd if=$disk bs=1 skip=$((2*512+256+128+16)) count=16 2>/dev/null | hexdump -v -e '4/1 "%02x"' | awk '{ \ - for(i=1;i<9;i=i+2) first=substr($0,i,1) substr($0,i+1,1) first; \ - for(i=9;i<13;i=i+2) second=substr($0,i,1) substr($0,i+1,1) second; \ - for(i=13;i<16;i=i+2) third=substr($0,i,1) substr($0,i+1,1) third; \ - fourth = substr($0,17,4); \ - five = substr($0,21,12); \ - } END { print toupper(first"-"second"-"third"-"fourth"-"five) }') - if [ "$1" = "$uuid" ]; then - uevent="/sys/class/block/${disk##*/}/uevent" - export SAVE_PARTITIONS=0 - break - fi - done - ;; - PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02) - uuid="${disk#PARTUUID=}" - uuid="${uuid%-02}" - for disk in $(find /dev -type b); do - set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') + case "$rootpart" in + PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9]) + uuid="${rootpart#PARTUUID=}" + uuid="${uuid%-[a-f0-9][a-f0-9]}" + for blockdev in $(find /dev -type b); do + set -- $(dd if=$blockdev bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "') if [ "$4$3$2$1" = "$uuid" ]; then - uevent="/sys/class/block/${disk##*/}/uevent" + uevent="/sys/class/block/${blockdev##*/}/uevent" break fi done @@ -184,7 +160,19 @@ export_bootdevice() { done ;; /dev/*) - uevent="/sys/class/block/${disk##*/}/uevent" + uevent="/sys/class/block/${rootpart##*/}/../uevent" + ;; + 0x[a-f0-9][a-f0-9][a-f0-9] | 0x[a-f0-9][a-f0-9][a-f0-9][a-f0-9] | \ + [a-f0-9][a-f0-9][a-f0-9] | [a-f0-9][a-f0-9][a-f0-9][a-f0-9]) + rootpart=0x${rootpart#0x} + for class in /sys/class/block/*; do + while read line; do + export -n "$line" + done < "$class/uevent" + if [ $((rootpart/256)) = $MAJOR -a $((rootpart%256)) = $MINOR ]; then + uevent="$class/../uevent" + fi + done ;; esac @@ -195,7 +183,6 @@ export_bootdevice() { export BOOTDEV_MAJOR=$MAJOR export BOOTDEV_MINOR=$MINOR return 0 - fi fi return 1 From 54c0966bb1b138f1ede86c3c34004145808522ea Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Fri, 6 Aug 2021 22:23:34 +0800 Subject: [PATCH 11/29] kernel: bump to 4.9.278, 4.14.242, 4.19.201 Resolve conflicted: - generic/pending-4.14/690-net-add-support-for-threaded-NAPI-polling.patch - generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch Refreshed all patches. Signed-off-by: Tianling Shen --- include/kernel-version.mk | 12 ++++----- .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- .../802-usb-xhci-force-msi-renesas-xhci.patch | 2 +- .../910-unaligned_access_hacks.patch | 4 +-- .../910-unaligned_access_hacks.patch | 4 +-- .../910-unaligned_access_hacks.patch | 2 +- .../910-unaligned_access_hacks.patch | 4 +-- .../950-0039-Add-dwc_otg-driver.patch | 2 +- ...043-MMC-added-alternative-MMC-driver.patch | 8 +++--- ...ix-connected-active-CSI-2-lane-repor.patch | 2 +- ...-Add-support-for-972Mbit-s-link-freq.patch | 2 +- ...743-Check-I2C-succeeded-during-probe.patch | 4 +-- ...3-mmc-sdhci-Mask-spurious-interrupts.patch | 2 +- ...Better-coalescing-parameter-defaults.patch | 4 +-- ...or-host-controllers-that-don-t-updat.patch | 6 ++--- ...t-Workaround-2-for-Pi4-Ethernet-fail.patch | 2 +- ...ore-event-ring-segment-table-entries.patch | 6 ++--- ...support-for-performing-fake-doorbell.patch | 2 +- ...support-for-performing-fake-doorbell.patch | 2 +- ...ts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch | 2 +- ...M-dts-Add-ethernet-to-the-Gemini-SoC.patch | 2 +- ...s-Add-the-FOTG210-USB-host-to-Gemini.patch | 2 +- ...he-FOTG210-USB-host-to-Gemini-boards.patch | 2 +- ...tcp-allow-drivers-to-tweak-TSQ-logic.patch | 4 +-- ...ption-fix-dwm-158-3g-modem-interface.patch | 2 +- ...conntrack-add-IPS_OFFLOAD-status-bit.patch | 12 ++++----- ...w_table-fix-offloaded-connection-tim.patch | 4 +-- ...r-better-deal-with-suboptimal-GSO-II.patch | 6 ++--- ...w_table-fix-offloaded-connection-tim.patch | 4 +-- ...tsq-add-shortcut-in-tcp_tasklet_func.patch | 2 +- ...-a-shortcut-in-tcp_small_queue_check.patch | 2 +- ...cp_mtu_probe-is-likely-to-exit-early.patch | 2 +- ...ove-tsq_flags-close-to-sk_wmem_alloc.patch | 8 +++--- ...tcp-allow-drivers-to-tweak-TSQ-logic.patch | 4 +-- ...90-net-generalize-napi_complete_done.patch | 2 +- ...p-internal-implementation-for-pacing.patch | 6 ++--- ...r-better-deal-with-suboptimal-GSO-II.patch | 6 ++--- .../hack-4.14/901-debloat_sock_diag.patch | 2 +- ...k-events-support-multiple-registrant.patch | 6 ++--- ...-linux-kernel-to-support-shortcut-fe.patch | 2 +- .../998-usb-serial-option-add-u9300.patch | 6 ++--- .../hack-4.19/901-debloat_sock_diag.patch | 2 +- ...k-events-support-multiple-registrant.patch | 6 ++--- ...-linux-kernel-to-support-shortcut-fe.patch | 2 +- .../998-usb-serial-option-add-u9300.patch | 6 ++--- .../hack-4.9/901-debloat_sock_diag.patch | 2 +- ...ridge-APIs-needed-for-network-HW-acc.patch | 2 +- ...k-events-support-multiple-registrant.patch | 2 +- .../205-backtrace_module_info.patch | 4 +-- .../601-add-kernel-imq-support.patch | 2 +- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++---- ...dd-support-for-threaded-NAPI-polling.patch | 20 +++++++------- .../205-backtrace_module_info.patch | 4 +-- .../601-add-kernel-imq-support.patch | 2 +- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++---- ...dd-support-for-threaded-NAPI-polling.patch | 20 +++++++------- .../810-pci_disable_common_quirks.patch | 8 +++--- ...T-skip-GRO-for-foreign-MAC-addresses.patch | 8 +++--- ....11-encapusaltion-offloading-support.patch | 2 +- .../202-core-linux-support-layerscape.patch | 16 ++++++------ .../302-dts-support-layerscape.patch | 26 +++++++++---------- .../807-usb-support-layerscape.patch | 10 +++---- .../819-sdhc-support-layerscape.patch | 10 +++---- .../822-uart-support-layerscape.patch | 4 +-- ...low-imod-interval-to-be-configurable.patch | 2 +- .../patches-4.19/0900-bt-mtk-serial-fix.patch | 2 +- ...-device-to-the-same-MAX-payload-size.patch | 6 ++--- ...ark-allow-to-specify-link-capability.patch | 4 +-- ...rdvark-Convert-to-use-pci_host_probe.patch | 4 +-- ...-device-to-the-same-MAX-payload-size.patch | 6 ++--- ...ark-allow-to-specify-link-capability.patch | 4 +-- ...0031-uvc-add-iPassion-iP2970-support.patch | 4 +-- 72 files changed, 185 insertions(+), 185 deletions(-) diff --git a/include/kernel-version.mk b/include/kernel-version.mk index f778cb2b2a..862af46c01 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER) endif -LINUX_VERSION-4.9 = .275 -LINUX_VERSION-4.14 = .239 -LINUX_VERSION-4.19 = .197 +LINUX_VERSION-4.9 = .278 +LINUX_VERSION-4.14 = .242 +LINUX_VERSION-4.19 = .201 -LINUX_KERNEL_HASH-4.9.275 = 6651728a295b13ca6266f2b6ed55065302a2117785e5a6f80bb64c587f3dbf22 -LINUX_KERNEL_HASH-4.14.239 = a0e7163e24675524d16b8077c055e4946bb16c0fe7cb0eaa20fbc7f846e5ff98 -LINUX_KERNEL_HASH-4.19.197 = e601259beb5184a189db3f8871c97fad9a3bdaceb9cc62e8cdc64f8505217282 +LINUX_KERNEL_HASH-4.9.278 = e73781c4d45488cc615ed0f4ed3b213bb571e42ff5f97b279643bdc5cc567e11 +LINUX_KERNEL_HASH-4.14.242 = 3e3d1c42a44d22e968a31a6136165b7d70ea703683ff669d5045e8891a4c1a5c +LINUX_KERNEL_HASH-4.19.201 = 8235dfa7188246ee64a247b70bcf2508b15bf5af07fb1fe817d96cf962e1dcd0 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) diff --git a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch index a9ce750e80..c8eb2b420b 100644 --- a/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.14/802-usb-xhci-force-msi-renesas-xhci.patch @@ -44,7 +44,7 @@ produce a noisy warning. hcd->msi_enabled = 1; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1858,6 +1858,7 @@ struct xhci_hcd { +@@ -1859,6 +1859,7 @@ struct xhci_hcd { /* support xHCI 0.96 spec USB2 software LPM */ unsigned sw_lpm_support:1; /* support xHCI 1.0 spec USB2 hardware LPM */ diff --git a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch index c2b8cb4e7a..39a7fa5025 100644 --- a/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch +++ b/target/linux/apm821xx/patches-4.19/802-usb-xhci-force-msi-renesas-xhci.patch @@ -43,7 +43,7 @@ produce a noisy warning. hcd->msi_enabled = 1; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1884,6 +1884,7 @@ struct xhci_hcd { +@@ -1885,6 +1885,7 @@ struct xhci_hcd { /* support xHCI 0.96 spec USB2 software LPM */ unsigned sw_lpm_support:1; /* support xHCI 1.0 spec USB2 hardware LPM */ diff --git a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch index 921b98394c..b007ee859a 100644 --- a/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.14/910-unaligned_access_hacks.patch @@ -223,7 +223,7 @@ #include #include #include -@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s +@@ -835,10 +836,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { @@ -850,7 +850,7 @@ *sum = csum_fold(csum_partial(diff, sizeof(diff), --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c -@@ -1876,15 +1876,15 @@ static int vxlan_build_skb(struct sk_buf +@@ -1878,15 +1878,15 @@ static int vxlan_build_skb(struct sk_buf return err; vxh = __skb_push(skb, sizeof(*vxh)); diff --git a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch index a90dec2a98..e0bb5521bb 100644 --- a/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch +++ b/target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -796,10 +797,10 @@ static void tcp_v6_send_response(const s +@@ -811,10 +812,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { @@ -888,7 +888,7 @@ *sum = csum_fold(csum_partial(diff, sizeof(diff), --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c -@@ -1808,15 +1808,15 @@ static int vxlan_build_skb(struct sk_buf +@@ -1810,15 +1810,15 @@ static int vxlan_build_skb(struct sk_buf goto out_free; vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh)); diff --git a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch index c92cd10fc2..b122dd848f 100644 --- a/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.14/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -819,10 +820,10 @@ static void tcp_v6_send_response(const s +@@ -835,10 +836,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { diff --git a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch index f7a8be35e5..748784dacc 100644 --- a/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch +++ b/target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch @@ -214,7 +214,7 @@ #include #include #include -@@ -837,10 +838,10 @@ static void tcp_v6_send_response(const s +@@ -853,10 +854,10 @@ static void tcp_v6_send_response(const s topt = (__be32 *)(t1 + 1); if (tsecr) { @@ -278,7 +278,7 @@ key, greh->protocol); --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c -@@ -756,7 +756,7 @@ static bool ipv6_hop_jumbo(struct sk_buf +@@ -755,7 +755,7 @@ static bool ipv6_hop_jumbo(struct sk_buf goto drop; } diff --git a/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch index 2d71dcd34e..b2c6cda4cc 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0039-Add-dwc_otg-driver.patch @@ -917,7 +917,7 @@ Fixes https://github.com/raspberrypi/linux/issues/2408 } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5249,7 +5249,7 @@ static void port_event(struct usb_hub *h +@@ -5297,7 +5297,7 @@ static void port_event(struct usb_hub *h u16 status = 0, unused; port_dev->over_current_count++; diff --git a/target/linux/bcm27xx/patches-4.19/950-0043-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-4.19/950-0043-MMC-added-alternative-MMC-driver.patch index d366cc2418..061930af1c 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0043-MMC-added-alternative-MMC-driver.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0043-MMC-added-alternative-MMC-driver.patch @@ -125,7 +125,7 @@ Signed-off-by: Phil Elwell static inline int mmc_blk_part_switch(struct mmc_card *card, unsigned int part_type); -@@ -2893,6 +2900,7 @@ static int mmc_blk_probe(struct mmc_card +@@ -2901,6 +2908,7 @@ static int mmc_blk_probe(struct mmc_card { struct mmc_blk_data *md, *part_md; char cap_str[10]; @@ -133,7 +133,7 @@ Signed-off-by: Phil Elwell /* * Check that the card supports the command class(es) we need. -@@ -2900,7 +2908,16 @@ static int mmc_blk_probe(struct mmc_card +@@ -2908,7 +2916,16 @@ static int mmc_blk_probe(struct mmc_card if (!(card->csd.cmdclass & CCC_BLOCK_READ)) return -ENODEV; @@ -151,7 +151,7 @@ Signed-off-by: Phil Elwell card->complete_wq = alloc_workqueue("mmc_complete", WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); -@@ -2915,9 +2932,14 @@ static int mmc_blk_probe(struct mmc_card +@@ -2923,9 +2940,14 @@ static int mmc_blk_probe(struct mmc_card string_get_size((u64)get_capacity(md->disk), 512, STRING_UNITS_2, cap_str, sizeof(cap_str)); @@ -170,7 +170,7 @@ Signed-off-by: Phil Elwell goto out; --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -2233,7 +2233,8 @@ EXPORT_SYMBOL(mmc_erase); +@@ -2236,7 +2236,8 @@ EXPORT_SYMBOL(mmc_erase); int mmc_can_erase(struct mmc_card *card) { if ((card->host->caps & MMC_CAP_ERASE) && diff --git a/target/linux/bcm27xx/patches-4.19/950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch b/target/linux/bcm27xx/patches-4.19/950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch index 514bc1bbbf..dbb059b86a 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0170-media-tc358743-fix-connected-active-CSI-2-lane-repor.patch @@ -68,7 +68,7 @@ Signed-off-by: Philipp Zabel return 0; } -@@ -2054,6 +2055,7 @@ static int tc358743_probe(struct i2c_cli +@@ -2055,6 +2056,7 @@ static int tc358743_probe(struct i2c_cli if (pdata) { state->pdata = *pdata; state->bus.flags = V4L2_MBUS_CSI2_CONTINUOUS_CLOCK; diff --git a/target/linux/bcm27xx/patches-4.19/950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch b/target/linux/bcm27xx/patches-4.19/950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch index a8d3c0cc1a..0cf42845f1 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0171-media-tc358743-Add-support-for-972Mbit-s-link-freq.patch @@ -21,7 +21,7 @@ Signed-off-by: Dave Stevenson */ bps_pr_lane = 2 * endpoint->link_frequencies[0]; if (bps_pr_lane < 62500000U || bps_pr_lane > 1000000000U) { -@@ -1981,23 +1982,41 @@ static int tc358743_probe_of(struct tc35 +@@ -1982,23 +1983,41 @@ static int tc358743_probe_of(struct tc35 state->pdata.refclk_hz * state->pdata.pll_prd; /* diff --git a/target/linux/bcm27xx/patches-4.19/950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch b/target/linux/bcm27xx/patches-4.19/950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch index 5b46840c24..c2b1fe723c 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0172-media-tc358743-Check-I2C-succeeded-during-probe.patch @@ -78,7 +78,7 @@ Signed-off-by: Dave Stevenson static void i2c_wr16(struct v4l2_subdev *sd, u16 reg, u16 val) { i2c_wrreg(sd, reg, val, 2); -@@ -2056,6 +2073,7 @@ static int tc358743_probe(struct i2c_cli +@@ -2057,6 +2074,7 @@ static int tc358743_probe(struct i2c_cli struct tc358743_platform_data *pdata = client->dev.platform_data; struct v4l2_subdev *sd; u16 irq_mask = MASK_HDMI_MSK | MASK_CSI_MSK; @@ -86,7 +86,7 @@ Signed-off-by: Dave Stevenson int err; if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) -@@ -2088,7 +2106,8 @@ static int tc358743_probe(struct i2c_cli +@@ -2089,7 +2107,8 @@ static int tc358743_probe(struct i2c_cli sd->flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_HAS_EVENTS; /* i2c access */ diff --git a/target/linux/bcm27xx/patches-4.19/950-0463-mmc-sdhci-Mask-spurious-interrupts.patch b/target/linux/bcm27xx/patches-4.19/950-0463-mmc-sdhci-Mask-spurious-interrupts.patch index fd5cb5277c..e083902c95 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0463-mmc-sdhci-Mask-spurious-interrupts.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0463-mmc-sdhci-Mask-spurious-interrupts.patch @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -2935,6 +2935,10 @@ static irqreturn_t sdhci_irq(int irq, vo +@@ -2939,6 +2939,10 @@ static irqreturn_t sdhci_irq(int irq, vo result = IRQ_WAKE_THREAD; } diff --git a/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch b/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch index 5d3403c96c..bf74fb6f15 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0470-bcmgenet-Better-coalescing-parameter-defaults.patch @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -2151,7 +2151,7 @@ static void bcmgenet_init_tx_ring(struct +@@ -2152,7 +2152,7 @@ static void bcmgenet_init_tx_ring(struct bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_PROD_INDEX); bcmgenet_tdma_ring_writel(priv, index, 0, TDMA_CONS_INDEX); @@ -27,7 +27,7 @@ Signed-off-by: Phil Elwell /* Disable rate control for now */ bcmgenet_tdma_ring_writel(priv, index, flow_period_val, TDMA_FLOW_PERIOD); -@@ -3582,9 +3582,12 @@ static int bcmgenet_probe(struct platfor +@@ -3583,9 +3583,12 @@ static int bcmgenet_probe(struct platfor netif_set_real_num_rx_queues(priv->dev, priv->hw_params->rx_queues + 1); /* Set default coalescing parameters */ diff --git a/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch b/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch index 15fe41b820..134eb2f79f 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0609-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch @@ -37,7 +37,7 @@ Signed-off-by: Jonathan Bell pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -520,7 +520,10 @@ void xhci_find_new_dequeue_state(struct +@@ -543,7 +543,10 @@ void xhci_find_new_dequeue_state(struct struct xhci_virt_ep *ep = &dev->eps[ep_index]; struct xhci_ring *ep_ring; struct xhci_segment *new_seg; @@ -48,7 +48,7 @@ Signed-off-by: Jonathan Bell dma_addr_t addr; u64 hw_dequeue; bool cycle_found = false; -@@ -541,7 +544,28 @@ void xhci_find_new_dequeue_state(struct +@@ -564,7 +567,28 @@ void xhci_find_new_dequeue_state(struct hw_dequeue = xhci_get_hw_deq(xhci, dev, ep_index, stream_id); new_seg = ep_ring->deq_seg; new_deq = ep_ring->dequeue; @@ -80,7 +80,7 @@ Signed-off-by: Jonathan Bell /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1872,6 +1872,7 @@ struct xhci_hcd { +@@ -1873,6 +1873,7 @@ struct xhci_hcd { #define XHCI_ZERO_64B_REGS BIT_ULL(32) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) diff --git a/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch b/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch index 2eb92c616b..9fa889bcfc 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0658-net-bcmgenet-Workaround-2-for-Pi4-Ethernet-fail.patch @@ -38,7 +38,7 @@ Signed-off-by: Phil Elwell static inline void bcmgenet_writel(u32 value, void __iomem *offset) { /* MIPS chips strapped for BE will automagically configure the -@@ -1997,6 +2001,11 @@ static void reset_umac(struct bcmgenet_p +@@ -1998,6 +2002,11 @@ static void reset_umac(struct bcmgenet_p bcmgenet_rbuf_ctrl_set(priv, 0); udelay(10); diff --git a/target/linux/bcm27xx/patches-4.19/950-0666-xhci-Use-more-event-ring-segment-table-entries.patch b/target/linux/bcm27xx/patches-4.19/950-0666-xhci-Use-more-event-ring-segment-table-entries.patch index b634f824b4..ac97190d3e 100644 --- a/target/linux/bcm27xx/patches-4.19/950-0666-xhci-Use-more-event-ring-segment-table-entries.patch +++ b/target/linux/bcm27xx/patches-4.19/950-0666-xhci-Use-more-event-ring-segment-table-entries.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c -@@ -2525,9 +2525,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2526,9 +2526,11 @@ int xhci_mem_init(struct xhci_hcd *xhci, * Event ring setup: Allocate a normal ring, but also setup * the event ring segment table (ERST). Section 4.9.3. */ @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell if (!xhci->event_ring) goto fail; if (xhci_check_trb_in_td_math(xhci) < 0) -@@ -2540,7 +2542,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, +@@ -2541,7 +2543,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, /* set ERST count with the number of entries in the segment table */ val = readl(&xhci->ir_set->erst_size); val &= ERST_SIZE_MASK; @@ -47,7 +47,7 @@ Signed-off-by: Jonathan Bell val); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1643,8 +1643,8 @@ struct urb_priv { +@@ -1644,8 +1644,8 @@ struct urb_priv { * Each segment table entry is 4*32bits long. 1K seems like an ok size: * (1K bytes * 8bytes/bit) / (4*32 bits) = 64 segment entries in the table, * meaning 64 ring segments. diff --git a/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index 5784f5e5ab..4cddcb1d4b 100644 --- a/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-4.14/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -127,7 +127,7 @@ it on BCM4708 family. /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1840,6 +1840,7 @@ struct xhci_hcd { +@@ -1841,6 +1841,7 @@ struct xhci_hcd { #define XHCI_INTEL_USB_ROLE_SW BIT_ULL(31) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) diff --git a/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index 06bf28fdbf..ae6afa8448 100644 --- a/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-4.19/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -127,7 +127,7 @@ it on BCM4708 family. /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1872,6 +1872,7 @@ struct xhci_hcd { +@@ -1873,6 +1873,7 @@ struct xhci_hcd { #define XHCI_ZERO_64B_REGS BIT_ULL(32) #define XHCI_RESET_PLL_ON_DISCONNECT BIT_ULL(34) #define XHCI_SNPS_BROKEN_SUSPEND BIT_ULL(35) diff --git a/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch b/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch index 81d9788af0..459b0155b0 100644 --- a/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch +++ b/target/linux/gemini/patches-4.14/0003-ARM-dts-Add-TVE200-to-the-Gemini-SoC-DTSI.patch @@ -28,7 +28,7 @@ Signed-off-by: Arnd Bergmann }; }; -@@ -348,5 +354,20 @@ +@@ -349,5 +355,20 @@ memcpy-bus-width = <32>; #dma-cells = <2>; }; diff --git a/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch b/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch index 0960f6bfdd..3893c58f90 100644 --- a/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch +++ b/target/linux/gemini/patches-4.14/0023-ARM-dts-Add-ethernet-to-the-Gemini-SoC.patch @@ -30,7 +30,7 @@ Signed-off-by: Linus Walleij }; }; pci_default_pins: pinctrl-pci { -@@ -316,6 +323,41 @@ +@@ -317,6 +324,41 @@ }; }; diff --git a/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch b/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch index 5b2c4139c1..f371ec3f29 100644 --- a/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch +++ b/target/linux/gemini/patches-4.14/0031-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini.patch @@ -115,7 +115,7 @@ the patch is only included in the series for context. }; --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi -@@ -411,5 +411,31 @@ +@@ -412,5 +412,31 @@ #size-cells = <0>; status = "disabled"; }; diff --git a/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch b/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch index 83d993b1f9..c04a272509 100644 --- a/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch +++ b/target/linux/gemini/patches-4.19/0018-ARM-dts-Add-the-FOTG210-USB-host-to-Gemini-boards.patch @@ -151,7 +151,7 @@ ChangeLog v1->v2: }; --- a/arch/arm/boot/dts/gemini.dtsi +++ b/arch/arm/boot/dts/gemini.dtsi -@@ -409,5 +409,37 @@ +@@ -410,5 +410,37 @@ #size-cells = <0>; status = "disabled"; }; diff --git a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index 39a3964af7..6f018b9e4a 100644 --- a/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.14/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin * Before updating sk_refcnt, we must commit prior changes to memory --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1700,7 +1700,7 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1701,7 +1701,7 @@ u32 tcp_tso_autosize(const struct sock * { u32 bytes, segs; @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); /* Goal is to send at least one packet per ms, -@@ -2218,7 +2218,7 @@ static bool tcp_small_queue_check(struct +@@ -2219,7 +2219,7 @@ static bool tcp_small_queue_check(struct { unsigned int limit; diff --git a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch index 84874d3d93..4ebcc115cd 100644 --- a/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch +++ b/target/linux/generic/backport-4.14/030-USB-serial-option-fix-dwm-158-3g-modem-interface.patch @@ -30,7 +30,7 @@ Signed-off-by: Johan Hovold --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -2028,7 +2028,8 @@ static const struct usb_device_id option +@@ -2031,7 +2031,8 @@ static const struct usb_device_id option { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d01, 0xff) }, /* D-Link DWM-156 (variant) */ { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d02, 0xff) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7d03, 0xff) }, diff --git a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch index 1a4321cb96..771d515b2d 100644 --- a/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch +++ b/target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch @@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso }; --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -975,6 +975,9 @@ static unsigned int early_drop_list(stru +@@ -980,6 +980,9 @@ static unsigned int early_drop_list(stru hlist_nulls_for_each_entry_rcu(h, n, head, hnnode) { tmp = nf_ct_tuplehash_to_ctrack(h); @@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso if (nf_ct_is_expired(tmp)) { nf_ct_gc_expired(tmp); continue; -@@ -1052,6 +1055,18 @@ static bool gc_worker_can_early_drop(con +@@ -1057,6 +1060,18 @@ static bool gc_worker_can_early_drop(con return false; } @@ -76,7 +76,7 @@ Signed-off-by: Pablo Neira Ayuso static void gc_worker(struct work_struct *work) { unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); -@@ -1088,6 +1103,11 @@ static void gc_worker(struct work_struct +@@ -1093,6 +1108,11 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; @@ -90,7 +90,7 @@ Signed-off-by: Pablo Neira Ayuso expired_count++; --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c -@@ -1125,6 +1125,14 @@ static const struct nla_policy ct_nla_po +@@ -1128,6 +1128,14 @@ static const struct nla_policy ct_nla_po .len = NF_CT_LABELS_MAX_SIZE }, }; @@ -105,7 +105,7 @@ Signed-off-by: Pablo Neira Ayuso static int ctnetlink_flush_conntrack(struct net *net, const struct nlattr * const cda[], u32 portid, int report) -@@ -1137,7 +1145,7 @@ static int ctnetlink_flush_conntrack(str +@@ -1140,7 +1148,7 @@ static int ctnetlink_flush_conntrack(str return PTR_ERR(filter); } @@ -114,7 +114,7 @@ Signed-off-by: Pablo Neira Ayuso portid, report); kfree(filter); -@@ -1183,6 +1191,11 @@ static int ctnetlink_del_conntrack(struc +@@ -1186,6 +1194,11 @@ static int ctnetlink_del_conntrack(struc ct = nf_ct_tuplehash_to_ctrack(h); diff --git a/target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index 230c90f7c5..2776e6e861 100644 --- a/target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch @@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -1055,18 +1055,6 @@ static bool gc_worker_can_early_drop(con +@@ -1060,18 +1060,6 @@ static bool gc_worker_can_early_drop(con return false; } @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau static void gc_worker(struct work_struct *work) { unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); -@@ -1103,10 +1091,8 @@ static void gc_worker(struct work_struct +@@ -1108,10 +1096,8 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; diff --git a/target/linux/generic/backport-4.14/605-0003-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch b/target/linux/generic/backport-4.14/605-0003-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch index 437bd91907..d24dafaa9d 100644 --- a/target/linux/generic/backport-4.14/605-0003-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch +++ b/target/linux/generic/backport-4.14/605-0003-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch @@ -99,7 +99,7 @@ Signed-off-by: UtsavisGreat }; --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1695,8 +1695,8 @@ static bool tcp_nagle_check(bool partial +@@ -1696,8 +1696,8 @@ static bool tcp_nagle_check(bool partial /* Return how many segs we'd like on a TSO packet, * to send one TSO packet per ms */ @@ -110,7 +110,7 @@ Signed-off-by: UtsavisGreat { u32 bytes, segs; -@@ -1712,7 +1712,6 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1713,7 +1713,6 @@ u32 tcp_tso_autosize(const struct sock * return segs; } @@ -118,7 +118,7 @@ Signed-off-by: UtsavisGreat /* Return the number of segments we want in the skb we are transmitting. * See if congestion control module wants to decide; otherwise, autosize. -@@ -1720,11 +1719,13 @@ EXPORT_SYMBOL(tcp_tso_autosize); +@@ -1721,11 +1720,13 @@ EXPORT_SYMBOL(tcp_tso_autosize); static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now) { const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops; diff --git a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch index 5c83457be1..b16550ef21 100644 --- a/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch +++ b/target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch @@ -21,7 +21,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -1179,18 +1179,6 @@ static bool gc_worker_can_early_drop(con +@@ -1184,18 +1184,6 @@ static bool gc_worker_can_early_drop(con return false; } @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau static void gc_worker(struct work_struct *work) { unsigned int min_interval = max(HZ / GC_MAX_BUCKETS_DIV, 1u); -@@ -1227,10 +1215,8 @@ static void gc_worker(struct work_struct +@@ -1232,10 +1220,8 @@ static void gc_worker(struct work_struct tmp = nf_ct_tuplehash_to_ctrack(h); scanned++; diff --git a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch index 7b723867b4..0d4394b6f4 100644 --- a/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch +++ b/target/linux/generic/backport-4.9/024-3-tcp-tsq-add-shortcut-in-tcp_tasklet_func.patch @@ -60,7 +60,7 @@ Signed-off-by: David S. Miller nval = cmpxchg(&tp->tsq_flags, oval, nval); if (nval != oval) continue; -@@ -2240,6 +2240,8 @@ static bool tcp_write_xmit(struct sock * +@@ -2241,6 +2241,8 @@ static bool tcp_write_xmit(struct sock * unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) break; diff --git a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch index 76567805e5..f844412545 100644 --- a/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch +++ b/target/linux/generic/backport-4.9/024-5-tcp-tsq-add-a-shortcut-in-tcp_small_queue_check.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -2145,6 +2145,15 @@ static bool tcp_small_queue_check(struct +@@ -2146,6 +2146,15 @@ static bool tcp_small_queue_check(struct limit <<= factor; if (atomic_read(&sk->sk_wmem_alloc) > limit) { diff --git a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch index de7fcc4cbb..c83a699046 100644 --- a/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch +++ b/target/linux/generic/backport-4.9/024-6-tcp-tcp_mtu_probe-is-likely-to-exit-early.patch @@ -17,7 +17,7 @@ Signed-off-by: David S. Miller --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1977,26 +1977,26 @@ static bool tcp_can_coalesce_send_queue_ +@@ -1978,26 +1978,26 @@ static bool tcp_can_coalesce_send_queue_ */ static int tcp_mtu_probe(struct sock *sk) { diff --git a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch index 19daabf639..5168e56178 100644 --- a/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch +++ b/target/linux/generic/backport-4.9/024-8-tcp-tsq-move-tsq_flags-close-to-sk_wmem_alloc.patch @@ -114,7 +114,7 @@ Signed-off-by: David S. Miller if (nval != oval) continue; -@@ -2154,7 +2154,7 @@ static bool tcp_small_queue_check(struct +@@ -2155,7 +2155,7 @@ static bool tcp_small_queue_check(struct skb->prev == sk->sk_write_queue.next) return false; @@ -123,7 +123,7 @@ Signed-off-by: David S. Miller /* It is possible TX completion already happened * before we set TSQ_THROTTLED, so we must * test again the condition. -@@ -2252,8 +2252,8 @@ static bool tcp_write_xmit(struct sock * +@@ -2253,8 +2253,8 @@ static bool tcp_write_xmit(struct sock * unlikely(tso_fragment(sk, skb, limit, mss_now, gfp))) break; @@ -134,7 +134,7 @@ Signed-off-by: David S. Miller if (tcp_small_queue_check(sk, skb, 0)) break; -@@ -3577,8 +3577,6 @@ void __tcp_send_ack(struct sock *sk, u32 +@@ -3578,8 +3578,6 @@ void __tcp_send_ack(struct sock *sk, u32 /* We do not want pure acks influencing TCP Small Queues or fq/pacing * too much. * SKB_TRUESIZE(max(1 .. 66, MAX_TCP_HEADER)) is unfortunately ~784 @@ -165,7 +165,7 @@ Signed-off-by: David S. Miller bh_unlock_sock(sk); --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c -@@ -404,7 +404,7 @@ static void tcp_v6_err(struct sk_buff *s +@@ -419,7 +419,7 @@ static void tcp_v6_err(struct sk_buff *s if (!sock_owned_by_user(sk)) tcp_v6_mtu_reduced(sk); else if (!test_and_set_bit(TCP_MTU_REDUCED_DEFERRED, diff --git a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch b/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch index a7fe3c0d08..b11d624797 100644 --- a/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch +++ b/target/linux/generic/backport-4.9/025-tcp-allow-drivers-to-tweak-TSQ-logic.patch @@ -65,7 +65,7 @@ Cc: Kir Kolyshkin * Before updating sk_refcnt, we must commit prior changes to memory --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1610,7 +1610,7 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1611,7 +1611,7 @@ u32 tcp_tso_autosize(const struct sock * { u32 bytes, segs; @@ -74,7 +74,7 @@ Cc: Kir Kolyshkin sk->sk_gso_max_size - 1 - MAX_TCP_HEADER); /* Goal is to send at least one packet per ms, -@@ -2141,7 +2141,7 @@ static bool tcp_small_queue_check(struct +@@ -2142,7 +2142,7 @@ static bool tcp_small_queue_check(struct { unsigned int limit; diff --git a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch index edf9af7be8..e6f2580c43 100644 --- a/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch +++ b/target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch @@ -938,7 +938,7 @@ Signed-off-by: David S. Miller --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c -@@ -2391,7 +2391,7 @@ static int pch_gbe_napi_poll(struct napi +@@ -2384,7 +2384,7 @@ static int pch_gbe_napi_poll(struct napi poll_end_flag = true; if (poll_end_flag) { diff --git a/target/linux/generic/backport-4.9/605-0001-tcp-internal-implementation-for-pacing.patch b/target/linux/generic/backport-4.9/605-0001-tcp-internal-implementation-for-pacing.patch index 1632631561..0dd8d9f9af 100644 --- a/target/linux/generic/backport-4.9/605-0001-tcp-internal-implementation-for-pacing.patch +++ b/target/linux/generic/backport-4.9/605-0001-tcp-internal-implementation-for-pacing.patch @@ -274,7 +274,7 @@ Signed-off-by: Albert I } if (after(tcb->end_seq, tp->snd_nxt) || tcb->seq == tcb->end_seq) -@@ -2125,6 +2192,12 @@ static int tcp_mtu_probe(struct sock *sk +@@ -2126,6 +2193,12 @@ static int tcp_mtu_probe(struct sock *sk return -1; } @@ -287,7 +287,7 @@ Signed-off-by: Albert I /* TCP Small Queues : * Control number of packets in qdisc/devices to two packets / or ~1 ms. * (These limits are doubled for retransmits) -@@ -2208,6 +2281,9 @@ static bool tcp_write_xmit(struct sock * +@@ -2209,6 +2282,9 @@ static bool tcp_write_xmit(struct sock * while ((skb = tcp_send_head(sk))) { unsigned int limit; @@ -297,7 +297,7 @@ Signed-off-by: Albert I tso_segs = tcp_init_tso_segs(skb, mss_now); BUG_ON(!tso_segs); -@@ -2932,6 +3008,10 @@ void tcp_xmit_retransmit_queue(struct so +@@ -2933,6 +3009,10 @@ void tcp_xmit_retransmit_queue(struct so if (skb == tcp_send_head(sk)) break; diff --git a/target/linux/generic/backport-4.9/605-0004-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch b/target/linux/generic/backport-4.9/605-0004-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch index 62ed2d7184..41410bf84b 100644 --- a/target/linux/generic/backport-4.9/605-0004-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch +++ b/target/linux/generic/backport-4.9/605-0004-tcp_bbr-better-deal-with-suboptimal-GSO-II.patch @@ -101,7 +101,7 @@ Signed-off-by: Albert I }; --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c -@@ -1672,8 +1672,8 @@ static bool tcp_nagle_check(bool partial +@@ -1673,8 +1673,8 @@ static bool tcp_nagle_check(bool partial /* Return how many segs we'd like on a TSO packet, * to send one TSO packet per ms */ @@ -112,7 +112,7 @@ Signed-off-by: Albert I { u32 bytes, segs; -@@ -1689,7 +1689,6 @@ u32 tcp_tso_autosize(const struct sock * +@@ -1690,7 +1690,6 @@ u32 tcp_tso_autosize(const struct sock * return segs; } @@ -120,7 +120,7 @@ Signed-off-by: Albert I /* Return the number of segments we want in the skb we are transmitting. * See if congestion control module wants to decide; otherwise, autosize. -@@ -1697,11 +1696,13 @@ EXPORT_SYMBOL(tcp_tso_autosize); +@@ -1698,11 +1697,13 @@ EXPORT_SYMBOL(tcp_tso_autosize); static u32 tcp_tso_segs(struct sock *sk, unsigned int mss_now) { const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops; diff --git a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch index 2f2b8eb705..e6b098344c 100644 --- a/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.14/901-debloat_sock_diag.patch @@ -126,7 +126,7 @@ Signed-off-by: Felix Fietkau Support for PF_PACKET sockets monitoring interface used by the ss tool. --- a/net/unix/Kconfig +++ b/net/unix/Kconfig -@@ -22,6 +22,7 @@ config UNIX +@@ -27,6 +27,7 @@ config UNIX_SCM config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX diff --git a/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch index ab4858335d..a02a3f328f 100644 --- a/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-4.14/952-net-conntrack-events-support-multiple-registrant.patch @@ -120,7 +120,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2250,6 +2250,10 @@ int nf_conntrack_init_net(struct net *ne +@@ -2255,6 +2255,10 @@ int nf_conntrack_init_net(struct net *ne ret = nf_conntrack_proto_pernet_init(net); if (ret < 0) goto err_proto; @@ -294,7 +294,7 @@ Signed-off-by: Zhi Chen #include #include -@@ -621,14 +626,22 @@ static size_t ctnetlink_nlmsg_size(const +@@ -624,14 +629,22 @@ static size_t ctnetlink_nlmsg_size(const ; } @@ -317,7 +317,7 @@ Signed-off-by: Zhi Chen struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3337,9 +3350,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3340,9 +3353,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 0b74451331..fecdf3f147 100644 --- a/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-4.14/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -133,7 +133,7 @@ connections. */ --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -653,3 +653,26 @@ void br_port_flags_change(struct net_bri +@@ -668,3 +668,26 @@ void br_port_flags_change(struct net_bri if (mask & BR_AUTO_MASK) nbp_update_port_count(br); } diff --git a/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch index 1f2efd6e04..a03f3576d7 100644 --- a/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-4.14/998-usb-serial-option-add-u9300.patch @@ -10,7 +10,7 @@ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -386,6 +386,7 @@ static void option_instat_callback(struc +@@ -387,6 +387,7 @@ static void option_instat_callback(struc * Mobidata, etc sell under their own brand names. */ #define LONGCHEER_VENDOR_ID 0x1c9e @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -583,6 +584,16 @@ static void option_instat_callback(struc +@@ -584,6 +585,16 @@ static void option_instat_callback(struc /* Device needs ZLP */ #define ZLP BIT(17) @@ -35,7 +35,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -617,6 +628,8 @@ static const struct usb_device_id option +@@ -618,6 +629,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch index 25509ad9c0..e55f45478a 100644 --- a/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.19/901-debloat_sock_diag.patch @@ -126,7 +126,7 @@ Signed-off-by: Felix Fietkau Support for PF_PACKET sockets monitoring interface used by the ss tool. --- a/net/unix/Kconfig +++ b/net/unix/Kconfig -@@ -22,6 +22,7 @@ config UNIX +@@ -27,6 +27,7 @@ config UNIX_SCM config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX diff --git a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch index c0b811e4b8..b36760b172 100644 --- a/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-4.19/952-net-conntrack-events-support-multiple-registrant.patch @@ -120,7 +120,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2448,6 +2448,10 @@ int nf_conntrack_init_net(struct net *ne +@@ -2453,6 +2453,10 @@ int nf_conntrack_init_net(struct net *ne ret = nf_conntrack_proto_pernet_init(net); if (ret < 0) goto err_proto; @@ -294,7 +294,7 @@ Signed-off-by: Zhi Chen #include #include -@@ -678,14 +683,22 @@ static size_t ctnetlink_nlmsg_size(const +@@ -681,14 +686,22 @@ static size_t ctnetlink_nlmsg_size(const ; } @@ -317,7 +317,7 @@ Signed-off-by: Zhi Chen struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3482,9 +3495,15 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3485,9 +3498,15 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 3e2013bc01..84deb56275 100644 --- a/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-4.19/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -133,7 +133,7 @@ connections. */ --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -741,3 +741,26 @@ void br_port_flags_change(struct net_bri +@@ -756,3 +756,26 @@ void br_port_flags_change(struct net_bri if (mask & BR_NEIGH_SUPPRESS) br_recalculate_neigh_suppress_enabled(br); } diff --git a/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch b/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch index f0f301dd5c..6ed75e5ac1 100644 --- a/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch +++ b/target/linux/generic/hack-4.19/998-usb-serial-option-add-u9300.patch @@ -10,7 +10,7 @@ {QMI_QUIRK_SET_DTR(0x2c7c, 0x0195, 4)}, /* Quectel EG95 */ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -383,6 +383,7 @@ static void option_instat_callback(struc +@@ -384,6 +384,7 @@ static void option_instat_callback(struc * Mobidata, etc sell under their own brand names. */ #define LONGCHEER_VENDOR_ID 0x1c9e @@ -18,7 +18,7 @@ /* 4G Systems products */ /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * -@@ -580,6 +581,16 @@ static void option_instat_callback(struc +@@ -581,6 +582,16 @@ static void option_instat_callback(struc /* Device needs ZLP */ #define ZLP BIT(17) @@ -35,7 +35,7 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, -@@ -614,6 +625,8 @@ static const struct usb_device_id option +@@ -615,6 +626,8 @@ static const struct usb_device_id option { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) }, { USB_DEVICE(QUANTA_VENDOR_ID, 0xea42), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch index db048bc8ae..cbf82631ab 100644 --- a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch @@ -85,7 +85,7 @@ Signed-off-by: Felix Fietkau Support for PF_PACKET sockets monitoring interface used by the ss tool. --- a/net/unix/Kconfig +++ b/net/unix/Kconfig -@@ -22,6 +22,7 @@ config UNIX +@@ -27,6 +27,7 @@ config UNIX_SCM config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX diff --git a/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch b/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch index b576ad91b6..83c5d7fb36 100644 --- a/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch +++ b/target/linux/generic/hack-4.9/951-bridge-Add-new-bridge-APIs-needed-for-network-HW-acc.patch @@ -36,7 +36,7 @@ Signed-off-by: Murat Sezgin extern br_should_route_hook_t __rcu *br_should_route_hook; --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c -@@ -654,3 +654,28 @@ void br_port_flags_change(struct net_bri +@@ -669,3 +669,28 @@ void br_port_flags_change(struct net_bri if (mask & BR_AUTO_MASK) nbp_update_port_count(br); } diff --git a/target/linux/generic/hack-4.9/952-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-4.9/952-net-conntrack-events-support-multiple-registrant.patch index b3ba1cddec..fe9d7db26c 100644 --- a/target/linux/generic/hack-4.9/952-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-4.9/952-net-conntrack-events-support-multiple-registrant.patch @@ -115,7 +115,7 @@ Signed-off-by: Zhi Chen depends on NETFILTER_ADVANCED --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c -@@ -2078,6 +2078,10 @@ int nf_conntrack_init_net(struct net *ne +@@ -2083,6 +2083,10 @@ int nf_conntrack_init_net(struct net *ne ret = nf_conntrack_proto_pernet_init(net); if (ret < 0) goto err_proto; diff --git a/target/linux/generic/pending-4.14/205-backtrace_module_info.patch b/target/linux/generic/pending-4.14/205-backtrace_module_info.patch index 4040f91021..974dc4e29c 100644 --- a/target/linux/generic/pending-4.14/205-backtrace_module_info.patch +++ b/target/linux/generic/pending-4.14/205-backtrace_module_info.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/lib/vsprintf.c +++ b/lib/vsprintf.c -@@ -670,8 +670,10 @@ char *symbol_string(char *buf, char *end +@@ -696,8 +696,10 @@ char *symbol_string(char *buf, char *end struct printf_spec spec, const char *fmt) { unsigned long value; @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau #endif if (fmt[1] == 'R') -@@ -685,11 +687,16 @@ char *symbol_string(char *buf, char *end +@@ -711,11 +713,16 @@ char *symbol_string(char *buf, char *end sprint_symbol(sym, value); else sprint_symbol_no_offset(sym, value); diff --git a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch index dc41003f9d..16f77d33f4 100644 --- a/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.14/601-add-kernel-imq-support.patch @@ -1569,7 +1569,7 @@ extern struct kmem_cache *skbuff_head_cache; void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); -@@ -3876,8 +3895,12 @@ static inline void __nf_copy(struct sk_b +@@ -3885,8 +3904,12 @@ static inline void __nf_copy(struct sk_b dst->_nfct = src->_nfct; nf_conntrack_get(skb_nfct(src)); #endif diff --git a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index a79d88d992..0c24403576 100644 --- a/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4812,6 +4812,9 @@ static enum gro_result dev_gro_receive(s +@@ -4813,6 +4813,9 @@ static enum gro_result dev_gro_receive(s enum gro_result ret; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -6290,6 +6293,48 @@ static void __netdev_adjacent_dev_unlink +@@ -6298,6 +6301,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) -@@ -6328,6 +6373,7 @@ static int __netdev_upper_dev_link(struc +@@ -6336,6 +6381,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6405,6 +6451,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6413,6 +6459,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6969,6 +7016,7 @@ int dev_set_mac_address(struct net_devic +@@ -6977,6 +7024,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.14/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-4.14/690-net-add-support-for-threaded-NAPI-polling.patch index e9e28a88be..c5dfd88062 100644 --- a/target/linux/generic/pending-4.14/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-4.14/690-net-add-support-for-threaded-NAPI-polling.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau static int netif_rx_internal(struct sk_buff *skb); static int call_netdevice_notifiers_info(unsigned long val, -@@ -5247,6 +5248,11 @@ void __napi_schedule(struct napi_struct +@@ -5248,6 +5249,11 @@ void __napi_schedule(struct napi_struct { unsigned long flags; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); -@@ -5294,6 +5300,11 @@ EXPORT_SYMBOL(napi_schedule_prep); +@@ -5299,6 +5305,11 @@ EXPORT_SYMBOL(napi_schedule_prep); */ void __napi_schedule_irqoff(struct napi_struct *n) { @@ -108,10 +108,10 @@ Signed-off-by: Felix Fietkau + return; + } + - ____napi_schedule(this_cpu_ptr(&softnet_data), n); - } - EXPORT_SYMBOL(__napi_schedule_irqoff); -@@ -5531,6 +5542,82 @@ static enum hrtimer_restart napi_watchdo + if (!IS_ENABLED(CONFIG_PREEMPT_RT)) + ____napi_schedule(this_cpu_ptr(&softnet_data), n); + else +@@ -5539,6 +5550,82 @@ static enum hrtimer_restart napi_watchdo return HRTIMER_NORESTART; } @@ -194,7 +194,7 @@ Signed-off-by: Felix Fietkau void netif_napi_add(struct net_device *dev, struct napi_struct *napi, int (*poll)(struct napi_struct *, int), int weight) { -@@ -5549,6 +5636,7 @@ void netif_napi_add(struct net_device *d +@@ -5557,6 +5644,7 @@ void netif_napi_add(struct net_device *d #ifdef CONFIG_NETPOLL napi->poll_owner = -1; #endif @@ -202,7 +202,7 @@ Signed-off-by: Felix Fietkau set_bit(NAPI_STATE_SCHED, &napi->state); set_bit(NAPI_STATE_NPSVC, &napi->state); list_add_rcu(&napi->dev_list, &dev->napi_list); -@@ -5576,6 +5664,7 @@ EXPORT_SYMBOL(napi_disable); +@@ -5584,6 +5672,7 @@ EXPORT_SYMBOL(napi_disable); void netif_napi_del(struct napi_struct *napi) { might_sleep(); @@ -210,7 +210,7 @@ Signed-off-by: Felix Fietkau if (napi_hash_del(napi)) synchronize_net(); list_del_init(&napi->dev_list); -@@ -5589,49 +5678,19 @@ EXPORT_SYMBOL(netif_napi_del); +@@ -5597,49 +5686,19 @@ EXPORT_SYMBOL(netif_napi_del); static int napi_poll(struct napi_struct *n, struct list_head *repoll) { @@ -264,7 +264,7 @@ Signed-off-by: Felix Fietkau /* Some drivers may have called napi_schedule * prior to exhausting their budget. */ -@@ -8866,6 +8925,10 @@ static int __init net_dev_init(void) +@@ -8874,6 +8933,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } diff --git a/target/linux/generic/pending-4.19/205-backtrace_module_info.patch b/target/linux/generic/pending-4.19/205-backtrace_module_info.patch index 5671173d45..27f577d19e 100644 --- a/target/linux/generic/pending-4.19/205-backtrace_module_info.patch +++ b/target/linux/generic/pending-4.19/205-backtrace_module_info.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/lib/vsprintf.c +++ b/lib/vsprintf.c -@@ -681,8 +681,10 @@ char *symbol_string(char *buf, char *end +@@ -707,8 +707,10 @@ char *symbol_string(char *buf, char *end struct printf_spec spec, const char *fmt) { unsigned long value; @@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau #endif if (fmt[1] == 'R') -@@ -696,11 +698,16 @@ char *symbol_string(char *buf, char *end +@@ -722,11 +724,16 @@ char *symbol_string(char *buf, char *end sprint_symbol(sym, value); else sprint_symbol_no_offset(sym, value); diff --git a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch index c9587580c4..f1062b5894 100644 --- a/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch +++ b/target/linux/generic/pending-4.19/601-add-kernel-imq-support.patch @@ -1264,7 +1264,7 @@ extern struct kmem_cache *skbuff_head_cache; void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); -@@ -3940,8 +3959,12 @@ static inline void __nf_copy(struct sk_b +@@ -3949,8 +3968,12 @@ static inline void __nf_copy(struct sk_b dst->_nfct = src->_nfct; nf_conntrack_get(skb_nfct(src)); #endif diff --git a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index b79dad498b..c8a8b39d58 100644 --- a/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.19/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5471,6 +5471,9 @@ static enum gro_result dev_gro_receive(s +@@ -5472,6 +5472,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7130,6 +7133,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7138,6 +7141,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7180,6 +7225,7 @@ static int __netdev_upper_dev_link(struc +@@ -7188,6 +7233,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7272,6 +7318,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7280,6 +7326,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -7911,6 +7958,7 @@ int dev_set_mac_address(struct net_devic +@@ -7919,6 +7966,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch index 7604724439..ab0e4380c9 100644 --- a/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch +++ b/target/linux/generic/pending-4.19/690-net-add-support-for-threaded-NAPI-polling.patch @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau static int netif_rx_internal(struct sk_buff *skb); static int call_netdevice_notifiers_info(unsigned long val, -@@ -5901,6 +5902,11 @@ void __napi_schedule(struct napi_struct +@@ -5902,6 +5903,11 @@ void __napi_schedule(struct napi_struct { unsigned long flags; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau local_irq_save(flags); ____napi_schedule(this_cpu_ptr(&softnet_data), n); local_irq_restore(flags); -@@ -5948,6 +5954,11 @@ EXPORT_SYMBOL(napi_schedule_prep); +@@ -5953,6 +5959,11 @@ EXPORT_SYMBOL(napi_schedule_prep); */ void __napi_schedule_irqoff(struct napi_struct *n) { @@ -108,10 +108,10 @@ Signed-off-by: Felix Fietkau + return; + } + - ____napi_schedule(this_cpu_ptr(&softnet_data), n); - } - EXPORT_SYMBOL(__napi_schedule_irqoff); -@@ -6196,6 +6207,82 @@ static void init_gro_hash(struct napi_st + if (!IS_ENABLED(CONFIG_PREEMPT_RT)) + ____napi_schedule(this_cpu_ptr(&softnet_data), n); + else +@@ -6204,6 +6215,82 @@ static void init_gro_hash(struct napi_st napi->gro_bitmask = 0; } @@ -194,7 +194,7 @@ Signed-off-by: Felix Fietkau void netif_napi_add(struct net_device *dev, struct napi_struct *napi, int (*poll)(struct napi_struct *, int), int weight) { -@@ -6213,6 +6300,7 @@ void netif_napi_add(struct net_device *d +@@ -6221,6 +6308,7 @@ void netif_napi_add(struct net_device *d #ifdef CONFIG_NETPOLL napi->poll_owner = -1; #endif @@ -202,7 +202,7 @@ Signed-off-by: Felix Fietkau set_bit(NAPI_STATE_SCHED, &napi->state); set_bit(NAPI_STATE_NPSVC, &napi->state); list_add_rcu(&napi->dev_list, &dev->napi_list); -@@ -6253,6 +6341,7 @@ static void flush_gro_hash(struct napi_s +@@ -6261,6 +6349,7 @@ static void flush_gro_hash(struct napi_s void netif_napi_del(struct napi_struct *napi) { might_sleep(); @@ -210,7 +210,7 @@ Signed-off-by: Felix Fietkau if (napi_hash_del(napi)) synchronize_net(); list_del_init(&napi->dev_list); -@@ -6265,49 +6354,19 @@ EXPORT_SYMBOL(netif_napi_del); +@@ -6273,49 +6362,19 @@ EXPORT_SYMBOL(netif_napi_del); static int napi_poll(struct napi_struct *n, struct list_head *repoll) { @@ -264,7 +264,7 @@ Signed-off-by: Felix Fietkau /* Some drivers may have called napi_schedule * prior to exhausting their budget. */ -@@ -9911,6 +9970,10 @@ static int __init net_dev_init(void) +@@ -9919,6 +9978,10 @@ static int __init net_dev_init(void) sd->backlog.weight = weight_p; } diff --git a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch index c757aeeaad..d0eca7415b 100644 --- a/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/pending-4.19/810-pci_disable_common_quirks.patch @@ -25,7 +25,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -207,6 +207,7 @@ static void quirk_mmio_always_on(struct +@@ -208,6 +208,7 @@ static void quirk_mmio_always_on(struct DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); @@ -33,7 +33,7 @@ Signed-off-by: Gabor Juhos /* * The Mellanox Tavor device gives false positive parity errors. Mark this * device with a broken_parity_status to allow PCI scanning code to "skip" -@@ -3226,6 +3227,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I +@@ -3227,6 +3228,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65f9, quirk_intel_mc_errata); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x65fa, quirk_intel_mc_errata); @@ -42,7 +42,7 @@ Signed-off-by: Gabor Juhos /* * Ivytown NTB BAR sizes are misreported by the hardware due to an erratum. * To work around this, query the size it should be configured to by the -@@ -3251,6 +3254,8 @@ static void quirk_intel_ntb(struct pci_d +@@ -3252,6 +3255,8 @@ static void quirk_intel_ntb(struct pci_d DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e08, quirk_intel_ntb); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0e0d, quirk_intel_ntb); @@ -51,7 +51,7 @@ Signed-off-by: Gabor Juhos /* * Some BIOS implementations leave the Intel GPU interrupts enabled, even * though no one is handling them (e.g., if the i915 driver is never -@@ -3289,6 +3294,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN +@@ -3290,6 +3295,8 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IN DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x010a, disable_igfx_irq); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x0152, disable_igfx_irq); diff --git a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index ae66804e67..c92e04dd46 100644 --- a/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-4.9/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau if (!(skb->dev->features & NETIF_F_GRO)) goto normal; -@@ -5874,6 +5877,48 @@ static void __netdev_adjacent_dev_unlink +@@ -5881,6 +5884,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -93,7 +93,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) -@@ -5946,6 +5991,7 @@ static int __netdev_upper_dev_link(struc +@@ -5953,6 +5998,7 @@ static int __netdev_upper_dev_link(struc goto rollback_lower_mesh; } @@ -101,7 +101,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -6072,6 +6118,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -6079,6 +6125,7 @@ void netdev_upper_dev_unlink(struct net_ list_for_each_entry(i, &upper_dev->all_adj_list.upper, list) __netdev_adjacent_dev_unlink(dev, i->dev, i->ref_nr); @@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, dev, &changeupper_info.info); } -@@ -6675,6 +6722,7 @@ int dev_set_mac_address(struct net_devic +@@ -6682,6 +6729,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; diff --git a/target/linux/ipq40xx/patches-4.14/950-add-tx-hw802.11-encapusaltion-offloading-support.patch b/target/linux/ipq40xx/patches-4.14/950-add-tx-hw802.11-encapusaltion-offloading-support.patch index 4d5e579b11..370f8f97a6 100644 --- a/target/linux/ipq40xx/patches-4.14/950-add-tx-hw802.11-encapusaltion-offloading-support.patch +++ b/target/linux/ipq40xx/patches-4.14/950-add-tx-hw802.11-encapusaltion-offloading-support.patch @@ -258,7 +258,7 @@ /* Using vdev_id as queue number will make it very easy to do per-vif * tx queue locking. This shouldn't wrap due to interface combinations -@@ -8201,6 +8247,8 @@ int ath10k_mac_register(struct ath10k *a +@@ -8202,6 +8248,8 @@ int ath10k_mac_register(struct ath10k *a ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch index 18b07437a1..865d6c0bce 100644 --- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch @@ -580,7 +580,7 @@ Signed-off-by: Yangbo Lu void __kfree_skb(struct sk_buff *skb); #if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE) -@@ -3366,6 +3367,7 @@ static inline void skb_free_datagram_loc +@@ -3375,6 +3376,7 @@ static inline void skb_free_datagram_loc } int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); @@ -713,7 +713,7 @@ Signed-off-by: Yangbo Lu } #ifdef CONFIG_NET_INGRESS -@@ -6435,7 +6436,15 @@ static int __netdev_upper_dev_link(struc +@@ -6443,7 +6444,15 @@ static int __netdev_upper_dev_link(struc struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info) { @@ -730,7 +730,7 @@ Signed-off-by: Yangbo Lu int ret = 0; ASSERT_RTNL(); -@@ -6453,12 +6462,7 @@ static int __netdev_upper_dev_link(struc +@@ -6461,12 +6470,7 @@ static int __netdev_upper_dev_link(struc if (master && netdev_master_upper_dev_get(dev)) return -EBUSY; @@ -744,7 +744,7 @@ Signed-off-by: Yangbo Lu &changeupper_info.info); ret = notifier_to_errno(ret); if (ret) -@@ -6470,7 +6474,7 @@ static int __netdev_upper_dev_link(struc +@@ -6478,7 +6482,7 @@ static int __netdev_upper_dev_link(struc return ret; netdev_update_addr_mask(dev); @@ -753,7 +753,7 @@ Signed-off-by: Yangbo Lu &changeupper_info.info); ret = notifier_to_errno(ret); if (ret) -@@ -6534,21 +6538,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li +@@ -6542,21 +6546,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev) { @@ -784,7 +784,7 @@ Signed-off-by: Yangbo Lu &changeupper_info.info); } EXPORT_SYMBOL(netdev_upper_dev_unlink); -@@ -6564,11 +6572,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink); +@@ -6572,11 +6580,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink); void netdev_bonding_info_change(struct net_device *dev, struct netdev_bonding_info *bonding_info) { @@ -800,7 +800,7 @@ Signed-off-by: Yangbo Lu &info.info); } EXPORT_SYMBOL(netdev_bonding_info_change); -@@ -6694,11 +6704,13 @@ EXPORT_SYMBOL(dev_get_nest_level); +@@ -6702,11 +6712,13 @@ EXPORT_SYMBOL(dev_get_nest_level); void netdev_lower_state_changed(struct net_device *lower_dev, void *lower_state_info) { @@ -816,7 +816,7 @@ Signed-off-by: Yangbo Lu &changelowerstate_info.info); } EXPORT_SYMBOL(netdev_lower_state_changed); -@@ -6989,11 +7001,14 @@ void __dev_notify_flags(struct net_devic +@@ -6997,11 +7009,14 @@ void __dev_notify_flags(struct net_devic if (dev->flags & IFF_UP && (changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) { diff --git a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch index 51797cc6dd..d0e1be3253 100644 --- a/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/302-dts-support-layerscape.patch @@ -7318,7 +7318,7 @@ Signed-off-by: Zhao Qiang }; dspi: dspi@2100000 { -@@ -574,15 +494,126 @@ +@@ -573,15 +493,126 @@ #interrupt-cells = <2>; }; @@ -7447,7 +7447,7 @@ Signed-off-by: Zhao Qiang }; i2c1: i2c@2010000 { -@@ -593,7 +624,7 @@ +@@ -592,7 +623,7 @@ reg = <0x0 0x2010000 0x0 0x10000>; interrupts = <0 34 0x4>; /* Level high type */ clock-names = "i2c"; @@ -7456,7 +7456,7 @@ Signed-off-by: Zhao Qiang }; i2c2: i2c@2020000 { -@@ -604,7 +635,7 @@ +@@ -603,7 +634,7 @@ reg = <0x0 0x2020000 0x0 0x10000>; interrupts = <0 35 0x4>; /* Level high type */ clock-names = "i2c"; @@ -7465,7 +7465,7 @@ Signed-off-by: Zhao Qiang }; i2c3: i2c@2030000 { -@@ -615,7 +646,7 @@ +@@ -614,7 +645,7 @@ reg = <0x0 0x2030000 0x0 0x10000>; interrupts = <0 35 0x4>; /* Level high type */ clock-names = "i2c"; @@ -7474,7 +7474,7 @@ Signed-off-by: Zhao Qiang }; ifc: ifc@2240000 { -@@ -648,8 +679,8 @@ +@@ -647,8 +678,8 @@ compatible = "fsl,ls2080a-pcie", "fsl,ls2085a-pcie", "snps,dw-pcie"; reg-names = "regs", "config"; @@ -7485,7 +7485,7 @@ Signed-off-by: Zhao Qiang #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -657,20 +688,22 @@ +@@ -656,20 +687,22 @@ num-lanes = <4>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -7510,7 +7510,7 @@ Signed-off-by: Zhao Qiang #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -678,20 +711,22 @@ +@@ -677,20 +710,22 @@ num-lanes = <4>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -7535,7 +7535,7 @@ Signed-off-by: Zhao Qiang #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -699,20 +734,22 @@ +@@ -698,20 +733,22 @@ num-lanes = <8>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -7560,7 +7560,7 @@ Signed-off-by: Zhao Qiang #address-cells = <3>; #size-cells = <2>; device_type = "pci"; -@@ -720,12 +757,14 @@ +@@ -719,12 +756,14 @@ num-lanes = <4>; bus-range = <0x0 0xff>; msi-parent = <&its>; @@ -7575,7 +7575,7 @@ Signed-off-by: Zhao Qiang }; sata0: sata@3200000 { -@@ -754,6 +793,8 @@ +@@ -753,6 +792,8 @@ dr_mode = "host"; snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; @@ -7584,7 +7584,7 @@ Signed-off-by: Zhao Qiang }; usb1: usb3@3110000 { -@@ -764,6 +805,14 @@ +@@ -763,6 +804,14 @@ dr_mode = "host"; snps,quirk-frame-length-adjustment = <0x20>; snps,dis_rxdet_inp3_quirk; @@ -7599,7 +7599,7 @@ Signed-off-by: Zhao Qiang }; ccn@4000000 { -@@ -771,6 +820,14 @@ +@@ -770,6 +819,14 @@ reg = <0x0 0x04000000 0x0 0x01000000>; interrupts = <0 12 4>; }; @@ -7614,7 +7614,7 @@ Signed-off-by: Zhao Qiang }; ddr1: memory-controller@1080000 { -@@ -786,4 +843,44 @@ +@@ -785,4 +842,44 @@ interrupts = <0 18 0x4>; little-endian; }; diff --git a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch index 270cd93998..43e680c543 100644 --- a/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/807-usb-support-layerscape.patch @@ -1289,7 +1289,7 @@ Signed-off-by: Zhao Chenhui xhci->quirks |= XHCI_BROKEN_PORT_PED; --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -1983,10 +1983,12 @@ static int finish_td(struct xhci_hcd *xh +@@ -2016,10 +2016,12 @@ static int finish_td(struct xhci_hcd *xh union xhci_trb *ep_trb, struct xhci_transfer_event *event, struct xhci_virt_ep *ep, int *status) { @@ -1302,7 +1302,7 @@ Signed-off-by: Zhao Chenhui u32 trb_comp_code; int ep_index; -@@ -2009,14 +2011,30 @@ static int finish_td(struct xhci_hcd *xh +@@ -2042,14 +2044,30 @@ static int finish_td(struct xhci_hcd *xh if (trb_comp_code == COMP_STALL_ERROR || xhci_requires_manual_halt_cleanup(xhci, ep_ctx, trb_comp_code)) { @@ -1387,7 +1387,7 @@ Signed-off-by: Zhao Chenhui spin_unlock_irqrestore(&xhci->lock, flags); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1794,7 +1794,7 @@ struct xhci_hcd { +@@ -1795,7 +1795,7 @@ struct xhci_hcd { #define XHCI_STATE_DYING (1 << 0) #define XHCI_STATE_HALTED (1 << 1) #define XHCI_STATE_REMOVING (1 << 2) @@ -1396,7 +1396,7 @@ Signed-off-by: Zhao Chenhui #define XHCI_LINK_TRB_QUIRK BIT_ULL(0) #define XHCI_RESET_EP_QUIRK BIT_ULL(1) #define XHCI_NEC_HOST BIT_ULL(2) -@@ -1830,6 +1830,9 @@ struct xhci_hcd { +@@ -1831,6 +1831,9 @@ struct xhci_hcd { #define XHCI_SSIC_PORT_UNUSED BIT_ULL(22) #define XHCI_NO_64BIT_SUPPORT BIT_ULL(23) #define XHCI_MISSING_CAS BIT_ULL(24) @@ -1406,7 +1406,7 @@ Signed-off-by: Zhao Chenhui /* For controller with a broken Port Disable implementation */ #define XHCI_BROKEN_PORT_PED BIT_ULL(25) #define XHCI_LIMIT_ENDPOINT_INTERVAL_7 BIT_ULL(26) -@@ -1838,8 +1841,9 @@ struct xhci_hcd { +@@ -1839,8 +1842,9 @@ struct xhci_hcd { #define XHCI_HW_LPM_DISABLE BIT_ULL(29) #define XHCI_SUSPEND_DELAY BIT_ULL(30) #define XHCI_INTEL_USB_ROLE_SW BIT_ULL(31) diff --git a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch index b89916b55d..583ca11751 100644 --- a/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/819-sdhc-support-layerscape.patch @@ -497,7 +497,7 @@ Signed-off-by: Yinbo Zhu .name = "sdhci-esdhc", --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c -@@ -2148,7 +2148,7 @@ static void sdhci_send_tuning(struct sdh +@@ -2152,7 +2152,7 @@ static void sdhci_send_tuning(struct sdh } @@ -506,7 +506,7 @@ Signed-off-by: Yinbo Zhu { int i; -@@ -2165,13 +2165,13 @@ static void __sdhci_execute_tuning(struc +@@ -2169,13 +2169,13 @@ static void __sdhci_execute_tuning(struc pr_debug("%s: Tuning timeout, falling back to fixed sampling clock\n", mmc_hostname(host->mmc)); sdhci_abort_tuning(host, opcode); @@ -522,7 +522,7 @@ Signed-off-by: Yinbo Zhu break; } -@@ -2183,6 +2183,7 @@ static void __sdhci_execute_tuning(struc +@@ -2187,6 +2187,7 @@ static void __sdhci_execute_tuning(struc pr_info("%s: Tuning failed, falling back to fixed sampling clock\n", mmc_hostname(host->mmc)); sdhci_reset_tuning(host); @@ -530,7 +530,7 @@ Signed-off-by: Yinbo Zhu } int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) -@@ -2244,7 +2245,7 @@ int sdhci_execute_tuning(struct mmc_host +@@ -2248,7 +2249,7 @@ int sdhci_execute_tuning(struct mmc_host sdhci_start_tuning(host); @@ -541,7 +541,7 @@ Signed-off-by: Yinbo Zhu out: --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h -@@ -545,6 +545,7 @@ struct sdhci_host { +@@ -546,6 +546,7 @@ struct sdhci_host { unsigned int tuning_count; /* Timer count for re-tuning */ unsigned int tuning_mode; /* Re-tuning mode supported by host */ diff --git a/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch b/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch index f8d893ceeb..0781704d9b 100644 --- a/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/822-uart-support-layerscape.patch @@ -22,7 +22,7 @@ Signed-off-by: Biwen Li struct lpuart_port { struct uart_port port; struct clk *clk; -@@ -2153,13 +2155,13 @@ static int lpuart_probe(struct platform_ +@@ -2156,13 +2158,13 @@ static int lpuart_probe(struct platform_ ret = of_alias_get_id(np, "serial"); if (ret < 0) { @@ -42,7 +42,7 @@ Signed-off-by: Biwen Li sport->port.line = ret; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); sport->port.membase = devm_ioremap_resource(&pdev->dev, res); -@@ -2250,6 +2252,7 @@ static int lpuart_remove(struct platform +@@ -2253,6 +2255,7 @@ static int lpuart_remove(struct platform struct lpuart_port *sport = platform_get_drvdata(pdev); uart_remove_one_port(&lpuart_reg, &sport->port); diff --git a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch index 84ffc5f271..884c5008d5 100644 --- a/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch +++ b/target/linux/mediatek/patches-4.14/0191-usb-xhci-allow-imod-interval-to-be-configurable.patch @@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman /* Set the HCD state before we enable the irqs */ --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1730,6 +1730,8 @@ struct xhci_hcd { +@@ -1731,6 +1731,8 @@ struct xhci_hcd { u8 max_interrupters; u8 max_ports; u8 isoc_threshold; diff --git a/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch index bdba3c8d82..d95f1dde65 100644 --- a/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-4.19/0900-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2667,6 +2667,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2680,6 +2680,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch index beea6a55ba..aa5bfe7d06 100644 --- a/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch +++ b/target/linux/mvebu/patches-4.14/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch @@ -57,7 +57,7 @@ Signed-off-by: Thomas Petazzoni #define PCIE_CORE_LINK_CTRL_STAT_REG 0xd0 #define PCIE_CORE_LINK_L0S_ENTRY BIT(0) #define PCIE_CORE_LINK_TRAINING BIT(5) -@@ -297,7 +299,8 @@ static void advk_pcie_setup_hw(struct ad +@@ -298,7 +300,8 @@ static void advk_pcie_setup_hw(struct ad /* Set PCIe Device Control and Status 1 PF0 register */ reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE | @@ -67,7 +67,7 @@ Signed-off-by: Thomas Petazzoni PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE | (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ << PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT); -@@ -882,6 +885,58 @@ out_release_res: +@@ -913,6 +916,58 @@ out_release_res: return err; } @@ -126,7 +126,7 @@ Signed-off-by: Thomas Petazzoni static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -956,6 +1011,9 @@ static int advk_pcie_probe(struct platfo +@@ -987,6 +1042,9 @@ static int advk_pcie_probe(struct platfo list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); diff --git a/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch b/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch index fb57f4112a..d9ebf2e498 100644 --- a/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch +++ b/target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch @@ -14,7 +14,7 @@ Signed-off-by: Tomasz Maciej Nowak --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c -@@ -272,6 +272,8 @@ static void advk_pcie_set_ob_win(struct +@@ -273,6 +273,8 @@ static void advk_pcie_set_ob_win(struct static void advk_pcie_setup_hw(struct advk_pcie *pcie) { @@ -23,7 +23,7 @@ Signed-off-by: Tomasz Maciej Nowak u32 reg; int i; -@@ -311,10 +313,15 @@ static void advk_pcie_setup_hw(struct ad +@@ -312,10 +314,15 @@ static void advk_pcie_setup_hw(struct ad PCIE_CORE_CTRL2_TD_ENABLE; advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG); diff --git a/target/linux/mvebu/patches-4.19/523-Revert-PCI-aardvark-Convert-to-use-pci_host_probe.patch b/target/linux/mvebu/patches-4.19/523-Revert-PCI-aardvark-Convert-to-use-pci_host_probe.patch index 4cadd791ea..60bd76d296 100644 --- a/target/linux/mvebu/patches-4.19/523-Revert-PCI-aardvark-Convert-to-use-pci_host_probe.patch +++ b/target/linux/mvebu/patches-4.19/523-Revert-PCI-aardvark-Convert-to-use-pci_host_probe.patch @@ -10,7 +10,7 @@ This reverts commit c8e144f8ab00e6c4a070a932ef9c57db09aa41cf. --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c -@@ -839,6 +839,7 @@ static int advk_pcie_probe(struct platfo +@@ -870,6 +870,7 @@ static int advk_pcie_probe(struct platfo struct device *dev = &pdev->dev; struct advk_pcie *pcie; struct resource *res; @@ -18,7 +18,7 @@ This reverts commit c8e144f8ab00e6c4a070a932ef9c57db09aa41cf. struct pci_host_bridge *bridge; int ret, irq; -@@ -892,13 +893,22 @@ static int advk_pcie_probe(struct platfo +@@ -923,13 +924,22 @@ static int advk_pcie_probe(struct platfo bridge->map_irq = of_irq_parse_and_map_pci; bridge->swizzle_irq = pci_common_swizzle; diff --git a/target/linux/mvebu/patches-4.19/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch b/target/linux/mvebu/patches-4.19/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch index af221499a8..8056a284e6 100644 --- a/target/linux/mvebu/patches-4.19/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch +++ b/target/linux/mvebu/patches-4.19/524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch @@ -57,7 +57,7 @@ Signed-off-by: Thomas Petazzoni #define PCIE_CORE_LINK_CTRL_STAT_REG 0xd0 #define PCIE_CORE_LINK_L0S_ENTRY BIT(0) #define PCIE_CORE_LINK_TRAINING BIT(5) -@@ -253,7 +255,8 @@ static void advk_pcie_setup_hw(struct ad +@@ -254,7 +256,8 @@ static void advk_pcie_setup_hw(struct ad /* Set PCIe Device Control and Status 1 PF0 register */ reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE | @@ -67,7 +67,7 @@ Signed-off-by: Thomas Petazzoni PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE | (PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SZ << PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT); -@@ -834,6 +837,58 @@ out_release_res: +@@ -865,6 +868,58 @@ out_release_res: return err; } @@ -126,7 +126,7 @@ Signed-off-by: Thomas Petazzoni static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -908,6 +963,9 @@ static int advk_pcie_probe(struct platfo +@@ -939,6 +994,9 @@ static int advk_pcie_probe(struct platfo list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); diff --git a/target/linux/mvebu/patches-4.19/527-PCI-aardvark-allow-to-specify-link-capability.patch b/target/linux/mvebu/patches-4.19/527-PCI-aardvark-allow-to-specify-link-capability.patch index 0ac3476147..aba142881b 100644 --- a/target/linux/mvebu/patches-4.19/527-PCI-aardvark-allow-to-specify-link-capability.patch +++ b/target/linux/mvebu/patches-4.19/527-PCI-aardvark-allow-to-specify-link-capability.patch @@ -14,7 +14,7 @@ Signed-off-by: Tomasz Maciej Nowak --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c -@@ -233,6 +233,8 @@ static int advk_pcie_wait_for_link(struc +@@ -234,6 +234,8 @@ static int advk_pcie_wait_for_link(struc static void advk_pcie_setup_hw(struct advk_pcie *pcie) { @@ -23,7 +23,7 @@ Signed-off-by: Tomasz Maciej Nowak u32 reg; /* Set to Direct mode */ -@@ -267,10 +269,15 @@ static void advk_pcie_setup_hw(struct ad +@@ -268,10 +270,15 @@ static void advk_pcie_setup_hw(struct ad PCIE_CORE_CTRL2_TD_ENABLE; advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG); diff --git a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch index 77ec3f111c..7304936b6c 100644 --- a/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch +++ b/target/linux/ramips/patches-4.14/0031-uvc-add-iPassion-iP2970-support.patch @@ -64,7 +64,7 @@ Signed-off-by: John Crispin #include -@@ -1101,9 +1106,149 @@ static void uvc_video_decode_data(struct +@@ -1128,9 +1133,149 @@ static void uvc_video_decode_data(struct } } @@ -214,7 +214,7 @@ Signed-off-by: John Crispin /* Mark the buffer as done if the EOF marker is set. */ if (data[1] & UVC_STREAM_EOF && buf->bytesused != 0) { uvc_trace(UVC_TRACE_FRAME, "Frame complete (EOF found).\n"); -@@ -1518,6 +1663,8 @@ static int uvc_init_video_isoc(struct uv +@@ -1545,6 +1690,8 @@ static int uvc_init_video_isoc(struct uv if (npackets == 0) return -ENOMEM; From 5b8b1cc3d51e51129ad3be1ea6df8eaae2759db2 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 8 Aug 2021 12:09:53 +0800 Subject: [PATCH 12/29] keyring: switch to ImmortalWrt Team --- package/system/openwrt-keyring/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile index d394eef422..672709db45 100644 --- a/package/system/openwrt-keyring/Makefile +++ b/package/system/openwrt-keyring/Makefile @@ -6,10 +6,10 @@ PKG_NAME:=openwrt-keyring PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=$(PROJECT_GIT)/keyring.git -PKG_SOURCE_DATE:=2018-05-18 -PKG_SOURCE_VERSION:=103a32e9f52fd35a428dc08ddbca86fe41dfb918 -PKG_MIRROR_HASH:=58f42796396fee0e4f008d6f5a970a421d023d6c98e71bf53c2778734fa3480b +PKG_SOURCE_URL=https://github.com/immortalwrt/keyring.git +PKG_MIRROR_HASH:=c8600265b922462431c8f87a8cf3cd12f3e55b3c54078bb15bad9a8f41be2424 +PKG_SOURCE_DATE:=2021-08-06 +PKG_SOURCE_VERSION:=746fa1a0c45bd82d9bf25d5334933a2e454fdeeb PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 @@ -20,7 +20,7 @@ define Package/openwrt-keyring SECTION:=base CATEGORY:=Base system PROVIDES:=lede-keyring - TITLE:=OpenWrt Developer Keyring + TITLE:=ImmortalWrt Developer Keyring URL:=https://openwrt.org/docs/guide-user/security/signatures endef From 01d065377196f267c014db726114be6c1b5bffeb Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sun, 8 Aug 2021 17:08:29 +0800 Subject: [PATCH 13/29] openwrt-keyring: limit usign keys Signed-off-by: Tianling Shen --- package/system/openwrt-keyring/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/system/openwrt-keyring/Makefile b/package/system/openwrt-keyring/Makefile index 672709db45..9a27df20a3 100644 --- a/package/system/openwrt-keyring/Makefile +++ b/package/system/openwrt-keyring/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwrt-keyring -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=https://github.com/immortalwrt/keyring.git @@ -31,8 +31,12 @@ endef Build/Compile= define Package/openwrt-keyring/install - $(INSTALL_DIR) $(1)/etc/opkg/keys/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/* $(1)/etc/opkg/keys/ + # Public usign key for OPDE + $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/66ceb3e8f7432fed $(1)/etc/opkg/keys/ + # Public usign key for unattended snapshot builds + $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/b5043e70f9a75cde $(1)/etc/opkg/keys/ + # Public usign key for 18.06 release builds + $(INSTALL_DATA) $(PKG_BUILD_DIR)/usign/1035ac73cc4e59e3 $(1)/etc/opkg/keys/ endef $(eval $(call BuildPackage,openwrt-keyring)) From e5dfc23cfa97f77ec86de5ea6d577f395dc34fd8 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Thu, 29 Jul 2021 12:20:16 +0800 Subject: [PATCH 14/29] r8168: update to 8.049.01 (cherry picked from commit bd7988e68e3ad3183f3f047f861f5d62e706450b) --- package/kernel/r8168/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/kernel/r8168/Makefile b/package/kernel/r8168/Makefile index 5185490e81..3a3162651d 100644 --- a/package/kernel/r8168/Makefile +++ b/package/kernel/r8168/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8168 -PKG_VERSION:=8.048.03 -PKG_RELEASE:=3 +PKG_VERSION:=8.049.01 +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/BROBIRD/openwrt-r8168.git -PKG_SOURCE_VERSION:=93718d4ae69097a14a9e93ea8765f7767e2ddd9e -PKG_MIRROR_HASH:=d5cfe3184d84de5a686720c9855c295ab1cd1423777f70c5488eb7aa588a52e9 +PKG_SOURCE_VERSION:=66fdc44a1f69c4fda18e6f922a234cbaa933ede6 +PKG_MIRROR_HASH:=a480cf9c70bbc3ee5d9b967e5006ff4fc9bba2bf38638fb2b7567f10b6f41bf3 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) From 19271d7813faa59df05a811d5cfc4a40ae0f6e4c Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 28 Jul 2021 12:33:09 +0100 Subject: [PATCH 15/29] toolchain/gcc: bump gcc 11 to 11.2 Patches automatically refreshed. Signed-off-by: Rui Salvaterra --- toolchain/gcc/Config.version | 2 +- toolchain/gcc/common.mk | 4 ++-- .../gcc/patches/{11.1.0 => 11.2.0}/002-case_insensitive.patch | 0 .../gcc/patches/{11.1.0 => 11.2.0}/010-documentation.patch | 0 .../patches/{11.1.0 => 11.2.0}/110-Fix-MIPS-PR-84790.patch | 0 .../gcc/patches/{11.1.0 => 11.2.0}/230-musl_libssp.patch | 0 .../{11.1.0 => 11.2.0}/300-mips_Os_cpu_rtx_cost_model.patch | 0 .../patches/{11.1.0 => 11.2.0}/810-arm-softfloat-libgcc.patch | 0 toolchain/gcc/patches/{11.1.0 => 11.2.0}/820-libgcc_pic.patch | 0 .../{11.1.0 => 11.2.0}/840-armv4_pass_fix-v4bx_to_ld.patch | 0 .../patches/{11.1.0 => 11.2.0}/850-use_shared_libgcc.patch | 0 .../gcc/patches/{11.1.0 => 11.2.0}/851-libgcc_no_compat.patch | 0 .../gcc/patches/{11.1.0 => 11.2.0}/870-ppc_no_crtsavres.patch | 0 .../gcc/patches/{11.1.0 => 11.2.0}/881-no_tm_section.patch | 0 .../gcc/patches/{11.1.0 => 11.2.0}/900-bad-mips16-crt.patch | 0 toolchain/gcc/patches/{11.1.0 => 11.2.0}/910-mbsd_multi.patch | 2 +- .../{11.1.0 => 11.2.0}/920-specs_nonfatal_getenv.patch | 2 +- .../patches/{11.1.0 => 11.2.0}/930-fix-mips-noexecstack.patch | 0 .../931-libffi-fix-MIPS-softfloat-build-issue.patch | 0 ...0-gotools-fix-compilation-when-making-cross-compiler.patch | 0 20 files changed, 5 insertions(+), 5 deletions(-) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/002-case_insensitive.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/010-documentation.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/110-Fix-MIPS-PR-84790.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/230-musl_libssp.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/300-mips_Os_cpu_rtx_cost_model.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/810-arm-softfloat-libgcc.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/820-libgcc_pic.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/840-armv4_pass_fix-v4bx_to_ld.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/850-use_shared_libgcc.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/851-libgcc_no_compat.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/870-ppc_no_crtsavres.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/881-no_tm_section.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/900-bad-mips16-crt.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/910-mbsd_multi.patch (98%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/920-specs_nonfatal_getenv.patch (90%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/930-fix-mips-noexecstack.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/931-libffi-fix-MIPS-softfloat-build-issue.patch (100%) rename toolchain/gcc/patches/{11.1.0 => 11.2.0}/960-gotools-fix-compilation-when-making-cross-compiler.patch (100%) diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index e8cc3215be..dd61d1e210 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -19,7 +19,7 @@ config GCC_VERSION default "7.5.0" if GCC_VERSION_7 default "9.3.0" if GCC_VERSION_9 default "10.3.0" if GCC_VERSION_10 - default "11.1.0" if GCC_VERSION_11 + default "11.2.0" if GCC_VERSION_11 default "8.4.0" config GCC_USE_IREMAP diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 36849de007..76c5fc114a 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -44,8 +44,8 @@ ifeq ($(PKG_VERSION),10.3.0) PKG_HASH:=64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344 endif -ifeq ($(PKG_VERSION),11.1.0) - PKG_HASH:=4c4a6fb8a8396059241c2e674b85b351c26a5d678274007f076957afa1cc9ddf +ifeq ($(PKG_VERSION),11.2.0) + PKG_HASH:=d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b endif PATCH_DIR=../patches/$(GCC_VERSION) diff --git a/toolchain/gcc/patches/11.1.0/002-case_insensitive.patch b/toolchain/gcc/patches/11.2.0/002-case_insensitive.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/002-case_insensitive.patch rename to toolchain/gcc/patches/11.2.0/002-case_insensitive.patch diff --git a/toolchain/gcc/patches/11.1.0/010-documentation.patch b/toolchain/gcc/patches/11.2.0/010-documentation.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/010-documentation.patch rename to toolchain/gcc/patches/11.2.0/010-documentation.patch diff --git a/toolchain/gcc/patches/11.1.0/110-Fix-MIPS-PR-84790.patch b/toolchain/gcc/patches/11.2.0/110-Fix-MIPS-PR-84790.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/110-Fix-MIPS-PR-84790.patch rename to toolchain/gcc/patches/11.2.0/110-Fix-MIPS-PR-84790.patch diff --git a/toolchain/gcc/patches/11.1.0/230-musl_libssp.patch b/toolchain/gcc/patches/11.2.0/230-musl_libssp.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/230-musl_libssp.patch rename to toolchain/gcc/patches/11.2.0/230-musl_libssp.patch diff --git a/toolchain/gcc/patches/11.1.0/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches/11.2.0/300-mips_Os_cpu_rtx_cost_model.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/300-mips_Os_cpu_rtx_cost_model.patch rename to toolchain/gcc/patches/11.2.0/300-mips_Os_cpu_rtx_cost_model.patch diff --git a/toolchain/gcc/patches/11.1.0/810-arm-softfloat-libgcc.patch b/toolchain/gcc/patches/11.2.0/810-arm-softfloat-libgcc.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/810-arm-softfloat-libgcc.patch rename to toolchain/gcc/patches/11.2.0/810-arm-softfloat-libgcc.patch diff --git a/toolchain/gcc/patches/11.1.0/820-libgcc_pic.patch b/toolchain/gcc/patches/11.2.0/820-libgcc_pic.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/820-libgcc_pic.patch rename to toolchain/gcc/patches/11.2.0/820-libgcc_pic.patch diff --git a/toolchain/gcc/patches/11.1.0/840-armv4_pass_fix-v4bx_to_ld.patch b/toolchain/gcc/patches/11.2.0/840-armv4_pass_fix-v4bx_to_ld.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/840-armv4_pass_fix-v4bx_to_ld.patch rename to toolchain/gcc/patches/11.2.0/840-armv4_pass_fix-v4bx_to_ld.patch diff --git a/toolchain/gcc/patches/11.1.0/850-use_shared_libgcc.patch b/toolchain/gcc/patches/11.2.0/850-use_shared_libgcc.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/850-use_shared_libgcc.patch rename to toolchain/gcc/patches/11.2.0/850-use_shared_libgcc.patch diff --git a/toolchain/gcc/patches/11.1.0/851-libgcc_no_compat.patch b/toolchain/gcc/patches/11.2.0/851-libgcc_no_compat.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/851-libgcc_no_compat.patch rename to toolchain/gcc/patches/11.2.0/851-libgcc_no_compat.patch diff --git a/toolchain/gcc/patches/11.1.0/870-ppc_no_crtsavres.patch b/toolchain/gcc/patches/11.2.0/870-ppc_no_crtsavres.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/870-ppc_no_crtsavres.patch rename to toolchain/gcc/patches/11.2.0/870-ppc_no_crtsavres.patch diff --git a/toolchain/gcc/patches/11.1.0/881-no_tm_section.patch b/toolchain/gcc/patches/11.2.0/881-no_tm_section.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/881-no_tm_section.patch rename to toolchain/gcc/patches/11.2.0/881-no_tm_section.patch diff --git a/toolchain/gcc/patches/11.1.0/900-bad-mips16-crt.patch b/toolchain/gcc/patches/11.2.0/900-bad-mips16-crt.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/900-bad-mips16-crt.patch rename to toolchain/gcc/patches/11.2.0/900-bad-mips16-crt.patch diff --git a/toolchain/gcc/patches/11.1.0/910-mbsd_multi.patch b/toolchain/gcc/patches/11.2.0/910-mbsd_multi.patch similarity index 98% rename from toolchain/gcc/patches/11.1.0/910-mbsd_multi.patch rename to toolchain/gcc/patches/11.2.0/910-mbsd_multi.patch index b167436752..9f9d3226e8 100644 --- a/toolchain/gcc/patches/11.1.0/910-mbsd_multi.patch +++ b/toolchain/gcc/patches/11.2.0/910-mbsd_multi.patch @@ -114,7 +114,7 @@ Date: Tue Jul 31 00:52:27 2007 +0000 ; On SVR4 targets, it also controls whether or not to emit a --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi -@@ -9054,6 +9054,17 @@ This option is only supported for C and +@@ -9055,6 +9055,17 @@ This option is only supported for C and @option{-Wall} and by @option{-Wpedantic}, which can be disabled with @option{-Wno-pointer-sign}. diff --git a/toolchain/gcc/patches/11.1.0/920-specs_nonfatal_getenv.patch b/toolchain/gcc/patches/11.2.0/920-specs_nonfatal_getenv.patch similarity index 90% rename from toolchain/gcc/patches/11.1.0/920-specs_nonfatal_getenv.patch rename to toolchain/gcc/patches/11.2.0/920-specs_nonfatal_getenv.patch index edbef09c6c..dda33c0202 100644 --- a/toolchain/gcc/patches/11.1.0/920-specs_nonfatal_getenv.patch +++ b/toolchain/gcc/patches/11.2.0/920-specs_nonfatal_getenv.patch @@ -7,7 +7,7 @@ Date: Sat Apr 21 03:02:39 2012 +0000 --- a/gcc/gcc.c +++ b/gcc/gcc.c -@@ -10090,8 +10090,10 @@ getenv_spec_function (int argc, const ch +@@ -10100,8 +10100,10 @@ getenv_spec_function (int argc, const ch } if (!value) diff --git a/toolchain/gcc/patches/11.1.0/930-fix-mips-noexecstack.patch b/toolchain/gcc/patches/11.2.0/930-fix-mips-noexecstack.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/930-fix-mips-noexecstack.patch rename to toolchain/gcc/patches/11.2.0/930-fix-mips-noexecstack.patch diff --git a/toolchain/gcc/patches/11.1.0/931-libffi-fix-MIPS-softfloat-build-issue.patch b/toolchain/gcc/patches/11.2.0/931-libffi-fix-MIPS-softfloat-build-issue.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/931-libffi-fix-MIPS-softfloat-build-issue.patch rename to toolchain/gcc/patches/11.2.0/931-libffi-fix-MIPS-softfloat-build-issue.patch diff --git a/toolchain/gcc/patches/11.1.0/960-gotools-fix-compilation-when-making-cross-compiler.patch b/toolchain/gcc/patches/11.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch similarity index 100% rename from toolchain/gcc/patches/11.1.0/960-gotools-fix-compilation-when-making-cross-compiler.patch rename to toolchain/gcc/patches/11.2.0/960-gotools-fix-compilation-when-making-cross-compiler.patch From 5e9122e3c78bd7d00ba1561fc12da0c3813f9b82 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Tue, 27 Jul 2021 20:13:40 +0200 Subject: [PATCH 16/29] iproute2: bump to 5.13 Drop patch 185-libbpf-add-limits-h merged upstream Update patch 170-ip_tiny Update patch 130-no_netem_tpic_dcb... Signed-off-by: Ansuel Smith --- package/network/utils/iproute2/Makefile | 6 +-- ...h => 130-no_netem_tipc_dcb_man_vdpa.patch} | 2 +- .../utils/iproute2/patches/170-ip_tiny.patch | 17 +++---- .../patches/185-libbpf-add-limits-h.patch | 45 ------------------- 4 files changed, 13 insertions(+), 57 deletions(-) rename package/network/utils/iproute2/patches/{130-no_netem_tipc_dcb_man.patch => 130-no_netem_tipc_dcb_man_vdpa.patch} (97%) delete mode 100644 package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 65a133c027..cb590c4ef7 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=5.11.0 -PKG_RELEASE:=4 +PKG_VERSION:=5.13.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=c5e2ea108212b3445051b35953ec267f9f3469e1d5c67ac034ab559849505c54 +PKG_HASH:=72a2e53774cac9e65f7b617deebb2059f87e8960d6e9713e4d788cea966f1b36 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man.patch b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch similarity index 97% rename from package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man.patch rename to package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch index e3faee0d8f..8ddb316744 100644 --- a/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man.patch +++ b/package/network/utils/iproute2/patches/130-no_netem_tipc_dcb_man_vdpa.patch @@ -4,7 +4,7 @@ CFLAGS := $(WFLAGS) $(CCOPTS) -I../include -I../include/uapi $(DEFINES) $(CFLAGS) YACCFLAGS = -d -t -v --SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man +-SUBDIRS=lib ip tc bridge misc netem genl tipc devlink rdma dcb man vdpa +SUBDIRS=lib ip tc bridge misc genl devlink rdma LIBNETLINK=../lib/libutil.a ../lib/libnetlink.a diff --git a/package/network/utils/iproute2/patches/170-ip_tiny.patch b/package/network/utils/iproute2/patches/170-ip_tiny.patch index d5e5b36936..a0dde748c7 100644 --- a/package/network/utils/iproute2/patches/170-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/170-ip_tiny.patch @@ -25,19 +25,20 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, "\1")) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -64,10 +64,16 @@ static void usage(void) +@@ -64,11 +64,17 @@ static void usage(void) fprintf(stderr, "Usage: ip [ OPTIONS ] OBJECT { COMMAND | help }\n" " ip [ -force ] -batch filename\n" +#ifndef IPROUTE2_TINY - "where OBJECT := { link | address | addrlabel | route | rule | neigh | ntable |\n" - " tunnel | tuntap | maddress | mroute | mrule | monitor | xfrm |\n" - " netns | l2tp | fou | macsec | tcp_metrics | token | netconf | ila |\n" - " vrf | sr | nexthop | mptcp }\n" + "where OBJECT := { address | addrlabel | fou | help | ila | l2tp | link |\n" + " macsec | maddress | monitor | mptcp | mroute | mrule |\n" + " neighbor | neighbour | netconf | netns | nexthop | ntable |\n" + " ntbl | route | rule | sr | tap | tcpmetrics |\n" + " token | tunnel | tuntap | vrf | xfrm }\n" +#else -+ "where OBJECT := { link | address | route | rule | neigh | tunnel | maddress |\n" -+ " mroute | mrule | monitor | netns | macsec | token | ila |\n" -+ " vrf | sr }\n" ++ "where OBJECT := { address | ila | link | macsec | maddress | monitor |\n" ++ " mroute | mrule | neighbor | neighbour | netns | route |\n" ++ " rule | sr | token | tunnel | vrf }\n" +#endif " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " -h[uman-readable] | -iec | -j[son] | -p[retty] |\n" diff --git a/package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch b/package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch deleted file mode 100644 index 07dbbc65b9..0000000000 --- a/package/network/utils/iproute2/patches/185-libbpf-add-limits-h.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c77310119f9a5f99221dd967c5eb0c7a26094b41 Mon Sep 17 00:00:00 2001 -From: Tony Ambardar -Date: Wed, 3 Mar 2021 10:29:24 -0800 -Subject: [PATCH] lib/bpf: add missing limits.h includes - -Several functions in bpf_glue.c and bpf_libbpf.c rely on PATH_MAX, which is -normally included from in other iproute2 source files. - -It fixes errors seen using gcc 10.2.0, binutils 2.35.1 and musl 1.1.24: - -bpf_glue.c: In function 'get_libbpf_version': -bpf_glue.c:46:11: error: 'PATH_MAX' undeclared (first use in this function); -did you mean 'AF_MAX'? - 46 | char buf[PATH_MAX], *s; - | ^~~~~~~~ - | AF_MAX - -Reported-by: Rui Salvaterra -Signed-off-by: Tony Ambardar ---- - lib/bpf_glue.c | 2 ++ - lib/bpf_libbpf.c | 1 + - 2 files changed, 3 insertions(+) - ---- a/lib/bpf_glue.c -+++ b/lib/bpf_glue.c -@@ -4,6 +4,8 @@ - * Authors: Hangbin Liu - * - */ -+#include -+ - #include "bpf_util.h" - #ifdef HAVE_LIBBPF - #include ---- a/lib/bpf_libbpf.c -+++ b/lib/bpf_libbpf.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include - #include From a4d2a98ee7f5ab6f852a7f219d6cfbc639803f4b Mon Sep 17 00:00:00 2001 From: Daniel Kestrel Date: Sun, 25 Jul 2021 20:32:05 +0200 Subject: [PATCH 17/29] fritz-tools: fix returning wrong values due to strncmp usage When having two keys that start with the same characters and the second key just has one character more nand_tffs_read and tffs_read return the wrong value for the longer key. This is due to the usage of strncmp in combination with the length of the shorter key which is usually first in the list before the longer key and when strncmp matches, the search is stopped. The problem only occurs when the length of the two keys is different, not if just the last character is different. The fix is to use strcmp and as such it will only return the value if the key (name) and the key to look for (namefilter) have the same value and length. A sample case returning wrong values is when keys macwlan and macwlan2 are defined and querying macwlan2 returns the value for macwlan. Signed-off-by: Daniel Kestrel --- package/utils/fritz-tools/src/fritz_tffs_nand_read.c | 2 +- package/utils/fritz-tools/src/fritz_tffs_read.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/utils/fritz-tools/src/fritz_tffs_nand_read.c b/package/utils/fritz-tools/src/fritz_tffs_nand_read.c index ded0577cf3..22b27336f8 100644 --- a/package/utils/fritz-tools/src/fritz_tffs_nand_read.c +++ b/package/utils/fritz-tools/src/fritz_tffs_nand_read.c @@ -340,7 +340,7 @@ static int show_matching_key_value(struct tffs_key_name_table *key_names) for (uint32_t i = 0; i < key_names->size; i++) { name = key_names->entries[i].val; - if (strncmp(name, name_filter, strlen(name)) == 0) { + if (strcmp(name, name_filter) == 0) { if (find_entry(key_names->entries[i].id, &tmp)) { print_entry_value(&tmp); printf("\n"); diff --git a/package/utils/fritz-tools/src/fritz_tffs_read.c b/package/utils/fritz-tools/src/fritz_tffs_read.c index d1b3038e63..256c34c414 100644 --- a/package/utils/fritz-tools/src/fritz_tffs_read.c +++ b/package/utils/fritz-tools/src/fritz_tffs_read.c @@ -204,7 +204,7 @@ static int show_matching_key_value(uint8_t *buffer, for (i = 0; i < key_names->size; i++) { name = key_names->entries[i].val; - if (strncmp(name, name_filter, strlen(name)) == 0) { + if (strcmp(name, name_filter) == 0) { id = to_entry_header_id(*key_names->entries[i].id); if (find_entry(buffer, id, &tmp)) { From eccc3727fca0af32deab1bb9e50ff4ca41243575 Mon Sep 17 00:00:00 2001 From: Stephan Schmidtmer Date: Sun, 25 Jul 2021 11:50:53 +0000 Subject: [PATCH 18/29] libpcap: add rpcapd as package This enables building of rpcapd and adds it as a package. It is a daemon that allows remote packet capturing from another machine. E.g. Wireshark can talk to it using the Remote Capture Protocol (RPCAP). https://www.tcpdump.org/manpages/rpcapd.8.html Compile and run tested: OpenWrt SNAPSHOT r17190-2801fe6132 on x86/64 Signed-off-by: Stephan Schmidtmer --- package/libs/libpcap/Makefile | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile index 8c08259055..518744435b 100644 --- a/package/libs/libpcap/Makefile +++ b/package/libs/libpcap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpcap PKG_VERSION:=1.10.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \ @@ -43,6 +43,19 @@ define Package/libpcap/config source "$(SOURCE)/Config.in" endef +define Package/rpcapd + SECTION:=net + CATEGORY:=Network + TITLE:=Capture daemon to be controlled by a remote libpcap application + URL:=http://www.tcpdump.org/ + DEPENDS+= +libpcap +endef + +ifdef CONFIG_PACKAGE_rpcapd + CMAKE_OPTIONS += \ + -DENABLE_REMOTE=ON +endif + CMAKE_OPTIONS += \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_WITH_LIBNL=OFF \ @@ -81,4 +94,10 @@ define Package/libpcap/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpcap.so.* $(1)/usr/lib/ endef +define Package/rpcapd/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rpcapd $(1)/usr/sbin/ +endef + $(eval $(call BuildPackage,libpcap)) +$(eval $(call BuildPackage,rpcapd)) From d18f194ca10596ec78f3cd0bdcfdc058d629c47a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Jul 2021 13:49:14 -0700 Subject: [PATCH 19/29] util-linux: update to 2.37 Switched to AUTORELEASE to avoid manual increments. Changed PKG_LICENSE to SPDX format. Signed-off-by: Rosen Penev --- package/utils/util-linux/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/utils/util-linux/Makefile b/package/utils/util-linux/Makefile index b385030e39..74f3f17469 100644 --- a/package/utils/util-linux/Makefile +++ b/package/utils/util-linux/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=util-linux -PKG_VERSION:=2.36.1 -PKG_RELEASE:=2 +PKG_VERSION:=2.37 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.36 -PKG_HASH:=09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed +PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.37 +PKG_HASH:=bd07b7e98839e0359842110525a3032fdb8eaf3a90bedde3dd1652d32d15cce5 PKG_CPE_ID:=cpe:/a:kernel:util-linux -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:= COPYING \ libblkid/COPYING \ libmount/COPYING \ From 96df921c7710fd097ddbb9b4340a7601b927868c Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 11 Jul 2021 18:00:55 -0700 Subject: [PATCH 20/29] gettext-full: disable parallel compilation Fails fairly reliably with make -j 12 on a Ryzen 3600. Signed-off-by: Rosen Penev --- package/libs/gettext-full/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile index 8111a36f5f..6a97fd5b91 100644 --- a/package/libs/gettext-full/Makefile +++ b/package/libs/gettext-full/Makefile @@ -24,8 +24,8 @@ PKG_CPE_ID:=cpe:/a:gnu:gettext PKG_FIXUP:=autoreconf PKG_INSTALL:=1 PKG_BUILD_DEPENDS:=gettext-full/host -PKG_BUILD_PARALLEL:=1 -HOST_BUILD_PARALLEL:=1 +PKG_BUILD_PARALLEL:=0 +HOST_BUILD_PARALLEL:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk From d18364ad2af5a3fddff36df6145625320eb821b6 Mon Sep 17 00:00:00 2001 From: Luiz Angelo Daros de Luca Date: Mon, 27 Apr 2020 18:45:44 -0300 Subject: [PATCH 21/29] elfutils: powerpc build fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes following build error on mpc85xx/generic: ppc_initreg.c: In function 'ppc_set_initial_registers_tid': ppc_initreg.c:79:22: error: field 'r' has incomplete type struct pt_regs r; Ref: FS#2924 Fixes: d27623b54254 ("elfutils: update to 0.179") Signed-off-by: Luiz Angelo Daros de Luca [commit description facelift] Signed-off-by: Petr Štetiar --- ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch diff --git a/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch new file mode 100644 index 0000000000..904da2b44e --- /dev/null +++ b/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch @@ -0,0 +1,34 @@ +From http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-devtools/elfutils/files/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch + +From 2e2232d0935bf8ef6e66ebffba3be68a73b5b3e5 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 8 Sep 2019 15:57:59 -0700 +Subject: [PATCH] ppc_initreg.c: Incliude asm/ptrace.h for pt_regs definition + +Fixes +| ../../elfutils-0.176/backends/ppc_initreg.c:79:22: error: field 'r' has incomplete type +| struct pt_regs r; +| ^ + +Upstream-Status: Pending + +Signed-off-by: Khem Raj +--- + backends/ppc_initreg.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c +index 0e0d359..e5cca7e 100644 +--- a/backends/ppc_initreg.c ++++ b/backends/ppc_initreg.c +@@ -33,6 +33,7 @@ + #include + #if defined(__powerpc__) && defined(__linux__) + # include ++# include + # include + #endif + +-- +2.23.0 + From fb330b6e0adb97be0ec3a3380fc8c6ccf9512d01 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 3 Jan 2021 15:18:33 -0800 Subject: [PATCH 22/29] elfutils: update to 0.182 Add --disable-libdebuginfod with remove libcurl dependency. Remove totally unused host elfutils. Refreshed and rebased patches. Also happens to fix compilation with GCC11. Newer versions of elfutils seem to have some kind of dependency on obstack. Signed-off-by: Rosen Penev --- package/libs/elfutils/Makefile | 10 +++++--- ...cliude-asm-ptrace.h-for-pt_regs-defi.patch | 5 ---- .../patches/003-libintl-compatibility.patch | 4 +-- .../patches/005-build_only_libs.patch | 6 ++--- .../006-Fix-build-on-aarch64-musl.patch | 6 +---- .../libs/elfutils/patches/110-no-cdefs.patch | 25 ------------------- .../patches/111-fix-gcc11-build.patch | 22 ---------------- .../120-Fix-build-on-powerpc-musl.patch | 12 --------- 8 files changed, 12 insertions(+), 78 deletions(-) delete mode 100644 package/libs/elfutils/patches/111-fix-gcc11-build.patch delete mode 100644 package/libs/elfutils/patches/120-Fix-build-on-powerpc-musl.patch diff --git a/package/libs/elfutils/Makefile b/package/libs/elfutils/Makefile index 3e36dc27b8..d595e4caf2 100644 --- a/package/libs/elfutils/Makefile +++ b/package/libs/elfutils/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=elfutils -PKG_VERSION:=0.180 -PKG_RELEASE:=2 +PKG_VERSION:=0.182 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://sourceware.org/$(PKG_NAME)/ftp/$(PKG_VERSION) -PKG_HASH:=b827b6e35c59d188ba97d7cf148fa8dc6f5c68eb6c5981888dfdbb758c0b569d +PKG_HASH:=ecc406914edf335f0b7fc084ebe6c460c4d6d5175bfdd6688c1c78d9146b8858 PKG_MAINTAINER:=Luiz Angelo Daros de Luca PKG_LICENSE:=GPL-3.0-or-later @@ -63,7 +63,9 @@ endif CONFIGURE_ARGS += \ --program-prefix=eu- \ --disable-debuginfod \ - --without-lzma + --disable-libdebuginfod \ + --without-lzma \ + --without-zstd TARGET_CFLAGS += -D_GNU_SOURCE -Wno-unused-result -Wno-format-nonliteral diff --git a/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch b/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch index 904da2b44e..839f86ee6a 100644 --- a/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch +++ b/package/libs/elfutils/patches/0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch @@ -17,8 +17,6 @@ Signed-off-by: Khem Raj backends/ppc_initreg.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c -index 0e0d359..e5cca7e 100644 --- a/backends/ppc_initreg.c +++ b/backends/ppc_initreg.c @@ -33,6 +33,7 @@ @@ -29,6 +27,3 @@ index 0e0d359..e5cca7e 100644 # include #endif --- -2.23.0 - diff --git a/package/libs/elfutils/patches/003-libintl-compatibility.patch b/package/libs/elfutils/patches/003-libintl-compatibility.patch index e883a302e6..26fcc85c8b 100644 --- a/package/libs/elfutils/patches/003-libintl-compatibility.patch +++ b/package/libs/elfutils/patches/003-libintl-compatibility.patch @@ -11,7 +11,7 @@ Requires.private: zlib --- a/configure.ac +++ b/configure.ac -@@ -586,6 +586,9 @@ AC_CONFIG_FILES([config/libelf.pc config +@@ -590,6 +590,9 @@ AC_CONFIG_FILES([config/libelf.pc config AC_SUBST(USE_NLS, yes) AM_PO_SUBDIRS @@ -47,7 +47,7 @@ #define _(Str) dgettext ("elfutils", Str) --- a/libdwfl/libdwflP.h +++ b/libdwfl/libdwflP.h -@@ -44,6 +44,9 @@ +@@ -47,6 +47,9 @@ typedef struct Dwfl_Process Dwfl_Process; diff --git a/package/libs/elfutils/patches/005-build_only_libs.patch b/package/libs/elfutils/patches/005-build_only_libs.patch index a81d1d2cab..501348f21c 100644 --- a/package/libs/elfutils/patches/005-build_only_libs.patch +++ b/package/libs/elfutils/patches/005-build_only_libs.patch @@ -4,8 +4,8 @@ pkginclude_HEADERS = version.h SUBDIRS = config m4 lib libelf libcpu backends libebl libdwelf libdwfl libdw \ -- libasm src po doc tests +- libasm debuginfod src po doc tests + libasm - if DEBUGINFOD - SUBDIRS += debuginfod + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch b/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch index 6f7956c5ae..d8066c5ca7 100644 --- a/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch +++ b/package/libs/elfutils/patches/006-Fix-build-on-aarch64-musl.patch @@ -22,8 +22,6 @@ Signed-off-by: Hongxu Jia backends/arm_initreg.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/backends/aarch64_initreg.c b/backends/aarch64_initreg.c -index daf6f37..6445276 100644 --- a/backends/aarch64_initreg.c +++ b/backends/aarch64_initreg.c @@ -33,7 +33,7 @@ @@ -35,7 +33,7 @@ index daf6f37..6445276 100644 # include # include /* Deal with old glibc defining user_pt_regs instead of user_regs_struct. */ -@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t tid __attribute__ ((unused)), +@@ -82,7 +82,7 @@ aarch64_set_initial_registers_tid (pid_t Dwarf_Word dwarf_fregs[32]; for (int r = 0; r < 32; r++) @@ -44,8 +42,6 @@ index daf6f37..6445276 100644 if (! setfunc (64, 32, dwarf_fregs, arg)) return false; -diff --git a/backends/arm_initreg.c b/backends/arm_initreg.c -index efcabaf..062bb9e 100644 --- a/backends/arm_initreg.c +++ b/backends/arm_initreg.c @@ -38,7 +38,7 @@ diff --git a/package/libs/elfutils/patches/110-no-cdefs.patch b/package/libs/elfutils/patches/110-no-cdefs.patch index f95625a913..d66f1e924f 100644 --- a/package/libs/elfutils/patches/110-no-cdefs.patch +++ b/package/libs/elfutils/patches/110-no-cdefs.patch @@ -24,28 +24,3 @@ Signed-off-by: Rosen Penev #include ---- a/libelf/elf.h -+++ b/libelf/elf.h -@@ -19,9 +19,9 @@ - #ifndef _ELF_H - #define _ELF_H 1 - --#include -- --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - /* Standard ELF types. */ - -@@ -4103,6 +4103,8 @@ enum - #define R_ARC_TLS_LE_S9 0x4a - #define R_ARC_TLS_LE_32 0x4b - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* elf.h */ diff --git a/package/libs/elfutils/patches/111-fix-gcc11-build.patch b/package/libs/elfutils/patches/111-fix-gcc11-build.patch deleted file mode 100644 index 1ec880e34e..0000000000 --- a/package/libs/elfutils/patches/111-fix-gcc11-build.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/libebl/libebl.h -+++ b/libebl/libebl.h -@@ -245,7 +245,7 @@ extern ssize_t ebl_register_info (Ebl *e - Each of these is filled with the DWARF register number corresponding, - or -1 if there is none. Returns zero when the information is available. */ - extern int ebl_syscall_abi (Ebl *ebl, int *sp, int *pc, -- int *callno, int args[6]); -+ int *callno, int args[]); - - /* Supply the ABI-specified state of DWARF CFI before CIE initial programs. - ---- a/libdw/libdw.h -+++ b/libdw/libdw.h -@@ -1065,7 +1065,7 @@ extern int dwarf_frame_cfa (Dwarf_Frame - expressions in the CFI, *OPS is an internal pointer that can be used as - long as the Dwarf_CFI used to create FRAME remains alive. */ - extern int dwarf_frame_register (Dwarf_Frame *frame, int regno, -- Dwarf_Op ops_mem[3], -+ Dwarf_Op ops_mem[], - Dwarf_Op **ops, size_t *nops) - __nonnull_attribute__ (3, 4, 5); - diff --git a/package/libs/elfutils/patches/120-Fix-build-on-powerpc-musl.patch b/package/libs/elfutils/patches/120-Fix-build-on-powerpc-musl.patch deleted file mode 100644 index 664f596b12..0000000000 --- a/package/libs/elfutils/patches/120-Fix-build-on-powerpc-musl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/backends/ppc_initreg.c b/backends/ppc_initreg.c -index 0e0d359..810e14a 100644 ---- a/backends/ppc_initreg.c -+++ b/backends/ppc_initreg.c -@@ -33,6 +33,7 @@ - #include - #if defined(__powerpc__) && defined(__linux__) - # include -+# include - # include - #endif - From 55b458382151a2b4e9ef525aaadec5022fef591f Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Jul 2021 13:16:50 -0700 Subject: [PATCH 23/29] libcap: update to 2.51 Switched to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev --- package/libs/libcap/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libcap/Makefile b/package/libs/libcap/Makefile index b8e45a52c7..53a577f1f9 100644 --- a/package/libs/libcap/Makefile +++ b/package/libs/libcap/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libcap -PKG_VERSION:=2.48 -PKG_RELEASE:=1 +PKG_VERSION:=2.51 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/libs/security/linux-privs/libcap2 -PKG_HASH:=4de9590ee09a87c282d558737ffb5b6175ccbfd26d580add10df44d0f047f6c2 +PKG_HASH:=6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9 PKG_MAINTAINER:=Paul Wassi PKG_LICENSE:=GPL-2.0-only From 03d9063a7357544938d539d0e2aad09c19035623 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Jul 2021 13:19:08 -0700 Subject: [PATCH 24/29] libnftnl: update to 1.2.0 Switch to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev --- package/libs/libnftnl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 198e01ba22..4c7f6ad465 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnftnl -PKG_VERSION:=1.1.8 -PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files -PKG_HASH:=04a3fa5b08b736268f7e65836b9f05d9d5f438181467bee3c76c3c4a4f3ab711 +PKG_HASH:=90b01fddfe9be8c3245c3ba5ff5a4424a8df708828f92b2b361976b658c074f5 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0-or-later From 4781b5807ef9702b6d6aca97e93756d0c4f2b0b3 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Jul 2021 13:24:54 -0700 Subject: [PATCH 25/29] libpcap: update to 1.10.1 Switch to AUTORELEASE to avoid manual increments. Refreshed patches. Signed-off-by: Rosen Penev --- package/libs/libpcap/Makefile | 6 +++--- package/libs/libpcap/patches/100-no-openssl.patch | 2 +- package/libs/libpcap/patches/102-skip-manpages.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libs/libpcap/Makefile b/package/libs/libpcap/Makefile index 518744435b..d07c83ac6f 100644 --- a/package/libs/libpcap/Makefile +++ b/package/libs/libpcap/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpcap -PKG_VERSION:=1.10.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.10.1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.us.tcpdump.org/release/ \ http://www.tcpdump.org/release/ -PKG_HASH:=8d12b42623eeefee872f123bd0dc85d535b00df4d42e865f993c40f7bfc92b1e +PKG_HASH:=ed285f4accaf05344f90975757b3dbfe772ba41d1c401c2648b7fa45b711bdd4 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause diff --git a/package/libs/libpcap/patches/100-no-openssl.patch b/package/libs/libpcap/patches/100-no-openssl.patch index 6424cf8c6f..56896ad8ba 100644 --- a/package/libs/libpcap/patches/100-no-openssl.patch +++ b/package/libs/libpcap/patches/100-no-openssl.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1006,7 +1006,6 @@ endif() +@@ -1042,7 +1042,6 @@ endif() # # OpenSSL/libressl. # diff --git a/package/libs/libpcap/patches/102-skip-manpages.patch b/package/libs/libpcap/patches/102-skip-manpages.patch index 57b780c1fe..79a365643e 100644 --- a/package/libs/libpcap/patches/102-skip-manpages.patch +++ b/package/libs/libpcap/patches/102-skip-manpages.patch @@ -9,7 +9,7 @@ Subject: [PATCH] skip manpages --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2701,57 +2701,6 @@ if(NOT MSVC) +@@ -2732,57 +2732,6 @@ if(NOT MSVC) if(MINGW) find_program(LINK_EXECUTABLE ln) endif(MINGW) From ee6b78e05324e512c94bab5b1bf2f5cfeb053d5b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Jul 2021 13:27:09 -0700 Subject: [PATCH 26/29] mbedtls: update to 2.16.11 Switched to AUTORELEASE to avoid manual increments. Release notes: https://github.com/ARMmbed/mbedtls/releases/tag/v2.16.11 Signed-off-by: Rosen Penev --- package/libs/mbedtls/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/mbedtls/Makefile b/package/libs/mbedtls/Makefile index caa239430b..36f9950820 100644 --- a/package/libs/mbedtls/Makefile +++ b/package/libs/mbedtls/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mbedtls -PKG_VERSION:=2.16.10 -PKG_RELEASE:=1 +PKG_VERSION:=2.16.11 +PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/ARMmbed/mbedtls/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=96257bb03b30300b2f35f861ffe204ed957e9fd0329d80646fe57fc49f589b29 +PKG_HASH:=c18e7e9abf95e69e425260493720470021384a1728417042060a35d0b7b18b41 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=gpl-2.0.txt From 2a408e39af42f2df4b734926f9d6b50d5f0837c8 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 13 Jul 2021 13:30:24 -0700 Subject: [PATCH 27/29] nettle: update to 3.7.3 Switch to AUTORELEASE to avoid manual increments. Refreshed patches. Signed-off-by: Rosen Penev --- package/libs/nettle/Makefile | 6 +++--- package/libs/nettle/patches/100-portability.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/libs/nettle/Makefile b/package/libs/nettle/Makefile index b15ea0fa07..3b4bd9d053 100644 --- a/package/libs/nettle/Makefile +++ b/package/libs/nettle/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nettle -PKG_VERSION:=3.6 -PKG_RELEASE:=1 +PKG_VERSION:=3.7.3 +PKG_RELEASE:=$(AUTORELEASE) PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/nettle -PKG_HASH:=d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1 +PKG_HASH:=661f5eb03f048a3b924c3a8ad2515d4068e40f67e774e8a26827658007e3bcf0 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/package/libs/nettle/patches/100-portability.patch b/package/libs/nettle/patches/100-portability.patch index 2849e53eab..5bbae22752 100644 --- a/package/libs/nettle/patches/100-portability.patch +++ b/package/libs/nettle/patches/100-portability.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -4635,6 +4635,7 @@ $as_echo_n "checking build system compil +@@ -4661,6 +4661,7 @@ $as_echo_n "checking build system compil # remove anything that might look like compiler output to our "||" expression rm -f conftest* a.out b.out a.exe a_out.exe cat >conftest.c <conftest.c <conftest.c <conftest.c < Date: Tue, 13 Jul 2021 13:32:30 -0700 Subject: [PATCH 28/29] pcre: update to 8.45 Switch to AUTORELEASE to avoid manual increments. Signed-off-by: Rosen Penev --- package/libs/pcre/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile index 8644746b4b..db157ec1b4 100644 --- a/package/libs/pcre/Makefile +++ b/package/libs/pcre/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pcre -PKG_VERSION:=8.44 -PKG_RELEASE:=4 +PKG_VERSION:=8.45 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_HASH:=19108658b23b3ec5058edc9f66ac545ea19f9537234be1ec62b714c84399366d +PKG_HASH:=4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8 PKG_MAINTAINER:=Thomas Heil PKG_LICENSE:=BSD-3-Clause From 3f0c2b59f73d20da38de8a1dca17a1d22d03a7dd Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sun, 8 Aug 2021 12:05:01 +0800 Subject: [PATCH 29/29] generic: add missing kernel config Fixes: #426 --- target/linux/generic/config-4.14 | 1 + target/linux/generic/config-4.19 | 1 + 2 files changed, 2 insertions(+) diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index 43183f3904..2a2603ba6e 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -450,6 +450,7 @@ CONFIG_BASE_SMALL=0 # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BAYCOM_EPP is not set # CONFIG_BAYCOM_PAR is not set diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index f16a3938d0..2791a2ade2 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -470,6 +470,7 @@ CONFIG_BASE_SMALL=0 # CONFIG_BATTERY_MAX17040 is not set # CONFIG_BATTERY_MAX17042 is not set # CONFIG_BATTERY_MAX1721X is not set +# CONFIG_BATTERY_RT5033 is not set # CONFIG_BATTERY_SBS is not set # CONFIG_BAYCOM_EPP is not set # CONFIG_BAYCOM_PAR is not set