summaryrefslogtreecommitdiffstats
path: root/recipes-extended/cloud-init/cloud-init_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-08-14 13:21:40 +0200
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-08-15 18:47:38 +0000
commit926d714972edc85f47ad771d0bfe9565d7e57e74 (patch)
treeac0213896c3b2c2a6a445adb789298a31fe6aba7 /recipes-extended/cloud-init/cloud-init_git.bb
parent0f1601d98f2c926a109b7beb7df21a5dfe6188d9 (diff)
downloadmeta-virtualization-926d714972edc85f47ad771d0bfe9565d7e57e74.tar.gz
cloud-init: fix usrmerge QA issue
* backport a fix from 23.2 version (notice that the recipe claims to be: v23.2.2+git, but the commit in master-next which updated PV only changed the branch name, not the SRCREV, so it's still 23.1 and missing this fix cloud-init/v23.2.2+git/git $ git describe --tags 23.1-53-g57752970e * fixes: ERROR: cloud-init-v23.2.2+git-r0 do_package_qa: QA Issue: cloud-init package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] caused by udev rules: $ find cloud-init/v23.2.2+git/image/lib/ cloud-init/v23.2.2+git/image/lib/ cloud-init/v23.2.2+git/image/lib/udev cloud-init/v23.2.2+git/image/lib/udev/rules.d cloud-init/v23.2.2+git/image/lib/udev/rules.d/66-azure-ephemeral.rules Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/cloud-init/cloud-init_git.bb')
-rw-r--r--recipes-extended/cloud-init/cloud-init_git.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-extended/cloud-init/cloud-init_git.bb b/recipes-extended/cloud-init/cloud-init_git.bb
index a35f50a4..e01bdad2 100644
--- a/recipes-extended/cloud-init/cloud-init_git.bb
+++ b/recipes-extended/cloud-init/cloud-init_git.bb
@@ -11,6 +11,7 @@ SRCREV = "e02c4607923af64311c70ae9a06d6794355e9a61"
11SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \ 11SRC_URI = "git://github.com/canonical/cloud-init;branch=23.2.x;protocol=https \
12 file://cloud-init-source-local-lsb-functions.patch \ 12 file://cloud-init-source-local-lsb-functions.patch \
13 file://0001-setup.py-check-for-install-anywhere-in-args.patch \ 13 file://0001-setup.py-check-for-install-anywhere-in-args.patch \
14 file://0002-setup.py-use-pkg-config-for-udev-rules-path-2137.patch \
14" 15"
15 16
16PV = "v23.2.2+git${SRCPV}" 17PV = "v23.2.2+git${SRCPV}"