Skip to content

Commit

Permalink
tty: vt: conmakehash: Don't mention the full path of the input in output
Browse files Browse the repository at this point in the history
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.

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>
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Apr 9, 2024
1 parent da4e0ba commit 3bd85c6
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions drivers/tty/vt/conmakehash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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++ )
{
Expand Down

0 comments on commit 3bd85c6

Please sign in to comment.