71 lines
2.3 KiB
Diff
71 lines
2.3 KiB
Diff
|
From 3bd85c6c97b2d232638594bf828de62083fe3389 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
|
||
|
|
Date: Mon, 11 Mar 2024 12:30:18 +0100
|
||
|
|
Subject: [PATCH] tty: vt: conmakehash: Don't mention the full path of the
|
||
|
|
input in output
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
This change strips $abs_srctree of the input file containing the
|
||
|
|
character mapping table in the generated output. The motivation for this
|
||
|
|
change is Yocto emitting a build warning
|
||
|
|
|
||
|
|
WARNING: linux-lxatac-6.7-r0 do_package_qa: QA Issue: File /usr/src/debug/linux-lxatac/6.7-r0/drivers/tty/vt/consolemap_deftbl.c in package linux-lxatac-src contains reference to TMPDIR
|
||
|
|
|
||
|
|
So this change brings us one step closer to make the build result
|
||
|
|
reproducible independent of the build path.
|
||
|
|
|
||
|
|
Upstream-Status: Backport [https://github.com/torvalds/linux/commit/3bd85c6c97b2d232638594bf828de62083fe3389]
|
||
|
|
|
||
|
|
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
||
|
|
Link: https://lore.kernel.org/r/20240311113017.483101-2-u.kleine-koenig@pengutronix.de
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
---
|
||
|
|
drivers/tty/vt/conmakehash.c | 15 +++++++++++++--
|
||
|
|
1 file changed, 13 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c
|
||
|
|
index cddd789fe46e..dc2177fec715 100644
|
||
|
|
--- a/drivers/tty/vt/conmakehash.c
|
||
|
|
+++ b/drivers/tty/vt/conmakehash.c
|
||
|
|
@@ -76,7 +76,8 @@ static void addpair(int fp, int un)
|
||
|
|
int main(int argc, char *argv[])
|
||
|
|
{
|
||
|
|
FILE *ctbl;
|
||
|
|
- char *tblname;
|
||
|
|
+ const char *tblname, *rel_tblname;
|
||
|
|
+ const char *abs_srctree;
|
||
|
|
char buffer[65536];
|
||
|
|
int fontlen;
|
||
|
|
int i, nuni, nent;
|
||
|
|
@@ -101,6 +102,16 @@ int main(int argc, char *argv[])
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
+ abs_srctree = getenv("abs_srctree");
|
||
|
|
+ if (abs_srctree && !strncmp(abs_srctree, tblname, strlen(abs_srctree)))
|
||
|
|
+ {
|
||
|
|
+ rel_tblname = tblname + strlen(abs_srctree);
|
||
|
|
+ while (*rel_tblname == '/')
|
||
|
|
+ ++rel_tblname;
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
+ rel_tblname = tblname;
|
||
|
|
+
|
||
|
|
/* For now we assume the default font is always 256 characters. */
|
||
|
|
fontlen = 256;
|
||
|
|
|
||
|
|
@@ -253,7 +264,7 @@ int main(int argc, char *argv[])
|
||
|
|
#include <linux/types.h>\n\
|
||
|
|
\n\
|
||
|
|
u8 dfont_unicount[%d] = \n\
|
||
|
|
-{\n\t", argv[1], fontlen);
|
||
|
|
+{\n\t", rel_tblname, fontlen);
|
||
|
|
|
||
|
|
for ( i = 0 ; i < fontlen ; i++ )
|
||
|
|
{
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|