23.05: build 23.05.5

.github/workflows/build-openwrt.yml

@@ -75,11 +75,12 @@ jobs:
           # - 22.03.3
           # - 22.03.4
           # - 22.03.5
-          - 22.03.6
+          #- 22.03.6
           # - 23.05.0
           # - 23.05.2
           # - 23.05.3
-          - 23.05.4
+          # - 23.05.4
+          - 23.05.5
           # - snapshot
         include:
         - mode: normal

.github/workflows/squash.yml

@@ -52,10 +52,11 @@ jobs:
           #- 22.03.3
           #- 22.03.4
           #- 22.03.5
-          - 22.03.6
+          #- 22.03.6
           #- 23.05.2
           #- 23.05.3
-          - 23.05.4
+          #- 23.05.4
+          - 23.05.5
           - snapshot
         include:
           - mode: normal

user/23.05.5/config.diff

@@ -0,0 +1,227 @@
+CONFIG_TARGET_imx=y
+CONFIG_TARGET_imx_cortexa7=y
+CONFIG_TARGET_MULTI_PROFILE=y
+CONFIG_TARGET_PER_DEVICE_ROOTFS=y
+CONFIG_TARGET_DEVICE_imx_cortexa7_DEVICE_aqara_zhwg11lm=y
+CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_aqara_zhwg11lm="kmod-rtl8189es-ol jntools luci-app-jntools memtool"
+CONFIG_TARGET_DEVICE_imx_cortexa7_DEVICE_xiaomi_dgnwg05lm=y
+CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_xiaomi_dgnwg05lm="kmod-rtl8723bs-ol rtk_hciattach jntools luci-app-jntools memtool"
+CONFIG_TARGET_DEVICE_imx_cortexa7_DEVICE_geniatech_gtw360=y
+CONFIG_TARGET_DEVICE_PACKAGES_imx_cortexa7_DEVICE_geniatech_gtw360="kmod-brcmfmac broadcom-43455-fmac broadcom-4345C0-hci"
+CONFIG_TARGET_PER_DEVICE_ROOTFS=y
+CONFIG_PACKAGE_cgi-io=y
+CONFIG_PACKAGE_coreutils=y
+CONFIG_PACKAGE_coreutils-stty=y
+CONFIG_PACKAGE_jntools=m
+CONFIG_PACKAGE_kmod-nls-base=y
+CONFIG_PACKAGE_kmod-nls-cp437=y
+CONFIG_PACKAGE_kmod-nls-iso8859-1=y
+CONFIG_PACKAGE_kmod-nls-utf8=y
+CONFIG_PACKAGE_kmod-rtl8189es-ol=m
+CONFIG_PACKAGE_kmod-rtl8723bs-ol=m
+CONFIG_PACKAGE_rtk_hciattach=m
+# CONFIG_PACKAGE_kmod-rtl8723bs is not set
+CONFIG_PACKAGE_kmod-scsi-core=y
+CONFIG_PACKAGE_kmod-sdhci=y
+CONFIG_PACKAGE_kmod-usb-core=y
+CONFIG_PACKAGE_kmod-usb-gadget=y
+CONFIG_PACKAGE_kmod-usb-gadget-cdc-composite=y
+CONFIG_PACKAGE_kmod-usb-gadget-ehci-debug=y
+CONFIG_PACKAGE_kmod-usb-gadget-eth=y
+CONFIG_PACKAGE_kmod-usb-gadget-hid=y
+CONFIG_PACKAGE_kmod-usb-gadget-mass-storage=y
+CONFIG_PACKAGE_kmod-usb-gadget-serial=y
+CONFIG_PACKAGE_kmod-usb-lib-composite=y
+CONFIG_PACKAGE_kmod-usb-net=y
+CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y
+CONFIG_PACKAGE_kmod-usb-net-rndis=y
+CONFIG_PACKAGE_kmod-usb-serial=y
+CONFIG_PACKAGE_kmod-usb-storage=y
+CONFIG_PACKAGE_libiwinfo=y
+CONFIG_PACKAGE_libiwinfo-lua=y
+CONFIG_PACKAGE_liblua=y
+CONFIG_PACKAGE_liblucihttp=y
+CONFIG_PACKAGE_liblucihttp-lua=y
+CONFIG_PACKAGE_libmbedtls=y
+CONFIG_PACKAGE_libubus-lua=y
+CONFIG_PACKAGE_lua=y
+CONFIG_PACKAGE_luci=y
+CONFIG_PACKAGE_luci-app-firewall=y
+CONFIG_PACKAGE_luci-app-jntools=m
+CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-base=y
+CONFIG_PACKAGE_luci-lib-base=y
+CONFIG_PACKAGE_luci-lib-ip=y
+CONFIG_PACKAGE_luci-lib-jsonc=y
+CONFIG_PACKAGE_luci-lib-nixio=y
+CONFIG_PACKAGE_luci-mod-admin-full=y
+CONFIG_PACKAGE_luci-mod-network=y
+CONFIG_PACKAGE_luci-mod-status=y
+CONFIG_PACKAGE_luci-mod-system=y
+CONFIG_PACKAGE_luci-proto-ipv6=y
+CONFIG_PACKAGE_luci-proto-ppp=y
+CONFIG_PACKAGE_luci-theme-bootstrap=y
+CONFIG_PACKAGE_memtool=m
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-file=y
+CONFIG_PACKAGE_rpcd-mod-iwinfo=y
+CONFIG_PACKAGE_rpcd-mod-luci=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+CONFIG_PACKAGE_uhttpd=y
+CONFIG_PACKAGE_uhttpd-mod-ubus=y
+CONFIG_PACKAGE_MAC80211_DEBUGFS=y
+CONFIG_PACKAGE_MAC80211_MESH=y
+# CONFIG_PACKAGE_MAC80211_TRACING is not set
+CONFIG_PACKAGE_kmod-mac80211=y
+CONFIG_PACKAGE_kmod-mmc=y
+# CONFIG_PACKAGE_zabbix-extra-mac80211 is not set
+
+CONFIG_ALL_KMODS=y
+# CONFIG_PACKAGE_kmod-bluetooth_6lowpan is not set
+# CONFIG_PACKAGE_kmod-6lowpan is not set
+CONFIG_PACKAGE_block-mount=m
+CONFIG_PACKAGE_blockd=m
+CONFIG_PACKAGE_comgt-directip=m
+CONFIG_PACKAGE_comgt-ncm=m
+CONFIG_PACKAGE_comgt=m
+CONFIG_PACKAGE_dropbearconvert=m
+CONFIG_PACKAGE_ip6tables-extra=m
+CONFIG_PACKAGE_ip6tables-mod-nat=m
+CONFIG_PACKAGE_iptables-mod-checksum=m
+CONFIG_PACKAGE_iptables-mod-cluster=m
+CONFIG_PACKAGE_iptables-mod-clusterip=m
+CONFIG_PACKAGE_iptables-mod-conntrack-extra=m
+CONFIG_PACKAGE_iptables-mod-extra=m
+CONFIG_PACKAGE_iptables-mod-filter=m
+CONFIG_PACKAGE_iptables-mod-hashlimit=m
+CONFIG_PACKAGE_iptables-mod-ipopt=m
+CONFIG_PACKAGE_iptables-mod-iprange=m
+CONFIG_PACKAGE_iptables-mod-ipsec=m
+CONFIG_PACKAGE_iptables-mod-led=m
+CONFIG_PACKAGE_iptables-mod-nat-extra=m
+CONFIG_PACKAGE_iptables-mod-nflog=m
+CONFIG_PACKAGE_iptables-mod-nfqueue=m
+CONFIG_PACKAGE_iptables-mod-physdev=m
+CONFIG_PACKAGE_iptables-mod-rpfilter=m
+CONFIG_PACKAGE_iptables-mod-tee=m
+CONFIG_PACKAGE_iptables-mod-tproxy=m
+CONFIG_PACKAGE_iptables-mod-trace=m
+CONFIG_PACKAGE_iptables-mod-u32=m
+CONFIG_PACKAGE_iptables-mod-ulog=m
+CONFIG_PACKAGE_libxtables-nft12=m
+CONFIG_PACKAGE_snapshot-tool=m
+CONFIG_PACKAGE_spidev-test=m
+CONFIG_PACKAGE_umbim=m
+CONFIG_PACKAGE_uqmi=m
+
+CONFIG_IMAGEOPT=y
+CONFIG_NODEJS_20=y
+CONFIG_NODEJS_ICU_SMALL=y
+CONFIG_OPENSSL_ENGINE=y
+CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
+CONFIG_OPENSSL_WITH_ASM=y
+CONFIG_OPENSSL_WITH_CHACHA_POLY1305=y
+CONFIG_OPENSSL_WITH_CMS=y
+CONFIG_OPENSSL_WITH_DEPRECATED=y
+CONFIG_OPENSSL_WITH_ERROR_MESSAGES=y
+CONFIG_OPENSSL_WITH_PSK=y
+CONFIG_OPENSSL_WITH_SRP=y
+CONFIG_OPENSSL_WITH_TLS13=y
+CONFIG_PACKAGE_MAC80211_DEBUGFS=y
+CONFIG_PACKAGE_MAC80211_MESH=y
+CONFIG_PACKAGE_avahi-dbus-daemon=m
+CONFIG_PACKAGE_davfs2=m
+CONFIG_PACKAGE_ip-tiny=m
+CONFIG_PACKAGE_kmod-fuse=m
+CONFIG_PACKAGE_kmod-tun=m
+CONFIG_PACKAGE_libatomic=m
+CONFIG_PACKAGE_libavahi-client=m
+CONFIG_PACKAGE_libavahi-compat-libdnssd=m
+CONFIG_PACKAGE_libavahi-dbus-support=m
+CONFIG_PACKAGE_libbz2=m
+CONFIG_PACKAGE_libcares=m
+CONFIG_PACKAGE_libdaemon=m
+CONFIG_PACKAGE_libdb47=m
+CONFIG_PACKAGE_libevdev=m
+CONFIG_PACKAGE_libfuse=m
+CONFIG_PACKAGE_libgdbm=m
+
+CONFIG_PACKAGE_liblzma=m
+CONFIG_PACKAGE_libminiupnpc=m
+CONFIG_PACKAGE_libnatpmp=m
+CONFIG_PACKAGE_libneon=m
+CONFIG_PACKAGE_libnghttp2=m
+CONFIG_PACKAGE_libopenssl=m
+CONFIG_PACKAGE_libsqlite3=m
+CONFIG_PACKAGE_libstdcpp=m
+
+CONFIG_PACKAGE_baresip=m
+CONFIG_PACKAGE_baresip-mod-mqtt=m
+# CONFIG_PACKAGE_ble2mqtt=m # builds in OpenWrt upstream
+CONFIG_PACKAGE_bluez-libs=m
+CONFIG_PACKAGE_bluez-utils=m
+CONFIG_PACKAGE_libudev-zero=m
+CONFIG_PACKAGE_libuv=m
+CONFIG_PACKAGE_lumimqtt=m
+CONFIG_PACKAGE_lumimqttd=m
+#CONFIG_PACKAGE_node-espruinohub=m
+CONFIG_PACKAGE_node-npm=m
+# CONFIG_PACKAGE_node-onvif2mqtt=m
+CONFIG_PACKAGE_node-red-contrib-gpio=m
+CONFIG_PACKAGE_node-red-contrib-homekit-bridged=m
+CONFIG_PACKAGE_node-red-dashboard=m
+CONFIG_PACKAGE_node-red-node-discovery=m
+CONFIG_PACKAGE_node-red-node-serialport=m
+CONFIG_PACKAGE_node-red=m
+# CONFIG_PACKAGE_node-zigbee2mqtt-dev=m
+CONFIG_PACKAGE_node-zigbee2mqtt=m
+CONFIG_PACKAGE_node=m
+CONFIG_PACKAGE_python3-aio-mqtt-mod=m
+CONFIG_PACKAGE_python3-asyncio=m
+CONFIG_PACKAGE_python3-base=m
+# CONFIG_PACKAGE_python3-bleak=m # builds in OpenWrt upstream
+CONFIG_PACKAGE_python3-bluepy=m
+CONFIG_PACKAGE_python3-cgi=m
+CONFIG_PACKAGE_python3-cgitb=m
+CONFIG_PACKAGE_python3-codecs=m
+CONFIG_PACKAGE_python3-ctypes=m
+CONFIG_PACKAGE_python3-dbm=m
+# CONFIG_PACKAGE_python3-dbus-fast=m # builds in OpenWrt upstream
+CONFIG_PACKAGE_python3-decimal=m
+CONFIG_PACKAGE_python3-distutils=m
+CONFIG_PACKAGE_python3-email=m
+CONFIG_PACKAGE_python3-evdev=m
+CONFIG_PACKAGE_python3-gdbm=m
+CONFIG_PACKAGE_python3-light=m
+CONFIG_PACKAGE_python3-logging=m
+CONFIG_PACKAGE_python3-lzma=m
+CONFIG_PACKAGE_python3-multiprocessing=m
+CONFIG_PACKAGE_python3-ncurses=m
+CONFIG_PACKAGE_python3-openssl=m
+CONFIG_PACKAGE_python3-pkg-resources=m
+CONFIG_PACKAGE_python3-pydoc=m
+CONFIG_PACKAGE_python3-sqlite3=m
+CONFIG_PACKAGE_python3-unittest=m
+CONFIG_PACKAGE_python3-urllib=m
+CONFIG_PACKAGE_python3-xml=m
+CONFIG_PACKAGE_python3=m
+CONFIG_PACKAGE_snapclient=m
+CONFIG_PACKAGE_snapserver=m
+CONFIG_PACKAGE_zerotier=m
+CONFIG_SQLITE3_DYNAMIC_EXTENSIONS=y
+CONFIG_SQLITE3_FTS3=y
+CONFIG_SQLITE3_FTS4=y
+CONFIG_SQLITE3_FTS5=y
+CONFIG_SQLITE3_JSON1=y
+CONFIG_SQLITE3_RTREE=y
+
+CONFIG_VERSIONOPT=y
+CONFIG_VERSION_DIST="OpenLumi"
+CONFIG_VERSION_FILENAMES=y
+CONFIG_VERSION_HOME_URL="https://openlumi.github.io/releases"
+CONFIG_VERSION_BUG_URL="https://github.com/openlumi/openlumi.github.io/issues"
+CONFIG_VERSION_SUPPORT_URL="https://github.com/openlumi/openlumi.github.io/issues"
+CONFIG_VERSION_REPO="%u/%v"
+
+CONFIG_IB=n
+# CONFIG_IB_STANDALONE is not set

