cloud-init: bump SRCREV to fix update to 23.2.2
PATCH 1/1 cloud-init: bump SRCREV to fix update to 23.2.2
* the update from
commit 0f1601d98f2c926a109b7beb7df21a5dfe6188d9
Author: Bruce Ashfield <[email protected]>
Date: Thu Aug 3 20:15:04 2023 +0000
Subject: cloud-init: update to 23.2.2
Bumping cloud-init to version 23.2.2, which comprises the following commits:
e65a715d Release 23.2.2
was missing the SRCREV update, so it was still 23.1:
cloud-init/v23.2.2+git/git $ git describe --tags 23.1-52-ge02c46079
fix that by using the right one of the 23.2.2 tag:
cloud-init/v23.2.2+git/git $ git show-ref -d 23.2.2 293c6546f038ef4da98910dfeb8d0ade65707952 refs/tags/23.2.2 e65a715d524456285e07ac521457424713ea4aa5 refs/tags/23.2.2^{}
* this fix also allows up to drop the patch backported from 23.2
--- ...-pkg-config-for-udev-rules-path-2137.patch | 50 ------------------- recipes-extended/cloud-init/cloud-init_git.bb | 3 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 recipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch
recipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch deleted +0 -50
@@ -1,50 +0,0 @@ -From 57752970ebea017820343aadf11b65c537bef336 Mon Sep 17 00:00:00 2001 -From: dankm <[email protected]> -Date: Fri, 28 Apr 2023 15:10:34 -0600 -Subject: [PATCH] setup.py: use pkg-config for udev/rules path (#2137) - -Distributions other than RHEL also use /usr/lib/udev for the rules -path. Instead of hardcoding the udev rules path for RedHat, check -pkg-config for the proper location. - -Upstream-Status: Backport [23.2 https://github.com/canonical/cloud-init/commit/5abf5f5f2cf93c57ac74220251d2a2acce5f7099] -Signed-off-by: Martin Jansa <[email protected]> ---- - setup.py | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/setup.py b/setup.py -index a6dbc5c23..66e618d3a 100644 ---- a/setup.py -+++ b/setup.py -@@ -46,7 +46,10 @@ def pkg_config_read(library, var): - "systemdsystemconfdir": "/etc/systemd/system", - "systemdsystemunitdir": "/lib/systemd/system", - "systemdsystemgeneratordir": "/lib/systemd/system-generators", -- } -+ }, -+ "udev": { -+ "udevdir": "/lib/udev", -+ }, - } - cmd = ["pkg-config", "--variable=%s" % var, library] - try: -@@ -309,14 +312,13 @@ data_files = [ - ), - ] - if not platform.system().endswith("BSD"): -- -- RULES_PATH = LIB -- if os.path.isfile("/etc/redhat-release"): -- RULES_PATH = "/usr/lib" -+ RULES_PATH = pkg_config_read("udev", "udevdir") -+ if not in_virtualenv(): -+ RULES_PATH = "/" + RULES_PATH - - data_files.extend( - [ -- (RULES_PATH + "/udev/rules.d", [f for f in glob("udev/*.rules")]), -+ (RULES_PATH + "/rules.d", [f for f in glob("udev/*.rules")]), - ( - ETC + "/systemd/system/[email protected]/", - ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
recipes-extended/cloud-init/cloud-init_git.bb +1 -2
@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408 \ file://LICENSE-Apache2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -SRCREV = "e02c4607923af64311c70ae9a06d6794355e9a61" +SRCREV = "293c6546f038ef4da98910dfeb8d0ade65707952" SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \ file://cloud-init-source-local-lsb-functions.patch \ file://0001-setup.py-check-for-install-anywhere-in-args.patch \ - file://0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch \ " PV = "v23.2.2+git"
Signature · 1 line
2.42.0
In message: [meta-virtualization] [PATCH] cloud-init: bump SRCREV to fix update to 23.2.2
Quoted 15 lines · on 28/08/2023 Martin Jansa wrote:
* the update from
commit0f1601d98f2c926a109b7beb7df21a5dfe6188d9
Author: Bruce Ashfield <[email protected]>
Date: Thu Aug 3 20:15:04 2023 +0000
Subject: cloud-init: update to 23.2.2Bumping cloud-init to version 23.2.2, which comprises the following commits:
e65a715dRelease 23.2.2was missing the SRCREV update, so it was still 23.1:
cloud-init/v23.2.2+git/git $ git describe --tags 23.1-52-ge02c46079
Quoted 7 lines
fix that by using the right one of the 23.2.2 tag:
cloud-init/v23.2.2+git/git $ git show-ref -d 23.2.2
293c6546f038ef4da98910dfeb8d0ade65707952refs/tags/23.2.2e65a715d524456285e07ac521457424713ea4aa5refs/tags/23.2.2^{}* this fix also allows up to drop the patch backported from 23.2
My update scripts did something very strange with that bump.
Thanks for the catch.
This is on master-next.
Bruce
Quoted 94 lines
Signed-off-by Martin Jansa <[email protected]>--- ...-pkg-config-for-udev-rules-path-2137.patch | 50 ------------------- recipes-extended/cloud-init/cloud-init_git.bb | 3 +- 2 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 recipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patchrecipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch deleted +0
-50@@ -1,50 +0,0 @@ -From 57752970ebea017820343aadf11b65c537bef336 Mon Sep 17 00:00:00 2001 -From: dankm <[email protected]> -Date: Fri, 28 Apr 2023 15:10:34 -0600 -Subject: [PATCH] setup.py: use pkg-config for udev/rules path (#2137) - -Distributions other than RHEL also use /usr/lib/udev for the rules -path. Instead of hardcoding the udev rules path for RedHat, check -pkg-config for the proper location. - -Upstream-Status: Backport [23.2 https://github.com/canonical/cloud-init/commit/5abf5f5f2cf93c57ac74220251d2a2acce5f7099] -Signed-off-by: Martin Jansa <[email protected]> ---- - setup.py | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/setup.py b/setup.py -index a6dbc5c23..66e618d3a 100644 ---- a/setup.py -+++ b/setup.py -@@ -46,7 +46,10 @@ def pkg_config_read(library, var): - "systemdsystemconfdir": "/etc/systemd/system", - "systemdsystemunitdir": "/lib/systemd/system", - "systemdsystemgeneratordir": "/lib/systemd/system-generators", -- } -+ }, -+ "udev": { -+ "udevdir": "/lib/udev", -+ }, - } - cmd = ["pkg-config", "--variable=%s" % var, library] - try: -@@ -309,14 +312,13 @@ data_files = [ - ), - ] - if not platform.system().endswith("BSD"): -- -- RULES_PATH = LIB -- if os.path.isfile("/etc/redhat-release"): -- RULES_PATH = "/usr/lib" -+ RULES_PATH = pkg_config_read("udev", "udevdir") -+ if not in_virtualenv(): -+ RULES_PATH = "/" + RULES_PATH - - data_files.extend( - [ -- (RULES_PATH + "/udev/rules.d", [f for f in glob("udev/*.rules")]), -+ (RULES_PATH + "/rules.d", [f for f in glob("udev/*.rules")]), - ( - ETC + "/systemd/system/[email protected]/", - ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],recipes-extended/cloud-init/cloud-init_git.bb +1
-2@@ -7,11 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408 \ file://LICENSE-Apache2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -SRCREV = "e02c4607923af64311c70ae9a06d6794355e9a61" +SRCREV = "293c6546f038ef4da98910dfeb8d0ade65707952" SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \ file://cloud-init-source-local-lsb-functions.patch \ file://0001-setup.py-check-for-install-anywhere-in-args.patch \ - file://0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch \ " PV = "v23.2.2+git"Signature · 11 lines
2.42.0 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8247): https://lists.yoctoproject.org/g/meta-virtualization/message/8247 Mute This Topic: https://lists.yoctoproject.org/mt/101011241/1050810 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-