From dda111bbd400db74b7b1cbc6843a39845837d550 Mon Sep 17 00:00:00 2001 From: hgy59 Date: Thu, 7 Sep 2023 20:14:37 +0200 Subject: [PATCH] homeassistant: fix tradfri integration (#5869) * homeassistant: fix tradfri integration - add dtlssocket wheel (runtime dependecy of tradfri) * update cross/dtlssocket to v0.1.16 * update cross/cython to v0.29.36 * fix makefile indentation * python.mk: fix log output --- cross/cython/Makefile | 4 ++-- cross/cython/digests | 6 +++--- cross/dtlssocket/Makefile | 4 ++-- cross/dtlssocket/digests | 6 +++--- mk/spksrc.python.mk | 17 ++++++++--------- spk/homeassistant/Makefile | 5 ++++- 6 files changed, 22 insertions(+), 20 deletions(-) diff --git a/cross/cython/Makefile b/cross/cython/Makefile index 382276200bf..0bce457c610 100644 --- a/cross/cython/Makefile +++ b/cross/cython/Makefile @@ -1,8 +1,8 @@ PKG_NAME = cython -PKG_VERS = 0.29.24 +PKG_VERS = 0.29.36 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://github.com/$(PKG_NAME)/$(PKG_NAME)/archive +PKG_DIST_SITE = https://github.com/cython/cython/archive PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-$(PKG_VERS) diff --git a/cross/cython/digests b/cross/cython/digests index 479727f8f35..689ee3773c8 100644 --- a/cross/cython/digests +++ b/cross/cython/digests @@ -1,3 +1,3 @@ -cython-0.29.24.tar.gz SHA1 36a2a5fe9730758cebf3de28c0ff7ae33595700f -cython-0.29.24.tar.gz SHA256 a5efb97612f0f97164e87c54cc295b2e2d06c539487670079963adeab872de80 -cython-0.29.24.tar.gz MD5 6a7bd0c2d7a9f1630d82e957197ea6e8 +cython-0.29.36.tar.gz SHA1 5b7a3e929edb741b670f318475318c3242b28e62 +cython-0.29.36.tar.gz SHA256 bd8ee4208e1f2817914894eca8c4ca894f6c9a51803b0b815a9a3c03d01ab729 +cython-0.29.36.tar.gz MD5 18d560eee4bba6ef943d98a5499fb977 diff --git a/cross/dtlssocket/Makefile b/cross/dtlssocket/Makefile index 47954fd0617..af1a7a2b2ee 100644 --- a/cross/dtlssocket/Makefile +++ b/cross/dtlssocket/Makefile @@ -1,8 +1,8 @@ PKG_NAME = DTLSSocket -PKG_VERS = 0.1.15 +PKG_VERS = 0.1.16 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) -PKG_DIST_SITE = https://files.pythonhosted.org/packages/72/dc/8171d3106233efbd28620539594ca705f1aa9e140287823e23cd46ca7c42 +PKG_DIST_SITE = https://files.pythonhosted.org/packages/58/42/0a0442118096eb9fbc9dc70b45aee2957f7546b80545e2a05bd839380519 PKG_DIR = $(PKG_NAME)-$(PKG_VERS) BUILD_DEPENDS = cross/cython diff --git a/cross/dtlssocket/digests b/cross/dtlssocket/digests index 25738f75876..6f1c3b7f1a7 100644 --- a/cross/dtlssocket/digests +++ b/cross/dtlssocket/digests @@ -1,3 +1,3 @@ -DTLSSocket-0.1.15.tar.gz SHA1 e0f7d4455cac5863d7f67d5b884da56f2ff70f25 -DTLSSocket-0.1.15.tar.gz SHA256 456b1c53126c98b908d863e39e94b5a0954fb09fb16ea3c02a4e10d46ec84aee -DTLSSocket-0.1.15.tar.gz MD5 c5c6fe31e8acd0a6512dd2ec4360896d +DTLSSocket-0.1.16.tar.gz SHA1 9b4eaa3e9a949f202844a27ba54b2f05d73aa410 +DTLSSocket-0.1.16.tar.gz SHA256 30b108ae45fce1c033e3ef6c2ddd7e7418062ae374228e3a7fa969b254366a39 +DTLSSocket-0.1.16.tar.gz MD5 15dfeca9678e381c7bb6e11e4c864fd5 diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk index 0f7648290a4..86ed2eefc56 100644 --- a/mk/spksrc.python.mk +++ b/mk/spksrc.python.mk @@ -65,25 +65,24 @@ include ../../mk/spksrc.spk.mk .PHONY: python_pre_depend python_pre_depend: - @$(MSG) ***************************************************** - @$(MSG) *** Use existing shared objects from python $(PYTHON_VERSION) - @$(MSG) *** PATH: $(PYTHON_PACKAGE_ROOT) - @$(MSG) ***************************************************** + @$(MSG) "*****************************************************" + @$(MSG) "*** Use existing shared objects from python $(PYTHON_VERSION)" + @$(MSG) "*** PATH: $(PYTHON_PACKAGE_ROOT)" + @$(MSG) "*****************************************************" @mkdir -p $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/ @$(foreach lib,$(PYTHON_LIBS),ln -sf $(lib) $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/ ;) @ln -sf $(PYTHON_PACKAGE_ROOT)/crossenv $(WORK_DIR)/crossenv @ln -sf $(PYTHON_PACKAGE_ROOT)/python-cc.mk $(WORK_DIR)/python-cc.mk @$(foreach _done,$(PYTHON_DEPENDS), ln -sf $(_done) $(WORK_DIR) ;) - # EXCEPTION: Ensure zlib is always built locally + @# EXCEPTION: Ensure zlib is always built locally @rm -f $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/zlib.pc $(WORK_DIR)/.zlib* - # EXCEPTION: Do not symlink cross/* wheel builds + @# EXCEPTION: Do not symlink cross/* wheel builds @make --no-print-directory dependency-flat | sort -u | grep -v spk/ | while read depend ; do \ makefile="../../$${depend}/Makefile" ; \ if grep -q spksrc.python-wheel.mk $${makefile} ; then \ pkgstr=$$(grep ^PKG_NAME $${makefile}) ; \ pkgname=$$(echo $${pkgstr#*=} | xargs) ; \ - echo "rm -fr work-*/$${pkgname}*\\n work-*/.$${pkgname}-*" ; \ - rm -fr work-*/$${pkgname}* \ - work-*/.$${pkgname}-* ; \ + echo "rm -fr work-*/$${pkgname}* work-*/.$${pkgname}-*" ; \ + rm -fr work-*/$${pkgname}* work-*/.$${pkgname}-* ; \ fi ; \ done diff --git a/spk/homeassistant/Makefile b/spk/homeassistant/Makefile index 3333669ee76..8528b799641 100644 --- a/spk/homeassistant/Makefile +++ b/spk/homeassistant/Makefile @@ -1,6 +1,6 @@ SPK_NAME = homeassistant SPK_VERS = 2023.7.3 -SPK_REV = 21 +SPK_REV = 22 SPK_ICON = src/homeassistant.png HACS_VERS = 1.32.1 @@ -37,6 +37,9 @@ POST_STRIP_TARGET = homeassistant_extra_install # Include cross compiled wheels only, the package installer downloads pure python wheels at installation time. WHEELS = src/requirements-abi3.txt src/requirements-crossenv.txt src/requirements-pure.txt +# [DTLSSocket] runtime dependency of [tradfri] +DEPENDS += cross/dtlssocket + include ../../mk/spksrc.common.mk # [grpcio]