initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,49 @@
|
||||
From e1cdcfd94172a0b1ba4c9df70f4d69a41c687404 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun, 26 Jan 2020 18:35:13 +0000
|
||||
Subject: [PATCH] squashfs-tools: fix build failure against gcc-10
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
On gcc-10 (and gcc-9 -fno-common) build fails as:
|
||||
|
||||
```
|
||||
cc ... -o mksquashfs
|
||||
ld: read_fs.o:(.bss+0x0):
|
||||
multiple definition of `fwriter_buffer'; mksquashfs.o:(.bss+0x400c90): first defined here
|
||||
ld: read_fs.o:(.bss+0x8):
|
||||
multiple definition of `bwriter_buffer'; mksquashfs.o:(.bss+0x400c98): first defined here
|
||||
```
|
||||
|
||||
gcc-10 will change the default from -fcommon to fno-common:
|
||||
https://gcc.gnu.org/PR85678.
|
||||
|
||||
The error also happens if CFLAGS=-fno-common passed explicitly.
|
||||
|
||||
Reported-by: Toralf Förster
|
||||
Bug: https://bugs.gentoo.org/706456
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
|
||||
[Upstream: https://github.com/plougher/squashfs-tools/commit/fe2f5da4b0f8994169c53e84b7cb8a0feefc97b5.patch]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
squashfs-tools/mksquashfs.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/squashfs-tools/mksquashfs.h b/squashfs-tools/mksquashfs.h
|
||||
index 1beefef..b650306 100644
|
||||
--- a/squashfs-tools/mksquashfs.h
|
||||
+++ b/squashfs-tools/mksquashfs.h
|
||||
@@ -143,7 +143,7 @@ struct append_file {
|
||||
#endif
|
||||
|
||||
extern struct cache *reader_buffer, *fragment_buffer, *reserve_cache;
|
||||
-struct cache *bwriter_buffer, *fwriter_buffer;
|
||||
+extern struct cache *bwriter_buffer, *fwriter_buffer;
|
||||
extern struct queue *to_reader, *to_deflate, *to_writer, *from_writer,
|
||||
*to_frag, *locked_fragment, *to_process_frag;
|
||||
extern struct append_file **file_mapping;
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
config BR2_PACKAGE_SQUASHFS
|
||||
bool "squashfs"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
# ensure at least on compression backend (defaults to gzip)
|
||||
select BR2_PACKAGE_SQUASHFS_GZIP if !( \
|
||||
BR2_PACKAGE_SQUASHFS_LZ4 || \
|
||||
BR2_PACKAGE_SQUASHFS_LZMA || \
|
||||
BR2_PACKAGE_SQUASHFS_LZO || \
|
||||
BR2_PACKAGE_SQUASHFS_XZ || \
|
||||
BR2_PACKAGE_SQUASHFS_ZSTD)
|
||||
help
|
||||
Tools to generate SquashFS filesystems.
|
||||
|
||||
https://github.com/plougher/squashfs-tools
|
||||
|
||||
if BR2_PACKAGE_SQUASHFS
|
||||
|
||||
config BR2_PACKAGE_SQUASHFS_GZIP
|
||||
bool "gzip support"
|
||||
default y
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
Support GZIP compression algorithm
|
||||
|
||||
config BR2_PACKAGE_SQUASHFS_LZ4
|
||||
bool "lz4 support"
|
||||
select BR2_PACKAGE_LZ4
|
||||
help
|
||||
Support LZ4 compression algorithm
|
||||
|
||||
config BR2_PACKAGE_SQUASHFS_LZMA
|
||||
bool "lzma support"
|
||||
select BR2_PACKAGE_XZ
|
||||
help
|
||||
Support LZMA compression algorithm
|
||||
|
||||
config BR2_PACKAGE_SQUASHFS_LZO
|
||||
bool "lzo support"
|
||||
select BR2_PACKAGE_LZO
|
||||
help
|
||||
Support LZO compression algorithm
|
||||
|
||||
config BR2_PACKAGE_SQUASHFS_XZ
|
||||
bool "xz support"
|
||||
select BR2_PACKAGE_XZ
|
||||
help
|
||||
Support XZ compression algorithm
|
||||
|
||||
config BR2_PACKAGE_SQUASHFS_ZSTD
|
||||
bool "zstd support"
|
||||
select BR2_PACKAGE_ZSTD
|
||||
help
|
||||
Support ZSTD compression algorithm
|
||||
|
||||
endif
|
||||
|
||||
comment "squashfs needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU
|
||||
@@ -0,0 +1,6 @@
|
||||
config BR2_PACKAGE_HOST_SQUASHFS
|
||||
bool "host squashfs"
|
||||
help
|
||||
Tools to generate SquashFS filesystems.
|
||||
|
||||
https://github.com/plougher/squashfs-tools
|
||||
@@ -0,0 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 a7fa4845e9908523c38d4acf92f8a41fdfcd19def41bd5090d7ad767a6dc75c3 squashfs-4.4.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
@@ -0,0 +1,96 @@
|
||||
################################################################################
|
||||
#
|
||||
# squashfs
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SQUASHFS_VERSION = 4.4
|
||||
SQUASHFS_SITE = $(call github,plougher,squashfs-tools,$(SQUASHFS_VERSION))
|
||||
SQUASHFS_LICENSE = GPL-2.0+
|
||||
SQUASHFS_LICENSE_FILES = COPYING
|
||||
SQUASHFS_CPE_ID_VENDOR = squashfs_project
|
||||
SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y)
|
||||
SQUASHFS_DEPENDENCIES += lz4
|
||||
SQUASHFS_MAKE_ARGS += LZ4_SUPPORT=1 COMP_DEFAULT=lz4
|
||||
else
|
||||
SQUASHFS_MAKE_ARGS += LZ4_SUPPORT=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y)
|
||||
SQUASHFS_DEPENDENCIES += xz
|
||||
SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 COMP_DEFAULT=lzma
|
||||
else
|
||||
SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQUASHFS_XZ),y)
|
||||
SQUASHFS_DEPENDENCIES += xz
|
||||
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz
|
||||
else
|
||||
SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQUASHFS_LZO),y)
|
||||
SQUASHFS_DEPENDENCIES += lzo
|
||||
SQUASHFS_MAKE_ARGS += LZO_SUPPORT=1 COMP_DEFAULT=lzo
|
||||
else
|
||||
SQUASHFS_MAKE_ARGS += LZO_SUPPORT=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQUASHFS_ZSTD),y)
|
||||
SQUASHFS_DEPENDENCIES += zstd
|
||||
SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=1 COMP_DEFAULT=zstd
|
||||
else
|
||||
SQUASHFS_MAKE_ARGS += ZSTD_SUPPORT=0
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP),y)
|
||||
SQUASHFS_DEPENDENCIES += zlib
|
||||
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=1 COMP_DEFAULT=gzip
|
||||
else
|
||||
SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0
|
||||
endif
|
||||
|
||||
HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz host-zstd
|
||||
|
||||
HOST_SQUASHFS_MAKE_ARGS = \
|
||||
XATTR_SUPPORT=1 \
|
||||
XZ_SUPPORT=1 \
|
||||
GZIP_SUPPORT=1 \
|
||||
LZ4_SUPPORT=1 \
|
||||
LZO_SUPPORT=1 \
|
||||
LZMA_XZ_SUPPORT=1 \
|
||||
ZSTD_SUPPORT=1
|
||||
|
||||
define SQUASHFS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
CC="$(TARGET_CC)" \
|
||||
EXTRA_CFLAGS="$(TARGET_CFLAGS) -fgnu89-inline" \
|
||||
EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
$(SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/
|
||||
endef
|
||||
|
||||
define SQUASHFS_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install
|
||||
endef
|
||||
|
||||
define HOST_SQUASHFS_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) \
|
||||
CC="$(HOSTCC)" \
|
||||
EXTRA_CFLAGS="$(HOST_CFLAGS)" \
|
||||
EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
$(HOST_SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/
|
||||
endef
|
||||
|
||||
define HOST_SQUASHFS_INSTALL_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \
|
||||
-C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/bin install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(host-generic-package))
|
||||
Reference in New Issue
Block a user