[arch-commits] Commit in cloud-init/trunk (PKGBUILD archlinux.cloud.cfg)

[Christian Rebischke]

    Date: Sunday, October 20, 2019 @ 19:29:33
  Author: shibumi
Revision: 517954

upgpkg: cloud-init 19.2-2

moved cloud-init from AUR to community

Modified:
  cloud-init/trunk/PKGBUILD
  cloud-init/trunk/archlinux.cloud.cfg

---------------------+
 PKGBUILD            |   53 ++++++++++++++++++++++++++------------------------
 archlinux.cloud.cfg |    2 -
 2 files changed, 29 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-20 19:29:33 UTC (rev 517953)
+++ PKGBUILD	2019-10-20 19:29:33 UTC (rev 517954)
@@ -2,42 +2,45 @@
 # 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=18.2
+pkgver=19.2
 pkgrel=2
 pkgdesc="The standard for customising cloud instances"
 arch=('any')
 url="https://cloud-init.io"
 license=('GPL3')
-depends=('systemd' 'sudo' 'python2-yaml' 'python2-cheetah' 'python2-prettytable'
-         'python2-oauth' 'python2-boto' 'python2-configobj'
-         'python2-jsonschema' 'python2-jsonpatch' 'python2-jsonpointer' 'net-tools'
-         'python2-requests' 'python2-argparse' 'python2-oauthlib'
-         'python2-jinja')
-makedepends=('python2' 'python2-setuptools')
+depends=('systemd' 'sudo' 'python-yaml' 'python-prettytable'
+  'python-oauthlib' 'python-configobj'
+  'python-jsonschema' 'python-jsonpatch' 'net-tools'
+  'python-requests' 'python-oauthlib' 'python-jinja' 'python-six')
+makedepends=('python' 'python-setuptools')
 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
-        archlinux.cloud.cfg)
-sha256sums=('0224969ebdae6eadffc5f40823bb206d8b05d99a1b730018535102f38b155249'
-            '0ace6a9e4156145e5b50bd5fa75d6aeefe8e5c10a63f8d9e0d3c7be4c9b53942'
-            '109dd4500593c2fb7b2f7bf05eaf1835be8062c4f7b3025a0371184a691950da')
+source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
+  'fix-lib.patch'
+  'archlinux.cloud.cfg')
+sha512sums=('c6adab5838ddf53fad96c3d680becd23ce7227dc4e6c853863882bf9f5d0b6ea6259d529ec3848247254459b793bbef5a6791b26c65741a68390c970173b3293'
+            '6c435fbe1e0a7093b79f8bb3789b05a39afd1e43b7ff96f13e68c9ad16311cc58270b947bae574cfdc3d2e27c7258789880a101c9bdf2c3c141bcbedc47a8a4b'
+            '915cbe0da65e754d23661f9b6d5680ed6395fab3df3a9946e51920edcf4191a4fa5475260f5a744a1962801b69f04a583bf9db8ca11c4b385aea8d92d7f09f41')
 
-prepare(){
-  cd $pkgname-$pkgver
-
-  patch -Np1 -i ../fix-lib.patch
-
-  find . -name \*.py -exec sed -i '1s/python$/&2/' {} +
-  sed -i '1s/python$/&2/' tools/read*
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-lib.patch"
   sed -e 's:/etc/systemd:/usr/lib/systemd:g' -e 's:\"/lib\":\"/usr/lib\":g' -i setup.py
 }
 
+# This checks need: python-mock, python-httpretty
+# Due to a bug unittest2 is used even when python3 is used for building
+# So let's wait until cloud-init implemented a try/except for python3 builds
+# check() {
+#   cd "${pkgname}"-"${pkgver}"
+#   nosetests tests/unittests/
+# }
+
 package() {
-  cd $pkgname-$pkgver
-
-  python2 ./setup.py install --root="$pkgdir" --init-system systemd
-
-  install -m644 ../archlinux.cloud.cfg "$pkgdir"/etc/cloud/cloud.cfg
+  cd "${pkgname}-${pkgver}"
+  python ./setup.py install --root="${pkgdir}" -O1 --init-system systemd
+  install -Dm644 "${srcdir}/archlinux.cloud.cfg" "${pkgdir}/etc/cloud/cloud.cfg"
 }

Modified: archlinux.cloud.cfg
===================================================================
--- archlinux.cloud.cfg	2019-10-20 19:29:33 UTC (rev 517953)
+++ archlinux.cloud.cfg	2019-10-20 19:29:33 UTC (rev 517954)
@@ -44,7 +44,7 @@
      name: archlinux
      lock_passwd: True
      gecos: Archlinux
-     groups: [adm, audio, floppy, video, wheel]
+     groups: [users, power, audio, video, wheel]
      sudo: ["ALL=(ALL) NOPASSWD:ALL"]
      shell: /bin/bash
    paths: