From: Martin Jansa <martin.jansa@gmail.com>
To: meta-virtualization@lists.yoctoproject.org
Cc: Martin Jansa <Martin.Jansa@gmail.com>
Subject: [PATCH] cloud-init: bump SRCREV to fix update to 23.2.2
Date: Mon, 28 Aug 2023 16:38:56 +0200 [thread overview]
Message-ID: <20230828143856.549539-1-Martin.Jansa@gmail.com> (raw)
* the update from
commit 0f1601d98f2c926a109b7beb7df21a5dfe6188d9
Author: Bruce Ashfield <bruce.ashfield@gmail.com>
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...-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
diff --git a/recipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch b/recipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch
deleted file mode 100644
index 9f3760c..0000000
--- a/recipes-extended/cloud-init/cloud-init/0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 57752970ebea017820343aadf11b65c537bef336 Mon Sep 17 00:00:00 2001
-From: dankm <dan.mcgregor@usask.ca>
-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 <Martin.Jansa@gmail.com>
----
- 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/sshd-keygen@.service.d/",
- ["systemd/disable-sshd-keygen-if-cloud-init-active.conf"],
diff --git a/recipes-extended/cloud-init/cloud-init_git.bb b/recipes-extended/cloud-init/cloud-init_git.bb
index b5c2d71..9d84f47 100644
--- a/recipes-extended/cloud-init/cloud-init_git.bb
+++ b/recipes-extended/cloud-init/cloud-init_git.bb
@@ -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"
--
2.42.0
next reply other threads:[~2023-08-28 14:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-28 14:38 Martin Jansa [this message]
2023-08-29 2:09 ` [meta-virtualization] [PATCH] cloud-init: bump SRCREV to fix update to 23.2.2 Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230828143856.549539-1-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).