Răsfoiți Sursa

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 <[email protected]>
Adrian Schmutzler 4 ani în urmă
părinte
comite
4894a3ff28
2 a modificat fișierele cu 6 adăugiri și 2 ștergeri
  1. 2 1
      target/sdk/Makefile
  2. 4 1
      target/toolchain/Makefile

+ 2 - 1
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 \

+ 4 - 1
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