cloud-init: make network config optional
anthos-gke-on-prem requires network to be configured using cloud-init
remove network dependency optional and remove by default
adding flag to make it optional
BUG=b/172390016
TEST=emerge-lakitu cloud-init
RELEASE_NOTE=None
Change-Id: Iee522bebb3e317427b65530c10580af234860e65
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/8760
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Roy Yang <royyang@google.com>
diff --git a/project-lakitu/app-emulation/cloud-init/cloud-init-20.1-r3.ebuild b/project-lakitu/app-emulation/cloud-init/cloud-init-20.1-r4.ebuild
similarity index 100%
rename from project-lakitu/app-emulation/cloud-init/cloud-init-20.1-r3.ebuild
rename to project-lakitu/app-emulation/cloud-init/cloud-init-20.1-r4.ebuild
diff --git a/project-lakitu/app-emulation/cloud-init/cloud-init-20.1.ebuild b/project-lakitu/app-emulation/cloud-init/cloud-init-20.1.ebuild
index 0a7f226..263c5fe 100644
--- a/project-lakitu/app-emulation/cloud-init/cloud-init-20.1.ebuild
+++ b/project-lakitu/app-emulation/cloud-init/cloud-init-20.1.ebuild
@@ -19,7 +19,7 @@
LICENSE="GPL-3"
SLOT="0"
-IUSE="test"
+IUSE="test configure_network"
RESTRICT="!test? ( test )"
CDEPEND="
@@ -61,16 +61,20 @@
"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
# For lakitu
- # Moved remove-sshd-depedency to 20.1-cloud-init-remove-sshd-and-network-service-dependencies.patch
- # "${FILESDIR}/${PV}-remove-sshd-dependency.patch"
"${FILESDIR}/${PV}-stable-uid.patch"
"${FILESDIR}/${PV}-fix-cross-compile.patch"
"${FILESDIR}/${PV}-datasource-gce-platform-google.patch"
"${FILESDIR}/${PV}-skip-root-ssh-keys.patch"
- "${FILESDIR}/${PV}-cloud-init-remove-sshd-and-network-service-dependencies.patch"
)
python_prepare_all() {
+ # remove network dependencies when not configuring network
+ if ! use configure_network; then
+ PATCHES+=("${FILESDIR}/${PV}-cloud-init-remove-sshd-and-network-service-dependencies.patch")
+ else
+ PATCHES+=("${FILESDIR}/${PV}-remove-sshd-dependency.patch")
+ fi
+
# Fix location of documentation installation
sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
