Skip to content
Permalink
Browse files

tools sync to openwrt

  • Loading branch information
zyxmon committed Jan 6, 2020
1 parent ffd84a6 commit f37d373931c5de904e0e129a4a1b145eda9676a4
Showing with 2,578 additions and 107 deletions.
  1. +0 −13 tools/automake/patches/200-do-not-override-silent-rules.patch
  2. +2 −2 tools/ccache/Makefile
  3. +1 −1 tools/ccache/patches/100-honour-copts.patch
  4. +1 −1 tools/coreutils/Makefile
  5. +2 −2 tools/e2fsprogs/Makefile
  6. +3 −3 tools/expat/Makefile
  7. +9 −0 tools/firmware-utils/src/mkfwimage.c
  8. +8 −3 tools/firmware-utils/src/mkrasimage.c
  9. +6 −0 tools/firmware-utils/src/mktplinkfw.c
  10. +199 −64 tools/firmware-utils/src/tplink-safeloader.c
  11. +3 −3 tools/make-ext4fs/Makefile
  12. +0 −11 tools/make-ext4fs/patches/100-add-ldflags.patch
  13. +75 −0 tools/qemu/patches/0001-vmdk-fix-endianness-bugs.patch
  14. +557 −0 tools/qemu/patches/0002-VMDK-introduce-VmdkExtent.patch
  15. +46 −0 tools/qemu/patches/0003-VMDK-bugfix-align-offset-to-cluster-in-get_whole_clu.patch
  16. +74 −0 tools/qemu/patches/0004-VMDK-probe-for-monolithicFlat-images.patch
  17. +241 −0 tools/qemu/patches/0005-VMDK-separate-vmdk_open-by-format-version.patch
  18. +102 −0 tools/qemu/patches/0006-VMDK-add-field-BDRVVmdkState.desc_offset.patch
  19. +35 −0 tools/qemu/patches/0007-VMDK-flush-multiple-extents.patch
  20. +46 −0 tools/qemu/patches/0008-VMDK-move-static-cid_update-flag-to-bs-field.patch
  21. +198 −0 tools/qemu/patches/0009-VMDK-change-get_cluster_offset-return-type.patch
  22. +257 −0 tools/qemu/patches/0010-VMDK-open-read-write-for-monolithicFlat-image.patch
  23. +595 −0 tools/qemu/patches/0011-VMDK-create-different-subformats.patch
  24. +114 −0 tools/qemu/patches/0012-vmdk-Allow-selecting-SCSI-adapter-in-image-creation.patch
  25. +2 −2 tools/quilt/Makefile
  26. +1 −1 tools/quilt/patches/000-relocatable.patch
  27. +1 −1 tools/quilt/patches/001-fix_compile.patch

This file was deleted.

@@ -8,11 +8,11 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/target.mk

PKG_NAME:=ccache
PKG_VERSION:=3.7.2
PKG_VERSION:=3.7.6

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://github.com/ccache/ccache/releases/download/v$(PKG_VERSION)
PKG_HASH:=a5da0008512ff9e882097acaffb3616fae98ec25827167bb4bd1e4acf0b66793
PKG_HASH:=73e2633ac9bca387b5a39c72a8f85634670c4091dab639228c433898163c86c0

include $(INCLUDE_DIR)/host-build.mk

