diff options
| author | Dermot Bradley <dermot_bradley@yahoo.com> | 2021-05-12 20:02:53 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2021-05-12 19:41:30 +0000 |
| commit | 9feea4e93d336396b02e675e222ee06244ec472c (patch) | |
| tree | 31faefdf20cac52a4bf6cf3ca9f45e38b885961c | |
| parent | 5163825b59fb3acc273db44c347251050890995b (diff) | |
community/cloud-init: disable modules irrelevant to Alpine
Add patch file 03-disable-irrelevant-modules.patch to disable
cloud-init modules that are irrelevant for/unsupported on Alpine.
| -rw-r--r-- | community/cloud-init/03-disable-irrelevant-modules.patch | 33 | ||||
| -rw-r--r-- | community/cloud-init/APKBUILD | 4 |
2 files changed, 36 insertions, 1 deletions
diff --git a/community/cloud-init/03-disable-irrelevant-modules.patch b/community/cloud-init/03-disable-irrelevant-modules.patch new file mode 100644 index 00000000000..ba327e49f69 --- /dev/null +++ b/community/cloud-init/03-disable-irrelevant-modules.patch @@ -0,0 +1,33 @@ +From: Dermot Bradley <dermot_bradley@yahoo.com> +Date: Wed, 12 May 2021 00:14 +0100 +Subject: [PATCH] cloud-init: Disable some modules not relevant to Alpine + +Disable some cloud-init modules that are not (currently) relevant +to Alpine and which have been removed from the Alpine package. + +--- + +diff -aur a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl +--- a/config/cloud.cfg.tmpl ++++ b/config/cloud.cfg.tmpl +@@ -89,7 +89,9 @@ + - emit_upstart + - snap + {% endif %} ++{% if variant not in ["alpine"] %} + - ssh-import-id ++{% endif %} + - locale + - set-passwords + {% if variant in ["rhel", "fedora"] %} +@@ -135,8 +137,10 @@ + - chef + - mcollective + - salt-minion ++{% if variant not in ["alpine"] %} + - reset_rmc + - refresh_rmc_and_interface ++{% endif %} + - rightscale_userdata + - scripts-vendor + - scripts-per-once diff --git a/community/cloud-init/APKBUILD b/community/cloud-init/APKBUILD index 0d8fbeeb306..359904df65a 100644 --- a/community/cloud-init/APKBUILD +++ b/community/cloud-init/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Dermot Bradley <dermot_bradley@yahoo.com> pkgname=cloud-init pkgver=21.2 -pkgrel=0 +pkgrel=1 pkgdesc="Cloud instance init scripts" url="https://cloud-init.io" # Dependant package "cloud-utils-growpart" is not available for mips, @@ -37,6 +37,7 @@ subpackages="$pkgname-doc $pkgname-bash-completion $pkgname-openrc" source="cloud-init-$pkgver.tar.gz::https://github.com/canonical/cloud-init/archive/$pkgver.tar.gz 01-oauthlib-remove.patch 02-hosts-template-fix.patch + 03-disable-irrelevant-modules.patch interfaces setup-cloud-init README.Alpine @@ -122,6 +123,7 @@ package() { sha512sums="0c67fd66b60a904d2dfddab563657c7028cc0bab9d2a195ce55e092f1c8e7cc8b0da2d2436146f1a1e545483f21f5658eeea2f6b224c1a253fdf467bd2b63145 cloud-init-21.2.tar.gz c14ce3b27c55d1c381e27b2898bb73da8a74c53480d496bdfc87318b69fb612678205ab5a686c1ce703ef5c2c7a8529f629c8f908aeff39524d36870a83c1929 01-oauthlib-remove.patch 444b15f0d81138f7f3767bc10b0bee29ff10fa8b74dfc3542e1abe20d745f09bb2e36cb30ef8035a677ba81af80743207fbd9973d7cb4f33ca37891ae7493916 02-hosts-template-fix.patch +bf6da0948f655ced970f97036db9df4d4027deb0fe2a6575b7d68ddefc3b474948b31edd0f3fb2aa6c8eba07466634bc5b7c948d12eb687fe852761c15485f35 03-disable-irrelevant-modules.patch 48b25ec4457c2b3772a7d210033551d041749a0d1869818d888030e6df7fd9bbc13a38b95cf465de3d46d96881a722f94a337584ce48f280c4a52b819586563a interfaces f32b90f26d1df0d88fbea7a1a9ab6704a20babdb750b933484bb7c4e91cc19a587d4bfbc95489a354003ecd00795d1592e71b4b93eccd41e392bb7170bfebb0e setup-cloud-init bb31b78e8f563d8b9d2bb896e28a51862e6479a399ac57cb69fa86f8c0704d05ec79023bd090706359259569ac1d2cc7939950be0d0490fb36c9ec396254b7de README.Alpine" |