- flashrom-gerrit - mail.coreboot.org

[S] Change in flashrom[master]: Makefile: do not generate man page when building sources
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Edward O'Callaghan, Alexander Goncharov. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74510 ) Change subject: Makefile: do not generate man page when building sources ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I've put CB:74519 up, which builds the man-page if sphinx is available. There should be no build/generation tasks executed in the install target. -- To view, visit https://review.coreboot.org/c/flashrom/+/74510 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9882445de2a0996f237470a73b6a1eb7eafce808 Gerrit-Change-Number: 74510 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Wed, 19 Apr 2023 13:07:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: Makefile: Build man-page only when sphinx is available
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/74519 ) Change subject: Makefile: Build man-page only when sphinx is available ...................................................................... Makefile: Build man-page only when sphinx is available Currently, it's not possible to compile the upstream branch using the `make' command without sphinx beeing installed. Check if sphinx-build is installed and only then build or install the man-page. The problem was noticed from commit f4f2f3dd19784efa26fd5619b7a44b4cdf14b04c move manpage to sphinx. Change-Id: If1b81d9bc25ecac19d493b44b00a7c42d0643fe6 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- M Makefile M Makefile.include 2 files changed, 46 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/74519/1 diff --git a/Makefile b/Makefile index 0e16942..ec79963 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ RANLIB ?= ranlib PKG_CONFIG ?= pkg-config BUILD_DETAILS_FILE ?= build_details.txt +SPHINXBUILD ?= sphinx-build # The following parameter changes the default programmer that will be used if there is no -p/--programmer # argument given when running flashrom. The predefined setting does not enable any default so that every @@ -259,6 +260,7 @@ HAS_LINUX_SPI := $(call c_compile_test, Makefile.d/linux_spi_test.c) HAS_LINUX_I2C := $(call c_compile_test, Makefile.d/linux_i2c_test.c) HAS_SERIAL := $(strip $(if $(filter $(TARGET_OS), DOS libpayload), no, yes)) +HAS_SPHINXBUILD := $(shell command -v $(SPHINXBUILD) &>/dev/null && echo yes || echo no) EXEC_SUFFIX := $(strip $(if $(filter $(TARGET_OS), DOS MinGW), .exe)) override CFLAGS += -Iinclude @@ -958,7 +960,7 @@ OBJS = $(CHIP_OBJS) $(PROGRAMMER_OBJS) $(LIB_OBJS) -all: $(PROGRAM)$(EXEC_SUFFIX) man8/$(PROGRAM).8 +all: $(PROGRAM)$(EXEC_SUFFIX) $(if $(findstring $(HAS_SPHINXBUILD),yes), man8/$(PROGRAM).8) ifeq ($(ARCH), x86) @+$(MAKE) -C util/ich_descriptors_tool/ HOST_OS=$(HOST_OS) TARGET_OS=$(TARGET_OS) endif @@ -1019,6 +1021,7 @@ echo "The following features are unavailable on your machine: $(UNSUPPORTED_FEATURES)" \ exit 1; \ fi + @echo "Found \"sphinx-build\" to generate man-pages: $(HAS_SPHINXBUILD)" %.o: %.c | config $(CC) -MMD $(CFLAGS) $(CPPFLAGS) $(FLASHROM_CFLAGS) $(FEATURE_FLAGS) $(SCMDEF) -o $@ -c $< @@ -1030,9 +1033,13 @@ $(AR) rcs $@ $^ $(RANLIB) $@ -SPHINXBUILD ?= sphinx-build man8/$(PROGRAM).8: doc/* - @FLASHROM_VERSION=$(VERSION) $(SPHINXBUILD) -b man doc . + @if [ "$(HAS_SPHINXBUILD)" = "yes" ]; then \ + $(SPHINXBUILD) -Drelease=$(VERSION) -b man doc .; \ + else \ + echo "$(SPHINXBUILD) not found. Can't build man-page"; \ + exit 1; \ + fi $(PROGRAM).bash: util/$(PROGRAM).bash-completion.tmpl @# Add to the bash completion file a list of enabled programmers. @@ -1049,20 +1056,28 @@ man8 .doctrees $(PROGRAM).bash $(BUILD_DETAILS_FILE) @+$(MAKE) -C util/ich_descriptors_tool/ clean -install: $(PROGRAM)$(EXEC_SUFFIX) man8/$(PROGRAM).8 $(PROGRAM).bash +install: install-bin install-bash $(call install-man) + +install-bin: $(PROGRAM)$(EXEC_SUFFIX) mkdir -p $(DESTDIR)$(PREFIX)/sbin - mkdir -p $(DESTDIR)$(MANDIR)/man8 - mkdir -p $(DESTDIR)$(BASHCOMPDIR) $(INSTALL) -m 0755 $(PROGRAM)$(EXEC_SUFFIX) $(DESTDIR)$(PREFIX)/sbin - $(INSTALL) -m 0644 man8/$(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 + +install-bash: $(PROGRAM).bash + mkdir -p $(DESTDIR)$(BASHCOMPDIR) $(INSTALL) -m 0644 $(PROGRAM).bash $(DESTDIR)$(BASHCOMPDIR) -libinstall: libflashrom.a include/libflashrom.h +install-man: man8/$(PROGRAM).8 + mkdir -p $(DESTDIR)$(MANDIR)/man8 + $(INSTALL) -m 0644 man8/$(PROGRAM).8 $(DESTDIR)$(MANDIR)/man8 + +install-lib: libflashrom.a include/libflashrom.h mkdir -p $(DESTDIR)$(PREFIX)/lib $(INSTALL) -m 0644 libflashrom.a $(DESTDIR)$(PREFIX)/lib mkdir -p $(DESTDIR)$(PREFIX)/include $(INSTALL) -m 0644 include/libflashrom.h $(DESTDIR)$(PREFIX)/include +libinstall: install-lib + _export: man8/$(PROGRAM).8 @rm -rf "$(EXPORTDIR)/flashrom-$(RELEASENAME)" @mkdir -p "$(EXPORTDIR)/flashrom-$(RELEASENAME)" diff --git a/Makefile.include b/Makefile.include index a55f6f5..ee7f530 100644 --- a/Makefile.include +++ b/Makefile.include @@ -52,6 +52,10 @@ $(call debug_shell, $(if $(PKG_CONFIG_LIBDIR),PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR),) $(PKG_CONFIG) --modversion $1 2>/dev/null) endef +define install-man +$(if $(findstring $(HAS_SPHINXBUILD),yes), install-man) +endef + define dependency_cflags $(call debug_shell, $(if $(PKG_CONFIG_LIBDIR),PKG_CONFIG_LIBDIR=$(PKG_CONFIG_LIBDIR),) $(PKG_CONFIG) --cflags $1 2>/dev/null) endef -- To view, visit https://review.coreboot.org/c/flashrom/+/74519 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If1b81d9bc25ecac19d493b44b00a7c42d0643fe6 Gerrit-Change-Number: 74519 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: doc: Add contact page
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Alexander Goncharov. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73822 ) Change subject: doc: Add contact page ...................................................................... Patch Set 6: (1 comment) File doc/contact.rst: https://review.coreboot.org/c/flashrom/+/73822/comment/87402627_c6155854 PS4, Line 2: = > I don't know which comment below you referring to, but alright :) line 3, starting with .. -- To view, visit https://review.coreboot.org/c/flashrom/+/73822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibfba6a59c5a945b4238d16e07a07584f94159568 Gerrit-Change-Number: 73822 Gerrit-PatchSet: 6 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Wed, 19 Apr 2023 11:47:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: Makefile: do not generate man page when building sources
by Anastasia Klimchuk (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74510 ) Change subject: Makefile: do not generate man page when building sources ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Thank you so much for the patch! Ideally if Thomas can have a look that would be great. It would unblock ni845_spi as my understanding it cannot be build with meson at the moment. -- To view, visit https://review.coreboot.org/c/flashrom/+/74510 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9882445de2a0996f237470a73b6a1eb7eafce808 Gerrit-Change-Number: 74510 Gerrit-PatchSet: 1 Gerrit-Owner: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Wed, 19 Apr 2023 11:41:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: doc: Add contact page
by Anastasia Klimchuk (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Thomas Heijligen, Alexander Goncharov. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73822 ) Change subject: doc: Add contact page ...................................................................... Patch Set 6: Code-Review+2 (2 comments) File doc/contact.rst: https://review.coreboot.org/c/flashrom/+/73822/comment/05d61575_f17c31b8 PS4, Line 2: = > See the comment below. Git uses 7 = to divide the parts in a diff. I don't know which comment below you referring to, but alright :) File doc/index.rst: https://review.coreboot.org/c/flashrom/+/73822/comment/fc569e8f_6b912562 PS4, Line 9: dev_guide/index : classic_cli_manpage : contact > Yes, this can be easily changes along the way. […] Done -- To view, visit https://review.coreboot.org/c/flashrom/+/73822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibfba6a59c5a945b4238d16e07a07584f94159568 Gerrit-Change-Number: 73822 Gerrit-PatchSet: 6 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Wed, 19 Apr 2023 11:35:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Thomas Heijligen <src(a)posteo.de> Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: util/flashchips_db_jsoniser: Initial version
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Edward O'Callaghan. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74065 ) Change subject: util/flashchips_db_jsoniser: Initial version ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I think we should have a closer look at the format we are using for the flash database. It would be good to have a format stable enough to keep it compatible through multiple version. Also it should be documented. -- To view, visit https://review.coreboot.org/c/flashrom/+/74065 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3b65caeb811ec0978091c543ccffb5a1b0d254ba Gerrit-Change-Number: 74065 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Sam McNally <sammc(a)google.com> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Wed, 19 Apr 2023 10:14:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: doc: Add contact page
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Anastasia Klimchuk, Alexander Goncharov. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73822 ) Change subject: doc: Add contact page ...................................................................... Patch Set 6: (1 comment) File doc/contact.rst: https://review.coreboot.org/c/flashrom/+/73822/comment/30cf384d_05101c32 PS4, Line 85: * > Looks like it shouldn't be part of the list Done -- To view, visit https://review.coreboot.org/c/flashrom/+/73822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibfba6a59c5a945b4238d16e07a07584f94159568 Gerrit-Change-Number: 73822 Gerrit-PatchSet: 6 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Comment-Date: Wed, 19 Apr 2023 09:42:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Alexander Goncharov <chat(a)joursoir.net> Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: doc: Add contact page
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Anastasia Klimchuk. Hello build bot (Jenkins), Edward O'Callaghan, Anastasia Klimchuk, Alexander Goncharov, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/73822 to look at the new patch set (#6). Change subject: doc: Add contact page ...................................................................... doc: Add contact page This is just a copy of https://www.flashrom.org/Contact. Change-Id: Ibfba6a59c5a945b4238d16e07a07584f94159568 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> --- A doc/contact.rst M doc/index.rst 2 files changed, 156 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/73822/6 -- To view, visit https://review.coreboot.org/c/flashrom/+/73822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibfba6a59c5a945b4238d16e07a07584f94159568 Gerrit-Change-Number: 73822 Gerrit-PatchSet: 6 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in flashrom[master]: doc: Add contact page
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Anastasia Klimchuk. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73822 ) Change subject: doc: Add contact page ...................................................................... Patch Set 4: (2 comments) File doc/contact.rst: https://review.coreboot.org/c/flashrom/+/73822/comment/ac78bd5c_2a02b824 PS4, Line 2: = > One extra char? See the comment below. Git uses 7 = to divide the parts in a diff. File doc/index.rst: https://review.coreboot.org/c/flashrom/+/73822/comment/36d5e5a9_9f14fa9d PS4, Line 9: dev_guide/index : classic_cli_manpage : contact > I want to spend some more time thinking about order of items and nesting, and about group names. […] Yes, this can be easily changes along the way. I just needed a starting point and wanted to introduce directories as soon as possible to not have the same problem which we have with the code. -- To view, visit https://review.coreboot.org/c/flashrom/+/73822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibfba6a59c5a945b4238d16e07a07584f94159568 Gerrit-Change-Number: 73822 Gerrit-PatchSet: 4 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Wed, 19 Apr 2023 09:37:05 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: usb_device.c: remove LIBUSB() wrapper around call that may fail
by Thomas Heijligen (Code Review) 19 Apr '23

19 Apr '23

Attention is currently required from: Edward O'Callaghan, Nikolai Artemiev. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74537 ) Change subject: usb_device.c: remove LIBUSB() wrapper around call that may fail ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Thanks for catching this -- To view, visit https://review.coreboot.org/c/flashrom/+/74537 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I38e4642bcbddaf3f37821093f6b919806134ed7b Gerrit-Change-Number: 74537 Gerrit-PatchSet: 1 Gerrit-Owner: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Comment-Date: Wed, 19 Apr 2023 09:24:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit