From d9ef6aa30c58fa5fad7f8e0c96739eb9840fd4a6 Mon Sep 17 00:00:00 2001 From: Jan-Tarek Butt <tarek@ring0.de> Date: Thu, 2 Jun 2016 14:36:26 +0200 Subject: [PATCH] add srcdiet as host build depence and minimize lua code --- hoodselector/Makefile | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/hoodselector/Makefile b/hoodselector/Makefile index 8300813..273475f 100644 --- a/hoodselector/Makefile +++ b/hoodselector/Makefile @@ -6,24 +6,34 @@ PKG_RELEASE:=1 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +PKG_BUILD_DEPENDS += lua/host luci-base/host + include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) +define Package/ffnw-hoodselector SECTION:=networke CATEGORY:=Freifunk Nordwest TITLE:=Select the hoods depending on the geo coordinate DEPENDS:=+lwtrace +ffnw-hoods +dkjson gluon-mesh-batman-adv-15 +gluon-mesh-vpn-fastd endef -define Package/$(PKG_NAME)/description +define Package/ffnw-hoodselector/description Select the hoods depending on the geo coordinates endef +define SrcDiet + $(FIND) $(1) -type f | while read src; do \ + if $(STAGING_DIR_HOST)/bin/lua $(STAGING_DIR_HOST)/bin/LuaSrcDiet \ + --noopt-binequiv -o "$$$$src.o" "$$$$src"; \ + then mv "$$$$src.o" "$$$$src"; fi; \ + done +endef + define Build/Prepare mkdir -p $(PKG_BUILD_DIR) $(CP) ./luasrc/* $(PKG_BUILD_DIR)/ - sed -e 's/--.*//' -e '/^$$$$/d' $(PKG_BUILD_DIR)/hoodselector > $(PKG_BUILD_DIR)/hoodselector-min - chmod +x $(PKG_BUILD_DIR)/hoodselector-min + $(call SrcDiet,$(PKG_BUILD_DIR),$(PKG_BUILD_DIR)) + chmod +x -R $(PKG_BUILD_DIR)/ endef define Build/Configure @@ -32,10 +42,10 @@ endef define Build/Compile endef -define Package/$(PKG_NAME)/install +define Package/ffnw-hoodselector/install $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/usr/sbin - $(CP) $(PKG_BUILD_DIR)/hoodselector-min $(1)/usr/sbin/hoodselector + $(CP) $(PKG_BUILD_DIR)/hoodselector $(1)/usr/sbin/hoodselector endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,ffnw-hoodselector)) -- GitLab