Attachment 237121 Details for Bug 266847 – bump version, drop portrevision

[patch] bump version, drop portrevision

0001-Add-net-cloud-init-devel.patch (text/plain), 7.09 KB, created by Mina Galić on 2022-10-06 13:03:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mina Galić

Created: 2022-10-06 13:03:11 UTC

Size: 7.09 KB

patch

obsolete

>From 425a1afbdd49b661fb3712cb691299b0b5be82d5 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Mina=20Gali=C4=87?= <me+git@igalic.co>
>Date: Wed, 14 Sep 2022 22:16:04 +0100
>Subject: [PATCH] Add net/cloud-init-devel
>
>This port is for the brave to help test the project of improving
>cloud-init for BSD support, *as I am working on it*.
>
>run portclippy and portfmt over the Makefile.
>(this should also be done for net/cloud-init, since this is just a copy)
>---
> net/Makefile                                  |  1 +
> net/cloud-init-devel/Makefile                 | 55 +++++++++++++++++++
> net/cloud-init-devel/distinfo                 |  3 +
> .../files/patch-cloudinit_settings.py         | 20 +++++++
> .../patch-config_cloud.cfg.d_99__freebsd.cfg  |  5 ++
> net/cloud-init-devel/files/patch-setup.py     | 11 ++++
> net/cloud-init-devel/pkg-descr                |  4 ++
> net/cloud-init-devel/pkg-message              | 11 ++++
> 8 files changed, 110 insertions(+)
> create mode 100644 net/cloud-init-devel/Makefile
> create mode 100644 net/cloud-init-devel/distinfo
> create mode 100644 net/cloud-init-devel/files/patch-cloudinit_settings.py
> create mode 100644 net/cloud-init-devel/files/patch-config_cloud.cfg.d_99__freebsd.cfg
> create mode 100644 net/cloud-init-devel/files/patch-setup.py
> create mode 100644 net/cloud-init-devel/pkg-descr
> create mode 100644 net/cloud-init-devel/pkg-message
>
>diff --git a/net/Makefile b/net/Makefile
>index a46effa93db3..d3ed31082cb9 100644
>--- a/net/Makefile
>+++ b/net/Makefile
>@@ -80,6 +80,7 @@
>     SUBDIR += cjdns
>     SUBDIR += clash
>     SUBDIR += cloud-init
>+    SUBDIR += cloud-init-devel
>     SUBDIR += cloudflared
>     SUBDIR += cloudquery
>     SUBDIR += clusterit
>diff --git a/net/cloud-init-devel/Makefile b/net/cloud-init-devel/Makefile
>new file mode 100644
>index 000000000000..abcf9c4e5615
>--- /dev/null
>+++ b/net/cloud-init-devel/Makefile
>@@ -0,0 +1,55 @@
>+PORTNAME=	cloud-init
>+DISTVERSION=	22.4
>+CATEGORIES=	net python
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>+PKGNAMESUFFIX=	-devel
>+
>+MAINTAINER=	me+FreeBSD@igalic.co
>+COMMENT=	Init scripts for use on cloud images, development version
>+WWW=		https://cloud-init.io/
>+
>+LICENSE=	APACHE20 GPLv3
>+LICENSE_COMB=	dual
>+LICENSE_FILE_APACHE20=	${WRKSRC}/LICENSE-Apache2.0
>+LICENSE_FILE_GPLv3=	${WRKSRC}/LICENSE-GPLv3
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}jsonpatch>0:devel/py-jsonpatch@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}jsonpointer>0:devel/py-jsonpointer@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}jsonschema>0:devel/py-jsonschema@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
>+		sudo>0:security/sudo
>+
>+USES=		python:3.6+ shebangfix
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	canonical
>+GH_TAGNAME=	0f005bf49
>+USE_PYTHON=	autoplist distutils
>+PYDISTUTILS_INSTALLARGS+=	"--init-system=sysvinit_freebsd"
>+
>+SHEBANG_FILES=	tools/hook-hotplug tools/read-dependencies tools/read-version \
>+		tools/validate-yaml.py
>+
>+# Conflicts
>+CONFLICTS_INSTALL=	cloud-init
>+
>+# Standard bsd.port.mk variables
>+ETCDIR=		${PREFIX}/etc/cloud
>+
>+NO_ARCH=	yes
>+
>+post-patch:
>+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
>+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
>+	@cd ${WRKSRC} && ${RM} config/cloud.cfg.d/99_freebsd.cfg.orig
>+
>+post-build:
>+	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
>+
>+.include <bsd.port.mk>
>diff --git a/net/cloud-init-devel/distinfo b/net/cloud-init-devel/distinfo
>new file mode 100644
>index 000000000000..553abd3c073d
>--- /dev/null
>+++ b/net/cloud-init-devel/distinfo
>@@ -0,0 +1,3 @@
>+TIMESTAMP = 1665055351
>+SHA256 (canonical-cloud-init-22.4-0f005bf49_GH0.tar.gz) = 21561049425fe2af78b8435cf7a7f4a4fabc545d6aa7ee992366b36004f30c4b
>+SIZE (canonical-cloud-init-22.4-0f005bf49_GH0.tar.gz) = 1444040
>diff --git a/net/cloud-init-devel/files/patch-cloudinit_settings.py b/net/cloud-init-devel/files/patch-cloudinit_settings.py
>new file mode 100644
>index 000000000000..d7ca2bd87f2c
>--- /dev/null
>+++ b/net/cloud-init-devel/files/patch-cloudinit_settings.py
>@@ -0,0 +1,20 @@
>+--- cloudinit/settings.py.orig	2021-03-17 15:43:42 UTC
>++++ cloudinit/settings.py
>+@@ -12,7 +12,7 @@
>+ CFG_ENV_NAME = "CLOUD_CFG"
>+ 
>+ # This is expected to be a yaml formatted file
>+-CLOUD_CONFIG = "/etc/cloud/cloud.cfg"
>++CLOUD_CONFIG = "%%PREFIX%%/etc/cloud/cloud.cfg"
>+ 
>+ RUN_CLOUD_CONFIG = "/run/cloud-init/cloud.cfg"
>+ 
>+@@ -50,7 +50,7 @@ CFG_BUILTIN = {
>+     "system_info": {
>+         "paths": {
>+             "cloud_dir": "/var/lib/cloud",
>+-            "templates_dir": "/etc/cloud/templates/",
>++            "templates_dir": "%%PREFIX%%/etc/cloud/templates/",
>+         },
>+         "distro": "ubuntu",
>+         "network": {"renderers": None},
>diff --git a/net/cloud-init-devel/files/patch-config_cloud.cfg.d_99__freebsd.cfg b/net/cloud-init-devel/files/patch-config_cloud.cfg.d_99__freebsd.cfg
>new file mode 100644
>index 000000000000..54430cfbd422
>--- /dev/null
>+++ b/net/cloud-init-devel/files/patch-config_cloud.cfg.d_99__freebsd.cfg
>@@ -0,0 +1,5 @@
>+--- config/cloud.cfg.d/99_freebsd.cfg.orig	2021-12-13 06:41:51 UTC
>++++ config/cloud.cfg.d/99_freebsd.cfg
>+@@ -0,0 +1,2 @@
>++no_ssh_fingerprints: true
>++disable_network_activation: true
>diff --git a/net/cloud-init-devel/files/patch-setup.py b/net/cloud-init-devel/files/patch-setup.py
>new file mode 100644
>index 000000000000..c94715dc97c6
>--- /dev/null
>+++ b/net/cloud-init-devel/files/patch-setup.py
>@@ -0,0 +1,11 @@
>+--- setup.py.orig	2021-03-17 15:40:30 UTC
>++++ setup.py
>+@@ -153,7 +153,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in I
>+ # Install everything in the right location and take care of Linux (default) and
>+ # FreeBSD systems.
>+ USR = "usr"
>+-ETC = "etc"
>++ETC = "%%PREFIX%%/etc"
>+ USR_LIB_EXEC = "usr/lib"
>+ LIB = "lib"
>+ if os.uname()[0] in ["FreeBSD", "DragonFly"]:
>diff --git a/net/cloud-init-devel/pkg-descr b/net/cloud-init-devel/pkg-descr
>new file mode 100644
>index 000000000000..6eacee0a5861
>--- /dev/null
>+++ b/net/cloud-init-devel/pkg-descr
>@@ -0,0 +1,4 @@
>+Cloud-init is the industry standard multi-distribution method for cross-platform
>+cloud instance initialization. It is supported across all major public cloud
>+providers, provisioning systems for private cloud infrastructure, and bare-metal
>+installations. This is the development version, it follows the git HEAD.
>diff --git a/net/cloud-init-devel/pkg-message b/net/cloud-init-devel/pkg-message
>new file mode 100644
>index 000000000000..f82dd34c3c06
>--- /dev/null
>+++ b/net/cloud-init-devel/pkg-message
>@@ -0,0 +1,11 @@
>+[
>+{ type: install
>+  message: <<EOM
>+To enable cloud-init, add the following line to rc.conf:
>+
>+cloudinit_enable="YES"
>+
>+This will make sure cloud-init is started at boot.
>+EOM
>+}
>+]
>-- 
>2.38.0
>

Actions: View | Diff

Attachments on bug 266847: 237103 | 237107 | 237121