svn commit: r568752 - in head/net/cloud-init: . files
Brad Davis
brd at FreeBSD.org
Thu Mar 18 18:00:24 UTC 2021
Author: brd (src,doc committer)
Date: Thu Mar 18 18:00:23 2021
New Revision: 568752
URL: https://svnweb.freebsd.org/changeset/ports/568752
Log:
net/cloud-init: Clean up post-patch
PR: 254365
Approved by: Andrey Fesenko (maintainer), swills, lwhsu
Added:
head/net/cloud-init/files/patch-cloudinit_settings.py (contents, props changed)
head/net/cloud-init/files/patch-setup.py (contents, props changed)
Modified:
head/net/cloud-init/Makefile
Modified: head/net/cloud-init/Makefile
==============================================================================
--- head/net/cloud-init/Makefile Thu Mar 18 17:36:57 2021 (r568751)
+++ head/net/cloud-init/Makefile Thu Mar 18 18:00:23 2021 (r568752)
@@ -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 @@ PYDISTUTILS_INSTALLARGS+= "--init-system=sysvinit_free
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
Added: head/net/cloud-init/files/patch-cloudinit_settings.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/cloud-init/files/patch-cloudinit_settings.py Thu Mar 18 18:00:23 2021 (r568752)
@@ -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},
Added: head/net/cloud-init/files/patch-setup.py
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/cloud-init/files/patch-setup.py Thu Mar 18 18:00:23 2021 (r568752)
@@ -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':
More information about the svn-ports-all
mailing list