svn commit: r476232 - in head/net/cloud-init: . files
Ryan Steinmetz
zi at FreeBSD.org
Thu Aug 2 12:05:48 UTC 2018
Author: zi
Date: Thu Aug 2 12:05:46 2018
New Revision: 476232
URL: https://svnweb.freebsd.org/changeset/ports/476232
Log:
- Bump PORTREVISION
- Fix rc script errors
- Fix config file location
Added:
head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig (contents, props changed)
head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal (contents, props changed)
head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal (contents, props changed)
Deleted:
head/net/cloud-init/pkg-plist
Modified:
head/net/cloud-init/Makefile
head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
Modified: head/net/cloud-init/Makefile
==============================================================================
--- head/net/cloud-init/Makefile Thu Aug 2 11:54:36 2018 (r476231)
+++ head/net/cloud-init/Makefile Thu Aug 2 12:05:46 2018 (r476232)
@@ -2,6 +2,7 @@
PORTNAME= cloud-init
PORTVERSION= 18.3
+PORTREVISION= 1
CATEGORIES= net python
MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -40,7 +41,9 @@ ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= currently depends on dmidecode which is x86-only
post-patch:
- @${RM} ${WRKSRC}/sysvinit/freebsd/cloudinit.orig
+ ${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
post-build:
@cd ${WRKSRC} && ${MV} sysvinit/freebsd/cloudconfig config/cloud.cfg
Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudconfig Thu Aug 2 12:05:46 2018 (r476232)
@@ -0,0 +1,10 @@
+--- sysvinit/freebsd/cloudconfig.orig 2018-08-01 15:31:13 UTC
++++ sysvinit/freebsd/cloudconfig
+@@ -22,4 +22,7 @@ cloudconfig_start()
+ }
+
+ load_rc_config $name
++
++: ${cloudconfig_enable="NO"}
++
+ run_rc_command "$1"
Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudfinal Thu Aug 2 12:05:46 2018 (r476232)
@@ -0,0 +1,10 @@
+--- sysvinit/freebsd/cloudfinal.orig 2018-08-01 15:31:17 UTC
++++ sysvinit/freebsd/cloudfinal
+@@ -22,4 +22,7 @@ cloudfinal_start()
+ }
+
+ load_rc_config $name
++
++: ${cloudfinal_enable="NO"}
++
+ run_rc_command "$1"
Modified: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit
==============================================================================
--- head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit Thu Aug 2 11:54:36 2018 (r476231)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinit Thu Aug 2 12:05:46 2018 (r476232)
@@ -1,4 +1,4 @@
---- sysvinit/freebsd/cloudinit.orig 2018-01-01 11:58:33 UTC
+--- sysvinit/freebsd/cloudinit.orig 2018-08-01 15:31:22 UTC
+++ sysvinit/freebsd/cloudinit
@@ -1,7 +1,7 @@
#!/bin/sh
@@ -9,3 +9,11 @@
# BEFORE: cloudconfig cloudfinal
. /etc/rc.subr
+@@ -22,4 +22,7 @@ cloudinit_start()
+ }
+
+ load_rc_config $name
++
++: ${cloudinit_enable="NO"}
++
+ run_rc_command "$1"
Added: head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/cloud-init/files/patch-sysvinit_freebsd_cloudinitlocal Thu Aug 2 12:05:46 2018 (r476232)
@@ -0,0 +1,10 @@
+--- sysvinit/freebsd/cloudinitlocal.orig 2018-08-01 15:31:29 UTC
++++ sysvinit/freebsd/cloudinitlocal
+@@ -22,4 +22,7 @@ cloudlocal_start()
+ }
+
+ load_rc_config $name
++
++: ${cloudinitlocal_enable="NO"}
++
+ run_rc_command "$1"
More information about the svn-ports-head
mailing list