From owner-svn-ports-head@freebsd.org Thu Mar 18 18:00:24 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D09D057F0C0; Thu, 18 Mar 2021 18:00:24 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F1ZZ05ZFfz4X7j; Thu, 18 Mar 2021 18:00:24 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B241526375; Thu, 18 Mar 2021 18:00:24 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12II0OpU000586; Thu, 18 Mar 2021 18:00:24 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12II0O8P000584; Thu, 18 Mar 2021 18:00:24 GMT (envelope-from brd@FreeBSD.org) Message-Id: <202103181800.12II0O8P000584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Thu, 18 Mar 2021 18:00:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568752 - in head/net/cloud-init: . files X-SVN-Group: ports-head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head/net/cloud-init: . files X-SVN-Commit-Revision: 568752 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Mar 2021 18:00:24 -0000 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':