Skip to content

Commit

Permalink
treewide: remove redundant definitions from package Makefiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@neocturne
neocturne committed Mar 7, 2018
1 parent 5315cfd commit 934221b
Show file tree
Hide file tree
Showing 45 changed files with 3 additions and 409 deletions.
10 changes: 0 additions & 10 deletions package/gluon-alfred/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,15 @@ 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
DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv +micrond +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
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-authorized-keys/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,15 @@ 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
TITLE:=Fill /etc/dropbear/authorized_keys from site.conf
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
Expand Down
9 changes: 0 additions & 9 deletions package/gluon-autoupdater/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-client-bridge/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,15 @@ 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
TITLE:=Provides a bridge and a wireless interface for clients to connect to
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
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-autoupdater/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,17 @@ 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
TITLE:=Config Mode: Let the user know whether the autoupdater is enabled or not
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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-contact-info/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-core/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,17 @@ 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
TITLE:=Configuration wizard for user friendly setup of new mesh nodes
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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-domain-select/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,15 @@ 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
TITLE:=UI for changing the node-config
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
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-geo-location/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,17 @@ 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
TITLE:=Set geographic location of a node
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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-hostname/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,17 @@ 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
TITLE:=Set the 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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-config-mode-mesh-vpn/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,17 @@ 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
TITLE:=Toggle mesh-vpn and bandwidth limit
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/)
Expand Down
10 changes: 1 addition & 9 deletions package/gluon-config-mode-theme/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,19 @@
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
TITLE:=Gluon config mode theme for gluon-web
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
Expand Down
7 changes: 0 additions & 7 deletions package/gluon-core/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/)
Expand Down
10 changes: 0 additions & 10 deletions package/gluon-ebtables-filter-multicast/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Loading

2 comments on commit 934221b

@rubo77
Copy link
Contributor

@rubo77 rubo77 commented on 934221b Mar 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are these lines redundant in older branches too?

@neocturne
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rubo77 At least on v2017.1.x they are, not sure about versions based on older OpenWrt releases. Anyways, this is unimportant cleanup, I don't intend to backport it to v2017.1.x.

Please sign in to comment.