From: Adrian Schmutzler Date: Sun, 14 Feb 2021 20:51:14 +0000 (+0100) Subject: target: fix copying of licenses for SDK/toolchain X-Git-Tag: v21.02.0-rc1~264 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=4894a3ff2870438cf812d88704c92c8d997a69db target: fix copying of licenses for SDK/toolchain The SDK and target/toolchain copy the license file into their directories. During the rename/move from LICENSE to a LICENSES folder, this has not been updated. Update it now, and include the new COPYING file. While at it, improve formatting/indent. Fixes: 882e3014610b ("LICENSES: include all used licenses in LICENSES directory") Signed-off-by: Adrian Schmutzler --- diff --git a/target/sdk/Makefile b/target/sdk/Makefile index d7e10a9bd8..0606621192 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -130,7 +130,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean $(SDK_BUILD_DIR)/target/linux/*/patches* ./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in $(CP) -L \ - $(TOPDIR)/LICENSE \ + $(TOPDIR)/LICENSES \ + $(TOPDIR)/COPYING \ $(TOPDIR)/rules.mk \ ./files/Config.in \ ./files/Makefile \ diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile index 5002ff7835..c3ba70db04 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -33,7 +33,10 @@ $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \ $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR) - $(CP) $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \ + $(CP) \ + $(TOPDIR)/LICENSES \ + $(TOPDIR)/COPYING \ + ./files/README.TOOLCHAIN \ $(TOOLCHAIN_BUILD_DIR)/ $(CP) ./files/wrapper.sh $(TOOLCHAIN_PREFIX)/bin/$(REAL_GNU_TARGET_NAME)-wrapper.sh