diff options
| author | Yoann Congal <yoann.congal@smile.fr> | 2025-04-11 23:51:04 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-04-11 20:51:29 -0700 |
| commit | acde3d2efefc798cc999812a3248559f78979304 (patch) | |
| tree | 49af01d41d3fcf7ff8f8e6907321726d61de5251 | |
| parent | 57f1ff43e5f5350589712e5cbb8567ec889152f1 (diff) | |
| download | meta-openembedded-acde3d2efefc798cc999812a3248559f78979304.tar.gz | |
cmatrix: Improve reproducibility patch to handle libdir!=/usr/lib
The upstream code basically hard-code libdir to /usr/lib. This was
hidden by the upstream non-reproducible path existence check.
Improve the reproducibility patch to use the cmake variables derived
from $libdir and $datadir :
CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_DATAROOTDIR.
Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
Reported-by: Martin Jansa <martin.jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch b/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch index 5f23252605..1353728dd5 100644 --- a/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch +++ b/meta-oe/recipes-extended/cmatrix/cmatrix/0001-reproducibility-Prevent-configuration-from-reading-h.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From f0a48c4e42819604063e6eacb7cdb4fa22331c77 Mon Sep 17 00:00:00 2001 | 1 | From 0a49ed8e949adda11c6268f36a10ac12074cd377 Mon Sep 17 00:00:00 2001 |
| 2 | From: Yoann Congal <yoann.congal@smile.fr> | 2 | From: Yoann Congal <yoann.congal@smile.fr> |
| 3 | Date: Tue, 1 Apr 2025 23:42:39 +0200 | 3 | Date: Tue, 1 Apr 2025 23:42:39 +0200 |
| 4 | Subject: [PATCH] reproducibility: Prevent configuration from reading host | 4 | Subject: [PATCH] reproducibility: Prevent configuration from reading host |
| @@ -17,7 +17,7 @@ Signed-off-by: Yoann Congal <yoann.congal@smile.fr> | |||
| 17 | 1 file changed, 2 insertions(+), 6 deletions(-) | 17 | 1 file changed, 2 insertions(+), 6 deletions(-) |
| 18 | 18 | ||
| 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 19 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 20 | index c5548b3..c9af31c 100644 | 20 | index c5548b3..a2f8b4d 100644 |
| 21 | --- a/CMakeLists.txt | 21 | --- a/CMakeLists.txt |
| 22 | +++ b/CMakeLists.txt | 22 | +++ b/CMakeLists.txt |
| 23 | @@ -7,8 +7,8 @@ set(VERSION "2.0") | 23 | @@ -7,8 +7,8 @@ set(VERSION "2.0") |
| @@ -26,8 +26,8 @@ index c5548b3..c9af31c 100644 | |||
| 26 | # which by default is "/usr/local" | 26 | # which by default is "/usr/local" |
| 27 | -set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts") | 27 | -set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts") |
| 28 | -set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc") | 28 | -set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc") |
| 29 | +set(CONSOLE_FONTS_DIRS "share/consolefonts") | 29 | +set(CONSOLE_FONTS_DIRS "${CMAKE_INSTALL_DATAROOTDIR}/consolefonts") |
| 30 | +set(X_FONTS_DIRS "lib/X11/fonts/misc" "share/fonts/X11/misc") | 30 | +set(X_FONTS_DIRS "${CMAKE_INSTALL_LIBDIR}/X11/fonts/misc" "${CMAKE_INSTALL_DATAROOTDIR}/fonts/X11/misc") |
| 31 | 31 | ||
| 32 | set(MKFONTDIR "/usr/bin/mkfontdir") | 32 | set(MKFONTDIR "/usr/bin/mkfontdir") |
| 33 | 33 | ||