浏览代码

Don't use site config in compile step

Matthias Schiffer 10 年之前
父节点
当前提交
cc1af68caa
共有 3 个文件被更改,包括 8 次插入6 次删除
  1. 3 2
      package/gluon-autoupdater/Makefile
  2. 2 2
      package/gluon-mesh-vpn-fastd/Makefile
  3. 3 2
      package/gluon-simple-tc/Makefile

+ 3 - 2
package/gluon-autoupdater/Makefile

@@ -23,13 +23,14 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(GLUON_CONFIGURE) invariant.pl > $(PKG_BUILD_DIR)/invariant.sh
 endef
 
 define Package/gluon-autoupdater/install
 	$(CP) ./files/* $(1)/
+
 	$(INSTALL_DIR) $(1)/lib/gluon/upgrade/autoupdater/invariant
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/invariant.sh $(1)/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater
+	$(GLUON_CONFIGURE) invariant.pl > $(1)/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater
+	chmod +x $(1)/lib/gluon/upgrade/autoupdater/invariant/010-autoupdater
 endef
 
 $(eval $(call BuildPackage,gluon-autoupdater))

+ 2 - 2
package/gluon-mesh-vpn-fastd/Makefile

@@ -27,14 +27,14 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(GLUON_CONFIGURE) fastd.pl > $(PKG_BUILD_DIR)/fastd.sh
 endef
 
 define Package/gluon-mesh-vpn-fastd/install
 	$(CP) ./files/* $(1)/
 
 	$(INSTALL_DIR) $(1)/lib/gluon/upgrade/mesh-vpn-fastd/invariant
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fastd.sh $(1)/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-mesh-vpn-fastd
+	$(GLUON_CONFIGURE) fastd.pl > $(1)/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-mesh-vpn-fastd
+	chmod +x $(1)/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-mesh-vpn-fastd
 endef
 
 $(eval $(call BuildPackage,gluon-mesh-vpn-fastd))

+ 3 - 2
package/gluon-simple-tc/Makefile

@@ -27,13 +27,14 @@ define Build/Configure
 endef
 
 define Build/Compile
-	$(GLUON_CONFIGURE) invariant.pl > $(PKG_BUILD_DIR)/invariant.sh
 endef
 
 define Package/gluon-simple-tc/install
 	$(CP) ./files/* $(1)/
+
 	$(INSTALL_DIR) $(1)/lib/gluon/upgrade/simple-tc/invariant
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/invariant.sh $(1)/lib/gluon/upgrade/simple-tc/invariant/010-site-defaults
+	$(GLUON_CONFIGURE) invariant.pl > $(1)/lib/gluon/upgrade/simple-tc/invariant/010-site-defaults
+	chmod +x $(1)/lib/gluon/upgrade/simple-tc/invariant/010-site-defaults
 endef
 
 $(eval $(call BuildPackage,gluon-simple-tc))