[arch-commits] Commit in cloud-init/repos/community-any (4 files)

David Runge dvzrv at archlinux.org
Fri May 7 17:22:39 UTC 2021


    Date: Friday, May 7, 2021 @ 17:22:39
  Author: dvzrv
Revision: 928645

archrelease: copy trunk to community-any

Added:
  cloud-init/repos/community-any/PKGBUILD
    (from rev 928644, cloud-init/trunk/PKGBUILD)
  cloud-init/repos/community-any/fix-lib.patch
    (from rev 928644, cloud-init/trunk/fix-lib.patch)
Deleted:
  cloud-init/repos/community-any/PKGBUILD
  cloud-init/repos/community-any/fix-lib.patch

---------------+
 PKGBUILD      |  139 ++++++++++++++++++++++++++++----------------------------
 fix-lib.patch |   22 ++++----
 2 files changed, 81 insertions(+), 80 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-07 17:22:29 UTC (rev 928644)
+++ PKGBUILD	2021-05-07 17:22:39 UTC (rev 928645)
@@ -1,69 +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=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}"
-}

Copied: cloud-init/repos/community-any/PKGBUILD (from rev 928644, cloud-init/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-07 17:22:39 UTC (rev 928645)
@@ -0,0 +1,70 @@
+# 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.2
+pkgrel=1
+pkgdesc="The standard for customising cloud instances"
+arch=('any')
+url="https://cloud-init.io"
+license=('GPL3')
+depends=('dhclient' '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')
+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=('8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d'
+            '6c435fbe1e0a7093b79f8bb3789b05a39afd1e43b7ff96f13e68c9ad16311cc58270b947bae574cfdc3d2e27c7258789880a101c9bdf2c3c141bcbedc47a8a4b')
+b2sums=('74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc'
+        '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_rhel_write_hostname_prefer_hostname \
+             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: fix-lib.patch
===================================================================
--- fix-lib.patch	2021-05-07 17:22:29 UTC (rev 928644)
+++ fix-lib.patch	2021-05-07 17:22:39 UTC (rev 928645)
@@ -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 928644, cloud-init/trunk/fix-lib.patch)
===================================================================
--- fix-lib.patch	                        (rev 0)
+++ fix-lib.patch	2021-05-07 17:22:39 UTC (rev 928645)
@@ -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