From 934221b86f48291451c094e2da17a2bd18737dc7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 7 Mar 2018 21:22:18 +0100
Subject: [PATCH] treewide: remove redundant definitions from package Makefiles
---
package/gluon-alfred/Makefile | 10 ----------
package/gluon-authorized-keys/Makefile | 10 ----------
package/gluon-autoupdater/Makefile | 9 ---------
package/gluon-client-bridge/Makefile | 10 ----------
package/gluon-config-mode-autoupdater/Makefile | 10 ----------
package/gluon-config-mode-contact-info/Makefile | 10 ----------
package/gluon-config-mode-core/Makefile | 10 ----------
package/gluon-config-mode-domain-select/Makefile | 10 ----------
package/gluon-config-mode-geo-location/Makefile | 10 ----------
package/gluon-config-mode-hostname/Makefile | 10 ----------
package/gluon-config-mode-mesh-vpn/Makefile | 10 ----------
package/gluon-config-mode-theme/Makefile | 10 +---------
package/gluon-core/Makefile | 7 -------
package/gluon-ebtables-filter-multicast/Makefile | 10 ----------
package/gluon-ebtables-filter-ra-dhcp/Makefile | 10 ----------
package/gluon-ebtables-limit-arp/Makefile | 14 --------------
package/gluon-ebtables-source-filter/Makefile | 10 ----------
package/gluon-ebtables/Makefile | 10 ----------
package/gluon-l3roamd/Makefile | 9 ---------
package/gluon-lock-password/Makefile | 10 ----------
package/gluon-mesh-batman-adv/Makefile | 7 -------
package/gluon-mesh-vpn-core/Makefile | 6 ------
package/gluon-mesh-vpn-fastd/Makefile | 7 -------
package/gluon-mesh-vpn-tunneldigger/Makefile | 9 ---------
package/gluon-neighbour-info/Makefile | 13 +------------
package/gluon-node-info/Makefile | 6 ------
package/gluon-radv-filterd/Makefile | 7 -------
package/gluon-radvd/Makefile | 10 ----------
package/gluon-respondd/Makefile | 8 --------
package/gluon-setup-mode/Makefile | 10 ----------
package/gluon-site/Makefile | 6 ------
package/gluon-status-page/Makefile | 2 --
package/gluon-wan-dnsmasq/Makefile | 10 ----------
package/gluon-web-admin/Makefile | 10 ----------
package/gluon-web-autoupdater/Makefile | 10 ----------
package/gluon-web-logging/Makefile | 10 ----------
package/gluon-web-mesh-vpn-fastd/Makefile | 10 ----------
package/gluon-web-model/Makefile | 9 ---------
package/gluon-web-network/Makefile | 10 ----------
package/gluon-web-node-role/Makefile | 13 +------------
package/gluon-web-private-wifi/Makefile | 10 ----------
package/gluon-web-wifi-config/Makefile | 10 ----------
package/gluon-web/Makefile | 7 -------
package/libbatadv/Makefile | 1 -
package/libgluonutil/Makefile | 12 ------------
45 files changed, 3 insertions(+), 409 deletions(-)
diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile
index be0ff0da4..ba3b9eb12 100644
--- a/package/gluon-alfred/Makefile
+++ b/package/gluon-alfred/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-alfred
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-alfred
SECTION:=gluon
CATEGORY:=Gluon
@@ -16,13 +13,6 @@ define Package/gluon-alfred
TITLE:=Configure alfred
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile
index 7d010dc9a..6a538f406 100644
--- a/package/gluon-authorized-keys/Makefile
+++ b/package/gluon-authorized-keys/Makefile
@@ -3,11 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-authorized-keys
PKG_VERSION:=2
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-authorized-keys
SECTION:=gluon
CATEGORY:=Gluon
@@ -15,13 +12,6 @@ define Package/gluon-authorized-keys
DEPENDS:=+gluon-core
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile
index eacf80c15..6d8b9f07b 100644
--- a/package/gluon-autoupdater/Makefile
+++ b/package/gluon-autoupdater/Makefile
@@ -3,15 +3,11 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-autoupdater
PKG_VERSION:=4
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
PKG_CONFIG_DEPENDS := CONFIG_GLUON_BRANCH
PKG_BUILD_DEPENDS := respondd
-
include ../gluon.mk
-
define Package/gluon-autoupdater
SECTION:=gluon
CATEGORY:=Gluon
@@ -26,11 +22,6 @@ config GLUON_BRANCH
default ""
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile
index b88b02914..af2a69c82 100644
--- a/package/gluon-client-bridge/Makefile
+++ b/package/gluon-client-bridge/Makefile
@@ -3,11 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-client-bridge
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-client-bridge
SECTION:=gluon
CATEGORY:=Gluon
@@ -15,13 +12,6 @@ define Package/gluon-client-bridge
DEPENDS:=+gluon-core +kmod-veth
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile
index 423aca18d..07c85b371 100644
--- a/package/gluon-config-mode-autoupdater/Makefile
+++ b/package/gluon-config-mode-autoupdater/Makefile
@@ -3,13 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-autoupdater
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-autoupdater
SECTION:=gluon
CATEGORY:=Gluon
@@ -17,13 +14,6 @@ define Package/gluon-config-mode-autoupdater
DEPENDS:=+gluon-config-mode-core +gluon-autoupdater
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-autoupdater,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile
index c7d11b114..96cf61319 100644
--- a/package/gluon-config-mode-contact-info/Makefile
+++ b/package/gluon-config-mode-contact-info/Makefile
@@ -3,13 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-contact-info
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-contact-info
SECTION:=gluon
CATEGORY:=Gluon
@@ -22,13 +19,6 @@ define Package/gluon-config-mode-contact-info/description
Can be made obligatory in site.conf
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-contact-info,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile
index dacbce089..6c0aeb5fe 100644
--- a/package/gluon-config-mode-core/Makefile
+++ b/package/gluon-config-mode-core/Makefile
@@ -6,13 +6,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-core
PKG_VERSION:=2
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-core
SECTION:=gluon
CATEGORY:=Gluon
@@ -20,13 +17,6 @@ define Package/gluon-config-mode-core
DEPENDS:=+gluon-setup-mode +gluon-web-model +gluon-config-mode-theme +uhttpd
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-core,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-config-mode-domain-select/Makefile b/package/gluon-config-mode-domain-select/Makefile
index 778599b2f..907de1a8b 100644
--- a/package/gluon-config-mode-domain-select/Makefile
+++ b/package/gluon-config-mode-domain-select/Makefile
@@ -3,11 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-domain-select
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-config-mode-domain-select
SECTION:=gluon
CATEGORY:=Gluon
@@ -15,13 +12,6 @@ define Package/gluon-config-mode-domain-select
DEPENDS:=+gluon-config-mode-core @GLUON_MULTIDOMAIN
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile
index 7c938ca72..a63d23416 100644
--- a/package/gluon-config-mode-geo-location/Makefile
+++ b/package/gluon-config-mode-geo-location/Makefile
@@ -3,13 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-geo-location
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-geo-location
SECTION:=gluon
CATEGORY:=Gluon
@@ -17,13 +14,6 @@ define Package/gluon-config-mode-geo-location
DEPENDS:=+gluon-config-mode-core +gluon-node-info
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-geo-location,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile
index 041f09d9a..2b435340a 100644
--- a/package/gluon-config-mode-hostname/Makefile
+++ b/package/gluon-config-mode-hostname/Makefile
@@ -3,13 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-hostname
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-hostname
SECTION:=gluon
CATEGORY:=Gluon
@@ -17,13 +14,6 @@ define Package/gluon-config-mode-hostname
DEPENDS:=+gluon-config-mode-core
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-hostname,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile
index ecca627d5..2cd045946 100644
--- a/package/gluon-config-mode-mesh-vpn/Makefile
+++ b/package/gluon-config-mode-mesh-vpn/Makefile
@@ -3,13 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-mesh-vpn
PKG_VERSION:=2
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-mesh-vpn
SECTION:=gluon
CATEGORY:=Gluon
@@ -17,13 +14,6 @@ define Package/gluon-config-mode-mesh-vpn
DEPENDS:=+gluon-config-mode-core +gluon-mesh-vpn-core
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-mesh-vpn,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-config-mode-theme/Makefile b/package/gluon-config-mode-theme/Makefile
index 766496e1a..d8bf6b588 100644
--- a/package/gluon-config-mode-theme/Makefile
+++ b/package/gluon-config-mode-theme/Makefile
@@ -4,16 +4,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-theme
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_VERSION:=1
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-config-mode-theme
SECTION:=gluon
CATEGORY:=Gluon
@@ -21,10 +17,6 @@ define Package/gluon-config-mode-theme
DEPENDS:=+gluon-core +gluon-web
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-config-mode-theme,i18n)
endef
diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index cc8de3394..00d0b6f73 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -5,13 +5,11 @@ PKG_NAME:=gluon-core
GLUON_VERSION = $(shell git describe --always --dirty=+ 2>/dev/null || echo unknown)
PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION))
-
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
include ../gluon.mk
include $(INCLUDE_DIR)/cmake.mk
-
define Package/gluon-core
SECTION:=gluon
CATEGORY:=Gluon
@@ -25,11 +23,6 @@ define Package/gluon-core/description
Gluon community wifi mesh firmware framework: core
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default,all)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-ebtables-filter-multicast/Makefile b/package/gluon-ebtables-filter-multicast/Makefile
index 6aa6d6ff2..6771d16bb 100644
--- a/package/gluon-ebtables-filter-multicast/Makefile
+++ b/package/gluon-ebtables-filter-multicast/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-ebtables-filter-multicast
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include $(INCLUDE_DIR)/package.mk
-
define Package/gluon-ebtables-filter-multicast
SECTION:=gluon
CATEGORY:=Gluon
@@ -24,13 +21,6 @@ define Package/gluon-ebtables-filter-multicast/description
Allowed protocols are: DHCP, DHCPv6, ARP, ICMP, ICMPv6, BitTorrent local peer discovery, BABEL and OSPF
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
endef
diff --git a/package/gluon-ebtables-filter-ra-dhcp/Makefile b/package/gluon-ebtables-filter-ra-dhcp/Makefile
index 832dfac4a..fd9903271 100644
--- a/package/gluon-ebtables-filter-ra-dhcp/Makefile
+++ b/package/gluon-ebtables-filter-ra-dhcp/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-ebtables-filter-ra-dhcp
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include $(INCLUDE_DIR)/package.mk
-
define Package/gluon-ebtables-filter-ra-dhcp
SECTION:=gluon
CATEGORY:=Gluon
@@ -23,13 +20,6 @@ define Package/gluon-ebtables-filter-ra-dhcp/description
client network, and not vice-versa.
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
endef
diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile
index 1a93c4457..d649025a5 100644
--- a/package/gluon-ebtables-limit-arp/Makefile
+++ b/package/gluon-ebtables-limit-arp/Makefile
@@ -4,8 +4,6 @@ PKG_NAME:=gluon-ebtables-limit-arp
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
define Package/gluon-ebtables-limit-arp
@@ -38,18 +36,6 @@ define Package/gluon-ebtables-limit-arp/description
a significant amount of overhead for all participants so far.
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
- $(call Build/Compile/Default)
-endef
-
define Package/gluon-ebtables-limit-arp/install
mkdir -p $(1)/usr/sbin/
$(CP) $(PKG_BUILD_DIR)/gluon-arp-limiter $(1)/usr/sbin/gluon-arp-limiter
diff --git a/package/gluon-ebtables-source-filter/Makefile b/package/gluon-ebtables-source-filter/Makefile
index 54653a163..8016dc7cb 100644
--- a/package/gluon-ebtables-source-filter/Makefile
+++ b/package/gluon-ebtables-source-filter/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-ebtables-source-filter
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-ebtables-source-filter
SECTION:=gluon
CATEGORY:=Gluon
@@ -21,13 +18,6 @@ define Package/gluon-ebtables-source-filter/description
traffic entering the network via the nodes.
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
endef
diff --git a/package/gluon-ebtables/Makefile b/package/gluon-ebtables/Makefile
index 066009b5e..b97e10d38 100644
--- a/package/gluon-ebtables/Makefile
+++ b/package/gluon-ebtables/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-ebtables
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-ebtables
SECTION:=gluon
CATEGORY:=Gluon
@@ -20,13 +17,6 @@ define Package/gluon-ebtables/description
Gluon community wifi mesh firmware framework: ebtables support
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
endef
diff --git a/package/gluon-l3roamd/Makefile b/package/gluon-l3roamd/Makefile
index 8e0421e40..4b4c438ad 100644
--- a/package/gluon-l3roamd/Makefile
+++ b/package/gluon-l3roamd/Makefile
@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-l3roamd
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
define Package/gluon-l3roamd
@@ -14,13 +12,6 @@ define Package/gluon-l3roamd
DEPENDS:=+gluon-core +l3roamd
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-lock-password/Makefile b/package/gluon-lock-password/Makefile
index 0583f96c2..3de51fac5 100644
--- a/package/gluon-lock-password/Makefile
+++ b/package/gluon-lock-password/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-lock-password
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include $(INCLUDE_DIR)/package.mk
-
define Package/gluon-lock-password
SECTION:=gluon
CATEGORY:=Gluon
@@ -20,13 +17,6 @@ define Package/gluon-lock-password/description
This packages locks the root account by default.
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
endef
diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile
index 57898b638..b647ba75e 100644
--- a/package/gluon-mesh-batman-adv/Makefile
+++ b/package/gluon-mesh-batman-adv/Makefile
@@ -3,12 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-batman-adv
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
include ../gluon.mk
-
define Package/gluon-mesh-batman-adv/common
SECTION:=gluon
CATEGORY:=Gluon
@@ -29,11 +27,6 @@ $(Package/gluon-mesh-batman-adv/common)
DEPENDS+=+kmod-batman-adv +batctl
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile
index b822ac05c..46b300961 100644
--- a/package/gluon-mesh-vpn-core/Makefile
+++ b/package/gluon-mesh-vpn-core/Makefile
@@ -3,10 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-core
PKG_VERSION:=1
-
include ../gluon.mk
-
define Package/gluon-mesh-vpn-core
SECTION:=gluon
CATEGORY:=Gluon
@@ -15,10 +13,6 @@ define Package/gluon-mesh-vpn-core
USERID:=:gluon-mesh-vpn=800
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile
index 2a1cc0671..7e6071996 100644
--- a/package/gluon-mesh-vpn-fastd/Makefile
+++ b/package/gluon-mesh-vpn-fastd/Makefile
@@ -3,12 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-fastd
PKG_VERSION:=3
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
include ../gluon.mk
-
define Package/gluon-mesh-vpn-fastd
SECTION:=gluon
CATEGORY:=Gluon
@@ -16,11 +14,6 @@ define Package/gluon-mesh-vpn-fastd
DEPENDS:=+gluon-core +libgluonutil +gluon-mesh-vpn-core +fastd
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-mesh-vpn-tunneldigger/Makefile b/package/gluon-mesh-vpn-tunneldigger/Makefile
index 6aadc3b6a..64e6b5d9d 100644
--- a/package/gluon-mesh-vpn-tunneldigger/Makefile
+++ b/package/gluon-mesh-vpn-tunneldigger/Makefile
@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-tunneldigger
PKG_VERSION:=3
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
define Package/gluon-mesh-vpn-tunneldigger
@@ -14,13 +12,6 @@ define Package/gluon-mesh-vpn-tunneldigger
DEPENDS:=+gluon-core +gluon-mesh-vpn-core +tunneldigger
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile
index 867f32f6d..d56f51886 100644
--- a/package/gluon-neighbour-info/Makefile
+++ b/package/gluon-neighbour-info/Makefile
@@ -4,11 +4,8 @@ PKG_NAME:=gluon-neighbour-info
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-neighbour-info
SECTION:=gluon
CATEGORY:=Gluon
@@ -20,16 +17,8 @@ define Package/gluon-neighbour-info/description
Gluon community wifi mesh firmware framework: neighbour-info
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
- CFLAGS="$(TARGET_CFLAGS)" CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C $(PKG_BUILD_DIR) $(TARGET_CONFIGURE_OPTS)
+ $(Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile
index 67856579e..c0b9487e5 100644
--- a/package/gluon-node-info/Makefile
+++ b/package/gluon-node-info/Makefile
@@ -4,7 +4,6 @@ PKG_NAME:=gluon-node-info
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DEPENDS := respondd
include ../gluon.mk
@@ -17,11 +16,6 @@ define Package/gluon-node-info
DEPENDS:=+gluon-core +libgluonutil
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-radv-filterd/Makefile b/package/gluon-radv-filterd/Makefile
index 4dd2ebbac..381ba0a05 100644
--- a/package/gluon-radv-filterd/Makefile
+++ b/package/gluon-radv-filterd/Makefile
@@ -4,8 +4,6 @@ PKG_NAME:=gluon-radv-filterd
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
define Package/gluon-radv-filterd
@@ -19,11 +17,6 @@ MAKE_VARS += \
LIBNL_NAME="libnl-tiny" \
LIBNL_GENL_NAME="libnl-tiny"
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Package/gluon-radv-filterd/install
$(CP) ./files/* $(1)/
diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile
index ba04c04e6..c039c5007 100644
--- a/package/gluon-radvd/Makefile
+++ b/package/gluon-radvd/Makefile
@@ -3,11 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-radvd
PKG_VERSION:=3
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-radvd
SECTION:=gluon
CATEGORY:=Gluon
@@ -19,13 +16,6 @@ define Package/gluon-radvd/description
Gluon community wifi mesh firmware framework: Advertise an IPv6 prefix from the node
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile
index ea40f8df8..e372064cc 100644
--- a/package/gluon-respondd/Makefile
+++ b/package/gluon-respondd/Makefile
@@ -3,11 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-respondd
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-respondd
SECTION:=gluon
CATEGORY:=Gluon
@@ -15,11 +12,6 @@ define Package/gluon-respondd
DEPENDS:=+gluon-core +libplatforminfo +libgluonutil +libuci +ubus +respondd
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile
index 5a6e9b327..57d94a6cf 100644
--- a/package/gluon-setup-mode/Makefile
+++ b/package/gluon-setup-mode/Makefile
@@ -6,11 +6,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-setup-mode
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-setup-mode
SECTION:=gluon
CATEGORY:=Gluon
@@ -22,13 +19,6 @@ define Package/gluon-setup-mode/description
Offline mode to perform basic setup in a secure manner.
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile
index a255b2445..ca88e5f52 100644
--- a/package/gluon-site/Makefile
+++ b/package/gluon-site/Makefile
@@ -6,7 +6,6 @@ GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR))
GLUON_SITE_VERSION = $(shell ( cd '$(GLUON_SITEDIR)' && git --git-dir=.git describe --always --dirty=+ ) 2>/dev/null || echo unknown)
PKG_VERSION:=$(if $(DUMP),x,$(GLUON_SITE_VERSION))
-
PKG_CONFIG_DEPENDS := CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN
PKG_FILE_DEPENDS := $(GLUON_SITEDIR)/site.conf $(GLUON_SITEDIR)/domains/ $(GLUON_SITEDIR)/i18n/
PKG_BUILD_DEPENDS := lua-cjson/host
@@ -17,7 +16,6 @@ include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-site
SECTION:=gluon
CATEGORY:=Gluon
@@ -40,10 +38,6 @@ config GLUON_MULTIDOMAIN
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
define GenerateJSON
GLUON_SITEDIR='$$(GLUON_SITEDIR)' GLUON_SITE_CONFIG='$(1).conf' lua -e 'print(require("cjson").encode(assert(dofile("../../scripts/site_config.lua"))))' > '$$(PKG_BUILD_DIR)/$(1).json'
endef
diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile
index 02a386a48..68079ee02 100644
--- a/package/gluon-status-page/Makefile
+++ b/package/gluon-status-page/Makefile
@@ -7,7 +7,6 @@ include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-status-page
SECTION:=gluon
CATEGORY:=Gluon
@@ -15,7 +14,6 @@ define Package/gluon-status-page
DEPENDS:=+gluon-web +gluon-neighbour-info +gluon-respondd +uhttpd +sse-multiplex +libiwinfo +libjson-c +libnl-tiny +libubus-lua +libbatadv
endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile
index 92e1edaa1..f1cf3c035 100644
--- a/package/gluon-wan-dnsmasq/Makefile
+++ b/package/gluon-wan-dnsmasq/Makefile
@@ -3,11 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-wan-dnsmasq
PKG_VERSION:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
-
define Package/gluon-wan-dnsmasq
SECTION:=gluon
CATEGORY:=Gluon
@@ -19,13 +16,6 @@ define Package/gluon-wan-dnsmasq/description
Gluon community wifi mesh firmware framework: Support for a secondary DNS server using the WAN interface
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
endef
diff --git a/package/gluon-web-admin/Makefile b/package/gluon-web-admin/Makefile
index 164b0db13..eb82c8d77 100644
--- a/package/gluon-web-admin/Makefile
+++ b/package/gluon-web-admin/Makefile
@@ -7,13 +7,10 @@ PKG_NAME:=gluon-web-admin
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-admin
SECTION:=gluon
CATEGORY:=Gluon
@@ -21,13 +18,6 @@ define Package/gluon-web-admin
DEPENDS:=+gluon-config-mode-core +pretty-hostname
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-admin,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-autoupdater/Makefile b/package/gluon-web-autoupdater/Makefile
index 398aa75c3..4bc856bdd 100644
--- a/package/gluon-web-autoupdater/Makefile
+++ b/package/gluon-web-autoupdater/Makefile
@@ -7,13 +7,10 @@ PKG_NAME:=gluon-web-autoupdater
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-autoupdater
SECTION:=gluon
CATEGORY:=Gluon
@@ -21,13 +18,6 @@ define Package/gluon-web-autoupdater
DEPENDS:=+gluon-web-admin +gluon-autoupdater
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-autoupdater,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-logging/Makefile b/package/gluon-web-logging/Makefile
index 7a7d03500..a810b52d0 100644
--- a/package/gluon-web-logging/Makefile
+++ b/package/gluon-web-logging/Makefile
@@ -4,13 +4,10 @@ PKG_NAME:=gluon-web-logging
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-logging
SECTION:=gluon
CATEGORY:=Gluon
@@ -18,13 +15,6 @@ define Package/gluon-web-logging
TITLE:=UI for remote syslog configuration
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-logging,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-mesh-vpn-fastd/Makefile b/package/gluon-web-mesh-vpn-fastd/Makefile
index 7ab759f6b..3df01b42c 100644
--- a/package/gluon-web-mesh-vpn-fastd/Makefile
+++ b/package/gluon-web-mesh-vpn-fastd/Makefile
@@ -4,13 +4,10 @@ PKG_NAME:=gluon-web-mesh-vpn-fastd
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-mesh-vpn-fastd
SECTION:=gluon
CATEGORY:=Gluon
@@ -18,13 +15,6 @@ define Package/gluon-web-mesh-vpn-fastd
DEPENDS:=+gluon-web-admin +gluon-mesh-vpn-fastd
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-mesh-vpn-fastd,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-model/Makefile b/package/gluon-web-model/Makefile
index 7139d9064..846fdfb7e 100644
--- a/package/gluon-web-model/Makefile
+++ b/package/gluon-web-model/Makefile
@@ -3,12 +3,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-model
PKG_VERSION:=1
-
include ../gluon.mk
-PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
-
define Package/gluon-web-model
SECTION:=gluon
CATEGORY:=Gluon
@@ -16,11 +12,6 @@ define Package/gluon-web-model
DEPENDS:=+gluon-web
endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-model,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-network/Makefile b/package/gluon-web-network/Makefile
index 07538365d..096a8d685 100644
--- a/package/gluon-web-network/Makefile
+++ b/package/gluon-web-network/Makefile
@@ -7,13 +7,10 @@ PKG_NAME:=gluon-web-network
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-network
SECTION:=gluon
CATEGORY:=Gluon
@@ -21,13 +18,6 @@ define Package/gluon-web-network
DEPENDS:=+gluon-web-admin +gluon-client-bridge
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-network,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-node-role/Makefile b/package/gluon-web-node-role/Makefile
index 9eea13e1d..40a1b2335 100644
--- a/package/gluon-web-node-role/Makefile
+++ b/package/gluon-web-node-role/Makefile
@@ -1,16 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-node-role
-PKG_VERSION:=0.1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_VERSION:=1
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-node-role
SECTION:=gluon
CATEGORY:=Gluon
@@ -18,13 +14,6 @@ define Package/gluon-web-node-role
TITLE:=UI for specifying node role
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-node-role,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-private-wifi/Makefile b/package/gluon-web-private-wifi/Makefile
index acee32b29..b8171aea1 100644
--- a/package/gluon-web-private-wifi/Makefile
+++ b/package/gluon-web-private-wifi/Makefile
@@ -4,13 +4,10 @@ PKG_NAME:=gluon-web-private-wifi
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-private-wifi
SECTION:=gluon
CATEGORY:=Gluon
@@ -18,13 +15,6 @@ define Package/gluon-web-private-wifi
TITLE:=UI for activating a private WLAN
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-private-wifi,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web-wifi-config/Makefile b/package/gluon-web-wifi-config/Makefile
index bd1ed8a29..3f889e985 100644
--- a/package/gluon-web-wifi-config/Makefile
+++ b/package/gluon-web-wifi-config/Makefile
@@ -4,13 +4,10 @@ PKG_NAME:=gluon-web-wifi-config
PKG_VERSION:=1
PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
-
define Package/gluon-web-wifi-config
SECTION:=gluon
CATEGORY:=Gluon
@@ -18,13 +15,6 @@ define Package/gluon-web-wifi-config
TITLE:=UI for Wifi Settings
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
define Build/Compile
$(call GluonBuildI18N,gluon-web-wifi-config,i18n)
$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
diff --git a/package/gluon-web/Makefile b/package/gluon-web/Makefile
index b66e3c24e..113d033d5 100644
--- a/package/gluon-web/Makefile
+++ b/package/gluon-web/Makefile
@@ -3,14 +3,12 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web
PKG_VERSION:=1
-
include ../gluon.mk
PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG)
PKG_INSTALL:=1
-
define Package/gluon-web
SECTION:=gluon
CATEGORY:=Gluon
@@ -30,11 +28,6 @@ define Package/gluon-web/config
$(foreach lang,$(GLUON_SUPPORTED_LANGS),$(call lang-config,$(lang)))
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Build/Compile
$(call Build/Compile/Default)
$(call GluonBuildI18N,gluon-web,i18n)
diff --git a/package/libbatadv/Makefile b/package/libbatadv/Makefile
index 66846f5b0..d27747691 100644
--- a/package/libbatadv/Makefile
+++ b/package/libbatadv/Makefile
@@ -28,7 +28,6 @@ PKG_NAME:=libbatadv
PKG_VERSION:=1
PKG_LICENSE:=MIT
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/libgluonutil/Makefile b/package/libgluonutil/Makefile
index 2536727c2..7fd7a8657 100644
--- a/package/libgluonutil/Makefile
+++ b/package/libgluonutil/Makefile
@@ -6,12 +6,9 @@ CMAKE_INSTALL:=1
PKG_LICENSE:=BSD-2-Clause
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
include ../gluon.mk
include $(INCLUDE_DIR)/cmake.mk
-
define Package/libgluonutil
SECTION:=libs
CATEGORY:=Libraries
@@ -19,15 +16,6 @@ define Package/libgluonutil
DEPENDS:=+libjson-c +libuci
endef
-CMAKE_OPTIONS += \
- -DCMAKE_BUILD_TYPE:String="MINSIZEREL"
-
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
define Package/libgluonutil/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libgluonutil.so $(1)/usr/lib/
--
GitLab