Change in flashrom[master]: Makefile: Fix a bug with debug_shell lacking escaping single quotes.

[Pyry Kontio (Code Review)]

Pyry Kontio has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/44104 )

Change subject: Makefile: Fix a bug with debug_shell lacking escaping single quotes.
......................................................................

Makefile: Fix a bug with debug_shell lacking escaping single quotes.

Signed-off-by: Pyry Kontio <pyry.kontio>
Change-Id: I851f2d104c4f4a8171e0b2f74be519d3760fd4ae
---
M Makefile
1 file changed, 2 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/44104/1

diff --git a/Makefile b/Makefile
index 4ce854f..afe6334 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,8 @@

# Provide an easy way to execute a command, print its output to stdout and capture any error message on stderr
 # in the build details file together with the original stdout output.
-debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(1) ; }' >&2;  { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE))
+debug_shell = $(shell export LC_ALL=C ; { echo 'exec: export LC_ALL=C ; { $(subst ',''',$(1)) ; }' >&2; \
+    { $(1) ; } | tee -a $(BUILD_DETAILS_FILE) ; echo >&2 ; } 2>>$(BUILD_DETAILS_FILE))

###############################################################################
 # General OS-specific settings.

Change in flashrom[master]: Makefile: Fix building on AArch64 NixOS

[Pyry Kontio (Code Review)]

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/flashrom/+/44104

to look at the new patch set (#3).

Change subject: Makefile: Fix building on AArch64 NixOS
......................................................................

Makefile: Fix building on AArch64 NixOS

The parsing of the output of archtest.c produced an unexpected
value on AArch64 NixOS. For example, the make variable ARCH was set to:

```
bit outside of fd_set selected
arm
```

This made the arch and OS checks fail.

This commit simplifies the parsing, making it more robust.

The C files archtest.c, endiantest.c and os.h used to set the
TARGET_OS, ARCH and ENDIAN variables, respectively, output
the result of the test as the final line, so just extracting
the final line and removing double quoting is enough.

This commit also fixes a bug with debug_shell lacking escaping
single quotes, which prevented using the single quote in the
debug_shell calls. It used to work by accident before this fix;
the line in the call happened to contain a balanced pair of double
quotes and lacked other characters that needed escaping, which
didn't break the debug_shell, but this was accidental and very
brittle.

Signed-off-by: Pyry Kontio 
Change-Id: Iaa4477a71e758cf9ecad2c22f3b77bc6508a3510

Makefile: Fix a bug with debug_shell lacking escaping single quotes.

Signed-off-by: Pyry Kontio <pyry.kontio>
Change-Id: I851f2d104c4f4a8171e0b2f74be519d3760fd4ae
---
M Makefile
1 file changed, 10 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/04/44104/3

Change in flashrom[master]: Makefile: Fix building on AArch64 NixOS

[Pyry Kontio (Code Review)]

Pyry Kontio has abandoned this change. ( https://review.coreboot.org/c/flashrom/+/44104 )

Change subject: Makefile: Fix building on AArch64 NixOS
......................................................................

Abandoned

these changes were integrated in https://review.coreboot.org/c/flashrom/+/43140