It Fixes: ERROR: lms-2245.0.0.0-r0 do_package_qa: QA Issue: lms package is not obeying usrmerge distro feature. /lib should be relocated to /usr.[usrmerge]
This issue is surfaced with enabling usrmerge DISTRO feature. Signed-off-by: Naveen Saini <[email protected]> Signed-off-by: Anuj Mittal <[email protected]> --- ...eLists.txt-migrate-udev-rules-to-usr.patch | 33 +++++++++++++++++++ .../recipes-bsp/amt/lms_2245.0.0.0.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch new file mode 100644 index 00000000..80b64b37 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch @@ -0,0 +1,33 @@ +From 072d20e6dcd99ff272a934fcfda8df9dd15d4359 Mon Sep 17 00:00:00 2001 +From: Naveen Saini <[email protected]> +Date: Fri, 16 Jun 2023 11:35:42 +0800 +Subject: [PATCH] UNS/CMakeLists.txt: migrate udev rules to /usr + +With the upcoming v254 release of systemd mandating usrmerge[1] this +will become mandatory for anyone using systemd. + +[1] https://lists.freedesktop.org/archives/systemd-devel/2023-June/049173.html + +Upstream-Status: Submitted [https://github.com/intel/lms/pull/16] + +Signed-off-by: Naveen Saini <[email protected]> +--- + UNS/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/UNS/CMakeLists.txt b/UNS/CMakeLists.txt +index 09000eb..c6b98c1 100644 +--- a/UNS/CMakeLists.txt ++++ b/UNS/CMakeLists.txt +@@ -139,7 +139,7 @@ if (UNIX) + install (FILES + ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/70-persistent-mei.rules + ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/70-mei-wdt.rules +- DESTINATION /lib/udev/rules.d/ ++ DESTINATION /usr/lib/udev/rules.d/ + ) + + install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/20-lms.conf +-- +2.34.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2245.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2245.0.0.0.bb index 7f339c8f..7656571e 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2245.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2245.0.0.0.bb @@ -31,6 +31,7 @@ SYSTEMD_SERVICE:${PN} = "lms.service" SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ file://fix-gcc13.patch \ + file://0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch \ " SRCREV = "4db4ceb3f70cd1b907747646dda6785db7b247d7" -- 2.37.3
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8023): https://lists.yoctoproject.org/g/meta-intel/message/8023 Mute This Topic: https://lists.yoctoproject.org/mt/99822671/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
