From 96883344fe52864a2183db383b98d0da000700a5 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Wed, 15 Feb 2023 05:55:45 +0200 Subject: [PATCH 1/5] Add a package for ansible-core --- .buildbot/openwrt/build.sh | 4 +++- feed/ansible-core/Makefile | 39 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 feed/ansible-core/Makefile diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index fa56bf0..ac95db7 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -37,6 +37,7 @@ 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/asterisk-chan-quectel/compile make package/collectd/compile @@ -93,7 +94,8 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \ luci-app-mwan3 luci-app-upnp \ luci-proto-wireguard \ luci-ssl-nginx luci-app-acme \ - python3-packages python3-yaml \ + python3-ansible-core \ + python3-yaml \ openssh-sftp-server tcpdump \ iptables-nft ip6tables-nft \ wireguard-tools wget-ssl \ diff --git a/feed/ansible-core/Makefile b/feed/ansible-core/Makefile new file mode 100644 index 0000000..89c9c5b --- /dev/null +++ b/feed/ansible-core/Makefile @@ -0,0 +1,39 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ansible-core +PKG_VERSION:=2.14.2 +PKG_RELEASE:=$(AUTORELEASE) + +PYPI_NAME:=$(PKG_NAME) +PKG_HASH:=47f0d4b4125b58edba6435a47f37cbe6a18da54594d18f812958bb0cb58d4e65 +PKG_MAINTAINER:=Lee Miller +PKG_LICENSE:=GPL-3.0-or-later + +include $(TOPDIR)/feeds/packages/lang/python/pypi.mk +include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk + +define Package/python3-$(PKG_NAME) + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Radically simple IT automation + URL:=https://ansible.com/ + DEPENDS:=+python3 +python3-logging +python3-setuptools +python3-cryptography \ + +python3-jinja2 +python3-yaml +python3-packaging +endef + +define Package/python3-$(PKG_NAME)/description + Ansible is a radically simple IT automation system. It handles configuration + management, application deployment, cloud provisioning, ad-hoc task + execution, network automation, and multi-node orchestration. Ansible makes + complex changes like zero-downtime rolling updates with load balancers easy. +endef + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) -- 2.45.1 From 9cb4cbebf468dc07bbc05d5fc1a887300e795aa3 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Wed, 22 Feb 2023 06:16:26 +0200 Subject: [PATCH 2/5] Add missing dependencies --- feed/ansible-core/Makefile | 3 ++- feed/resolvelib/Makefile | 40 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 feed/resolvelib/Makefile diff --git a/feed/ansible-core/Makefile b/feed/ansible-core/Makefile index 89c9c5b..3c4473a 100644 --- a/feed/ansible-core/Makefile +++ b/feed/ansible-core/Makefile @@ -24,7 +24,8 @@ define Package/python3-$(PKG_NAME) TITLE:=Radically simple IT automation URL:=https://ansible.com/ DEPENDS:=+python3 +python3-logging +python3-setuptools +python3-cryptography \ - +python3-jinja2 +python3-yaml +python3-packaging + +python3-jinja2 +python3-yaml +python3-packaging \ + +python3-resolvelib endef define Package/python3-$(PKG_NAME)/description diff --git a/feed/resolvelib/Makefile b/feed/resolvelib/Makefile new file mode 100644 index 0000000..6533d3b --- /dev/null +++ b/feed/resolvelib/Makefile @@ -0,0 +1,40 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=resolvelib +PKG_VERSION:=0.9.0 +PKG_RELEASE:=$(AUTORELEASE) + +PYPI_NAME:=$(PKG_NAME) +PKG_HASH:=40ab05117c3281b1b160105e10075094c5ab118315003c922b77673a365290e1 +PKG_MAINTAINER:=Lee Miller +PKG_LICENSE:=ISC + +HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=setuptools-scm toml + +include $(TOPDIR)/feeds/packages/lang/python/pypi.mk +include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk + +define Package/python3-$(PKG_NAME) + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Resolve abstract dependencies into concrete ones + URL:=https://github.com/sarugaku/resolvelib + DEPENDS:=+python3 +python3-setuptools +endef + +define Package/python3-$(PKG_NAME)/description + ResolveLib at the highest level provides a Resolver class that includes + dependency resolution logic. You give it some things, and a little + information on how it should interact with them, and it will spit out + a resolution result. +endef + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) -- 2.45.1 From dca142cb6853157455ce2489b86dba3f66ad080e Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Thu, 23 Feb 2023 02:37:18 +0200 Subject: [PATCH 3/5] Add also GitPython package and its depends --- feed/ansible-core/Makefile | 2 +- feed/gitdb/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ feed/gitpython/Makefile | 36 ++++++++++++++++++++++++++++++++++++ feed/smmap/Makefile | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 feed/gitdb/Makefile create mode 100644 feed/gitpython/Makefile create mode 100644 feed/smmap/Makefile diff --git a/feed/ansible-core/Makefile b/feed/ansible-core/Makefile index 3c4473a..50e0af7 100644 --- a/feed/ansible-core/Makefile +++ b/feed/ansible-core/Makefile @@ -25,7 +25,7 @@ define Package/python3-$(PKG_NAME) URL:=https://ansible.com/ DEPENDS:=+python3 +python3-logging +python3-setuptools +python3-cryptography \ +python3-jinja2 +python3-yaml +python3-packaging \ - +python3-resolvelib + +python3-git +python3-resolvelib endef define Package/python3-$(PKG_NAME)/description diff --git a/feed/gitdb/Makefile b/feed/gitdb/Makefile new file mode 100644 index 0000000..390472e --- /dev/null +++ b/feed/gitdb/Makefile @@ -0,0 +1,38 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gitdb +PKG_VERSION:=4.0.10 +PKG_RELEASE:=$(AUTORELEASE) + +PYPI_NAME:=$(PKG_NAME) +PKG_HASH:=6eb990b69df4e15bad899ea868dc46572c3f75339735663b81de79b06f17eb9a +PKG_MAINTAINER:=Lee Miller +PKG_LICENSE:=BSD + +include $(TOPDIR)/feeds/packages/lang/python/pypi.mk +include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk + +define Package/python3-$(PKG_NAME) + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Git Object Database + URL:=https://github.com/gitpython-developers/gitdb + DEPENDS:=+python3 +python3-setuptools +python3-smmap +endef + +define Package/python3-$(PKG_NAME)/description + GitDB allows you to access bare git repositories for reading and writing. + It aims at allowing full access to loose objects as well as packs with + performance and scalability in mind. It operates exclusively on streams, + allowing to handle large objects with a small memory footprint. +endef + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) diff --git a/feed/gitpython/Makefile b/feed/gitpython/Makefile new file mode 100644 index 0000000..f43f000 --- /dev/null +++ b/feed/gitpython/Makefile @@ -0,0 +1,36 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=git +PKG_VERSION:=3.1.31 +PKG_RELEASE:=$(AUTORELEASE) + +PYPI_NAME:=GitPython +PKG_HASH:=8ce3bcf69adfdf7c7d503e78fd3b1c492af782d58893b650adb2ac8912ddd573 +PKG_MAINTAINER:=Lee Miller +PKG_LICENSE:=BSD-3-Clause + +include $(TOPDIR)/feeds/packages/lang/python/pypi.mk +include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk + +define Package/python3-$(PKG_NAME) + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=GitPython is a Python library used to interact with Git repositories + URL:=https://github.com/gitpython-developers/GitPython + DEPENDS:=+python3 +python3-setuptools +python3-gitdb +endef + +define Package/python3-$(PKG_NAME)/description + GitPython is a python library used to interact with git repositories, + high-level like git-porcelain, or low-level like git-plumbing. +endef + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) diff --git a/feed/smmap/Makefile b/feed/smmap/Makefile new file mode 100644 index 0000000..aaeb8b3 --- /dev/null +++ b/feed/smmap/Makefile @@ -0,0 +1,38 @@ +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=smmap +PKG_VERSION:=5.0.0 +PKG_RELEASE:=$(AUTORELEASE) + +PYPI_NAME:=$(PKG_NAME) +PKG_HASH:=c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936 +PKG_MAINTAINER:=Lee Miller +PKG_LICENSE:=BSD-3-Clause + +include $(TOPDIR)/feeds/packages/lang/python/pypi.mk +include $(INCLUDE_DIR)/package.mk +include $(TOPDIR)/feeds/packages/lang/python/python3-package.mk + +define Package/python3-$(PKG_NAME) + SECTION:=lang + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=A pure Python implementation of a sliding window memory map manager + URL:=https://github.com/gitpython-developers/smmap + DEPENDS:=+python3 +python3-setuptools +endef + +define Package/python3-$(PKG_NAME)/description + Smmap wraps an interface around mmap and tracks the mapped files as well + as the amount of clients who use it. If the system runs out of resources, + or if a memory limit is reached, it will automatically unload unused maps + to allow continued operation. +endef + +$(eval $(call Py3Package,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME))) +$(eval $(call BuildPackage,python3-$(PKG_NAME)-src)) -- 2.45.1 From b5eb13dcb601821835a972ad0639e4c980af1d18 Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Wed, 18 Oct 2023 04:36:42 +0300 Subject: [PATCH 4/5] Add python3-ansible-core-src package into base PACKAGES --- .buildbot/openwrt/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.buildbot/openwrt/build.sh b/.buildbot/openwrt/build.sh index ac95db7..58ba904 100755 --- a/.buildbot/openwrt/build.sh +++ b/.buildbot/openwrt/build.sh @@ -94,7 +94,7 @@ PACKAGES="kmod-i2c-bcm2835 kmod-i2c-mux kmod-i2c-mux-pinctrl \ luci-app-mwan3 luci-app-upnp \ luci-proto-wireguard \ luci-ssl-nginx luci-app-acme \ - python3-ansible-core \ + python3-ansible-core python3-ansible-core-src \ python3-yaml \ openssh-sftp-server tcpdump \ iptables-nft ip6tables-nft \ -- 2.45.1 From 86890bf436ced6040b1d3dc54e852120b647e8fd Mon Sep 17 00:00:00 2001 From: Lee Miller Date: Tue, 24 Oct 2023 04:44:49 +0300 Subject: [PATCH 5/5] Update resolvelib package --- feed/resolvelib/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feed/resolvelib/Makefile b/feed/resolvelib/Makefile index 6533d3b..22084eb 100644 --- a/feed/resolvelib/Makefile +++ b/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 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 -- 2.45.1