From 400678c7594470f56a46f4542bcd85bccf057283 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Thu, 19 Oct 2023 05:56:35 +0300 Subject: [PATCH] Revert i2c-tools to release 1 and make --- .buildbot/openwrt/build.sh | 3 +++ patches/i2c-tools-revert.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 patches/i2c-tools-revert.patch diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index cf359c8..fa56bf0 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -26,10 +26,13 @@ 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 diff --git a/patches/i2c-tools-revert.patch b/patches/i2c-tools-revert.patch new file mode 100644 index 0000000..2e5c0a9 --- /dev/null +++ b/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/