From: martin.jansa@gmail.com
To: openembedded-devel@lists.openembedded.org
Cc: Armin Kuster <akuster808@gmail.com>,
Yoann Congal <yoann.congal@smile.fr>,
Martin Jansa <martin.jansa@gmail.com>,
Khem Raj <raj.khem@gmail.com>
Subject: [meta-oe][walnascar][PATCH] cmatrix: Improve reproducibility patch to handle libdir!=/usr/lib
Date: Sat, 12 Apr 2025 14:56:52 +0200 [thread overview]
Message-ID: <20250412125652.75604-1-martin.jansa@gmail.com> (raw)
From: Yoann Congal <yoann.congal@smile.fr>
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>
---
...oducibility-Prevent-configuration-from-reading-h.patch | 8 ++++----
1 file 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 @@
-From f0a48c4e42819604063e6eacb7cdb4fa22331c77 Mon Sep 17 00:00:00 2001
+From 0a49ed8e949adda11c6268f36a10ac12074cd377 Mon Sep 17 00:00:00 2001
From: Yoann Congal <yoann.congal@smile.fr>
Date: Tue, 1 Apr 2025 23:42:39 +0200
Subject: [PATCH] reproducibility: Prevent configuration from reading host
@@ -17,7 +17,7 @@ Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5548b3..c9af31c 100644
+index c5548b3..a2f8b4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,8 +7,8 @@ set(VERSION "2.0")
@@ -26,8 +26,8 @@ index c5548b3..c9af31c 100644
# which by default is "/usr/local"
-set(CONSOLE_FONTS_DIRS "share/consolefonts" "lib/kbd/consolefonts")
-set(X_FONTS_DIRS "lib/X11/fonts/misc" "X11R6/lib/X11/fonts/misc" "share/fonts/X11/misc")
-+set(CONSOLE_FONTS_DIRS "share/consolefonts")
-+set(X_FONTS_DIRS "lib/X11/fonts/misc" "share/fonts/X11/misc")
++set(CONSOLE_FONTS_DIRS "${CMAKE_INSTALL_DATAROOTDIR}/consolefonts")
++set(X_FONTS_DIRS "${CMAKE_INSTALL_LIBDIR}/X11/fonts/misc" "${CMAKE_INSTALL_DATAROOTDIR}/fonts/X11/misc")
set(MKFONTDIR "/usr/bin/mkfontdir")
reply other threads:[~2025-04-12 12:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250412125652.75604-1-martin.jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=akuster808@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
--cc=raj.khem@gmail.com \
--cc=yoann.congal@smile.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.