Change in coreboot[master]: abuild: Fix board variant handling

[Keith Hui (Code Review)]

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/41918 )


Change subject: abuild: Fix board variant handling
......................................................................

abuild: Fix board variant handling

Problem:
Me: $ util/abuild/abuild -t asus/p2b -b p2b-ls
abuild: No such target: asus/p2b, variant: p2b-ls

Cause: We identify boards and variants using path names in tree, so
I type in the test command above. abuild identifies all board variants
the Kconfig way, in all caps and all underscores.

Result: Expectation gap and abuild can't find anything where we expect
it to. All variants with a hyphen in their names are affected.

Fix: Add a substitution to replace hyphens with underscores.

Test: I get my abuild with the command above, even a variant-specific
test config works.

Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Signed-off-by: Keith Hui <[e-mail]>
---
M util/abuild/abuild
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/41918/1

diff --git a/util/abuild/abuild b/util/abuild/abuild
index b6a6bfe..ca8a0cf 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -165,7 +165,7 @@
 	local targets
 	local VARIANT_UC
 
-	VARIANT_UC=$(echo "${variant}" | tr '[:lower:]' '[:upper:]')
+	VARIANT_UC=$(echo "${variant}" | tr '[:lower:]' '[:upper:]' | tr '-' '_')
 
 	targets=$(get_mainboards "$1")
 	if [ -n "$targets" ]; then

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-MessageType: newchange

[Keith Hui (Code Review)]

Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918 )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1:

If we don't want to land this patch, we will have to put out a full "Documentation" [1] on abuild that we have to use this format:

eg. to build test asus/p5qpl-am/variants/p5g41t-m_lx/, one has to run:
$ util/abuild/abuild -t asus/p5qpl-am -b p5g41t_m_lx

Meanwhile substitution underscores for dashes for base target like p5qpl_am does not work.

[1] Yes, I mean add full documentation under Documentation/


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin Roth <[e-mail]>
Gerrit-Reviewer: Patrick Georgi <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Sat, 30 May 2020 16:33:00 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918 )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1: Code-Review+1
> Patch Set 1:
>
> If we don't want to land this patch, we will have to put out a full "Documentation" [1] on abuild that we have to use this format:
>
> eg. to build test asus/p5qpl-am/variants/p5g41t-m_lx/, one has to run:
> $ util/abuild/abuild -t asus/p5qpl-am -b p5g41t_m_lx
>
> Meanwhile substitution underscores for dashes for base target like p5qpl_am does not work.
>
> [1] Yes, I mean add full documentation under Documentation/

What if a mainboard uses a non-matching Kconfig symbol? For example, the names I fixed in CB:38083


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin Roth <[e-mail]>
Gerrit-Reviewer: Patrick Georgi <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Tue, 02 Jun 2020 13:38:06 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Keith Hui (Code Review)]

Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918 )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1:
> Patch Set 1: Code-Review+1
> > Patch Set 1:
> >
> > If we don't want to land this patch, we will have to put out a full "Documentation" [1] on abuild that we have to use this format:
> >
> > eg. to build test asus/p5qpl-am/variants/p5g41t-m_lx/, one has to run:
> > $ util/abuild/abuild -t asus/p5qpl-am -b p5g41t_m_lx
> >
> > Meanwhile substitution underscores for dashes for base target like p5qpl_am does not work.
> >
> > [1] Yes, I mean add full documentation under Documentation/
>
> What if a mainboard uses a non-matching Kconfig symbol? For example, the names I fixed in CB:38083

Then we have to go by Kconfig symbol only (CONFIG_BOARD_xxx_yyy etc.), which would also (in theory) work with non-standard tree structures. Case in point: My earlier efforts to convert the entire asus/p2b family was done without variants/ directory with everything set up via Kconfig and Makefile.inc. That version has to be abandoned because it doesn't work with abuild.


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin Roth <[e-mail]>
Gerrit-Reviewer: Patrick Georgi <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Tue, 02 Jun 2020 18:22:19 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918 )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1: Code-Review+1


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin Roth <[e-mail]>
Gerrit-Reviewer: Patrick Georgi <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Wed, 03 Jun 2020 10:45:50 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918 )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/41918/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/41918/1//COMMIT_MSG@23 
PS1, Line 23: test config works.
Using Kconfig names still works, right?



-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin Roth <[e-mail]>
Gerrit-Reviewer: Patrick Georgi <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Comment-Date: Wed, 03 Jun 2020 10:47:34 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment

[XS] Change in coreboot[master]: abuild: Fix board variant handling

[Martin L Roth (Code Review)]

Attention is currently required from: Keith Hui.

