Skip to content
Snippets Groups Projects
Unverified Commit 934221b8 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

treewide: remove redundant definitions from package Makefiles

parent 5315cfd4
No related branches found
No related tags found
No related merge requests found
Showing
with 2 additions and 171 deletions
......@@ -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/)
......
......@@ -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
......
......@@ -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/)
......
......@@ -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
......
......@@ -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
......
......@@ -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/)
......
......@@ -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)/
......
......@@ -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
......
......@@ -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/)
......
......@@ -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
......
......@@ -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
......
......@@ -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/)
......
......@@ -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
......
......@@ -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/)
......
......@@ -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/)
......
......@@ -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/)
......
......@@ -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/)
......
......@@ -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/)
......
......@@ -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/)
......
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/)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment