Change in coreboot[master]: Makefile: Remove CONFIG_MAINBOARD_PART_NUMBER from doxyplatform

List overview All Threads
Download

newer

older

Change in coreboot[master]:...

Martin Roth (Code Review)

12 Oct 2020 12 Oct '20

2:01 a.m.

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove CONFIG_MAINBOARD_PART_NUMBER from doxyplatform ......................................................................

Makefile: Remove CONFIG_MAINBOARD_PART_NUMBER from doxyplatform

The CONFIG_MAINBOARD_PART_NUMBER string can have characters in it that don't work in the doxyplatform make script under sh, so remove it and just use the CONFIG_MAINBOARD_DIR value instead.

The spaces in the "QEMU x86 i440fx/piix4" platform are one example of this.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 --- M Makefile 1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/46287/1

diff --git a/Makefile b/Makefile index 2705c66..4f7f45d 100644 --- a/Makefile +++ b/Makefile @@ -440,10 +440,10 @@ doxyplatform doxygen_platform: $(obj)/project_filelist.txt echo echo "Building doxygen documentation for $(CONFIG_MAINBOARD_PART_NUMBER)" - export DOXYGEN_OUTPUT_DIR="$(DOXYGEN_OUTPUT_DIR)/$(CONFIG_MAINBOARD_VENDOR)/$(CONFIG_MAINBOARD_PART_NUMBER)"; \ + export DOXYGEN_OUTPUT_DIR="$(DOXYGEN_OUTPUT_DIR)/$(CONFIG_MAINBOARD_DIR)"; \ mkdir -p "$$DOXYGEN_OUTPUT_DIR"; \ export DOXYFILES="$$(cat $(obj)/project_filelist.txt | grep -v '.ld$$' | sed 's/.aml/.dsl/' | tr '\n' ' ')"; \ - export DOXYGEN_PLATFORM="$(CONFIG_MAINBOARD_DIR) ($(CONFIG_MAINBOARD_PART_NUMBER)) version $(KERNELVERSION)"; \ + export DOXYGEN_PLATFORM="$(CONFIG_MAINBOARD_DIR) version $(KERNELVERSION)"; \ $(DOXYGEN) Documentation/doxygen/Doxyfile.coreboot_platform

doxyclean: doxygen-clean

Attachments:

attachment.htm (text/html — 3.3 KB)

Show replies by date

Marc Jones (Code Review)

26 Oct 26 Oct

12:43 a.m.

Marc Jones has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove CONFIG_MAINBOARD_PART_NUMBER from doxyplatform ......................................................................

Patch Set 1:

(1 comment)

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

https://review.coreboot.org/c/coreboot/+/46287/1//COMMIT_MSG@14 PS1, Line 14: this. This is what generates: https://doc.coreboot.org/mainboard/index.html ?

What would it look like with this change?

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 1 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Sun, 25 Oct 2020 23:43:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Martin Roth (Code Review)

2:47 a.m.

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove CONFIG_MAINBOARD_PART_NUMBER from doxyplatform ......................................................................

Patch Set 1:

(1 comment)

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

https://review.coreboot.org/c/coreboot/+/46287/1//COMMIT_MSG@14 PS1, Line 14: this.

...

This is what generates: https://doc.coreboot.org/mainboard/index.html ? […]

No, I think all of those are done by hand. That's not doxygen documentation.

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 1 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Mon, 26 Oct 2020 01:47:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Marc Jones marc@marcjonesconsulting.com Gerrit-MessageType: comment

Martin Roth (Code Review)

2:47 a.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

Hello Marc Jones, build bot (Jenkins), Patrick Georgi, Stefan Reinauer, Paul Fagerburg, Felix Held,

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

https://review.coreboot.org/c/coreboot/+/46287

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

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Makefile: Remove possibly illegal characters from doxyplatform

The CONFIG_MAINBOARD_PART_NUMBER string can have characters in it that don't work in the doxyplatform make script under sh, so change any non-alphanumeric characters to an underscore.

Also strip all the quotes - they aren't needed.

The spaces in the "QEMU x86 i440fx/piix4" platform are one example of this.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 --- M Makefile 1 file changed, 2 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/46287/2

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 2 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-MessageType: newpatchset

Paul Fagerburg (Code Review)

2:33 p.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

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

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Patch Set 3: Code-Review+1

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Mon, 26 Oct 2020 13:33:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Angel Pons (Code Review)

27 Oct 27 Oct

12:17 p.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

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

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Patch Set 3: Code-Review+1

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 27 Oct 2020 11:17:15 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Patrick Georgi (Code Review)

11:19 p.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/46287/3/Makefile File Makefile:

https://review.coreboot.org/c/coreboot/+/46287/3/Makefile@443 PS3, Line 443: sed 's|[^A-Za-z0-9/]|_|g' How about

tr -c '[[:alnum:]]' '_'

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Tue, 27 Oct 2020 22:19:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

Martin Roth (Code Review)

28 Oct 28 Oct

