Attachment 223364 Details for Bug 254365 – patch

[patch] patch

cloud-init.diff (text/plain), 3.06 KB, created by Brad Davis on 2021-03-17 17:38:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2021-03-17 17:38:43 UTC

Size: 3.06 KB

patch

obsolete

>Index: net/cloud-init/Makefile
>===================================================================
>--- net/cloud-init/Makefile	(revision 568666)
>+++ net/cloud-init/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	cloud-init
> DISTVERSION=	20.4.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net python
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
>@@ -40,9 +40,8 @@
> NO_ARCH=	yes
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|"etc"|"${STAGEDIR}${PREFIX}/etc"|g' ${WRKSRC}/setup.py
>-	${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/cloudinit/settings.py
>-	@${RM} ${WRKSRC}/sysvinit/freebsd/*.orig
>+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${STAGEDIR}${PREFIX}|g' ${WRKSRC}/setup.py
>+	${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/cloudinit/settings.py
> 
> post-build:
> 	@cd ${WRKSRC} && ${MV} config/cloud.cfg.d/05_logging.cfg config/cloud.cfg.d/05_logging.cfg.sample
>Index: net/cloud-init/files/patch-cloudinit_settings.py
>===================================================================
>--- net/cloud-init/files/patch-cloudinit_settings.py	(nonexistent)
>+++ net/cloud-init/files/patch-cloudinit_settings.py	(working copy)
>@@ -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},
>
>Property changes on: net/cloud-init/files/patch-cloudinit_settings.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: net/cloud-init/files/patch-setup.py
>===================================================================
>--- net/cloud-init/files/patch-setup.py	(nonexistent)
>+++ net/cloud-init/files/patch-setup.py	(working copy)
>@@ -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] == 'FreeBSD':
>
>Property changes on: net/cloud-init/files/patch-setup.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 254365: 223364