From e35e40ad824eab9d51cdd690fb747e576e01412f Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 23 May 2020 13:38:12 +0200 Subject: [PATCH 1/2] usign: update to latest git HEAD f1f65026a941 Always pad fingerprints to 16 characters Signed-off-by: Matthias Schiffer --- package/system/usign/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/usign/Makefile b/package/system/usign/Makefile index ab7fda33a3..5267ce15f3 100644 --- a/package/system/usign/Makefile +++ b/package/system/usign/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/usign.git -PKG_SOURCE_DATE:=2019-09-21 -PKG_SOURCE_VERSION:=f34a383eeed6282fa16fb021157a60c75f33fdcd -PKG_MIRROR_HASH:=74dc05f3ff24995193956a2803d20994fa6fce3d9e7d997002ee524618fbcec6 +PKG_SOURCE_DATE:=2020-05-23 +PKG_SOURCE_VERSION:=f1f65026a94137c91b5466b149ef3ea3f20091e9 +PKG_MIRROR_HASH:=3f6569a5e63fdfd032976ac0f79d736d3935101ac1b97fb370514b013c5e6bb6 CMAKE_INSTALL:=1 PKG_CHECK_FORMAT_SECURITY:=1 PKG_USE_MIPS16:=0 From 1bbc1aa884902fd05cc579b53d68b2ba0b18683f Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 24 May 2020 12:23:31 +0200 Subject: [PATCH 2/2] squashfs: Fix compile with GCC 10 Fixes the following build error with GCC 10: /usr/bin/ld: read_fs.o:(.bss+0x0): multiple definition of `swap'; mksquashfs.o:(.bss+0x1b2a88): first defined here And a compile warning. Fixes: FS#3104, FS#3119 Signed-off-by: Hauke Mehrtens --- tools/squashfs/patches/140-gcc-10-fix.patch | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 tools/squashfs/patches/140-gcc-10-fix.patch diff --git a/tools/squashfs/patches/140-gcc-10-fix.patch b/tools/squashfs/patches/140-gcc-10-fix.patch new file mode 100644 index 0000000000..a02641f307 --- /dev/null +++ b/tools/squashfs/patches/140-gcc-10-fix.patch @@ -0,0 +1,25 @@ +Fixes the following build error with GCC 10: + /usr/bin/ld: read_fs.o:(.bss+0x0): multiple definition of `swap'; mksquashfs.o:(.bss+0x1b2a88): first defined here +And a compile warning. + +--- a/squashfs-tools/read_fs.c ++++ b/squashfs-tools/read_fs.c +@@ -61,7 +61,7 @@ extern int add_file(long long, long long + fprintf(stderr, s, ## args); \ + } while(0) + +-int swap; ++static int swap; + + int read_block(int fd, long long start, long long *next, unsigned char *block, squashfs_super_block *sBlk) + { +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c +@@ -258,6 +258,7 @@ int read_sort_file(char *filename, int s + void sort_files_and_write(struct dir_info *dir); + struct file_info *duplicate(char *(get_next_file_block)(struct duplicate_buffer_handle *, unsigned int), struct duplicate_buffer_handle *file_start, long long bytes, unsigned int **block_list, long long *start, int blocks, struct fragment **fragment, char *frag_data, int frag_bytes); + struct dir_info *dir_scan1(char *, int (_readdir)(char *, char *, struct dir_info *)); ++int dir_scan2(squashfs_inode *inode, struct dir_info *dir_info); + + #define MKINODE(A) ((squashfs_inode)(((squashfs_inode) inode_bytes << 16) + (((char *)A) - data_cache))) +