summaryrefslogtreecommitdiffstats
path: root/dynamic-layers
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2023-06-16 16:59:01 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2023-06-16 23:40:58 +0800
commitbd2c921fc07fb948ae117e54dd5fa2a5fdb9cd13 (patch)
tree6c0dcb2272e79a531598b256af43fd2bd696ae7d /dynamic-layers
parenta1ae00c7ac5eb47204c0631334bea6fc9f4e9835 (diff)
downloadmeta-intel-bd2c921fc07fb948ae117e54dd5fa2a5fdb9cd13.tar.gz
lms: fix build with usrmerge DISTRO feature
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] Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers')
-rw-r--r--dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch33
-rw-r--r--dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2245.0.0.0.bb1
2 files changed, 34 insertions, 0 deletions
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..984ce7ce
--- /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 @@
1From 1ac6329ffd740786bcd917ef0ddb1056524a8e4b Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Fri, 16 Jun 2023 11:35:42 +0800
4Subject: [PATCH] UNS/CMakeLists.txt: migrate udev rules to /usr
5
6With the upcoming v254 release of systemd mandating usrmerge[1] this
7will become mandatory for anyone using systemd.
8
9[1] https://lists.freedesktop.org/archives/systemd-devel/2023-June/049173.html
10
11Upstream-Status: Pending
12
13Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
14---
15 UNS/CMakeLists.txt | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/UNS/CMakeLists.txt b/UNS/CMakeLists.txt
19index 09000eb..b512a17 100644
20--- a/UNS/CMakeLists.txt
21+++ b/UNS/CMakeLists.txt
22@@ -139,7 +139,7 @@ if (UNIX)
23 install (FILES
24 ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/70-persistent-mei.rules
25 ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/70-mei-wdt.rules
26- DESTINATION /lib/udev/rules.d/
27+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/udev/rules.d/
28 )
29
30 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/20-lms.conf
31--
322.34.1
33
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"
31 31
32SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ 32SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \
33 file://fix-gcc13.patch \ 33 file://fix-gcc13.patch \
34 file://0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch \
34 " 35 "
35SRCREV = "4db4ceb3f70cd1b907747646dda6785db7b247d7" 36SRCREV = "4db4ceb3f70cd1b907747646dda6785db7b247d7"
36 37