David Runge pushed to branch main at Arch Linux / Packaging / Packages /
cloud-init
Commits:
08e804f7 by David Runge at 2024-10-06T12:01:20+02:00
upgpkg: 24.3.1-1
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- − cloud-init-24.2-Fix-btrfs-version-check-for-btrfs-6.10.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = cloud-init
pkgdesc = Cloud instance initialization
- pkgver = 24.2
+ pkgver = 24.3.1
pkgrel = 1
url = https://cloud-init.io
arch = any
@@ -37,11 +37,8 @@ pkgbase = cloud-init
optdepends = python-urllib3: for LXD and Scaleway data sources
backup = etc/cloud/cloud.cfg
backup = etc/cloud/cloud.cfg.d/05_logging.cfg
- source =
https://github.com/canonical/cloud-init/archive/24.2/cloud-init-24.2.tar.gz
- source = cloud-init-24.2-Fix-btrfs-version-check-for-btrfs-6.10.patch
- sha512sums =
2257de8c23f3a94324a7fe9e2105e6343ffe11cc86b27a68c7447b6e386a951bf2643988f3d26371420e3702a0b568107bb343d000ecae80d5e229b5a023513d
- sha512sums =
a92d1db1b73eae2a98e2a8fd6e8bdbaeba8f9ffdf2762f9c1cd43730da090317c41061295204392c440ed8b80a1f8746a8250ad4805bf7e0eab6b19fdd92de0a
- b2sums =
19f1dd16aa673b4fdc0a8368fbf490773195f765834b89409c0fda6f6fb897c18a5632cdbd4c4cac85373fba31e0de279ce86ca6253686bc0e7eac19e8adf4f8
- b2sums =
df454ed55e3f3f9d4a71e4f362ab59c125eb64c6e173e7b98a7a0e9c6be07a95c55a40c18288c732bf530a8ee4c29e405467ddd060d0474bf97feefe9d02a519
+ source =
https://github.com/canonical/cloud-init/archive/24.3.1/cloud-init-24.3.1.tar.gz
+ sha512sums =
01b798d67328ecd66229568233fb674f45c055ac469adb31a55a909b6b2c8fd1901a833accb66423923b8945210aa4dc6a0d61945787aabe414c01b501b1416d
+ b2sums =
7e4cb8bd65d34d08b4b4e5ea2370ac952e05b3a210b91a9b29d8e4b633246a9520c2d9259aedfe8edded0d7d761808b86b6b19d98309633c981b2eb0e7cf1f93
pkgname = cloud-init
=====================================
PKGBUILD
=====================================
@@ -7,11 +7,12 @@
# Contributor: Sparadox <etienne.lafarge at gmail.com>
pkgname=cloud-init
-pkgver=24.2
+pkgver=24.3.1
pkgrel=1
pkgdesc="Cloud instance initialization"
arch=(any)
url="https://cloud-init.io";
+_url="https://github.com/canonical/cloud-init";
license=('GPL-3.0-only OR Apache-2.0')
depends=(
bash
@@ -56,17 +57,10 @@ backup=(
etc/cloud/cloud.cfg.d/05_logging.cfg
)
source=(
-
https://github.com/canonical/cloud-init/archive/$pkgver/$pkgname-$pkgver.tar.gz
- $pkgname-24.2-Fix-btrfs-version-check-for-btrfs-6.10.patch
+ $_url/archive/$pkgver/$pkgname-$pkgver.tar.gz
)
-sha512sums=('2257de8c23f3a94324a7fe9e2105e6343ffe11cc86b27a68c7447b6e386a951bf2643988f3d26371420e3702a0b568107bb343d000ecae80d5e229b5a023513d'
-
'a92d1db1b73eae2a98e2a8fd6e8bdbaeba8f9ffdf2762f9c1cd43730da090317c41061295204392c440ed8b80a1f8746a8250ad4805bf7e0eab6b19fdd92de0a')
-b2sums=('19f1dd16aa673b4fdc0a8368fbf490773195f765834b89409c0fda6f6fb897c18a5632cdbd4c4cac85373fba31e0de279ce86ca6253686bc0e7eac19e8adf4f8'
-
'df454ed55e3f3f9d4a71e4f362ab59c125eb64c6e173e7b98a7a0e9c6be07a95c55a40c18288c732bf530a8ee4c29e405467ddd060d0474bf97feefe9d02a519')
-
-prepare() {
- patch -Np1 -d $pkgname-$pkgver -i
../$pkgname-24.2-Fix-btrfs-version-check-for-btrfs-6.10.patch
-}
+sha512sums=('01b798d67328ecd66229568233fb674f45c055ac469adb31a55a909b6b2c8fd1901a833accb66423923b8945210aa4dc6a0d61945787aabe414c01b501b1416d')
+b2sums=('7e4cb8bd65d34d08b4b4e5ea2370ac952e05b3a210b91a9b29d8e4b633246a9520c2d9259aedfe8edded0d7d761808b86b6b19d98309633c981b2eb0e7cf1f93')
build() {
cd $pkgname-$pkgver
@@ -115,7 +109,7 @@ package() {
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
+ for _file in cloud-{config,final,init-{local,main,network}}.service; do
./tools/render-template --variant arch ./systemd/$_file.tmpl
"$pkgdir/usr/lib/systemd/system/$_file"
done
install -vDm 644 systemd/*.{service,socket,target}
"$pkgdir/usr/lib/systemd/system/"
=====================================
cloud-init-24.2-Fix-btrfs-version-check-for-btrfs-6.10.patch deleted
=====================================
@@ -1,36 +0,0 @@
-From 16f013cf5fb1df94ea84861426af1025c1673c08 Mon Sep 17 00:00:00 2001
-From: Adam Williamson <[email protected]>
-Date: Tue, 13 Aug 2024 09:09:15 -0400
-Subject: [PATCH] Fix btrfs version check for btrfs 6.10
-
-In 6.10, the `--version` output has an extra line indicating
-build config and capabilities:
-
-[adamw@xps13a cloud-init (fix-btrfs-version-check-610 *)]$ btrfs --version
-btrfs-progs v6.10
--EXPERIMENTAL -INJECT -STATIC +LZO +ZSTD +UDEV +FSVERITY +ZONED
CRYPTO=libgcrypt
-
-this breaks the version parsing here, add another split operation
-to fix it.
-
-Signed-off-by: Adam Williamson <[email protected]>
----
- cloudinit/config/cc_resizefs.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cloudinit/config/cc_resizefs.py b/cloudinit/config/cc_resizefs.py
-index 77a2a26a7..cb6a413ab 100644
---- a/cloudinit/config/cc_resizefs.py
-+++ b/cloudinit/config/cc_resizefs.py
-@@ -58,7 +58,7 @@ def _resize_btrfs(mount_point, devpth):
- # the resize operation can be queued
- btrfs_with_queue = util.Version.from_str("5.10")
- system_btrfs_ver = util.Version.from_str(
-- subp.subp(["btrfs", "--version"])[0].split("v")[-1].strip()
-+ subp.subp(["btrfs",
"--version"])[0].split("v")[-1].split("\n")[0].strip()
- )
- if system_btrfs_ver >= btrfs_with_queue:
- idx = cmd.index("resize")
---
-2.46.0
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cloud-init/-/commit/08e804f7c41f7d742496aac6439ea8545d7202b6
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/cloud-init/-/commit/08e804f7c41f7d742496aac6439ea8545d7202b6
You're receiving this email because of your account on gitlab.archlinux.org.
