diff --git a/admin/nyx/Makefile b/admin/nyx/Makefile index a572fb893..5a7e26b41 100644 --- a/admin/nyx/Makefile +++ b/admin/nyx/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nyx PKG_VERSION:=2.1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=nyx PKG_HASH:=88521488d1c9052e457b9e66498a4acfaaa3adf3adc5a199892632f129a5390b @@ -21,7 +21,6 @@ define Package/nyx URL:=https://nyx.torproject.org/ TITLE:=Terminal status monitor for Tor DEPENDS:=+python3 +python3-stem - VARIANT:=python3 endef define Package/nyx/description diff --git a/devel/asu/Makefile b/devel/asu/Makefile index a6f0a8ef5..54d55f245 100644 --- a/devel/asu/Makefile +++ b/devel/asu/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asu PKG_VERSION:=0.2.3 -PKG_RELEASE=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-3.0 @@ -37,7 +37,6 @@ define Package/asu +gunicorn3 +python3-openssl +python3-pyodbc +python3-yaml \ +libustream-mbedtls +ca-certificates +gnupg USERID:=asu:asu - VARIANT:=python3 endef define Package/asu/description diff --git a/devel/meson/Makefile b/devel/meson/Makefile index b9af6f71c..5762ad773 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=meson PKG_VERSION:=0.54.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=meson PKG_HASH:=dde5726d778112acbd4a67bb3633ab2ee75d33d1e879a6283a7b4a44c3363c27 @@ -40,7 +40,6 @@ define Package/meson TITLE:=meson URL:=https://mesonbuild.com/ DEPENDS:=+ninja +python3-pkg-resources - VARIANT:=python3 endef define Package/meson/description diff --git a/libs/libgpiod/Makefile b/libs/libgpiod/Makefile index 86604b2de..11bf13ae8 100644 --- a/libs/libgpiod/Makefile +++ b/libs/libgpiod/Makefile @@ -22,6 +22,7 @@ PKG_MAINTAINER:=Michael Heimpold PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk diff --git a/libs/newt/Makefile b/libs/newt/Makefile index 10abe55f4..dd4ddcb2c 100644 --- a/libs/newt/Makefile +++ b/libs/newt/Makefile @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=newt PKG_VERSION:=0.52.21 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://releases.pagure.org/newt @@ -24,6 +24,7 @@ PKG_CPE_ID:=cpe:/a:fedorahosted:newt PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -73,7 +74,6 @@ $(call Package/newt/Default) SUBMENU:=Python TITLE+= module for Python DEPENDS:=+libnewt +python3-light - VARIANT:=python3 endef define Package/python3-newt/description @@ -93,8 +93,6 @@ CONFIGURE_VARS += $(if $(CONFIG_BUILD_NLS),ac_cv_lib_c_gettext=no) MAKE_VARS+= PYTHON_CONFIG_PATH="$(STAGING_DIR)/host/bin" -Build/Compile=$(call Build/Compile/Default,) - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/newt.h $(1)/usr/include/ diff --git a/multimedia/youtube-dl/Makefile b/multimedia/youtube-dl/Makefile index 2d025ff6c..7e3a2f1fe 100644 --- a/multimedia/youtube-dl/Makefile +++ b/multimedia/youtube-dl/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=youtube-dl PKG_VERSION:=2020.3.24 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=youtube_dl PKG_HASH:=4b03efe439f7cae26eba909821d1df00a9a4eb82741cb2e8b78fe29702bd4633 @@ -35,7 +35,6 @@ define Package/youtube-dl +python3-codecs \ +python3-ctypes \ +python3-setuptools - VARIANT:=python3 endef define Package/youtube-dl/description diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index ef32b33cc..a7085a94c 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -22,6 +22,7 @@ PKG_CPE_ID:=cpe:/a:freeradius:freeradius PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION) PKG_FIXUP:=autoreconf +PYTHON3_PKG_BUILD:=0 PKG_CONFIG_DEPENDS := \ FREERADIUS3_OPENSSL \ @@ -30,7 +31,7 @@ PKG_CONFIG_DEPENDS := \ CFLAGS += $(FPIC) include $(INCLUDE_DIR)/package.mk -include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk +include ../../lang/python/python3-package.mk define Package/freeradius3/config source "$(SOURCE)/Config.in" @@ -766,7 +767,6 @@ $(eval $(call BuildPlugin,freeradius3-mod-mschap,rlm_mschap,)) $(eval $(call BuildPlugin,freeradius3-mod-pap,rlm_pap,)) $(eval $(call BuildPlugin,freeradius3-mod-passwd,rlm_passwd,)) $(eval $(call BuildPlugin,freeradius3-mod-preprocess,rlm_preprocess,)) -$(eval $(call Py3Package,freeradius3-mod-python3)) $(eval $(call BuildPlugin,freeradius3-mod-python3,rlm_python3,)) $(eval $(call BuildPlugin,freeradius3-mod-radutmp,rlm_radutmp,)) $(eval $(call BuildPlugin,freeradius3-mod-realm,rlm_realm,)) diff --git a/net/nmap/Makefile b/net/nmap/Makefile index 46c047981..648ade267 100644 --- a/net/nmap/Makefile +++ b/net/nmap/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nmap PKG_VERSION:=7.80 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Nuno Goncalves PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -26,6 +26,7 @@ PKG_CPE_ID:=cpe:/a:nmap:nmap PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk @@ -100,7 +101,6 @@ endef define Package/ndiff $(call Package/nmap/default) DEPENDS:=+python3-light +python3-xml - VARIANT:=python3 TITLE:=Utility to compare the results of Nmap scans endef @@ -148,10 +148,10 @@ CONFIGURE_VARS += \ PYTHON3_PKG_SETUP_DIR:=ndiff PYTHON3_PKG_SETUP_ARGS:= -ifeq ($(BUILD_VARIANT),python3) - Build/Configure:=: - Build/Install:=: -endif +define Build/Compile + $(call Build/Compile/Default,) + $(call Py3Build/Compile) +endef define Package/nmap/install $(INSTALL_DIR) $(1)/usr/bin diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 09ff2b4a7..76ba560e2 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -32,6 +32,7 @@ PKG_USE_MIPS16:=0 PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 +PYTHON3_PKG_BUILD:=0 PKG_MAINTAINER:=Yousong Zhou diff --git a/net/radicale/Makefile b/net/radicale/Makefile index ac73d6762..5422fa7c6 100644 --- a/net/radicale/Makefile +++ b/net/radicale/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radicale PKG_VERSION:=1.1.6 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PYPI_NAME:=Radicale PKG_HASH:=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b @@ -37,7 +37,6 @@ define Package/radicale +python3-xml USERID:=radicale=5232:radicale=5232 PROVIDES:=radicale-py2 radicale-py3 - VARIANT:=python3 endef define Package/radicale/description diff --git a/net/radicale2/Makefile b/net/radicale2/Makefile index 02700a6b5..455053784 100644 --- a/net/radicale2/Makefile +++ b/net/radicale2/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radicale2 PKG_VERSION:=2.1.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-3.0 PKG_LICENSE_FILES:=COPYING @@ -31,7 +31,6 @@ $(call Package/radicale2/Default) USERID:=radicale2=225:radicale2=225 DEPENDS:=+python3 +python3-dateutil +python3-vobject +python3-setuptools CONFLICTS:=radicale - VARIANT:=python3 endef define Package/radicale2-examples diff --git a/net/samba4/Makefile b/net/samba4/Makefile index 078c286af..5fcf17436 100644 --- a/net/samba4/Makefile +++ b/net/samba4/Makefile @@ -33,13 +33,14 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_kmod-fs-btrfs \ CONFIG_PACKAGE_kmod-fs-xfs +PYTHON3_PKG_BUILD:=0 + include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk -include $(TOPDIR)/feeds/packages/lang/python/python3-host.mk -#include $(TOPDIR)/feeds/packages/lang/python/python-package.mk -include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk +include ../../lang/python/python3-host.mk +include ../../lang/python/python3-package.mk define Package/samba4/Default SECTION:=net diff --git a/net/sysrepo/Makefile b/net/sysrepo/Makefile index 72396aa5d..13fc9d79c 100644 --- a/net/sysrepo/Makefile +++ b/net/sysrepo/Makefile @@ -22,6 +22,7 @@ PKG_LICENSE_FILES:=LICENSE CMAKE_INSTALL:=1 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=swig/host +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk diff --git a/net/uwsgi/Makefile b/net/uwsgi/Makefile index d658c9c28..57e236204 100644 --- a/net/uwsgi/Makefile +++ b/net/uwsgi/Makefile @@ -9,6 +9,7 @@ PKG_SOURCE_URL=https://files.pythonhosted.org/packages/source/u/uwsgi/ PKG_HASH:=4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583 PKG_BUILD_DIR:=$(BUILD_DIR)/uwsgi-$(PKG_VERSION) PKG_BUILD_DEPENDS:=python3/host +PYTHON3_PKG_BUILD:=0 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/utils/bigclown/bigclown-control-tool/Makefile b/utils/bigclown/bigclown-control-tool/Makefile index 100a3be77..6e8db708b 100644 --- a/utils/bigclown/bigclown-control-tool/Makefile +++ b/utils/bigclown/bigclown-control-tool/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-control-tool PKG_VERSION:=0.2.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=bch PKG_HASH:=4cd73b92757fce7275a4744baed411c867af2e671c521b90d6690b2320851d58 @@ -32,7 +32,6 @@ define Package/bigclown-control-tool +python3-pyserial \ +python3-yaml \ +python3-simplejson - VARIANT:=python3 endef $(eval $(call Py3Package,bigclown-control-tool)) diff --git a/utils/bigclown/bigclown-firmware-tool/Makefile b/utils/bigclown/bigclown-firmware-tool/Makefile index c9a6ce943..5596a3638 100644 --- a/utils/bigclown/bigclown-firmware-tool/Makefile +++ b/utils/bigclown/bigclown-firmware-tool/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-firmware-tool PKG_VERSION:=1.5.1 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=bcf PKG_HASH:=50b0351b97e6b1b1d4cb4703491daa6102e7e5b3b750b47fa35182d9eb39ab9c @@ -34,7 +34,6 @@ define Package/bigclown-firmware-tool +python3-requests \ +python3-click \ +python3-intelhex - VARIANT:=python3 endef $(eval $(call Py3Package,bigclown-firmware-tool)) diff --git a/utils/bigclown/bigclown-gateway/Makefile b/utils/bigclown/bigclown-gateway/Makefile index 1419d16f9..af0fe8554 100644 --- a/utils/bigclown/bigclown-gateway/Makefile +++ b/utils/bigclown/bigclown-gateway/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-gateway PKG_VERSION:=1.16.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=bcg PKG_HASH:=ce7f27f372551c0beb3f8929af2d779417d9dcd0feaa2fa2dc49e87b1416c536 @@ -36,7 +36,6 @@ define Package/bigclown-gateway +python3-simplejson \ +python3-schema \ +python3-appdirs - VARIANT:=python3 endef define Py3Package/bigclown-gateway/install diff --git a/utils/bigclown/bigclown-mqtt2influxdb/Makefile b/utils/bigclown/bigclown-mqtt2influxdb/Makefile index c405ba8bd..ab57a10d4 100644 --- a/utils/bigclown/bigclown-mqtt2influxdb/Makefile +++ b/utils/bigclown/bigclown-mqtt2influxdb/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bigclown-mqtt2influxdb PKG_VERSION:=1.3.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PYPI_NAME:=mqtt2influxdb PKG_HASH:=1b4b3b13f5b2f092bcd27846d94e91ad6f05141b2daea5167a7d58b09a782639 @@ -31,7 +31,6 @@ define Package/bigclown-mqtt2influxdb +python3-influxdb \ +python3-jsonpath-ng \ +python3-schema - VARIANT:=python3 endef define Py3Package/bigclown-mqtt2influxdb/install diff --git a/utils/i2c-tools/Makefile b/utils/i2c-tools/Makefile index 388006360..79d6272e7 100644 --- a/utils/i2c-tools/Makefile +++ b/utils/i2c-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=i2c-tools PKG_VERSION:=4.1 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/utils/i2c-tools @@ -20,13 +20,11 @@ PKG_LICENSE:=GPL-2.0-or-later LGPL-2.1-or-later PKG_LICENSE_FILES:=COPYING COPYING.LGPL PKG_BUILD_PARALLEL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)-i2c-tools-$(PKG_VERSION) +PYTHON3_PKG_BUILD:=0 include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-package.mk -PKG_UNPACK:=$(HOST_TAR) -C $(PKG_BUILD_DIR) --strip-components=1 -xJf $(DL_DIR)/$(PKG_SOURCE) - define Package/i2c/Default URL:=https://i2c.wiki.kernel.org/index.php/I2C_Tools TITLE:=I2C @@ -37,7 +35,6 @@ define Package/libi2c SECTION:=libs CATEGORY:=Libraries TITLE+=library for i2c-tools - VARIANT:=bin endef define Package/i2c-tools @@ -46,7 +43,6 @@ define Package/i2c-tools CATEGORY:=Utilities TITLE+=tools for Linux DEPENDS:=+libi2c - VARIANT:=bin endef define Package/python3-smbus @@ -56,7 +52,6 @@ define Package/python3-smbus CATEGORY:=Languages TITLE:=Python bindings for the SMBUS DEPENDS:=+libi2c +python3-light - VARIANT:=python3 endef define Package/libi2c/description @@ -72,7 +67,8 @@ define Package/python3-smbus/description This package contain the Python3 bindings for Linux SMBus access through i2c-dev. endef -ifeq ($(BUILD_VARIANT),bin) +PYTHON3_PKG_SETUP_ARGS:= +PYTHON3_PKG_SETUP_DIR:=py-smbus define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ @@ -81,6 +77,7 @@ define Build/Compile STAGING_DIR="$(STAGING_DIR)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" + $(call Py3Build/Compile) endef define Build/InstallDev @@ -89,11 +86,6 @@ define Build/InstallDev $(CP) $(PKG_BUILD_DIR)/lib/libi2c.{a,so*} $(1)/usr/lib/ endef -endif # ifeq - -PYTHON3_PKG_SETUP_ARGS:= -PYTHON3_PKG_SETUP_DIR:=py-smbus - define Package/libi2c/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/lib/libi2c.so* $(1)/usr/lib/