[arch-commits] Commit in cloud-init/repos (5 files)
Christian Rebischke
shibumi at archlinux.org
Wed Mar 31 19:35:38 UTC 2021
Date: Wednesday, March 31, 2021 @ 19:35:38
Author: shibumi
Revision: 910716
db-move: moved cloud-init from [community-testing] to [community] (any)
Added:
cloud-init/repos/community-any/PKGBUILD
(from rev 910715, cloud-init/repos/community-testing-any/PKGBUILD)
cloud-init/repos/community-any/fix-lib.patch
(from rev 910715, cloud-init/repos/community-testing-any/fix-lib.patch)
Deleted:
cloud-init/repos/community-any/PKGBUILD
cloud-init/repos/community-any/fix-lib.patch
cloud-init/repos/community-testing-any/
-----------------------------+
/PKGBUILD | 69 ++++++++++++++++++++++++++++++++++++++++++
/fix-lib.patch | 11 ++++++
community-any/PKGBUILD | 57 ----------------------------------
community-any/fix-lib.patch | 11 ------
4 files changed, 80 insertions(+), 68 deletions(-)
Deleted: community-any/PKGBUILD
===================================================================
--- community-any/PKGBUILD 2021-03-31 19:28:27 UTC (rev 910715)
+++ community-any/PKGBUILD 2021-03-31 19:35:38 UTC (rev 910716)
@@ -1,57 +0,0 @@
-# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
-# Contributor: David Runge <dvzrv at archlinux.org>
-# Contributor: kpcyrd <git at rxv.cc>
-# Contributor: Jonathan Steel <jsteel at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: flaccid aka Chris Fordham <chris at fordham.id.au>
-# Contributor: Sparadox <etienne.lafarge at gmail.com>
-
-pkgname=cloud-init
-pkgver=20.4
-pkgrel=1
-pkgdesc="The standard for customising cloud instances"
-arch=('any')
-url="https://cloud-init.io"
-license=('GPL3')
-# TODO: remove inetutils when setting hostname via hostnamectl is supported
-depends=('dhclient' 'inetutils' 'net-tools' 'netplan' 'python-configobj'
-'python-jinja' 'python-jsonpatch' 'python-jsonschema' 'python-oauthlib'
-'python-requests' 'python-yaml' 'sudo' 'systemd')
-makedepends=('python' 'python-setuptools')
-checkdepends=('python-httpretty' 'python-prettytable' 'python-pytest')
-backup=('etc/cloud/cloud.cfg' 'etc/cloud/cloud.cfg.d/05_logging.cfg')
-source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
- 'fix-lib.patch'
-)
-sha512sums=('da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9'
- '6c435fbe1e0a7093b79f8bb3789b05a39afd1e43b7ff96f13e68c9ad16311cc58270b947bae574cfdc3d2e27c7258789880a101c9bdf2c3c141bcbedc47a8a4b')
-b2sums=('c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b'
- '7c4b07a285e8f3e1e810622ba6cf4b007e89625018015d8fa471ed9f4453543dc1ada30824137e91326db016b55e746517f3c34913156e2e9f095645e7ace317')
-
-prepare() {
- cd "${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/fix-lib.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- python setup.py build
-}
-
-check() {
- cd "${pkgname}-${pkgver}"
- export PYTHONPATH="build:${PYTHONPATH}"
- # disable tests that try to use /etc/ca-certificates.conf
- pytest -v tests/unittests cloudinit \
- -k "not test_multiple_certs \
- and not test_single_cert_no_trailing_cr \
- and not test_single_cert_trailing_c"
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
- python setup.py install --skip-build \
- --optimize=1 \
- --init-system=systemd \
- --root="${pkgdir}"
-}
Copied: cloud-init/repos/community-any/PKGBUILD (from rev 910715, cloud-init/repos/community-testing-any/PKGBUILD)
===================================================================
--- community-any/PKGBUILD (rev 0)
+++ community-any/PKGBUILD 2021-03-31 19:35:38 UTC (rev 910716)
@@ -0,0 +1,69 @@
+# Maintainer: Christian Rebischke <chris.rebischke at archlinux.org>
+# Contributor: David Runge <dvzrv at archlinux.org>
+# Contributor: kpcyrd <git at rxv.cc>
+# Contributor: Jonathan Steel <jsteel at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: flaccid aka Chris Fordham <chris at fordham.id.au>
+# Contributor: Sparadox <etienne.lafarge at gmail.com>
+
+pkgname=cloud-init
+pkgver=21.1
+pkgrel=3
+pkgdesc="The standard for customising cloud instances"
+arch=('any')
+url="https://cloud-init.io"
+license=('GPL3')
+depends=('dhclient' 'netplan' 'python-configobj' 'inetutils'
+'python-jinja' 'python-jsonpatch' 'python-jsonschema' 'python-oauthlib'
+'python-requests' 'python-yaml' 'sudo' 'systemd')
+makedepends=('python' 'python-setuptools')
+checkdepends=('python-httpretty' 'python-prettytable' 'python-pytest')
+optdepends=('cloud-guest-utils')
+backup=('etc/cloud/cloud.cfg' 'etc/cloud/cloud.cfg.d/05_logging.cfg')
+source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
+ 'fix-lib.patch'
+)
+sha512sums=('893b1eacc343a0aad61e308819163e99cab93c6a15b47d30d0a7fb2aced03d6188cf69062117876009ebccf69ba1bd1e3145d7fd2988b5794e736c91196bea1d'
+ '6c435fbe1e0a7093b79f8bb3789b05a39afd1e43b7ff96f13e68c9ad16311cc58270b947bae574cfdc3d2e27c7258789880a101c9bdf2c3c141bcbedc47a8a4b')
+b2sums=('5ae1cbd427c195dd207a15804748cfa581bf736cbe06152d2055c715b44150294da40f5779a19b5ed51508cc98e294e6d607c25548a4f1452b67c08b3d79fad5'
+ '7c4b07a285e8f3e1e810622ba6cf4b007e89625018015d8fa471ed9f4453543dc1ada30824137e91326db016b55e746517f3c34913156e2e9f095645e7ace317')
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/fix-lib.patch"
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ python setup.py build
+}
+
+check() {
+ cd "${pkgname}-${pkgver}"
+ export PYTHONPATH="build:${PYTHONPATH}"
+ # disable tests that try to use /etc/ca-certificates.conf
+ # additionally we are disabling a few tests that seem
+ # to fail on Arch Linux
+ pytest -v tests/unittests cloudinit \
+ -k "not test_multiple_certs \
+ and not test_single_cert_no_trailing_cr \
+ and not test_single_cert_trailing_c \
+ and not test_parse_add_new \
+ and not test_parse_adjust \
+ and not test_parse_no_adjust_shell \
+ and not test_parse_no_change \
+ and not test_parse_shell_vars \
+ and not test_set_locale_sles \
+ and not test_set_locale_sles \
+ and not test_set_locale_sles_default \
+ and not test_write_hostname_rhel \
+ and not test_set_timezone_sles"
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+ python setup.py install --skip-build \
+ --optimize=1 \
+ --init-system=systemd \
+ --root="${pkgdir}"
+}
Deleted: community-any/fix-lib.patch
===================================================================
--- community-any/fix-lib.patch 2021-03-31 19:28:27 UTC (rev 910715)
+++ community-any/fix-lib.patch 2021-03-31 19:35:38 UTC (rev 910716)
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -151,7 +151,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
- USR = "usr"
- ETC = "etc"
- USR_LIB_EXEC = "usr/lib"
--LIB = "lib"
-+LIB = "usr/lib"
- if os.uname()[0] == 'FreeBSD':
- USR = "usr/local"
- USR_LIB_EXEC = "usr/local/lib"
Copied: cloud-init/repos/community-any/fix-lib.patch (from rev 910715, cloud-init/repos/community-testing-any/fix-lib.patch)
===================================================================
--- community-any/fix-lib.patch (rev 0)
+++ community-any/fix-lib.patch 2021-03-31 19:35:38 UTC (rev 910716)
@@ -0,0 +1,11 @@
+--- a/setup.py
++++ b/setup.py
+@@ -151,7 +151,7 @@ INITSYS_TYPES = sorted([f.partition(".")[0] for f in INITSYS_ROOTS.keys()])
+ USR = "usr"
+ ETC = "etc"
+ USR_LIB_EXEC = "usr/lib"
+-LIB = "lib"
++LIB = "usr/lib"
+ if os.uname()[0] == 'FreeBSD':
+ USR = "usr/local"
+ USR_LIB_EXEC = "usr/local/lib"
More information about the arch-commits
mailing list