3:37 a.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/46287/3/Makefile File Makefile:

https://review.coreboot.org/c/coreboot/+/46287/3/Makefile@443 PS3, Line 443: sed 's|[^A-Za-z0-9/]|_|g'

...

How about […]

I want to skip slashes in the path as well.

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-Comment-Date: Wed, 28 Oct 2020 02:37:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Patrick Georgi pgeorgi@google.com Gerrit-MessageType: comment

Paul Fagerburg (Code Review)

29 Oct 29 Oct

3:48 p.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

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

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Patch Set 3: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Thu, 29 Oct 2020 14:48:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Marshall Dawson (Code Review)

30 Oct 30 Oct

2:48 p.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Patch Set 3: Code-Review+2

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 3 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Marshall Dawson marshalldawson3rd@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-Comment-Date: Fri, 30 Oct 2020 13:48:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

Felix Held (Code Review)

31 Oct 31 Oct

7:21 p.m.

New subject: Change in coreboot[master]: Makefile: Remove possibly illegal characters from doxyplatform

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46287 )

Change subject: Makefile: Remove possibly illegal characters from doxyplatform ......................................................................

Makefile: Remove possibly illegal characters from doxyplatform

The CONFIG_MAINBOARD_PART_NUMBER string can have characters in it that don't work in the doxyplatform make script under sh, so change any non-alphanumeric characters to an underscore.

Also strip all the quotes - they aren't needed.

The spaces in the "QEMU x86 i440fx/piix4" platform are one example of this.

Signed-off-by: Martin Roth martin@coreboot.org Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Reviewed-on: https://review.coreboot.org/c/coreboot/+/46287 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Paul Fagerburg pfagerburg@chromium.org Reviewed-by: Marshall Dawson marshalldawson3rd@gmail.com --- M Makefile 1 file changed, 2 insertions(+), 2 deletions(-)

Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved Angel Pons: Looks good to me, but someone else must approve Paul Fagerburg: Looks good to me, approved

diff --git a/Makefile b/Makefile index 2705c66..1b7cb9b 100644 --- a/Makefile +++ b/Makefile @@ -440,10 +440,10 @@ doxyplatform doxygen_platform: $(obj)/project_filelist.txt echo echo "Building doxygen documentation for $(CONFIG_MAINBOARD_PART_NUMBER)" - export DOXYGEN_OUTPUT_DIR="$(DOXYGEN_OUTPUT_DIR)/$(CONFIG_MAINBOARD_VENDOR)/$(CONFIG_MAINBOARD_PART_NUMBER)"; \ + export DOXYGEN_OUTPUT_DIR="$$( echo $(DOXYGEN_OUTPUT_DIR)/$(call strip_quotes, $(CONFIG_MAINBOARD_VENDOR))_$(call strip_quotes, $(CONFIG_MAINBOARD_PART_NUMBER)) | sed 's|[^A-Za-z0-9/]|_|g' )"; \ mkdir -p "$$DOXYGEN_OUTPUT_DIR"; \ export DOXYFILES="$$(cat $(obj)/project_filelist.txt | grep -v '.ld$$' | sed 's/.aml/.dsl/' | tr '\n' ' ')"; \ - export DOXYGEN_PLATFORM="$(CONFIG_MAINBOARD_DIR) ($(CONFIG_MAINBOARD_PART_NUMBER)) version $(KERNELVERSION)"; \ + export DOXYGEN_PLATFORM="$(call strip_quotes, $(CONFIG_MAINBOARD_DIR)) ($(call strip_quotes, $(CONFIG_MAINBOARD_PART_NUMBER))) version $(KERNELVERSION)"; \ $(DOXYGEN) Documentation/doxygen/Doxyfile.coreboot_platform

doxyclean: doxygen-clean

-- To view, visit https://review.coreboot.org/c/coreboot/+/46287 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I10bc6a8a245a34e89c859ff46835bde35aaa4286 Gerrit-Change-Number: 46287 Gerrit-PatchSet: 4 Gerrit-Owner: Martin Roth martinroth@google.com Gerrit-Reviewer: Angel Pons th3fanbus@gmail.com Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de Gerrit-Reviewer: Marc Jones marc@marcjonesconsulting.com Gerrit-Reviewer: Marshall Dawson marshalldawson3rd@gmail.com Gerrit-Reviewer: Patrick Georgi pgeorgi@google.com Gerrit-Reviewer: Paul Fagerburg pfagerburg@chromium.org Gerrit-Reviewer: Stefan Reinauer stefan.reinauer@coreboot.org Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org Gerrit-CC: Paul Menzel paulepanter@users.sourceforge.net Gerrit-MessageType: merged

1484

days inactive

1503

days old

coreboot-gerrit@coreboot.org

10 comments

7 participants

tags (0)

participants (7)

Angel Pons (Code Review)
Felix Held (Code Review)
Marc Jones (Code Review)
Marshall Dawson (Code Review)
Martin Roth (Code Review)
Patrick Georgi (Code Review)
Paul Fagerburg (Code Review)