From 8afc0b32daf089a002a4673914cc21b4638d01c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 7 Nov 2020 17:24:37 +0100 Subject: cloud-init: fix usrmerge QA error: * respect udevdir variable * with usrmerge cloud-init triggers QA error: ERROR: cloud-init-20.3-r0 do_package_qa: QA Issue: cloud-init package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] ERROR: cloud-init-20.3-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. because of: /lib/udev/rules.d/66-azure-ephemeral.rules Signed-off-by: Martin Jansa Signed-off-by: Bruce Ashfield --- .../0001-setup.py-respect-udevdir-variable.patch | 42 ++++++++++++++++++++++ recipes-extended/cloud-init/cloud-init_20.3.bb | 7 ++-- 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch diff --git a/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch b/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch new file mode 100644 index 00000000..94ec98ac --- /dev/null +++ b/recipes-extended/cloud-init/cloud-init/0001-setup.py-respect-udevdir-variable.patch @@ -0,0 +1,42 @@ +From d7a6b8f765e9a08a8811331298e76ebd7a0c7076 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 7 Nov 2020 15:55:23 +0000 +Subject: [PATCH] setup.py respect udevdir variable + +* with usrmerge cloud-init triggers QA error: + ERROR: cloud-init-20.3-r0 do_package_qa: QA Issue: cloud-init package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge] + ERROR: cloud-init-20.3-r0 do_package_qa: QA run found fatal errors. Please consider fixing them. + because of: + /lib/udev/rules.d/66-azure-ephemeral.rules + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index cbacf48e..5e137a6d 100755 +--- a/setup.py ++++ b/setup.py +@@ -142,6 +142,7 @@ INITSYS_ROOTS = { + 'sysvinit_deb': 'etc/init.d', + 'sysvinit_openrc': 'etc/init.d', + 'sysvinit_suse': 'etc/init.d', ++ 'udevdir': pkg_config_read('udev', 'udevdir'), + 'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'), + 'systemd.generators': pkg_config_read('systemd', + 'systemdsystemgeneratordir'), +@@ -264,7 +265,7 @@ if not platform.system().endswith('BSD'): + (ETC + '/NetworkManager/dispatcher.d/', + ['tools/hook-network-manager']), + (ETC + '/dhcp/dhclient-exit-hooks.d/', ['tools/hook-dhclient']), +- (LIB + '/udev/rules.d', [f for f in glob('udev/*.rules')]) ++ ('udevdir' + '/rules.d', [f for f in glob('udev/*.rules')]) + ]) + # Use a subclass for install that handles + # adding on the right init system configuration files +-- +2.27.0 + diff --git a/recipes-extended/cloud-init/cloud-init_20.3.bb b/recipes-extended/cloud-init/cloud-init_20.3.bb index 53d71a6d..b9efb31f 100644 --- a/recipes-extended/cloud-init/cloud-init_20.3.bb +++ b/recipes-extended/cloud-init/cloud-init_20.3.bb @@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c6dd79b6ec2130a3364f6fa9d6380408" SRCREV = "1431c8a1bddaabf85e1bbb32bf316a3aef20036e" SRC_URI = "git://github.com/canonical/cloud-init \ - file://cloud-init-source-local-lsb-functions.patch \ - file://0001-setup.py-check-for-install-anywhere-in-args.patch \ - " + file://cloud-init-source-local-lsb-functions.patch \ + file://0001-setup.py-check-for-install-anywhere-in-args.patch \ + file://0001-setup.py-respect-udevdir-variable.patch \ +" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf