update 2024-12-11 16:28:36

This commit is contained in:
kenzok8 2024-12-11 16:28:36 +08:00
parent 2312179e65
commit 5aa54dd52c
4 changed files with 28 additions and 23 deletions

View File

@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=haproxy PKG_NAME:=haproxy
PKG_VERSION:=3.0.6 PKG_VERSION:=3.0.6
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src PKG_SOURCE_URL:=https://www.haproxy.org/download/3.0/src
@ -46,7 +46,7 @@ endef
define Package/haproxy define Package/haproxy
$(call Package/haproxy/Default) $(call Package/haproxy/Default)
TITLE+=with SSL support TITLE+=with SSL support
DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libopenssl +libncurses +libreadline +libatomic DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.4 +libopenssl +libncurses +libreadline +libatomic
VARIANT:=ssl VARIANT:=ssl
endef endef
@ -59,7 +59,7 @@ define Package/haproxy-nossl
$(call Package/haproxy/Default) $(call Package/haproxy/Default)
TITLE+=without SSL support TITLE+=without SSL support
VARIANT:=nossl VARIANT:=nossl
DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.3 +libatomic DEPENDS+= +libpcre2 +libltdl +zlib +libpthread +liblua5.4 +libatomic
CONFLICTS:=haproxy CONFLICTS:=haproxy
endef endef
@ -92,7 +92,7 @@ define Build/Compile
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
PCREDIR="$(STAGING_DIR)/usr/" \ PCREDIR="$(STAGING_DIR)/usr/" \
USE_LUA=1 LUA_LIB_NAME="lua5.3" LUA_INC="$(STAGING_DIR)/usr/include/lua5.3" LUA_LIB="$(STAGING_DIR)/usr/lib" \ USE_LUA=1 LUA_LIB_NAME="lua5.4" LUA_INC="$(STAGING_DIR)/usr/include/lua5.4" LUA_LIB="$(STAGING_DIR)/usr/lib" \
SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530" \ SMALL_OPTS="-DBUFSIZE=16384 -DMAXREWRITE=1030 -DSYSTEM_MAXCONN=165530" \
USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PTHREAD_PSHARED=1 USE_LIBATOMIC=1 USE_PROMEX=1 \ USE_ZLIB=1 USE_PCRE2=1 USE_PCRE2_JIT=1 USE_PTHREAD_PSHARED=1 USE_LIBATOMIC=1 USE_PROMEX=1 \
VERSION="$(PKG_VERSION)" SUBVERS="-$(PKG_RELEASE)" \ VERSION="$(PKG_VERSION)" SUBVERS="-$(PKG_RELEASE)" \

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.0.2-20241208 PKG_VERSION:=1.0.2-20241211
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for bmtedge LUCI_TITLE:=LuCI support for bmtedge
@ -17,7 +17,7 @@ endef
# postrm # postrm
define Package/luci-app-bmtedge/prerm define Package/luci-app-bmtedge/prerm
#!/bin/sh #!/bin/sh
docker rm -f bmtedge /root/usr/libexec/istorec/bmtedge.sh rm
exit 0 exit 0
endef endef

View File

@ -2,7 +2,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.5-20241129 PKG_VERSION:=1.1.6-20241211
PKG_RELEASE:= PKG_RELEASE:=
LUCI_TITLE:=LuCI support for istoredup LUCI_TITLE:=LuCI support for istoredup
@ -13,6 +13,12 @@ define Package/luci-app-istoredup/conffiles
/etc/config/istoredup /etc/config/istoredup
endef endef
define Package/luci-app-istoredup/prerm
#!/bin/sh
/root/usr/libexec/istorec/istoredup.sh stop
exit 0
endef
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature # call BuildPackage - OpenWrt buildroot signature

View File

@ -5,23 +5,22 @@ shift 1
do_install() { do_install() {
local IMAGE_NAME=`uci get istoredup.@istoredup[0].image_name 2>/dev/null` local IMAGE_NAME=`uci get istoredup.@istoredup[0].image_name 2>/dev/null`
source /etc/openwrt_release local arch=`uname -m`
case ${DISTRIB_TARGET} in if [ "$arch" = "x86_64" -o "$arch" = "aarch64" ]; then
*x86*) echo "${arch} supported"
echo "${DISTRIB_TARGET} supported" else
;; echo "Unsupported ${arch} NOW"
*rk35xx) sleep 10
echo "${DISTRIB_TARGET} supported"
;;
*rk33xx)
echo "Unsupported ${DISTRIB_TARGET} NOW"
exit 1 exit 1
;; fi
*)
echo "Unsupported ${DISTRIB_TARGET} NOW" if [ -z ${IMAGE_NAME} ]; then
exit 1 if [ "$arch" = "x86_64" ]; then
;; IMAGE_NAME=linkease/istoredupx86_64:latest
esac else
IMAGE_NAME=linkease/istoreduprk35xx:latest
fi
fi
echo "docker pull ${IMAGE_NAME}" echo "docker pull ${IMAGE_NAME}"
docker pull ${IMAGE_NAME} docker pull ${IMAGE_NAME}