0c10c224be
Automatically compute and substitute current values for all
$(AUTORELEASE) instances as this feature is deprecated and shouldn't be
used.
The following temporary change was made to the core:
diff --git a/rules.mk b/rules.mk
index 57d7995d4fa8..f16367de87a8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -429,7 +429,7 @@ endef
abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1))))
COMMITCOUNT = $(if $(DUMP),0,$(call commitcount))
-AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1))
+AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile))
all:
FORCE: ;
And this command used to fix affected packages:
for i in $(cd feeds/packages; git grep -l PKG_RELEASE:=.*AUTORELEASE | \
sed 's^.*/\([^/]*\)/Makefile^\1^';);
do
make package/$i/download
done
Signed-off-by: Paul Fertser <fercerpav@gmail.com>
103 lines
3 KiB
Makefile
103 lines
3 KiB
Makefile
include $(TOPDIR)/rules.mk
|
|
|
|
PKG_NAME:=wg-installer
|
|
PKG_RELEASE:=28
|
|
|
|
PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
|
|
|
|
include $(INCLUDE_DIR)/package.mk
|
|
|
|
Build/Compile=
|
|
|
|
define Package/wg-installer/Default
|
|
SECTION:=net
|
|
CATEGORY:=Network
|
|
TITLE:=WireGuard Installer
|
|
URL:=https://github.com/Freifunk-Spalter/
|
|
PKGARCH:=all
|
|
DEPENDS:=+kmod-wireguard +wireguard-tools +owipcalc
|
|
endef
|
|
|
|
define Package/wg-installer-server
|
|
$(call Package/wg-installer/Default)
|
|
TITLE+= (server)
|
|
MENU:=1
|
|
DEPENDS+=+rpcd +uhttpd +uhttpd-mod-ubus +coreutils-dirname
|
|
endef
|
|
|
|
define Package/wg-installer-server/install
|
|
$(INSTALL_DIR) $(1)/usr/share/wginstaller/
|
|
$(INSTALL_BIN) ./wg-server/lib/install_wginstaller_user.sh $(1)/usr/share/wginstaller/install_wginstaller_user.sh
|
|
$(INSTALL_BIN) ./wg-server/lib/wg_functions.sh $(1)/usr/share/wginstaller/wg_functions.sh
|
|
$(INSTALL_BIN) ./common/wg.sh $(1)/usr/share/wginstaller/wg.sh
|
|
|
|
$(INSTALL_DIR) $(1)/usr/libexec/rpcd/
|
|
$(INSTALL_BIN) ./wg-server/wginstaller.sh $(1)/usr/libexec/rpcd/wginstaller
|
|
|
|
$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
|
|
$(CP) ./wg-server/config/wginstaller.json $(1)/usr/share/rpcd/acl.d/
|
|
|
|
$(INSTALL_DIR) $(1)/etc/config
|
|
$(INSTALL_CONF) ./wg-server/config/wgserver.conf $(1)/etc/config/wgserver
|
|
|
|
$(INSTALL_DIR) $(1)/etc/init.d
|
|
$(INSTALL_BIN) ./wg-server/config/wgserver.init $(1)/etc/init.d/wgserver
|
|
endef
|
|
|
|
define Package/wg-installer-server/conffiles
|
|
/etc/config/wgserver
|
|
endef
|
|
|
|
define Package/wg-installer-server/postinst
|
|
#!/bin/sh
|
|
if [ -z $${IPKG_INSTROOT} ] ; then
|
|
. /usr/share/wginstaller/install_wginstaller_user.sh
|
|
fi
|
|
endef
|
|
|
|
define Package/wg-installer-server-hotplug-babeld
|
|
$(call Package/wg-installer-server)
|
|
DEPENDS:=wg-installer-server
|
|
endef
|
|
|
|
define Package/wg-installer-server-hotplug-babeld/install
|
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/net/
|
|
$(INSTALL_BIN) ./wg-server/hotplug.d/99-mesh-babeld $(1)/etc/hotplug.d/net/99-mesh-babeld
|
|
endef
|
|
|
|
define Package/wg-installer-server-hotplug-olsrd
|
|
$(call Package/wg-installer-server)
|
|
DEPENDS:=wg-installer-server
|
|
endef
|
|
|
|
define Package/wg-installer-server-hotplug-olsrd/install
|
|
$(INSTALL_DIR) $(1)/etc/hotplug.d/net/
|
|
$(INSTALL_BIN) ./wg-server/hotplug.d/99-mesh-olsrd $(1)/etc/hotplug.d/net/99-mesh-olsrd
|
|
endef
|
|
|
|
define Package/wg-installer-client
|
|
$(call Package/wg-installer/Default)
|
|
TITLE+= (client)
|
|
DEPENDS+=+curl
|
|
endef
|
|
|
|
define Package/wg-installer-client/install
|
|
$(INSTALL_DIR) $(1)/usr/share/wginstaller/
|
|
$(INSTALL_BIN) ./wg-client/lib/rpcd_ubus.sh $(1)/usr/share/wginstaller/rpcd_ubus.sh
|
|
$(INSTALL_BIN) ./common/wg.sh $(1)/usr/share/wginstaller/wg.sh
|
|
|
|
$(INSTALL_DIR) $(1)/usr/bin
|
|
$(INSTALL_BIN) ./wg-client/wg-client-installer.sh $(1)/usr/bin/wg-client-installer
|
|
|
|
$(INSTALL_DIR) $(1)/etc/config
|
|
$(INSTALL_CONF) ./wg-client/config/wgclient.conf $(1)/etc/config/wgclient
|
|
endef
|
|
|
|
define Package/wg-installer-client/conffiles
|
|
/etc/config/wgclient
|
|
endef
|
|
|
|
$(eval $(call BuildPackage,wg-installer-server))
|
|
$(eval $(call BuildPackage,wg-installer-server-hotplug-babeld))
|
|
$(eval $(call BuildPackage,wg-installer-server-hotplug-olsrd))
|
|
$(eval $(call BuildPackage,wg-installer-client))
|