[arch-commits] Commit in cloud-init/trunk (5 files)
David Runge
dvzrv at gemini.archlinux.org
Tue Feb 15 23:21:03 UTC 2022
Date: Tuesday, February 15, 2022 @ 23:21:03
Author: dvzrv
Revision: 1133410
upgpkg: cloud-init 22.1-1: Upgrade to 22.1.
Update patches for default lib dir and removal of use of configobj internal functions.
Remove unneeded quotes and curly braces.
Added:
cloud-init/trunk/cloud-init-22.1-lib_dir.patch
cloud-init/trunk/cloud-init-22.1-python-configobj.patch
Modified:
cloud-init/trunk/PKGBUILD
Deleted:
cloud-init/trunk/cloud-init-21.3-lib_dir.patch
cloud-init/trunk/cloud-init-21.3-python-configobj.patch
----------------------------------------+
PKGBUILD | 45 +++++++++++++++----------------
cloud-init-21.3-lib_dir.patch | 12 --------
cloud-init-21.3-python-configobj.patch | 12 --------
cloud-init-22.1-lib_dir.patch | 12 ++++++++
cloud-init-22.1-python-configobj.patch | 12 ++++++++
5 files changed, 47 insertions(+), 46 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-02-15 23:11:17 UTC (rev 1133409)
+++ PKGBUILD 2022-02-15 23:21:03 UTC (rev 1133410)
@@ -7,9 +7,9 @@
# Contributor: Sparadox <etienne.lafarge at gmail.com>
pkgname=cloud-init
-pkgver=21.4
-pkgrel=2
-pkgdesc="The standard for customising cloud instances"
+pkgver=22.1
+pkgrel=1
+pkgdesc="Cloud instance initialization"
arch=(any)
url="https://cloud-init.io"
license=(GPL3)
@@ -23,41 +23,42 @@
etc/cloud/cloud.cfg
etc/cloud/cloud.cfg.d/05_logging.cfg
)
-source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"
- "${pkgname}-21.3-lib_dir.patch"
- "${pkgname}-21.3-python-configobj.patch"
+source=(
+ https://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ $pkgname-22.1-lib_dir.patch
+ $pkgname-22.1-python-configobj.patch
)
-sha512sums=('ee23dfab6720063f37a14100956b823d6b070281259248a09988fcf986190ca76db1a263fce430426f6643f76f378a3b9de0e33c674a65c11296cda3c15410bd'
- '3d23d060779e2bb82a7044ee6e00169baa7ea4cda756ea32c80329b73fd69521f7dd76a4079cb1c7a941859389a8d67dec7bfb5c2c9eb236a3950eca92f446ca'
- 'e4404702b51b2f199026bf8e8a75fe18cf216ce91da47f5faa644b6ed6251f49c49a85772e48f2bbfcf283292d67234b05d588ad69e5804bb4fb6b7a63f2dad5')
-b2sums=('e5075ea88d0be8f92237ce182eeb80d188ea3438e9b219bc0bcfb5ae2bcf6c2a59d14b7b6d48c14cfb9a70eb44f39f007cf6154c6e5fa4fdd70d71f2bc0964a4'
- 'a7845162108cdc90f576d2408c6244fbddac13431395740e02c8915b5a6a4b70f3dd5d44de27e13fb6d7a24d2e916c474bdce842b6992410385a786914e4da0f'
- '7e370e2ba8c159195586ae839a450368eeb6f558366714e873743d871bda9613dbdb2391db365f66f613fbfa60cb36a13cff990a5b92c17b31f711a098e5747f')
+sha512sums=('485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab'
+ '32b7521f0ae4d61a4d86f2f840fb0670e2cdc7bab708fc7b7676b5178b6d660beb3a46b803f5bcd7e0f18c6d6339fc96e20a951dfafadbb0312e4a0cafce325f'
+ '16e414661be0fc382d25ff18fd35147bf6115e64984d8a7e83c479f206a8d20ba0da1901a69eee9e07fe3d7b3c7cebc5702b2932f1847e19b43eccb5c89fa63b')
+b2sums=('ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55'
+ '4e03bd647ca9e1bc3d9c507824d43e4013a20d5bbcb7215755b427d0c7ded9ee48dbfb9faaae703ab2d519aee7c48a40277603c8f874347b574b7ac2b1e1a9fd'
+ 'e3470a365ecf7b5fe0ce0df30fab4160770ec128904a36ad57676af3c2c3a6730290a379c623d10fde588378149ef9c1b936f7f01f06fdb524a3f3d12f8d5112')
prepare() {
- cd "${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
# we use /usr/lib
- patch -Np1 -i ../"${pkgname}-21.3-lib_dir.patch"
+ patch -Np1 -i ../$pkgname-22.1-lib_dir.patch
# we have python-configobj > 5.0.6, which does not provide ConfigObj._a_to_u() anymore
- patch -Np1 -i ../"${pkgname}-21.3-python-configobj.patch"
+ patch -Np1 -i ../$pkgname-22.1-python-configobj.patch
}
build() {
- cd "${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
python setup.py build
}
check() {
- cd "${pkgname}-${pkgver}"
- export PYTHONPATH="build:${PYTHONPATH}"
+ cd $pkgname-$pkgver
+ export PYTHONPATH="build:$PYTHONPATH"
pytest -v
}
package() {
- cd "${pkgname}-${pkgver}"
- python setup.py install --optimize=1 --init-system=systemd --root="${pkgdir}"
+ cd $pkgname-$pkgver
+ python setup.py install --optimize=1 --init-system=systemd --root="$pkgdir"
# /etc/systemd is for administrative purposes, not for vendoring purposes
- mv -v "${pkgdir}/"{etc,usr/lib}/systemd/system/sshd-keygen at .service.d/
- rm -rf "${pkgdir}/etc/systemd"
+ mv -v "$pkgdir/"{etc,usr/lib}/systemd/system/sshd-keygen at .service.d/
+ rm -rf "$pkgdir/etc/systemd"
}
Deleted: cloud-init-21.3-lib_dir.patch
===================================================================
--- cloud-init-21.3-lib_dir.patch 2022-02-15 23:11:17 UTC (rev 1133409)
+++ cloud-init-21.3-lib_dir.patch 2022-02-15 23:21:03 UTC (rev 1133410)
@@ -1,12 +0,0 @@
-diff -ruN a/setup.py b/setup.py
---- a/setup.py 2021-08-23 19:43:37.000000000 +0200
-+++ b/setup.py 2021-08-24 13:11:25.506861830 +0200
-@@ -156,7 +156,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"
Deleted: cloud-init-21.3-python-configobj.patch
===================================================================
--- cloud-init-21.3-python-configobj.patch 2022-02-15 23:11:17 UTC (rev 1133409)
+++ cloud-init-21.3-python-configobj.patch 2022-02-15 23:21:03 UTC (rev 1133410)
@@ -1,12 +0,0 @@
-diff -ruN a/cloudinit/distros/parsers/sys_conf.py b/cloudinit/distros/parsers/sys_conf.py
---- a/cloudinit/distros/parsers/sys_conf.py 2021-08-23 19:43:37.000000000 +0200
-+++ b/cloudinit/distros/parsers/sys_conf.py 2021-08-24 13:29:30.646813586 +0200
-@@ -101,7 +101,7 @@
- cmnt = self._decode_element(comment)
- return '%s%s%s%s%s' % (indent_string,
- key,
-- self._a_to_u('='),
-+ "=",
- val,
- cmnt)
-
Added: cloud-init-22.1-lib_dir.patch
===================================================================
--- cloud-init-22.1-lib_dir.patch (rev 0)
+++ cloud-init-22.1-lib_dir.patch 2022-02-15 23:21:03 UTC (rev 1133410)
@@ -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"
Added: cloud-init-22.1-python-configobj.patch
===================================================================
--- cloud-init-22.1-python-configobj.patch (rev 0)
+++ cloud-init-22.1-python-configobj.patch 2022-02-15 23:21:03 UTC (rev 1133410)
@@ -0,0 +1,12 @@
+diff -ruN a/cloudinit/distros/parsers/sys_conf.py b/cloudinit/distros/parsers/sys_conf.py
+--- a/cloudinit/distros/parsers/sys_conf.py 2022-02-15 19:02:23.000000000 +0100
++++ b/cloudinit/distros/parsers/sys_conf.py 2022-02-16 00:09:13.366255298 +0100
+@@ -107,7 +107,7 @@
+ return "%s%s%s%s%s" % (
+ indent_string,
+ key,
+- self._a_to_u("="),
++ "=",
+ val,
+ cmnt,
+ )
More information about the arch-commits
mailing list