diff options
author | Khem Raj <raj.khem@gmail.com> | 2023-04-17 11:35:13 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2023-05-07 12:24:46 -0400 |
commit | 46b6acbe4f3ce3262ec576c2583a76c140d9d24e (patch) | |
tree | 34d9e6629e25f7e7cc38b4b04367f8c1dcfb6941 | |
parent | 1761c7d8e52c11ca51c81112d5921a1397af7dea (diff) | |
download | meta-openembedded-46b6acbe4f3ce3262ec576c2583a76c140d9d24e.tar.gz |
fwupd: Do not emit build time paths into generated headers
Fixes
WARNING: fwupd-1.8.9-r0 do_package_qa: QA Issue: File /usr/src/debug/fwupd/1.8.9-r0/src/fu-plugin-builtin.h in package fwupd-src contains reference to TMPDIR [buildpaths]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 62a3fa25e4b685a51acba19da62b2387346c8abe)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch | 41 | ||||
-rw-r--r-- | meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch b/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch new file mode 100644 index 0000000000..2273bdf105 --- /dev/null +++ b/meta-oe/recipes-bsp/fwupd/fwupd/0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From b1df1ed3a21b8ef0244102043a8fb88b0ccc3f91 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 17 Apr 2023 11:30:21 -0700 | ||
4 | Subject: [PATCH] meson: Avoid absolute buildtime paths in generated headers | ||
5 | |||
6 | using meson.project_source_root() means the path emitted to include .h | ||
7 | files is absolute and it makes its way into PN-src as well, which infact | ||
8 | is not going to work if the -src package was used to re-build this in a | ||
9 | different build path. Therefore use relative path which is '.' and | ||
10 | relative to ${S} | ||
11 | |||
12 | Changes | ||
13 | include "<abspath>/plugins/acpi-dmar/fu-acpi-dmar-plugin.h" | ||
14 | to | ||
15 | include "./plugins/acpi-dmar/fu-acpi-dmar-plugin.h" | ||
16 | |||
17 | in generated build/src/fu-plugin-builtin.h | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | --- | ||
23 | src/meson.build | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/meson.build b/src/meson.build | ||
27 | index b9f6736..bb856ea 100644 | ||
28 | --- a/src/meson.build | ||
29 | +++ b/src/meson.build | ||
30 | @@ -188,7 +188,7 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header', | ||
31 | command : [ | ||
32 | join_paths(meson.project_source_root(), 'contrib', 'generate-plugins-header.py'), | ||
33 | '@OUTPUT@', | ||
34 | - meson.project_source_root(), | ||
35 | + '.', | ||
36 | ','.join(plugin_names), | ||
37 | ], | ||
38 | ) | ||
39 | -- | ||
40 | 2.40.0 | ||
41 | |||
diff --git a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb index 14d83ec521..1f95dee1be 100644 --- a/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb +++ b/meta-oe/recipes-bsp/fwupd/fwupd_1.8.9.bb | |||
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" | |||
5 | DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" | 5 | DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native" |
6 | 6 | ||
7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ | 7 | SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ |
8 | file://0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch \ | ||
8 | file://run-ptest" | 9 | file://run-ptest" |
9 | SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a" | 10 | SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a" |
10 | 11 | ||