From cc9fdaea6ef33840223b06e5c1890700533647e5 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Sat, 17 Jul 2021 18:29:07 +0800 Subject: [PATCH 01/10] Update Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 适配新版本LUCI --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c58fc3..20d7fb7 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ define Build/Configure endef define Build/Compile - $(CP) ./*.sh $(PKG_BUILD_DIR) + $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) endef define Package/$(PKG_NAME)/preinst @@ -39,6 +39,9 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/ddns $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns + $(INSTALL_DIR) $(1)/usr/share/ddns/default + $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default + endef define Package/$(PKG_NAME)/postinst From 128dfb5ae5101db94ebf83f35f585f867de86577 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Sat, 17 Jul 2021 18:37:06 +0800 Subject: [PATCH 02/10] Create aliyun.com.json --- aliyun.com.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 aliyun.com.json diff --git a/aliyun.com.json b/aliyun.com.json new file mode 100644 index 0000000..c1ad8a5 --- /dev/null +++ b/aliyun.com.json @@ -0,0 +1,9 @@ +{ + "name": "aliyun.com", + "ipv4": { + "url": "update_aliyun_com.sh" + }, + "ipv6": { + "url": "update_aliyun_com.sh" + } +} From ce87831f3073d9b86b75a945980c364bc4d281bf Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Sat, 17 Jul 2021 18:48:46 +0800 Subject: [PATCH 03/10] Update Makefile --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9c58fc3..351dc45 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ define Build/Configure endef define Build/Compile - $(CP) ./*.sh $(PKG_BUILD_DIR) + $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) endef define Package/$(PKG_NAME)/preinst @@ -39,6 +39,8 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/ddns $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns + $(INSTALL_DIR) $(1)/usr/share/ddns/default + $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default endef define Package/$(PKG_NAME)/postinst From f9de9f6d2949d4112f28a623c8eec2b746758d99 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Fri, 31 Dec 2021 11:05:54 +0800 Subject: [PATCH 04/10] Update Makefile --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index 67e99d5..351dc45 100644 --- a/Makefile +++ b/Makefile @@ -41,10 +41,6 @@ define Package/$(PKG_NAME)/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns $(INSTALL_DIR) $(1)/usr/share/ddns/default $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default -<<<<<<< HEAD -======= - ->>>>>>> origin/mm2231031-patch-1 endef define Package/$(PKG_NAME)/postinst From 2110983b442e6ada24315b48f2406565a116e340 Mon Sep 17 00:00:00 2001 From: patoria Date: Sun, 11 Sep 2022 19:50:11 +0800 Subject: [PATCH 05/10] fix: fixed compile bug output "Makefile:72: *** missing separator (did you mean TAB instead of 8 spaces?). Stop." when compiling --- Makefile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index 351dc45..6342170 100644 --- a/Makefile +++ b/Makefile @@ -1,25 +1,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_aliyun -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.0.3 PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Sense +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - SUBMENU:=IP Addresses and Names - TITLE:=DDNS extension for AliYun.com - PKGARCH:=all - DEPENDS:=+ddns-scripts +wget +openssl-util +define Package/ddns-scripts_aliyun + SECTION:=net + CATEGORY:=Network + SUBMENU:=IP Addresses and Names + TITLE:=DDNS extension for AliYun.com + PKGARCH:=all + DEPENDS:=+ddns-scripts +wget-ssl +openssl-util endef -define Package/$(PKG_NAME)/description - Dynamic DNS Client scripts extension for AliYun.com +define Package/ddns-scripts_aliyun/description + Dynamic DNS Client scripts extension for AliYun.com endef define Build/Configure @@ -29,21 +31,19 @@ define Build/Compile $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) endef -define Package/$(PKG_NAME)/preinst +define Package/ddns-scripts_aliyun/preinst #!/bin/sh # if NOT run buildroot then stop service [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 exit 0 # suppress errors endef -define Package/$(PKG_NAME)/install +define Package/ddns-scripts_aliyun/install $(INSTALL_DIR) $(1)/usr/lib/ddns $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/default - $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default endef -define Package/$(PKG_NAME)/postinst +define Package/ddns-scripts_aliyun/postinst #!/bin/sh # remove old services file entries /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 @@ -59,7 +59,7 @@ define Package/$(PKG_NAME)/postinst exit 0 # suppress errors endef -define Package/$(PKG_NAME)/prerm +define Package/ddns-scripts_aliyun/prerm #!/bin/sh # if NOT run buildroot then stop service [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 @@ -69,4 +69,4 @@ define Package/$(PKG_NAME)/prerm exit 0 # suppress errors endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,ddns-scripts_aliyun)) From 2cda7663fb8dc4c97f8da19048f8c7f2986e3fa4 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Fri, 5 May 2023 08:03:37 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 351dc45..66dc653 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_aliyun -PKG_VERSION:=1.0.0 +PKG_VERSION:=1.0.1 PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 From 26ce4d22b7264e3e29be9ed15d6450ed46697f07 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Mon, 8 May 2023 09:39:18 +0800 Subject: [PATCH 07/10] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b7c8326..3237e1a 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk -define Package/ddns-scripts_aliyun +define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network SUBMENU:=IP Addresses and Names From 36510febdea6bac555a3dce4bd504bdf0967df08 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Thu, 13 Jul 2023 16:56:36 +0800 Subject: [PATCH 08/10] Update Makefile --- Makefile | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 3237e1a..5f6a502 100644 --- a/Makefile +++ b/Makefile @@ -1,29 +1,25 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts_aliyun - PKG_VERSION:=1.0.3 - -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPLv2 PKG_MAINTAINER:=Sense -PKG_BUILD_PARALLEL:=1 - include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - SUBMENU:=IP Addresses and Names - TITLE:=DDNS extension for AliYun.com - PKGARCH:=all - DEPENDS:=+ddns-scripts +wget-ssl +openssl-util + SECTION:=net + CATEGORY:=Network + SUBMENU:=IP Addresses and Names + TITLE:=DDNS extension for AliYun.com + PKGARCH:=all + DEPENDS:=+ddns-scripts +wget +openssl-util endef -define Package/ddns-scripts_aliyun/description - Dynamic DNS Client scripts extension for AliYun.com +define Package/$(PKG_NAME)/description + Dynamic DNS Client scripts extension for AliYun.com endef define Build/Configure @@ -33,19 +29,22 @@ define Build/Compile $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) endef -define Package/ddns-scripts_aliyun/preinst +define Package/$(PKG_NAME)/preinst #!/bin/sh # if NOT run buildroot then stop service [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 exit 0 # suppress errors endef -define Package/ddns-scripts_aliyun/install +define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/lib/ddns $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns + $(INSTALL_DIR) $(1)/usr/share/ddns/default + $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default + endef -define Package/ddns-scripts_aliyun/postinst +define Package/$(PKG_NAME)/postinst #!/bin/sh # remove old services file entries /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 @@ -61,7 +60,7 @@ define Package/ddns-scripts_aliyun/postinst exit 0 # suppress errors endef -define Package/ddns-scripts_aliyun/prerm +define Package/$(PKG_NAME)/prerm #!/bin/sh # if NOT run buildroot then stop service [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 @@ -71,4 +70,4 @@ define Package/ddns-scripts_aliyun/prerm exit 0 # suppress errors endef -$(eval $(call BuildPackage,ddns-scripts_aliyun)) +$(eval $(call BuildPackage,$(PKG_NAME))) From dba984422561ddc3522a4078d1dba101a3116189 Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Thu, 13 Jul 2023 21:26:02 +0800 Subject: [PATCH 09/10] Update Makefile Solve the problem of building errors. --- Makefile | 70 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index 5f6a502..9355861 100644 --- a/Makefile +++ b/Makefile @@ -10,64 +10,64 @@ PKG_MAINTAINER:=Sense include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - SUBMENU:=IP Addresses and Names - TITLE:=DDNS extension for AliYun.com - PKGARCH:=all - DEPENDS:=+ddns-scripts +wget +openssl-util + SECTION:=net + CATEGORY:=Network + SUBMENU:=IP Addresses and Names + TITLE:=DDNS extension for AliYun.com + PKGARCH:=all + DEPENDS:=+ddns-scripts +wget +openssl-util endef define Package/$(PKG_NAME)/description - Dynamic DNS Client scripts extension for AliYun.com + Dynamic DNS Client scripts extension for AliYun.com endef define Build/Configure endef define Build/Compile - $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) + $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) endef define Package/$(PKG_NAME)/preinst - #!/bin/sh - # if NOT run buildroot then stop service - [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 - exit 0 # suppress errors + #!/bin/sh + # if NOT run buildroot then stop service + [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 + exit 0 # suppress errors endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/ddns - $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/default + $(INSTALL_DIR) $(1)/usr/lib/ddns + $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns + $(INSTALL_DIR) $(1)/usr/share/ddns/default $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default endef define Package/$(PKG_NAME)/postinst - #!/bin/sh - # remove old services file entries - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 - # and create new - printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services - printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services_ipv6 - # on real system restart service if enabled - [ -z "$${IPKG_INSTROOT}" ] && { - /etc/init.d/ddns enabled && \ - /etc/init.d/ddns start >/dev/null 2>&1 - } - exit 0 # suppress errors + #!/bin/sh + # remove old services file entries + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 + # and create new + printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services + printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services_ipv6 + # on real system restart service if enabled + [ -z "$${IPKG_INSTROOT}" ] && { + /etc/init.d/ddns enabled && \ + /etc/init.d/ddns start >/dev/null 2>&1 + } + exit 0 # suppress errors endef define Package/$(PKG_NAME)/prerm - #!/bin/sh - # if NOT run buildroot then stop service - [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 - # remove services file entries - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 - exit 0 # suppress errors + #!/bin/sh + # if NOT run buildroot then stop service + [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 + # remove services file entries + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 + exit 0 # suppress errors endef $(eval $(call BuildPackage,$(PKG_NAME))) From 9a72f1697fc64069c66df97c2f66dfcc0fa5689a Mon Sep 17 00:00:00 2001 From: mm2231031 Date: Thu, 13 Jul 2023 21:38:57 +0800 Subject: [PATCH 10/10] Update Makefile Resolve the issue of incorrect makefile format during compilation. --- Makefile | 72 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/Makefile b/Makefile index 9355861..500cec3 100644 --- a/Makefile +++ b/Makefile @@ -10,64 +10,64 @@ PKG_MAINTAINER:=Sense include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - SUBMENU:=IP Addresses and Names - TITLE:=DDNS extension for AliYun.com - PKGARCH:=all - DEPENDS:=+ddns-scripts +wget +openssl-util + SECTION:=net + CATEGORY:=Network + SUBMENU:=IP Addresses and Names + TITLE:=DDNS extension for AliYun.com + PKGARCH:=all + DEPENDS:=+ddns-scripts +wget +openssl-util endef define Package/$(PKG_NAME)/description - Dynamic DNS Client scripts extension for AliYun.com + Dynamic DNS Client scripts extension for AliYun.com endef define Build/Configure endef define Build/Compile - $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) + $(CP) ./*.{sh,json} $(PKG_BUILD_DIR) endef define Package/$(PKG_NAME)/preinst - #!/bin/sh - # if NOT run buildroot then stop service - [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 - exit 0 # suppress errors + #!/bin/sh + # if NOT run buildroot then stop service + [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 + exit 0 # suppress errors endef define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/lib/ddns - $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns - $(INSTALL_DIR) $(1)/usr/share/ddns/default - $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default + $(INSTALL_DIR) $(1)/usr/lib/ddns + $(INSTALL_BIN) $(PKG_BUILD_DIR)/update_aliyun_com.sh $(1)/usr/lib/ddns + $(INSTALL_DIR) $(1)/usr/share/ddns/default + $(INSTALL_BIN) $(PKG_BUILD_DIR)/aliyun.com.json $(1)/usr/share/ddns/default endef define Package/$(PKG_NAME)/postinst - #!/bin/sh - # remove old services file entries - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 - # and create new - printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services - printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services_ipv6 - # on real system restart service if enabled - [ -z "$${IPKG_INSTROOT}" ] && { - /etc/init.d/ddns enabled && \ - /etc/init.d/ddns start >/dev/null 2>&1 - } - exit 0 # suppress errors + #!/bin/sh + # remove old services file entries + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 + # and create new + printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services + printf "%s\\t\\t%s\\n" '"aliyun.com"' '"update_aliyun_com.sh"' >> $${IPKG_INSTROOT}/etc/ddns/services_ipv6 + # on real system restart service if enabled + [ -z "$${IPKG_INSTROOT}" ] && { + /etc/init.d/ddns enabled && \ + /etc/init.d/ddns start >/dev/null 2>&1 + } + exit 0 # suppress errors endef define Package/$(PKG_NAME)/prerm - #!/bin/sh - # if NOT run buildroot then stop service - [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 - # remove services file entries - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 - /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 - exit 0 # suppress errors + #!/bin/sh + # if NOT run buildroot then stop service + [ -z "$${IPKG_INSTROOT}" ] && /etc/init.d/ddns stop >/dev/null 2>&1 + # remove services file entries + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services >/dev/null 2>&1 + /bin/sed -i '/aliyun\.com/d' $${IPKG_INSTROOT}/etc/ddns/services_ipv6 >/dev/null 2>&1 + exit 0 # suppress errors endef $(eval $(call BuildPackage,$(PKG_NAME)))