fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target: fix copying of licenses for SDK/toolchain

Browse Source 
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: 882e301461 ("LICENSES: include all used licenses in
LICENSES directory")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
(cherry picked from commit 4894a3ff28)
This commit is contained in:
Adrian Schmutzler 2021-02-14 21:51:14 +01:00 committed by Tianling Shen
parent a8e033e020
commit 3a3fc47da8
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/sdk/Makefile
View File

@ -137,6 +137,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in
$(CP) -L \
$(TOPDIR)/LICENSES \
$(TOPDIR)/COPYING \
$(TOPDIR)/rules.mk \
./files/Config.in \
./files/Makefile \

5
target/toolchain/Makefile
View File

@ -33,7 +33,10 @@ $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.xz: 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