mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
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 62a3fa25e4)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
1761c7d8e5
commit
46b6acbe4f
|
|
@ -0,0 +1,41 @@
|
|||
From b1df1ed3a21b8ef0244102043a8fb88b0ccc3f91 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Mon, 17 Apr 2023 11:30:21 -0700
|
||||
Subject: [PATCH] meson: Avoid absolute buildtime paths in generated headers
|
||||
|
||||
using meson.project_source_root() means the path emitted to include .h
|
||||
files is absolute and it makes its way into PN-src as well, which infact
|
||||
is not going to work if the -src package was used to re-build this in a
|
||||
different build path. Therefore use relative path which is '.' and
|
||||
relative to ${S}
|
||||
|
||||
Changes
|
||||
include "<abspath>/plugins/acpi-dmar/fu-acpi-dmar-plugin.h"
|
||||
to
|
||||
include "./plugins/acpi-dmar/fu-acpi-dmar-plugin.h"
|
||||
|
||||
in generated build/src/fu-plugin-builtin.h
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
src/meson.build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index b9f6736..bb856ea 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -188,7 +188,7 @@ plugins_hdr = custom_target('fwupd-generate-plugins-header',
|
||||
command : [
|
||||
join_paths(meson.project_source_root(), 'contrib', 'generate-plugins-header.py'),
|
||||
'@OUTPUT@',
|
||||
- meson.project_source_root(),
|
||||
+ '.',
|
||||
','.join(plugin_names),
|
||||
],
|
||||
)
|
||||
--
|
||||
2.40.0
|
||||
|
||||
|
|
@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
|||
DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native"
|
||||
|
||||
SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \
|
||||
file://0001-meson-Avoid-absolute-buildtime-paths-in-generated-he.patch \
|
||||
file://run-ptest"
|
||||
SRC_URI[sha256sum] = "719a791ac4ba5988aeb93ec42778bd65d33cb075d0c093b5c04e5e1682be528a"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user