@@ -1,6 +1,6 @@
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -2189,6 +2189,7 @@ calculate_object_hash(struct args *args,
@@ -2224,6 +2224,7 @@ calculate_object_hash(struct args *args,
"CPLUS_INCLUDE_PATH",
"OBJC_INCLUDE_PATH",
"OBJCPLUS_INCLUDE_PATH", // clang
@@ -16,7 +16,7 @@ PKG_HASH:=8891d349ee87b9ff7870f52b6d9312a9db672d2439d289bc57084771ca21656b

HOST_BUILD_PARALLEL := 1

BUILD_PROGRAMS = date readlink
BUILD_PROGRAMS = date readlink touch

include $(INCLUDE_DIR)/host-build.mk

@@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=e2fsprogs
PKG_CPE_ID:=cpe:/a:e2fsprogs_project:e2fsprogs
PKG_VERSION:=1.45.3
PKG_HASH:=90d10066b815e27b0b4875f0d5e396c663e0bf55aa3ca10868978d10c6ffe595
PKG_VERSION:=1.45.4
PKG_HASH:=65faf6b590ca1da97440d6446bd11de9e0914b42553740ba5d9d2a796fa0dc02
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=expat
PKG_CPE_ID:=cpe:/a:libexpat:expat
PKG_VERSION:=2.2.7
PKG_VERSION:=2.2.9

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_HASH:=cbc9102f4a31a8dafd42d642e9a3aa31e79a0aedaa1f6efd2795ebc83174ec18
PKG_SOURCE_URL:=@SF/expat
PKG_HASH:=f1063084dc4302a427dabcca499c8312b3a32a29b7d2506653ecc8f950a9a237
PKG_SOURCE_URL:=https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(PKG_VERSION))

HOST_BUILD_PARALLEL:=1

@@ -128,6 +128,15 @@ struct fw_info fw_info[] = {
},
.sign = true,
},
{
.name = "ACB-ISP",
.fw_layout = {
.kern_start = 0x9f050000,
.kern_entry = 0x80002000,
.firmware_max_length= 0x00F60000,
},
.sign = true,
},
{
.name = "",
},
@@ -70,6 +70,7 @@ static char *progname;
static char *board_name = 0;
static char *version_name = 0;
static unsigned int rootfs_size = 0;
static unsigned int header_length = HEADER_PARTITION_LENGTH;

static struct file_info kernel = { NULL, NULL, 0 };
static struct file_info rootfs = { NULL, NULL, 0 };
@@ -144,6 +145,7 @@ void usage(int status)
" -v <version> version string\n"
" -b <boardname> name of board to generate image for\n"
" -o <out_name> name of output image\n"
" -l <hdr_length> length of header, default 65536\n"
" -h show this screen\n"
);

@@ -334,7 +336,7 @@ int build_image()
board_header = generate_board_header(kernel_header, rootfs_header, board_name);

/* Prepare output file */
out.size = HEADER_PARTITION_LENGTH + rootfs_out.size;
out.size = header_length + rootfs_out.size;
if (kernel.name)
out.size += kernel.size;
out.data = malloc(out.size);
@@ -345,7 +347,7 @@ int build_image()
memcpy(out.data + ROOTFS_HEADER_LEN, board_header, BOARD_HEADER_LEN);
if (kernel.name)
memcpy(out.data + ROOTFS_HEADER_LEN + BOARD_HEADER_LEN, kernel_header, KERNEL_HEADER_LEN);
ptr = HEADER_PARTITION_LENGTH;
ptr = header_length;
memcpy(out.data + ptr, rootfs_out.data, rootfs_out.size);
ptr += rootfs_out.size;
if (kernel.name)
@@ -410,7 +412,7 @@ int main(int argc, char *argv[])
while (1) {
int c;

c = getopt(argc, argv, "b:k:o:r:s:v:h");
c = getopt(argc, argv, "b:k:o:r:s:v:l:h");
if (c == -1)
break;

@@ -436,6 +438,9 @@ int main(int argc, char *argv[])
case 'v':
version_name = optarg;
break;
case 'l':
sscanf(optarg, "%u", &header_length);
break;
default:
usage(EXIT_FAILURE);
break;
@@ -144,6 +144,12 @@ static struct flash_layout layouts[] = {
.kernel_la = 0x80060000,
.kernel_ep = 0x80060000,
.rootfs_ofs = 0x100000,
}, {
.id = "8Mmtk",
.fw_max_len = 0x7c0000,
.kernel_la = 0x80000000,
.kernel_ep = 0x8000c310,
.rootfs_ofs = 0x100000,
}, {
.id = "16M",
.fw_max_len = 0xf80000,

0 comments on commit f37d373

Please sign in to comment.
You can’t perform that action at this time.