mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-07-21 05:27:02 +00:00
Ross Burton
1f7e8b6de9
Upgrade to the latest 5.4 release (.205), and backport two patches to fix buildpath errors: File /usr/src/debug/linux-yocto/5.4.205+gitAUTOINC+e8c675c7e1_8a59dfded8-r0/lib/oid_registry_data.c in package linux-yocto-src contains reference to TMPDIR File /usr/src/debug/linux-yocto/5.4.205+gitAUTOINC+e8c675c7e1_8a59dfded8-r0/drivers/tty/vt/consolemap_deftbl.c in package linux-yocto-src contains reference to TMPDIR [buildpaths] Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Jon Mason <jon.mason@arm.com>
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
Upstream-Status: Backport
|
|
Signed-off-by: Ross Burton <ross.burton@arm.com>
|
|
|
|
From 10a09290f97d0435b9b304d3ef980b0cafa87bd2 Mon Sep 17 00:00:00 2001
|
|
From: Bruce Ashfield <bruce.ashfield@gmail.com>
|
|
Date: Sun, 10 Jul 2022 21:37:07 -0400
|
|
Subject: [PATCH 2/2] vt/conmakehash: improve reproducibility
|
|
|
|
The file generated by conmakehash capture the application
|
|
path used to generate the file. While that can be informative,
|
|
it varies based on where the kernel was built, as the full
|
|
path is captured.
|
|
|
|
We tweak the application to use a second input as the "capture
|
|
name", and then modify the Makefile to pass the basename of
|
|
the source, making it reproducible.
|
|
|
|
This could be improved by using some sort of path mapping,
|
|
or the application manipualing argv[1] itself, but for now
|
|
this solves the reprodicibility issue.
|
|
|
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
|
|
---
|
|
drivers/tty/vt/Makefile | 2 +-
|
|
scripts/conmakehash.c | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
|
|
index edbbe0ccdb83..19e21968f8de 100644
|
|
--- a/drivers/tty/vt/Makefile
|
|
+++ b/drivers/tty/vt/Makefile
|
|
@@ -13,7 +13,7 @@ obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
|
|
clean-files := consolemap_deftbl.c defkeymap.c
|
|
|
|
quiet_cmd_conmk = CONMK $@
|
|
- cmd_conmk = scripts/conmakehash $< > $@
|
|
+ cmd_conmk = scripts/conmakehash $< $(shell basename $<) > $@
|
|
|
|
$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
|
|
$(call cmd,conmk)
|
|
diff --git a/scripts/conmakehash.c b/scripts/conmakehash.c
|
|
index cddd789fe46e..d62510b280e9 100644
|
|
--- a/scripts/conmakehash.c
|
|
+++ b/scripts/conmakehash.c
|
|
@@ -253,7 +253,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", argv[2], fontlen);
|
|
|
|
for ( i = 0 ; i < fontlen ; i++ )
|
|
{
|
|
--
|
|
2.34.1
|
|
|