Date: Thursday, March 2, 2023 @ 19:01:23
Author: dvzrv
Revision: 1407333
archrelease: copy trunk to community-testing-any
Added:
cloud-init/repos/community-testing-any/PKGBUILD
(from rev 1407332, cloud-init/trunk/PKGBUILD)
cloud-init/repos/community-testing-any/cloud-init-22.1-lib_dir.patch
(from rev 1407332, cloud-init/trunk/cloud-init-22.1-lib_dir.patch)
Deleted:
cloud-init/repos/community-testing-any/PKGBUILD
cloud-init/repos/community-testing-any/cloud-init-22.1-lib_dir.patch
-------------------------------+
PKGBUILD | 188 ++++++++++++++++++++--------------------
cloud-init-22.1-lib_dir.patch | 24 ++---
2 files changed, 106 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-02 19:01:15 UTC (rev 1407332)
+++ PKGBUILD 2023-03-02 19:01:23 UTC (rev 1407333)
@@ -1,94 +0,0 @@
-# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
-# Maintainer: David Runge <[email protected]>
-# Contributor: kpcyrd <[email protected]>
-# Contributor: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: flaccid aka Chris Fordham <[email protected]>
-# Contributor: Sparadox <etienne.lafarge at gmail.com>
-
-pkgname=cloud-init
-pkgver=23.1
-pkgrel=1
-pkgdesc="Cloud instance initialization"
-arch=(any)
-url="https://cloud-init.io";
-license=(GPL3)
-depends=(dhclient python-configobj python-jinja
-python-jsonpatch python-jsonschema python-netifaces python-oauthlib
-python-requests python-pyserial python-pyyaml python-typing-extensions sudo
-systemd)
-makedepends=(netplan python-build python-installer python-setuptools
python-wheel)
-checkdepends=(python-httpretty python-pytest python-pytest-mock
python-responses)
-optdepends=(
- 'cloud-guest-utils: for growpart'
- 'netplan: for configuring network using netplan'
-)
-backup=(
- etc/cloud/cloud.cfg
- etc/cloud/cloud.cfg.d/05_logging.cfg
-)
-source=(
-
https://github.com/canonical/cloud-init/archive/$pkgver/$pkgname-$pkgver.tar.gz
- $pkgname-22.1-lib_dir.patch
-)
-sha512sums=('f9f2d72900035a21d8f7254d3c34f4fa95f0849334ae77e45c048df511317f8d7ef3d680214258b478c5d6d587e73fc375da87d163a3259b57ee802f103544aa'
-
'32b7521f0ae4d61a4d86f2f840fb0670e2cdc7bab708fc7b7676b5178b6d660beb3a46b803f5bcd7e0f18c6d6339fc96e20a951dfafadbb0312e4a0cafce325f')
-b2sums=('a7529d8e9eff06007b15caaa9eb39586731da421b8a79c562e3cff46d091700f609207bdd0d34d8e0fecd9fd8c5f2d934b3a810c9a13fb38fe49710b11e14334'
-
'4e03bd647ca9e1bc3d9c507824d43e4013a20d5bbcb7215755b427d0c7ded9ee48dbfb9faaae703ab2d519aee7c48a40277603c8f874347b574b7ac2b1e1a9fd')
-
-prepare() {
- cd $pkgname-$pkgver
- # we use /usr/lib
- patch -Np1 -i ../$pkgname-22.1-lib_dir.patch
-}
-
-build() {
- cd $pkgname-$pkgver
- python -m build --wheel --no-isolation
-}
-
-check() {
- local deselected=(
- # we don't ship /etc/ca-certificates.conf
- --deselect
tests/unittests/config/test_cc_ca_certs.py::TestRemoveDefaultCaCerts::test_commands
- )
- cd $pkgname-$pkgver
- pytest -vv "${deselected[@]}"
-}
-
-package() {
- local _file
- local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
-
- cd $pkgname-$pkgver
- python -m installer --destdir="$pkgdir" dist/*.whl
- # NOTE: due to limitations with PEP517, files are installed to site-packages,
- # not to the correct global locations (e.g. /etc and /usr), so we remove them
- # and install them manually below.
- rm -frv "$pkgdir/$site_packages/"{usr,etc}
-
- # configuration and hooks
- install -vDm 644 config/cloud.cfg.d/* -t "$pkgdir/etc/cloud/cloud.cfg.d/"
- ./tools/render-cloudcfg --variant arch ./config/cloud.cfg.tmpl
"$pkgdir/etc/cloud/cloud.cfg"
- install -vDm 644 templates/*.tmpl -t "$pkgdir/etc/cloud/templates/"
- install -vDm 755 tools/hook-network-manager -t
"$pkgdir/etc/NetworkManager/dispatcher.d/"
- install -vDm 755 tools/hook-dhclient -t
"$pkgdir/etc/dhcp/dhclient-exit-hooks.d/"
- install -vDm 755
tools/{ds-identify,hook-hotplug,uncloud-init,write-ssh-key-fingerprints} -t
"$pkgdir/usr/lib/$pkgname/"
- # documentation, man pages and shell completion
- install -vDm 644 doc/*.txt -t "$pkgdir/usr/share/doc/$pkgname/"
- install -vDm 644 doc/examples/*.txt -t
"$pkgdir/usr/share/doc/$pkgname/examples/"
- install -vDm 644 doc/examples/seed/* -t
"$pkgdir/usr/share/doc/$pkgname/examples/seed/"
- install -vDm 644 doc/man/*.1 -t "$pkgdir/usr/share/man/man1/"
- install -vDm 655 bash_completion/$pkgname -t
"$pkgdir/usr/share/bash-completion/completions/"
- # udev rules
- install -vDm 644 udev/*.rules -t "$pkgdir/usr/lib/udev/rules.d/"
- # systemd integration
- install -vdm 755 "$pkgdir/usr/lib/systemd/system"{,-generators}
- for _file in cloud-{config,final,init-local,init}.service; do
- ./tools/render-cloudcfg --variant arch ./systemd/$_file.tmpl
"$pkgdir/usr/lib/systemd/system/$_file"
- done
- install -vDm 644 systemd/*.{service,socket,target}
"$pkgdir/usr/lib/systemd/system/"
- ./tools/render-cloudcfg --variant arch ./systemd/cloud-init-generator.tmpl
"$pkgdir/usr/lib/systemd/system-generators/cloud-init-generator"
- chmod 755 "$pkgdir/usr/lib/systemd/system-generators/cloud-init-generator"
- install -vDm 644 systemd/disable-sshd-keygen-if-cloud-init-active.conf -t
"$pkgdir/usr/lib/systemd/system/[email protected]/"
-}
Copied: cloud-init/repos/community-testing-any/PKGBUILD (from rev 1407332,
cloud-init/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-02 19:01:23 UTC (rev 1407333)
@@ -0,0 +1,94 @@
+# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
+# Maintainer: David Runge <[email protected]>
+# Contributor: kpcyrd <[email protected]>
+# Contributor: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: flaccid aka Chris Fordham <[email protected]>
+# Contributor: Sparadox <etienne.lafarge at gmail.com>
+
+pkgname=cloud-init
+pkgver=23.1.1
+pkgrel=1
+pkgdesc="Cloud instance initialization"
+arch=(any)
+url="https://cloud-init.io";
+license=(GPL3)
+depends=(dhclient python-configobj python-jinja
+python-jsonpatch python-jsonschema python-netifaces python-oauthlib
+python-requests python-pyserial python-pyyaml python-typing-extensions sudo
+systemd)
+makedepends=(netplan python-build python-installer python-setuptools
python-wheel)
+checkdepends=(python-httpretty python-pytest python-pytest-mock
python-responses)
+optdepends=(
+ 'cloud-guest-utils: for growpart'
+ 'netplan: for configuring network using netplan'
+)
+backup=(
+ etc/cloud/cloud.cfg
+ etc/cloud/cloud.cfg.d/05_logging.cfg
+)
+source=(
+
https://github.com/canonical/cloud-init/archive/$pkgver/$pkgname-$pkgver.tar.gz
+ $pkgname-22.1-lib_dir.patch
+)
+sha512sums=('387d11d09e4c6443125216617893d72c9a060bbd086316a3101076206409f315e50ba580eb445e125179fbcf7bd97c264d3c3b7ebe970d9c536e71f3362e1c66'
+
'32b7521f0ae4d61a4d86f2f840fb0670e2cdc7bab708fc7b7676b5178b6d660beb3a46b803f5bcd7e0f18c6d6339fc96e20a951dfafadbb0312e4a0cafce325f')
+b2sums=('007ec9a8cffdf56a79f2f50b94ecd4c578c01d2897b1cec2f350b2ec2d77ecf163e632a01cc0d92cde988dc4b8750223b3a36172ce60e24cd113ccda5008eb6b'
+
'4e03bd647ca9e1bc3d9c507824d43e4013a20d5bbcb7215755b427d0c7ded9ee48dbfb9faaae703ab2d519aee7c48a40277603c8f874347b574b7ac2b1e1a9fd')
+
+prepare() {
+ cd $pkgname-$pkgver
+ # we use /usr/lib
+ patch -Np1 -i ../$pkgname-22.1-lib_dir.patch
+}
+
+build() {
+ cd $pkgname-$pkgver
+ python -m build --wheel --no-isolation
+}
+
+check() {
+ local deselected=(
+ # we don't ship /etc/ca-certificates.conf
+ --deselect
tests/unittests/config/test_cc_ca_certs.py::TestRemoveDefaultCaCerts::test_commands
+ )
+ cd $pkgname-$pkgver
+ pytest -vv "${deselected[@]}"
+}
+
+package() {
+ local _file
+ local site_packages=$(python -c "import site;
print(site.getsitepackages()[0])")
+
+ cd $pkgname-$pkgver
+ python -m installer --destdir="$pkgdir" dist/*.whl
+ # NOTE: due to limitations with PEP517, files are installed to site-packages,
+ # not to the correct global locations (e.g. /etc and /usr), so we remove them
+ # and install them manually below.
+ rm -frv "$pkgdir/$site_packages/"{usr,etc}
+
+ # configuration and hooks
+ install -vDm 644 config/cloud.cfg.d/* -t "$pkgdir/etc/cloud/cloud.cfg.d/"
+ ./tools/render-cloudcfg --variant arch ./config/cloud.cfg.tmpl
"$pkgdir/etc/cloud/cloud.cfg"
+ install -vDm 644 templates/*.tmpl -t "$pkgdir/etc/cloud/templates/"
+ install -vDm 755 tools/hook-network-manager -t
"$pkgdir/etc/NetworkManager/dispatcher.d/"
+ install -vDm 755 tools/hook-dhclient -t
"$pkgdir/etc/dhcp/dhclient-exit-hooks.d/"
+ install -vDm 755
tools/{ds-identify,hook-hotplug,uncloud-init,write-ssh-key-fingerprints} -t
"$pkgdir/usr/lib/$pkgname/"
+ # documentation, man pages and shell completion
+ install -vDm 644 doc/*.txt -t "$pkgdir/usr/share/doc/$pkgname/"
+ install -vDm 644 doc/examples/*.txt -t
"$pkgdir/usr/share/doc/$pkgname/examples/"
+ install -vDm 644 doc/examples/seed/* -t
"$pkgdir/usr/share/doc/$pkgname/examples/seed/"
+ install -vDm 644 doc/man/*.1 -t "$pkgdir/usr/share/man/man1/"
+ install -vDm 655 bash_completion/$pkgname -t
"$pkgdir/usr/share/bash-completion/completions/"
+ # udev rules
+ install -vDm 644 udev/*.rules -t "$pkgdir/usr/lib/udev/rules.d/"
+ # systemd integration
+ install -vdm 755 "$pkgdir/usr/lib/systemd/system"{,-generators}
+ for _file in cloud-{config,final,init-local,init}.service; do
+ ./tools/render-cloudcfg --variant arch ./systemd/$_file.tmpl
"$pkgdir/usr/lib/systemd/system/$_file"
+ done
+ install -vDm 644 systemd/*.{service,socket,target}
"$pkgdir/usr/lib/systemd/system/"
+ ./tools/render-cloudcfg --variant arch ./systemd/cloud-init-generator.tmpl
"$pkgdir/usr/lib/systemd/system-generators/cloud-init-generator"
+ chmod 755 "$pkgdir/usr/lib/systemd/system-generators/cloud-init-generator"
+ install -vDm 644 systemd/disable-sshd-keygen-if-cloud-init-active.conf -t
"$pkgdir/usr/lib/systemd/system/[email protected]/"
+}
Deleted: cloud-init-22.1-lib_dir.patch
===================================================================
--- cloud-init-22.1-lib_dir.patch 2023-03-02 19:01:15 UTC (rev 1407332)
+++ cloud-init-22.1-lib_dir.patch 2023-03-02 19:01:23 UTC (rev 1407333)
@@ -1,12 +0,0 @@
-diff -ruN a/setup.py b/setup.py
---- a/setup.py 2022-02-15 19:02:23.000000000 +0100
-+++ b/setup.py 2022-02-16 00:12:50.886331364 +0100
-@@ -177,7 +177,7 @@
- USR = "usr"
- ETC = "etc"
- USR_LIB_EXEC = "usr/lib"
--LIB = "lib"
-+LIB = "usr/lib"
- if os.uname()[0] in ["FreeBSD", "DragonFly"]:
- USR = "usr/local"
- USR_LIB_EXEC = "usr/local/lib"
Copied: cloud-init/repos/community-testing-any/cloud-init-22.1-lib_dir.patch
(from rev 1407332, cloud-init/trunk/cloud-init-22.1-lib_dir.patch)
===================================================================
--- cloud-init-22.1-lib_dir.patch (rev 0)
+++ cloud-init-22.1-lib_dir.patch 2023-03-02 19:01:23 UTC (rev 1407333)
@@ -0,0 +1,12 @@
+diff -ruN a/setup.py b/setup.py
+--- a/setup.py 2022-02-15 19:02:23.000000000 +0100
++++ b/setup.py 2022-02-16 00:12:50.886331364 +0100
+@@ -177,7 +177,7 @@
+ USR = "usr"
+ ETC = "etc"
+ USR_LIB_EXEC = "usr/lib"
+-LIB = "lib"
++LIB = "usr/lib"
+ if os.uname()[0] in ["FreeBSD", "DragonFly"]:
+ USR = "usr/local"
+ USR_LIB_EXEC = "usr/local/lib"
