Update resolvelib package

- fully parametrize downloads,
 - move env parameters down after apt packages install,
 - add python3-distutils for building without buildbot.

.buildbot/openwrt/Dockerfile

@@ -1,27 +1,28 @@
 FROM ubuntu:focal
 
-ENV OPENWRT_VERSION=22.03.2
-ENV OPENWRT_TARGET=bcm27xx
-ENV OPENWRT_DEVICE=bcm2711
-ENV OPENWRT_CC=gcc-11.2.0_musl
-
 RUN apt -y update
 
 RUN DEBIAN_FRONTEND=noninteractive TZ=UTC \
   apt -yq install \
   build-essential rsync git-core subversion mercurial libssl-dev \
   libncurses5-dev unzip  gawk zlib1g-dev libncursesw5-dev zlib1g-dev \
-  gettext xsltproc wget unzip python
+  gettext xsltproc wget unzip python python3-distutils
+
+# Board build parameters
+ENV OPENWRT_VERSION=22.03.2
+ENV OPENWRT_TARGET=bcm27xx
+ENV OPENWRT_DEVICE=bcm2711
+ENV OPENWRT_CC=gcc-11.2.0_musl
 
 RUN mkdir /Downloads
 
 RUN wget -qP /Downloads \
-     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-imagebuilder-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}.Linux-x86_64.tar.xz"
+     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/openwrt-imagebuilder-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}.Linux-x86_64.tar.xz"
 
 RUN wget -qP /Downloads \
-     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+     "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/openwrt-sdk-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
 # RUN wget -qP /Downloads \
-#      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/bcm27xx/bcm2711/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
+#      "https://downloads.openwrt.org/releases/${OPENWRT_VERSION}/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}/openwrt-toolchain-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}_${OPENWRT_CC}.Linux-x86_64.tar.xz"
 
 ADD . .

.buildbot/openwrt/build.sh

@@ -26,16 +26,18 @@ sed -i "s/\(packages.git\)\^.*/\1;openwrt-22.03/g" feeds.conf
 ./scripts/feeds update -a
 ./scripts/feeds install -a
 
+git apply ${pwd}/patches/i2c-tools-revert.patch
+
 make defconfig
 # Enable collectd network encryption
 echo "CONFIG_PACKAGE_COLLECTD_ENCRYPTED_NETWORK=y" >> .config
 
+make package/i2c-tools/compile
 make package/kmod-nvme/compile
 make package/kmod-i2c-mux-pinctrl/compile
 make package/kmod-rtc-pcf85063/compile
 make package/nvme-cli/compile
 make package/ansible-core/compile
-make package/python3-packages/compile
 make package/asterisk-chan-quectel/compile
 make package/collectd/compile
 
@@ -47,12 +49,14 @@ tar -xJf /Downloads/openwrt-imagebuilder-${OPENWRT_VERSION}-*.tar.xz
 PROFILE=rpi-4
 BINPATH=bin/targets/${OPENWRT_TARGET}/${OPENWRT_DEVICE}
 IMAGE_PATH=${BINPATH}/openwrt-${OPENWRT_VERSION}-${OPENWRT_TARGET}-${OPENWRT_DEVICE}-${PROFILE}
+PKG_ARCH=aarch64_cortex-a72
 
 cd openwrt-imagebuilder-*/
 cp ${sdkdir}/${BINPATH}/packages/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/packages/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/telephony/*.ipk packages/
-cp ${sdkdir}/bin/packages/aarch64_cortex-a72/local/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/base/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/packages/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/telephony/*.ipk packages/
+cp ${sdkdir}/bin/packages/${PKG_ARCH}/local/*.ipk packages/
 
 make info
 
@@ -91,7 +95,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
 	  luci-proto-wireguard \
 	  luci-ssl-nginx luci-app-acme \
 	  python3-ansible-core python3-ansible-core-src \
-	  python3-packages python3-yaml \
+	  python3-yaml \
 	  openssh-sftp-server tcpdump \
 	  iptables-nft ip6tables-nft \
 	  wireguard-tools wget-ssl \
@@ -99,7 +103,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \
 
 BOOTSOURCE=target/linux/${OPENWRT_TARGET}/image
 BOOTCONFIG=${BOOTSOURCE}/config.txt
-KERNELSOURCE=build_dir/target-aarch64_cortex-a72_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146
+KERNELSOURCE=build_dir/target-${PKG_ARCH}_musl/linux-${OPENWRT_TARGET}_${OPENWRT_DEVICE}/linux-5.10.146
 OVERLAYSOURCE=${KERNELSOURCE}/arch/arm64/boot/dts/overlays
 
 # Setup files

feed/resolvelib/Makefile

@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=resolvelib
 PKG_VERSION:=0.9.0
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=2
 
 PYPI_NAME:=$(PKG_NAME)
 PKG_HASH:=40ab05117c3281b1b160105e10075094c5ab118315003c922b77673a365290e1
 PKG_MAINTAINER:=Lee Miller <lee.miller@tutanota.com>
 PKG_LICENSE:=ISC
 
-HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm toml
+PKG_BUILD_DEPENDS:=python-setuptools-scm/host python-toml/host
 
 include $(TOPDIR)/feeds/packages/lang/python/pypi.mk
 include $(INCLUDE_DIR)/package.mk

patches/i2c-tools-revert.patch

@@ -0,0 +1,34 @@
+--- a/feeds/packages/utils/i2c-tools/Makefile	2023-10-19 02:48:26.528051917 +0000
++++ b/feeds/packages/utils/i2c-tools/Makefile	2023-10-19 02:50:13.281230932 +0000
+@@ -9,7 +9,7 @@
+ 
+ PKG_NAME:=i2c-tools
+ PKG_VERSION:=4.3
+-PKG_RELEASE:=3
++PKG_RELEASE:=1
+ 
+ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+ PKG_SOURCE_URL:=@KERNEL/software/utils/i2c-tools
+@@ -67,9 +67,8 @@
+  This package contain the Python3 bindings for Linux SMBus access through i2c-dev.
+ endef
+ 
+-PYTHON3_PKG_BUILD_PATH:=py-smbus
+-PYTHON3_PKG_WHEEL_NAME:=smbus
+-PYTHON3_PKG_WHEEL_VERSION:=1.1
++PYTHON3_PKG_SETUP_ARGS:=
++PYTHON3_PKG_SETUP_DIR:=py-smbus
+ 
+ define Build/Compile
+ 	$(MAKE) -C $(PKG_BUILD_DIR) \
+@@ -87,10 +86,6 @@
+ 	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.{a,so*} $(1)/usr/lib/
+ endef
+ 
+-define Build/Install
+-	$(call Py3Build/Install)
+-endef
+-
+ define Package/libi2c/install
+ 	$(INSTALL_DIR) $(1)/usr/lib
+ 	$(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/