Change in coreboot[master]: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files
greg@unrelenting.technology has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/35867 )
Change subject: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files ......................................................................
mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files
FreeBSD's sh (basic posix shell) did not interpret the '%o' escape in the same way bash/zsh do. As a result, the decoded files ended up with ASCII numbers instead of the decoded binary data.
Change-Id: I95b414d959e5cd4479fcf100adcf390562032c68 Signed-off-by: Greg V greg@unrelenting.technology --- M src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc M src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc M src/mainboard/google/auron/variants/gandof/spd/Makefile.inc M src/mainboard/google/auron/variants/lulu/spd/Makefile.inc M src/mainboard/google/auron/variants/samus/spd/Makefile.inc M src/mainboard/google/dragonegg/spd/Makefile.inc M src/mainboard/google/drallion/spd/Makefile.inc M src/mainboard/google/eve/spd/Makefile.inc M src/mainboard/google/hatch/spd/Makefile.inc M src/mainboard/google/poppy/spd/Makefile.inc M src/mainboard/intel/kunimitsu/spd/Makefile.inc M src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc M src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc 13 files changed, 13 insertions(+), 13 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/67/35867/1
diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc index 26e1a75..44edc70 100644 --- a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc @@ -41,7 +41,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc index 26e1a75..44edc70 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc @@ -41,7 +41,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc b/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc index f3a2162..23d0b4e 100644 --- a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc @@ -33,7 +33,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc b/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc index bc1454f..86cb2d2 100644 --- a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc @@ -42,7 +42,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc b/src/mainboard/google/auron/variants/samus/spd/Makefile.inc index 6a357c0..a026ef3 100644 --- a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/samus/spd/Makefile.inc @@ -41,7 +41,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/dragonegg/spd/Makefile.inc b/src/mainboard/google/dragonegg/spd/Makefile.inc index 7aa9505..2fdd9d4 100644 --- a/src/mainboard/google/dragonegg/spd/Makefile.inc +++ b/src/mainboard/google/dragonegg/spd/Makefile.inc @@ -30,7 +30,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/drallion/spd/Makefile.inc b/src/mainboard/google/drallion/spd/Makefile.inc index e35544b..9ab7394 100644 --- a/src/mainboard/google/drallion/spd/Makefile.inc +++ b/src/mainboard/google/drallion/spd/Makefile.inc @@ -25,7 +25,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/eve/spd/Makefile.inc b/src/mainboard/google/eve/spd/Makefile.inc index c97a818..cb4f8a8 100644 --- a/src/mainboard/google/eve/spd/Makefile.inc +++ b/src/mainboard/google/eve/spd/Makefile.inc @@ -32,7 +32,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/hatch/spd/Makefile.inc b/src/mainboard/google/hatch/spd/Makefile.inc index e35544b..9ab7394 100644 --- a/src/mainboard/google/hatch/spd/Makefile.inc +++ b/src/mainboard/google/hatch/spd/Makefile.inc @@ -25,7 +25,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/poppy/spd/Makefile.inc b/src/mainboard/google/poppy/spd/Makefile.inc index 444ac00..dd57835 100644 --- a/src/mainboard/google/poppy/spd/Makefile.inc +++ b/src/mainboard/google/poppy/spd/Makefile.inc @@ -5,7 +5,7 @@ define gen_spd_bin for f in $2; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $1 endef diff --git a/src/mainboard/intel/kunimitsu/spd/Makefile.inc b/src/mainboard/intel/kunimitsu/spd/Makefile.inc index 9856368e..4fa2d7e 100644 --- a/src/mainboard/intel/kunimitsu/spd/Makefile.inc +++ b/src/mainboard/intel/kunimitsu/spd/Makefile.inc @@ -43,7 +43,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc index 4b9ef55..72657b4 100644 --- a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc +++ b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc @@ -22,7 +22,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc index f5c233a..235fc10 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc +++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc @@ -24,7 +24,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35867 )
Change subject: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files ......................................................................
Patch Set 1: Code-Review+1
Tim Wawrzynczak has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35867 )
Change subject: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files ......................................................................
Patch Set 1: Code-Review+1
Confirmed, bash works with either escape sequence
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35867 )
Change subject: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files ......................................................................
Patch Set 1:
I don't really see an advantage of using these hex files over just plain binaries...
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35867 )
Change subject: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files ......................................................................
Patch Set 1: Code-Review+2
Patch Set 1:
I don't really see an advantage of using these hex files over just plain binaries...
different kind of fix for the problem, though ;-)
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/35867 )
Change subject: mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files ......................................................................
mb/[google/intel/lenovo]/*: fix posix shell bug with SPD files
FreeBSD's sh (basic posix shell) did not interpret the '%o' escape in the same way bash/zsh do. As a result, the decoded files ended up with ASCII numbers instead of the decoded binary data.
Change-Id: I95b414d959e5cd4479fcf100adcf390562032c68 Signed-off-by: Greg V greg@unrelenting.technology Reviewed-on: https://review.coreboot.org/c/coreboot/+/35867 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Paul Menzel paulepanter@users.sourceforge.net Reviewed-by: Tim Wawrzynczak twawrzynczak@chromium.org Reviewed-by: Patrick Georgi pgeorgi@google.com --- M src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc M src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc M src/mainboard/google/auron/variants/gandof/spd/Makefile.inc M src/mainboard/google/auron/variants/lulu/spd/Makefile.inc M src/mainboard/google/auron/variants/samus/spd/Makefile.inc M src/mainboard/google/dragonegg/spd/Makefile.inc M src/mainboard/google/drallion/spd/Makefile.inc M src/mainboard/google/eve/spd/Makefile.inc M src/mainboard/google/hatch/spd/Makefile.inc M src/mainboard/google/poppy/spd/Makefile.inc M src/mainboard/intel/kunimitsu/spd/Makefile.inc M src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc M src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc 13 files changed, 13 insertions(+), 13 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve Tim Wawrzynczak: Looks good to me, but someone else must approve
diff --git a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc index 26e1a75..44edc70 100644 --- a/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/auron_paine/spd/Makefile.inc @@ -41,7 +41,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc index 26e1a75..44edc70 100644 --- a/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/auron_yuna/spd/Makefile.inc @@ -41,7 +41,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc b/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc index f3a2162..23d0b4e 100644 --- a/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/gandof/spd/Makefile.inc @@ -33,7 +33,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc b/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc index bc1454f..86cb2d2 100644 --- a/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/lulu/spd/Makefile.inc @@ -42,7 +42,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc b/src/mainboard/google/auron/variants/samus/spd/Makefile.inc index 6a357c0..a026ef3 100644 --- a/src/mainboard/google/auron/variants/samus/spd/Makefile.inc +++ b/src/mainboard/google/auron/variants/samus/spd/Makefile.inc @@ -41,7 +41,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/dragonegg/spd/Makefile.inc b/src/mainboard/google/dragonegg/spd/Makefile.inc index 7aa9505..2fdd9d4 100644 --- a/src/mainboard/google/dragonegg/spd/Makefile.inc +++ b/src/mainboard/google/dragonegg/spd/Makefile.inc @@ -30,7 +30,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/drallion/spd/Makefile.inc b/src/mainboard/google/drallion/spd/Makefile.inc index e35544b..9ab7394 100644 --- a/src/mainboard/google/drallion/spd/Makefile.inc +++ b/src/mainboard/google/drallion/spd/Makefile.inc @@ -25,7 +25,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/eve/spd/Makefile.inc b/src/mainboard/google/eve/spd/Makefile.inc index c97a818..cb4f8a8 100644 --- a/src/mainboard/google/eve/spd/Makefile.inc +++ b/src/mainboard/google/eve/spd/Makefile.inc @@ -32,7 +32,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/hatch/spd/Makefile.inc b/src/mainboard/google/hatch/spd/Makefile.inc index e35544b..9ab7394 100644 --- a/src/mainboard/google/hatch/spd/Makefile.inc +++ b/src/mainboard/google/hatch/spd/Makefile.inc @@ -25,7 +25,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/google/poppy/spd/Makefile.inc b/src/mainboard/google/poppy/spd/Makefile.inc index 444ac00..dd57835 100644 --- a/src/mainboard/google/poppy/spd/Makefile.inc +++ b/src/mainboard/google/poppy/spd/Makefile.inc @@ -5,7 +5,7 @@ define gen_spd_bin for f in $2; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $1 endef diff --git a/src/mainboard/intel/kunimitsu/spd/Makefile.inc b/src/mainboard/intel/kunimitsu/spd/Makefile.inc index 9856368e..4fa2d7e 100644 --- a/src/mainboard/intel/kunimitsu/spd/Makefile.inc +++ b/src/mainboard/intel/kunimitsu/spd/Makefile.inc @@ -43,7 +43,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc index 4b9ef55..72657b4 100644 --- a/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc +++ b/src/mainboard/lenovo/t430s/variants/t431s/spd/Makefile.inc @@ -22,7 +22,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc index f5c233a..235fc10 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc +++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc @@ -24,7 +24,7 @@ $(SPD_BIN): $(SPD_DEPS) for f in $+; \ do for c in $$(cat $$f | grep -v ^#); \ - do printf $$(printf '%o' 0x$$c); \ + do printf $$(printf '\%o' 0x$$c); \ done; \ done > $@
-
Arthur Heymans (Code Review) -
Name of user not set (Code Review)
-
Patrick Georgi (Code Review)
-
Paul Menzel (Code Review)
-
Tim Wawrzynczak (Code Review)