user/23.05.5/custom.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "=============================================="
+rm ./package/feeds/packages/node
+rm ./package/feeds/packages/node-*
+./scripts/feeds update node
+./scripts/feeds install -a -p node
+make defconfig
+echo "=============================================="

user/23.05.5/files/files/etc/opkg/customfeeds.conf

@@ -0,0 +1,3 @@
+src/gz openwrt_base http://downloads.openwrt.org/releases/23.05.4/packages/arm_cortex-a7_neon-vfpv4/base
+src/gz openwrt_luci http://downloads.openwrt.org/releases/23.05.4/packages/arm_cortex-a7_neon-vfpv4/luci
+src/gz openwrt_packages http://downloads.openwrt.org/releases/23.05.4/packages/arm_cortex-a7_neon-vfpv4/packages

user/23.05.5/packages.txt

@@ -0,0 +1,2 @@
+
+lumimqttd https://github.com/Alx2000y/lumimqttd.git

user/23.05.5/patches/001_zigbee2mqtt_optimize.patch

@@ -0,0 +1,58 @@
+--- package/feeds/node/node-zigbee2mqtt/Makefile
++++ package/feeds/node/node-zigbee2mqtt/Makefile
+@@ -51,14 +51,23 @@
+ TARGET_CFLAGS+=$(FPIC)
+ TARGET_CPPFLAGS+=$(FPIC)
+
++NPM_FLAGS=$(MAKE_VARS) \
++    $(MAKE_FLAGS) \
++    npm_config_arch=$(NODEJS_CPU) \
++    npm_config_target_arch=$(NODEJS_CPU) \
++    npm_config_build_from_source=true \
++    npm_config_nodedir=$(STAGING_DIR)/usr/ \
++    npm_config_prefix=$(PKG_INSTALL_DIR)/usr/ \
++    npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM) \
++    npm_config_tmp=$(TMP_DIR)/npm-tmp-$(TMPNPM)
++
++
+ define Build/Compile
+-	cd $(PKG_BUILD_DIR); \
+-	$(MAKE_VARS) \
+-	$(MAKE_FLAGS) \
+-	npm_config_nodedir=$(STAGING_DIR)/usr/ \
+-	$(if $(CONFIG_NODEJS_NPM_KEEP_CACHE), npm_config_cache=$(NPM_CACHE_DIR)/npm-cache-$(PKG_NPM_NAME),npm_config_cache=$(TMP_DIR)/npm-cache-$(TMPNPM)) \
+-	npm install --prefer-offline --no-audit --global-style --install-strategy=shallow --no-save --omit=dev --no-package-lock --build-from-source --target_arch=$(NODEJS_CPU) --prefer-dedupe
+-	rm -rf $(TMP_DIR)/npm-cache-$(TMPNPM)
++	$(NPM_FLAGS) npm i --package-lock-only --prefix=$(PKG_BUILD_DIR)
++	$(NPM_FLAGS) npm i -g --production $(PKG_BUILD_DIR)
++	$(NPM_FLAGS) npm ci --production --prefix=$(PKG_BUILD_DIR) --target_arch=$(NODEJS_CPU) --prefer-dedupe
++	rm -rf $(PKG_BUILD_DIR)/node_modules/@serialport/bindings-cpp/prebuilds
++	rm -rf $(PKG_BUILD_DIR)/node_modules/{react-icons,@rjsf,react-dom,react-bootstrap}
+ 	rm -f $(PKG_BUILD_DIR)/node_modules/.package-lock.json
+ 	find $(PKG_BUILD_DIR)/node_modules -type d -empty -delete || true
+ 	rm -rf $(PKG_BUILD_DIR)/node_modules/zigbee-herdsman/node_modules/@serialport/bindings-cpp/prebuilds
+@@ -69,19 +78,20 @@
+ 	rm -rf $(PKG_BUILD_DIR)/node_modules/moment/locale
+ 	clean-modules -y -D $(PKG_BUILD_DIR)/node_modules "!**/*.map.js" "!**/*.png" \
+		"!**/example/" "!**/examples/" "**/npm-shrinkwrap.json" "**/.babelrc.js" \
++		"**/*.d.ts" "**/*.gypi" "**/*.mk" "**/*.Makefile" "**/package-lock.json" \
+ 		"**/.prebuild-installrc" "**/obj.target/" "**/config.gypi" "**/binding.Makefile"
+ endef
+
+ define Package/node-zigbee2mqtt/install
+ 	$(INSTALL_DIR) $(1)/opt/$(PKG_NPM_NAME)
+-	$(CP) $(PKG_BUILD_DIR)/{package.json,LICENSE} \
++	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{package.json,LICENSE} \
+ 		$(1)/opt/$(PKG_NPM_NAME)/
+-	$(CP) $(PKG_BUILD_DIR)/{*.md,*.js} \
++	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{*.md,*.js} \
+ 		$(1)/opt/$(PKG_NPM_NAME)/
+-	$(CP) $(PKG_BUILD_DIR)/{node_modules,dist} \
++	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{node_modules,dist} \
+ 		$(1)/opt/$(PKG_NPM_NAME)/
+-	$(CP) $(PKG_BUILD_DIR)/{data,scripts} \
++	$(CP) $(PKG_INSTALL_DIR)/usr/lib/node_modules/$(PKG_NPM_NAME)/{data,scripts} \
+ 		$(1)/opt/$(PKG_NPM_NAME)/
+ 	$(INSTALL_DIR) $(1)/etc/init.d
+ 	$(INSTALL_BIN) ./files/zigbee2mqtt.init $(1)/etc/init.d/zigbee2mqtt
+ 	$(INSTALL_DIR) $(1)/etc/zigbee2mqtt

user/23.05.5/pre_custom.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp feeds.conf.default feeds.conf
+echo "src-git node https://github.com/nxhack/openwrt-node-packages.git;openwrt-23.05" >> feeds.conf
+echo "src-git openlumi https://github.com/openlumi/openwrt-lumi-packages.git;23.05" >> feeds.conf

user/23.05.5/settings.ini

@@ -0,0 +1,8 @@
+# Specify here the name and tag you want to use for the builders, they will be used for your docker hub repository
+# For BUILDER_NAME: due to docker's limitation, only allowing lowercase letters, digits and separators (period, underscores, dashes)
+# For BUILDER_TAG: lowercase and uppercase letters, digits, underscores, periods and dashes
+BUILDER_NAME="openwrt"
+BUILDER_TAG="23.05.5"
+# Specify here the OpenWrt Repo URL and Branch
+REPO_URL="https://github.com/openlumi/openwrt"
+REPO_BRANCH="lumi-23.05"