From f17fa682d1566ec1a2abdfb0846a06084b8ead90 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 18 Apr 2024 13:39:33 +0200 Subject: [PATCH 1/3] luci-base: Extending packages prepare handling With this change, packages that do not have the source files in the generic location (luasrc,ucode,htdocs,root,src) can still copy there build files into the build directory if they add the following make target 'Build/Prepare/' to the Makefile. Signed-off-by: Florian Eckert --- luci.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/luci.mk b/luci.mk index b5bd6fcd13a8..ceb4903f7895 100644 --- 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 From fb279a0a25e59ac8bc18a127d7e6aaba7349c623 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 18 Apr 2024 13:46:24 +0200 Subject: [PATCH 2/3] luci-base: add additional prepare handling for the licenses files Copy the licenses file for luci into the build tree for further processing. This is achieved by the new additional prepare handling, that was added with commit '3b135c381cd5e5efd10353b76344e33e5230c870'. Signed-off-by: Florian Eckert --- modules/luci-base/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index 789e6a4bf6fa..856e4d186a37 100644 --- a/modules/luci-base/Makefile +++ b/modules/luci-base/Makefile @@ -52,6 +52,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 From 611ff53c736b968328515e1cc6e0baeb18b66b2c Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 18 Apr 2024 12:39:20 +0200 Subject: [PATCH 3/3] luci-base: add missing PKG_LICENSE_FILES info The 'luci-base' package is the base package that must always be installed when the LuCI is used. Therefore, according to the license, the license files used by the LuCI must be referenced there. Signed-off-by: Florian Eckert --- modules/luci-base/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index 856e4d186a37..d9832e3393b1 100644 --- 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)