Merge pull request #7115 from TDT-AG/pr/20240510-luci-base

luci-base: add PKG_LICENSE_FILES references to this packages
openwrt · Dec 2, 2024 · b1968d9 · b1968d9
2 parents b4d61a3 + 611ff53
commit b1968d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/luci.mk b/luci.mk
@@ -174,6 +174,7 @@ define Build/Prepare
 		$(CP) ./$$$$d/* $(PKG_BUILD_DIR)/$$$$d/; \
 	  fi; \
 	done
+	$(call Build/Prepare/$(LUCI_NAME))
 	$(call Build/Prepare/Default)
 endef
 

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
@@ -28,6 +28,7 @@ LUCI_DEPENDS:=\
 	+liblucihttp-ucode
 
 PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE NOTICE
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)
 
@@ -52,6 +53,11 @@ fi
 exit 0
 endef
 
+define Build/Prepare/luci-base
+	$(CP) ../../NOTICE $(PKG_BUILD_DIR)
+	$(CP) ../../LICENSE $(PKG_BUILD_DIR)
+endef
+
 include ../../luci.mk
 
 define Host/Configure
-Original file line number
+Diff line change
@@ Expand Up / @@ -174,6 +174,7 @@ define Build/Prepare @@
     		$(CP) ./$$$$d/* $(PKG_BUILD_DIR)/$$$$d/; \
     	  fi; \
     	done
+    	$(call Build/Prepare/$(LUCI_NAME))
     	$(call Build/Prepare/Default)
     endef
@@ Expand Down @@