diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
commit | 0584f638797a816b29b909d4611d5a099df7bbc1 (patch) | |
tree | 1ec4bdacf824c304290b5086fd54bba9b84158e2 /dynamic-layers/openembedded-layer | |
parent | 7a5e47b6a594eb29dfe84e47f043a49974bc0402 (diff) | |
download | meta-intel-0584f638797a816b29b909d4611d5a099df7bbc1.tar.gz |
Convert to new override syntax
Use the convert-overrides.py to convert to new syntax and manually
fix some additional changes.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'dynamic-layers/openembedded-layer')
8 files changed, 30 insertions, 30 deletions
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb index 86501025..8ff8c88a 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb | |||
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93" | |||
8 | 8 | ||
9 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 9 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
10 | 10 | ||
11 | COMPATIBLE_HOST_libc-musl = "null" | 11 | COMPATIBLE_HOST:libc-musl = "null" |
12 | 12 | ||
13 | inherit cmake systemd features_check | 13 | inherit cmake systemd features_check |
14 | 14 | ||
@@ -23,24 +23,24 @@ PACKAGECONFIG[networkmanager] = "-DNETWORK_NM=ON, -DNETWORK_NM=OFF, networkmanag | |||
23 | 23 | ||
24 | REQUIRED_DISTRO_FEATURES= "systemd" | 24 | REQUIRED_DISTRO_FEATURES= "systemd" |
25 | 25 | ||
26 | FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" | 26 | FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" |
27 | 27 | ||
28 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
29 | 29 | ||
30 | SYSTEMD_SERVICE_${PN} = "lms.service" | 30 | SYSTEMD_SERVICE:${PN} = "lms.service" |
31 | 31 | ||
32 | SRC_URI = "git://github.com/intel/lms.git \ | 32 | SRC_URI = "git://github.com/intel/lms.git \ |
33 | " | 33 | " |
34 | SRCREV = "e0ebda9d1e7884b51293b71c1bcda511a7942e1a" | 34 | SRCREV = "e0ebda9d1e7884b51293b71c1bcda511a7942e1a" |
35 | 35 | ||
36 | do_install_append() { | 36 | do_install:append() { |
37 | install -d ${D}${systemd_system_unitdir} | 37 | install -d ${D}${systemd_system_unitdir} |
38 | install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} | 38 | install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} |
39 | install -d ${D}${sysconfdir}/udev/rules.d | 39 | install -d ${D}${sysconfdir}/udev/rules.d |
40 | install -m 0644 ${S}/UNS/linux_scripts/70-mei-wdt.rules ${D}${sysconfdir}/udev/rules.d/70-mei-wdt.rules | 40 | install -m 0644 ${S}/UNS/linux_scripts/70-mei-wdt.rules ${D}${sysconfdir}/udev/rules.d/70-mei-wdt.rules |
41 | } | 41 | } |
42 | 42 | ||
43 | RDEPENDS_${PN} += "ace" | 43 | RDEPENDS:${PN} += "ace" |
44 | 44 | ||
45 | # This CVE is for Lan Management System software and not this lms. | 45 | # This CVE is for Lan Management System software and not this lms. |
46 | CVE_CHECK_WHITELIST += "CVE-2018-1000535" | 46 | CVE_CHECK_WHITELIST += "CVE-2018-1000535" |
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb index efad2fe3..906b85aa 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb | |||
@@ -20,7 +20,7 @@ inherit pkgconfig autotools systemd gtk-doc | |||
20 | 20 | ||
21 | # gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails | 21 | # gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails |
22 | # to copy becuase there is no m4 dir yet. | 22 | # to copy becuase there is no m4 dir yet. |
23 | do_configure_prepend () { | 23 | do_configure:prepend () { |
24 | mkdir -p ${S}/m4 | 24 | mkdir -p ${S}/m4 |
25 | } | 25 | } |
26 | 26 | ||
@@ -28,13 +28,13 @@ EXTRA_OECONF = " \ | |||
28 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ | 28 | --with-systemdsystemunitdir=${systemd_system_unitdir} \ |
29 | " | 29 | " |
30 | 30 | ||
31 | FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" | 31 | FILES:${PN} += "${datadir}/dbus-1/system-services/*.service" |
32 | 32 | ||
33 | SYSTEMD_SERVICE_${PN} = "thermald.service" | 33 | SYSTEMD_SERVICE:${PN} = "thermald.service" |
34 | 34 | ||
35 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' | 35 | COMPATIBLE_HOST = '(i.86|x86_64).*-linux' |
36 | 36 | ||
37 | CONFFILES_${PN} = " \ | 37 | CONFFILES:${PN} = " \ |
38 | ${sysconfdir}/thermald/thermal-conf.xml \ | 38 | ${sysconfdir}/thermald/thermal-conf.xml \ |
39 | ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \ | 39 | ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \ |
40 | " | 40 | " |
diff --git a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb index 9ab0804f..2238746f 100644 --- a/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-core/levelzero/level-zero_1.2.3.bb | |||
@@ -14,7 +14,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>(\d+(\.\d+)+))$" | |||
14 | 14 | ||
15 | PACKAGES =+ "${PN}-headers ${PN}-samples ${PN}-loader" | 15 | PACKAGES =+ "${PN}-headers ${PN}-samples ${PN}-loader" |
16 | 16 | ||
17 | do_install_append () { | 17 | do_install:append () { |
18 | install -d ${D}${bindir} ${D}${libdir} | 18 | install -d ${D}${bindir} ${D}${libdir} |
19 | install -m 755 ${B}/bin/zello* ${D}${bindir} | 19 | install -m 755 ${B}/bin/zello* ${D}${bindir} |
20 | 20 | ||
@@ -22,10 +22,10 @@ do_install_append () { | |||
22 | } | 22 | } |
23 | 23 | ||
24 | 24 | ||
25 | FILES_${PN}-headers = "${includedir}" | 25 | FILES:${PN}-headers = "${includedir}" |
26 | FILES_${PN}-samples = "${bindir} ${libdir}/libze_null* ${libdir}/libze_validation*" | 26 | FILES:${PN}-samples = "${bindir} ${libdir}/libze_null* ${libdir}/libze_validation*" |
27 | FILES_${PN}-loader = "${libdir}" | 27 | FILES:${PN}-loader = "${libdir}" |
28 | 28 | ||
29 | # PN-loader (non -dev/-dbg/nativesdk- package) contains symlink .so | 29 | # PN-loader (non -dev/-dbg/nativesdk- package) contains symlink .so |
30 | INSANE_SKIP_${PN}-loader = "dev-so" | 30 | INSANE_SKIP:${PN}-loader = "dev-so" |
31 | INSANE_SKIP_${PN}-samples = "dev-so" | 31 | INSANE_SKIP:${PN}-samples = "dev-so" |
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb index 82c4bbea..b2c5a038 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/openvkl/openvkl_0.13.0.bb | |||
@@ -31,6 +31,6 @@ EXTRA_OECMAKE += " \ | |||
31 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ | 31 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ |
32 | " | 32 | " |
33 | PACKAGES =+ "${PN}-examples" | 33 | PACKAGES =+ "${PN}-examples" |
34 | FILES_${PN}-examples = "\ | 34 | FILES:${PN}-examples = "\ |
35 | ${bindir} \ | 35 | ${bindir} \ |
36 | " | 36 | " |
diff --git a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb index 7b8544b0..b2f4f7cb 100644 --- a/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-oneapi/ospray/ospray_2.6.0.bb | |||
@@ -25,6 +25,6 @@ EXTRA_OECMAKE += " \ | |||
25 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ | 25 | -DISPC_EXECUTABLE=${STAGING_BINDIR_NATIVE}/ispc \ |
26 | " | 26 | " |
27 | PACKAGES =+ "${PN}-apps" | 27 | PACKAGES =+ "${PN}-apps" |
28 | FILES_${PN}-apps = "\ | 28 | FILES:${PN}-apps = "\ |
29 | ${bindir} \ | 29 | ${bindir} \ |
30 | " | 30 | " |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb index e84d1058..0e29c44c 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/ipmctl/ipmctl_03.00.00.0341.bb | |||
@@ -32,7 +32,7 @@ DEPENDS = "ndctl" | |||
32 | 32 | ||
33 | EXTRA_OECMAKE = "-DRELEASE=ON" | 33 | EXTRA_OECMAKE = "-DRELEASE=ON" |
34 | 34 | ||
35 | do_configure_prepend() { | 35 | do_configure:prepend() { |
36 | for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do | 36 | for dir in BaseTools MdeModulePkg MdePkg ShellPkg ; do |
37 | ln -sf edk2/${dir} ${S} | 37 | ln -sf edk2/${dir} ${S} |
38 | done | 38 | done |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb index 700f78c2..1461afe1 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo_2021.3.bb | |||
@@ -21,7 +21,7 @@ OECMAKE_SOURCEPATH = "${S}/demos" | |||
21 | 21 | ||
22 | DEPENDS += "openvino-inference-engine opencv gflags" | 22 | DEPENDS += "openvino-inference-engine opencv gflags" |
23 | 23 | ||
24 | RDEPENDS_${PN} += " \ | 24 | RDEPENDS:${PN} += " \ |
25 | python3-decorator \ | 25 | python3-decorator \ |
26 | python3-defusedxml \ | 26 | python3-defusedxml \ |
27 | python3-networkx \ | 27 | python3-networkx \ |
@@ -46,7 +46,7 @@ EXTRA_OECMAKE += " \ | |||
46 | -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ | 46 | -DIE_ROOT_DIR=${WORKDIR}/InferenceEngine \ |
47 | " | 47 | " |
48 | 48 | ||
49 | do_configure_prepend(){ | 49 | do_configure:prepend(){ |
50 | mkdir -p ${WORKDIR}/InferenceEngine/share | 50 | mkdir -p ${WORKDIR}/InferenceEngine/share |
51 | cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ | 51 | cp ${STAGING_LIBDIR}/cmake/InferenceEngine/* ${WORKDIR}/InferenceEngine/share/ |
52 | } | 52 | } |
@@ -63,4 +63,4 @@ do_install(){ | |||
63 | cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools | 63 | cp -rf ${WORKDIR}/git/tools/downloader ${D}${datadir}/openvino/open-model-zoo/tools |
64 | } | 64 | } |
65 | 65 | ||
66 | FILES_${PN} += "${datadir}/openvino" | 66 | FILES:${PN} += "${datadir}/openvino" |
diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb index 19da3e1b..654cac13 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/openvino-inference-engine_2021.3.bb | |||
@@ -30,7 +30,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \ | |||
30 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ | 30 | file://thirdparty/xbyak/COPYRIGHT;md5=03532861dad9003cc2c17f14fc7a4efa \ |
31 | file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | 31 | file://inference-engine/thirdparty/clDNN/common/include/OpenCL_CLHPP_License.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ |
32 | " | 32 | " |
33 | LICENSE_${PN}-vpu-firmware = "ISSL" | 33 | LICENSE:${PN}-vpu-firmware = "ISSL" |
34 | 34 | ||
35 | inherit cmake python3native | 35 | inherit cmake python3native |
36 | 36 | ||
@@ -64,7 +64,7 @@ DEPENDS += "libusb1 \ | |||
64 | " | 64 | " |
65 | 65 | ||
66 | COMPATIBLE_HOST = '(x86_64).*-linux' | 66 | COMPATIBLE_HOST = '(x86_64).*-linux' |
67 | COMPATIBLE_HOST_libc-musl = "null" | 67 | COMPATIBLE_HOST:libc-musl = "null" |
68 | 68 | ||
69 | #Disable opencl temporarily. intel-compute-runtime depends on | 69 | #Disable opencl temporarily. intel-compute-runtime depends on |
70 | #intel-graphics-compiler and vc-intrinsics and these two recipes fail to | 70 | #intel-graphics-compiler and vc-intrinsics and these two recipes fail to |
@@ -76,7 +76,7 @@ PACKAGECONFIG[python3] = "-DENABLE_PYTHON=ON -DPYTHON_LIBRARY=${PYTHON_LIBRARY} | |||
76 | PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" | 76 | PACKAGECONFIG[vpu] = "-DENABLE_VPU=ON -DVPU_FIRMWARE_USB-MA2X8X_FILE=../mvnc/usb-ma2x8x.mvcmd -DVPU_FIRMWARE_PCIE-MA2X8X_FILE=../mvnc/pcie-ma2x8x.mvcmd,-DENABLE_VPU=OFF,,${PN}-vpu-firmware" |
77 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" | 77 | PACKAGECONFIG[verbose] = "-DVERBOSE_BUILD=1,-DVERBOSE_BUILD=0" |
78 | 78 | ||
79 | do_install_append() { | 79 | do_install:append() { |
80 | if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then | 80 | if ${@bb.utils.contains('PACKAGECONFIG', 'vpu', 'true', 'false', d)}; then |
81 | install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ | 81 | install -m0644 ${WORKDIR}/mvnc/usb-ma2x8x.mvcmd ${D}${libdir}/ |
82 | install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ | 82 | install -m0644 ${WORKDIR}/mvnc/pcie-ma2x8x.mvcmd ${D}${libdir}/ |
@@ -102,13 +102,13 @@ do_install_append() { | |||
102 | 102 | ||
103 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR | 103 | # Otherwise e.g. ros-openvino-toolkit-dynamic-vino-sample when using dldt-inference-engine uses dldt-inference-engine WORKDIR |
104 | # instead of RSS | 104 | # instead of RSS |
105 | SSTATE_SCAN_FILES_append = " *.cmake" | 105 | SSTATE_SCAN_FILES:append = " *.cmake" |
106 | 106 | ||
107 | FILES_${PN}-dev = "${includedir} \ | 107 | FILES:${PN}-dev = "${includedir} \ |
108 | ${libdir}/cmake \ | 108 | ${libdir}/cmake \ |
109 | " | 109 | " |
110 | 110 | ||
111 | FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ | 111 | FILES:${PN} += "${libdir}/lib*${SOLIBSDEV} \ |
112 | ${datadir}/openvino \ | 112 | ${datadir}/openvino \ |
113 | ${libdir}/custom_kernels \ | 113 | ${libdir}/custom_kernels \ |
114 | ${libdir}/plugins.xml \ | 114 | ${libdir}/plugins.xml \ |
@@ -118,12 +118,12 @@ FILES_${PN} += "${libdir}/lib*${SOLIBSDEV} \ | |||
118 | # Move inference engine samples into a separate package | 118 | # Move inference engine samples into a separate package |
119 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" | 119 | PACKAGES =+ "${PN}-samples ${PN}-vpu-firmware" |
120 | 120 | ||
121 | FILES_${PN}-samples = "${datadir}/inference_engine \ | 121 | FILES:${PN}-samples = "${datadir}/inference_engine \ |
122 | ${bindir} \ | 122 | ${bindir} \ |
123 | " | 123 | " |
124 | FILES_${PN}-vpu-firmware += "${libdir}/*.mvcmd" | 124 | FILES:${PN}-vpu-firmware += "${libdir}/*.mvcmd" |
125 | 125 | ||
126 | # Package for inference engine python API | 126 | # Package for inference engine python API |
127 | PACKAGES =+ "${PN}-${PYTHON_PN}" | 127 | PACKAGES =+ "${PN}-${PYTHON_PN}" |
128 | 128 | ||
129 | FILES_${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" | 129 | FILES:${PN}-${PYTHON_PN} = "${PYTHON_SITEPACKAGES_DIR}/openvino" |