Martin L Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918?usp=email )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1: Code-Review+2


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin L Roth <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-Attention: Keith Hui <[e-mail]>
Gerrit-Comment-Date: Thu, 03 Aug 2023 22:25:46 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

[XS] Change in coreboot[master]: abuild: Fix board variant handling

[Keith Hui (Code Review)]

Attention is currently required from: Paul Menzel.

Keith Hui has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918?usp=email )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 1:

(1 comment)

Commit Message:

https://review.coreboot.org/c/coreboot/+/41918/comment/f07809cc_0554ebf8 :
PS1, Line 23: test config works.
> Using Kconfig names still works, right?
> Acually using Kconfig names with --skip_unset does work. According to Martin that there's also -K.

[XS] Change in coreboot[master]: abuild: Fix board variant handling

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41918?usp=email )

Change subject: abuild: Fix board variant handling
......................................................................

abuild: Fix board variant handling

Problem:
Me: $ util/abuild/abuild -t asus/p2b -b p2b-ls
abuild: No such target: asus/p2b, variant: p2b-ls

Cause: We identify boards and variants using path names in tree, so
I type in the test command above. abuild identifies all board variants
the Kconfig way, in all caps and all underscores.

Result: Expectation gap and abuild can't find anything where we expect
it to. All variants with a hyphen in their names are affected.

Fix: Add a substitution to replace hyphens with underscores.

Test: I get my abuild with the command above, even a variant-specific
test config works.

Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Signed-off-by: Keith Hui <[e-mail]>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41918
Reviewed-by: Angel Pons <[e-mail]>
Tested-by: build bot (Jenkins) <[e-mail]>
Reviewed-by: Martin L Roth <[e-mail]>
Reviewed-by: Paul Menzel <[e-mail]>
---
M util/abuild/abuild
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Paul Menzel: Looks good to me, but someone else must approve
  Angel Pons: Looks good to me, but someone else must approve
  build bot (Jenkins): Verified
  Martin L Roth: Looks good to me, approved




diff --git a/util/abuild/abuild b/util/abuild/abuild
index 233a661..0e7e97b 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -181,7 +181,7 @@
 	local targets
 	local VARIANT_UC
 
-	VARIANT_UC=$(echo "${variant}" | tr '[:lower:]' '[:upper:]')
+	VARIANT_UC=$(echo "${variant}" | tr '[:lower:]' '[:upper:]' | tr '-' '_')
 
 	targets=$(get_mainboards "$1")
 	if [ -n "$targets" ]; then

-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin L Roth <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-MessageType: merged

[XS] Change in coreboot[master]: abuild: Fix board variant handling

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/41918?usp=email )

Change subject: abuild: Fix board variant handling
......................................................................


Patch Set 2:

Automatic boot test returned (PASS/FAIL/TOTAL): 6 / 2 / 8
     
FAIL: x86_32  "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG 
     and payload TianoCore : https://lava.9esec.io/r/177310
PASS: x86_32  "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35_SMM_TSEG 
     and payload SeaBIOS : https://lava.9esec.io/r/177309
FAIL: x86_32  "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 
     and payload TianoCore : https://lava.9esec.io/r/177308
PASS: x86_32  "QEMU x86 q35/ich9" , build config EMULATION_QEMU_X86_Q35 
     and payload SeaBIOS : https://lava.9esec.io/r/177307
PASS: x86_64  "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_X86_64 
     and payload SeaBIOS : https://lava.9esec.io/r/177306
PASS: x86_32  "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ASAN 
     and payload SeaBIOS : https://lava.9esec.io/r/177305
PASS: x86_32  "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX_ 
     and payload SeaBIOS : https://lava.9esec.io/r/177304
PASS: x86_32  "QEMU x86 i440fx/piix4" , build config EMULATION_QEMU_X86_I440FX 
     and payload SeaBIOS : https://lava.9esec.io/r/177303

Please note: This test is under development and might not be accurate at all!


-- 
To view, visit https://review.coreboot.org/c/coreboot/+/41918?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I10d5b471dac41c50a85c4a309ec561b02687bb9a
Gerrit-Change-Number: 41918
Gerrit-PatchSet: 2
Gerrit-Owner: Keith Hui <[e-mail]>
Gerrit-Reviewer: Angel Pons <[e-mail]>
Gerrit-Reviewer: Julius Werner <[e-mail]>
Gerrit-Reviewer: Martin L Roth <[e-mail]>
Gerrit-Reviewer: Paul Menzel <[e-mail]>
Gerrit-Reviewer: build bot (Jenkins) <[e-mail]>
Gerrit-CC: 9elements QA <[e-mail]>
Gerrit-Comment-Date: Thu, 17 Aug 2023 17:14:31 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: No
Gerrit-MessageType: comment