diff mbox series

dejagnu: Remove references to some home directories

Message ID 20260610205912.1798968-1-danismostlikely@gmail.com
State New
Headers show
Series dejagnu: Remove references to some home directories | expand

Commit Message

Dan McGregor June 10, 2026, 8:59 p.m. UTC 
From: Dan McGregor <danmcgr@protonmail.com>

The recent buildpaths qa check that adds checking for home directories
introduced an interesting corner case. If a user's home directory is
/home/dan or /home/nickc, dejagnu failed the qa check, since it hard
coded those strings in its sample board configuration. Fix this
by replacing the sample strings with other non-home paths.

Signed-off-by: Dan McGregor <danmcgr@protonmail.com>
---
 ...directory-references-in-board-config.patch | 56 +++++++++++++++++++
 .../recipes-devtools/dejagnu/dejagnu_1.6.3.bb |  4 +-
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-devtools/dejagnu/dejagnu/0001-Remove-home-directory-references-in-board-config.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/dejagnu/dejagnu/0001-Remove-home-directory-references-in-board-config.patch b/meta/recipes-devtools/dejagnu/dejagnu/0001-Remove-home-directory-references-in-board-config.patch
new file mode 100644
index 00000000000..ded9f173b31
--- /dev/null
+++ b/meta/recipes-devtools/dejagnu/dejagnu/0001-Remove-home-directory-references-in-board-config.patch
@@ -0,0 +1,56 @@ 
+From 5c809dfceb13faeaacaa096de816d74428f72efb Mon Sep 17 00:00:00 2001
+From: Dan McGregor <danmcgr@protonmail.com>
+Date: Tue, 9 Jun 2026 13:21:49 -0600
+Subject: [PATCH] Remove home directory references in board config
+
+The OpenEmbedded sanity checker finds a build user's home directory
+in the configuration files. If the user happens to have a home directory
+named "dan" or "nickc", then this check fails. Instead change the
+defaults to point outside of the home space.
+
+Since these are samples, it shouldn't harm anything.
+
+Upstream-Status: Inappropriate [OE configuration specific]
+Signed-off-by: Dan McGregor <danmcgr@protonmail.com>
+---
+ baseboards/gdbserver-sample.exp | 2 +-
+ baseboards/mcore-moto-sim.exp   | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/baseboards/gdbserver-sample.exp b/baseboards/gdbserver-sample.exp
+index 16f9483..a3e89b2 100644
+--- a/baseboards/gdbserver-sample.exp
++++ b/baseboards/gdbserver-sample.exp
+@@ -31,7 +31,7 @@ set_board_info rcp_prog /usr/bin/scp
+ set_board_info protocol standard
+ set_board_info hostname voltaire.debian.org
+ set_board_info username dan
+-set_board_info gdb_server_prog /home/dan/gdb/mv/obj/gdb/gdbserver/gdbserver
++set_board_info gdb_server_prog /usr/bin/gdbserver
+ 
+ # We will be using the standard GDB remote protocol
+ set_board_info gdb_protocol "remote"
+diff --git a/baseboards/mcore-moto-sim.exp b/baseboards/mcore-moto-sim.exp
+index c5a4b97..06c0cdd 100644
+--- a/baseboards/mcore-moto-sim.exp
++++ b/baseboards/mcore-moto-sim.exp
+@@ -59,8 +59,8 @@ proc sim_spawn { dest cmdline args } {
+     ## XXX - fixme - this should be automatic based on the
+     ## multilib option.
+     ## XXX - fixme - this should not be hardcoded.
+-    set sim "/home/nickc/bin/linux/sim-be"
+-    #   set sim "/home/nickc/bin/linux/sim-le"
++    set sim "/opt/nickc/bin/linux/sim-be"
++    #   set sim "/opt/nickc/bin/linux/sim-le"
+ 
+     set simflags "-m abi"
+ 
+@@ -133,7 +133,7 @@ proc find_sim { target_alias sim_dir sim_name } {
+     ## XXX - fixme - this should not be hardcoded.
+     ## XXX - fixme - this should vary depending upon endianism selected.
+ 
+-    return "/home/nickc/bin/linux/sim-be"
++    return "/opt/nickc/bin/linux/sim-be"
+ }
+ 
+ set_board_info is_simulator 1
diff --git a/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb b/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb
index c6002d5e45a..ea5c21e709b 100644
--- a/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb
+++ b/meta/recipes-devtools/dejagnu/dejagnu_1.6.3.bb
@@ -11,7 +11,9 @@  RDEPENDS:${PN} = "expect"
 
 inherit autotools
 
-SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz"
+SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
+           file://0001-Remove-home-directory-references-in-board-config.patch \
+           "
 
 SRC_URI[sha256sum] = "87daefacd7958b4a69f88c6856dbd1634261963c414079d0c371f589cd66a2e3"