- flashrom-gerrit - mail.coreboot.org

Change in flashrom[staging]: fixup! Convert flashrom to git
by Stefan Tauner (Code Review) 06 Oct '17

06 Oct '17

Hello Paul Menzel, build bot (Jenkins), Nico Huber, I'd like you to reexamine a change. Please visit https://review.coreboot.org/21834 to look at the new patch set (#5). Change subject: fixup! Convert flashrom to git ...................................................................... fixup! Convert flashrom to git refine the pre-push hook: - get rid of the concept of precious brances - all of them on the upstream repos are precious (this is a change in the face of using gerrit instead of a native git repository for staging purposes) - likewise, only allow new versioned stable branches and no feature branches there Change-Id: I1d4b4a7ef2673cabee980ec4a7d7d5fbebdcaed1 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> --- M util/git-hooks/pre-push 1 file changed, 20 insertions(+), 19 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/34/21834/5 -- To view, visit https://review.coreboot.org/21834 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newpatchset Gerrit-Change-Id: I1d4b4a7ef2673cabee980ec4a7d7d5fbebdcaed1 Gerrit-Change-Number: 21834 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: squash! Convert flashrom to git
by Nico Huber (Code Review) 06 Oct '17

06 Oct '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/21886 ) Change subject: squash! Convert flashrom to git ...................................................................... Patch Set 1: (2 comments) https://review.coreboot.org/#/c/21886/1//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/21886/1//COMMIT_MSG@11 PS1, Line 11: Convert flashrom to git Please find a phrase that covers (at least most of) the changes. https://review.coreboot.org/#/c/21886/1//COMMIT_MSG@54 PS1, Line 54: involvement in making things possible... Darn, I was going to send you a bill if you miss that :-P -- To view, visit https://review.coreboot.org/21886 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I325edb7d9890c412a44ecacb5161268d3dbccc57 Gerrit-Change-Number: 21886 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 05 Oct 2017 19:56:12 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[master]: print: Update Asus URLs to use more secure HTTPS
by Paul Menzel (Code Review) 06 Oct '17

06 Oct '17

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/21874 ) Change subject: print: Update Asus URLs to use more secure HTTPS ...................................................................... Patch Set 1: > Did you test if all the URLs are still available (i.e. provide some > actual content related to the respective mainboards)? I only checked one board, and that worked (one more redirect). > Did you look at other vendors? No. -- To view, visit https://review.coreboot.org/21874 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I62319bfbf39c73f98ed3f865a11f4fe870befee4 Gerrit-Change-Number: 21874 Gerrit-PatchSet: 1 Gerrit-Owner: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 05 Oct 2017 16:29:08 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/21836 ) Change subject: fixup! Convert flashrom to git ...................................................................... Patch Set 4: Code-Review-2 Accidentally squashed another fixup? Nice try :-P -- To view, visit https://review.coreboot.org/21836 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Iac3bf11fbd55cfa034ef8af04ef90fe57182ee2b Gerrit-Change-Number: 21836 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 05 Oct 2017 10:51:43 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has posted comments on this change. ( https://review.coreboot.org/21834 ) Change subject: fixup! Convert flashrom to git ...................................................................... Patch Set 4: Code-Review+2 (1 comment) Will leave this unmerged for the moment in case you want to break that line... https://review.coreboot.org/#/c/21834/4/util/git-hooks/pre-push File util/git-hooks/pre-push: https://review.coreboot.org/#/c/21834/4/util/git-hooks/pre-push@37 PS4, Line 37: if [ "$remote_ref" != "refs/heads/staging" -a "$remote_ref" != "refs/heads/stable" -a -z "$version" ]; then line is too long and not hard to break -- To view, visit https://review.coreboot.org/21834 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I1d4b4a7ef2673cabee980ec4a7d7d5fbebdcaed1 Gerrit-Change-Number: 21834 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 05 Oct 2017 10:49:07 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/21833 ) Change subject: fixup! Convert flashrom to git ...................................................................... fixup! Convert flashrom to git - update the commit-msg to check for duplicate signoffs/acks Change-Id: Ia36147e673cceb6d175884b40d4bdd00015b96dc Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: https://review.coreboot.org/21833 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M util/git-hooks/commit-msg 1 file changed, 18 insertions(+), 1 deletion(-) Approvals: Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/util/git-hooks/commit-msg b/util/git-hooks/commit-msg index 3b3d541..b9217e0 100755 --- a/util/git-hooks/commit-msg +++ b/util/git-hooks/commit-msg @@ -6,6 +6,10 @@ # # Copyright (C) 2009 The Android Open Source Project # +# Any other changes including test_duplicate_signoffs_acks +# +# Copyright (C) 2017 Stefan Tauner +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -188,5 +192,18 @@ git hash-object -t commit --stdin } +# Test for duplicate signoffs/acks +test_duplicate_signoffs_acks() { + test "" = "$(grep -i '^(Signed-off-by|Acked-by): ' "$MSG" | + sort | uniq -c | sed -e '/^[[:space:]]*1[[:space:]]/d')" || { + echo "Duplicate Signed-off-by or Acked-by lines." >&2 + exit 1 + } +} -add_ChangeId +main() { + test_duplicate_signoffs_acks + add_ChangeId +} + +main -- To view, visit https://review.coreboot.org/21833 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: Ia36147e673cceb6d175884b40d4bdd00015b96dc Gerrit-Change-Number: 21833 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/21832 ) Change subject: fixup! Convert flashrom to git ...................................................................... fixup! Convert flashrom to git - update the commit-msg hook to the latest one provided by Gerrit. However, disable the (new) code that would avoid adding Change-IDs to fixup/squash commits as needed on the staging branch Change-Id: I2f2d7ae58dcd7d3e55959e18fe664df10bc3cc41 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: https://review.coreboot.org/21832 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M util/git-hooks/commit-msg 1 file changed, 27 insertions(+), 8 deletions(-) Approvals: Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/util/git-hooks/commit-msg b/util/git-hooks/commit-msg index 82f0581..3b3d541 100755 --- a/util/git-hooks/commit-msg +++ b/util/git-hooks/commit-msg @@ -1,6 +1,8 @@ #!/bin/sh # -# Part of Gerrit Code Review (http://code.google.com/p/gerrit/) +# Change-ID amending from Gerrit Code Review 2.14.2 +# +# Part of Gerrit Code Review (https://www.gerritcodereview.com/) # # Copyright (C) 2009 The Android Open Source Project # @@ -17,14 +19,16 @@ # limitations under the License. # -CHANGE_ID_AFTER="Bug|Issue" +unset GREP_OPTIONS + +CHANGE_ID_AFTER="Bug|Depends-On|Issue|Test|Feature|Fixes|Fixed|Staging-ID" MSG="$1" # Check for, and add if missing, a unique Change-Id # add_ChangeId() { clean_message=`sed -e ' - /^diff --git a\/.*/{ + /^diff --git .*/{ s/// q } @@ -36,8 +40,19 @@ return fi + # *Do* add Change-Id to temp commits (original code bails out here) + # if echo "$clean_message" | head -1 | grep -q '^$fixup\|squash$!' + # then + # return + # fi + + if test "false" = "`git config --bool --get gerrit.createChangeId`" + then + return + fi + # Does Change-Id: already exist? if so, exit (no change). - if grep -i '^Change-Id: I[0-9a-f]\{40\}$' "$MSG" >/dev/null + if grep -i '^Change-Id:' "$MSG" >/dev/null then return fi @@ -49,6 +64,10 @@ # Solaris AWK is just too broken AWK=/usr/xpg4/bin/awk fi + + # Get core.commentChar from git config or use default symbol + commentChar=`git config --get core.commentChar` + commentChar=${commentChar:-#} # How this works: # - parse the commit message as (textLine+ blankLine*)* @@ -68,13 +87,13 @@ blankLines = 0 } - # Skip lines starting with "#" without any spaces before it. - /^#/ { next } + # Skip lines starting with commentChar without any spaces before it. + /^'"$commentChar"'/ { next } # Skip the line starting with the diff command and everything after it, # up to the end of the file, assuming it is only patch data. # If more than one line before the diff was empty, strip all but one. - /^diff --git a/ { + /^diff --git / { blankLines = 0 while (getline) { } next @@ -151,7 +170,7 @@ if (unprinted) { print "Change-Id: I'"$id"'" } - }' "$MSG" > $T && mv $T "$MSG" || rm -f $T + }' "$MSG" > "$T" && mv "$T" "$MSG" || rm -f "$T" } _gen_ChangeIdInput() { echo "tree `git write-tree`" -- To view, visit https://review.coreboot.org/21832 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I2f2d7ae58dcd7d3e55959e18fe664df10bc3cc41 Gerrit-Change-Number: 21832 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/21831 ) Change subject: fixup! Convert flashrom to git ...................................................................... fixup! Convert flashrom to git - wrap a line in the hook installer. The line still exceeds our maximum limit by two chars but it makes no sense to break apart the one long argument IMHO Change-Id: I0e931fbb5902d2714d5399c1d1bfac0de35523bb Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: https://review.coreboot.org/21831 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M util/git-hooks/install.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/util/git-hooks/install.sh b/util/git-hooks/install.sh index bc90e37..d557c2f 100755 --- a/util/git-hooks/install.sh +++ b/util/git-hooks/install.sh @@ -14,6 +14,7 @@ if [ -e "${dst}$h" ]; then mv "${dst}$h" "${dst}$h.local" fi - ln -s "$(git rev-parse --prefix $(git rev-parse --git-path hooks/) --show-cdup)${src}wrapper.sh" "${dst}$h" + ln -s "$(git rev-parse --prefix $(git rev-parse --git-path hooks/) --show-cdup)${src}wrapper.sh" \ + "${dst}$h" fi done -- To view, visit https://review.coreboot.org/21831 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I0e931fbb5902d2714d5399c1d1bfac0de35523bb Gerrit-Change-Number: 21831 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/21830 ) Change subject: fixup! Convert flashrom to git ...................................................................... fixup! Convert flashrom to git - exploit Make's -include statement to simplify execution flow - expand and refine respective comment to better describe and match the new behavior Change-Id: I0c66f2508cc754cf9219211a06d6f305a32c422d Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: https://review.coreboot.org/21830 Reviewed-by: Nico Huber <nico.h(a)gmx.de> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M Makefile 1 file changed, 4 insertions(+), 7 deletions(-) Approvals: Nico Huber: Looks good to me, approved build bot (Jenkins): Verified diff --git a/Makefile b/Makefile index d014580..1893bb1 100644 --- a/Makefile +++ b/Makefile @@ -526,15 +526,12 @@ CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o -# versioninfo.inc is used when packaging flashrom and is generated by the -# export rule. If versioninfo.inc is not found, version info will be obtained -# using util/getrevision.sh. -ifeq ($(wildcard versioninfo.inc),) +# versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and +# imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will +# be obtained using util/getrevision.sh, which is the common case during development. +-include versioninfo.inc VERSION ?= $(shell ./util/getrevision.sh --revision) MAN_DATE ?= $(shell ./util/getrevision.sh --date $(PROGRAM).8.tmpl 2>/dev/null) -else -include versioninfo.inc -endif # VERSION equals "offline" if online access is required but the respective git # config variable is not set yet. -- To view, visit https://review.coreboot.org/21830 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I0c66f2508cc754cf9219211a06d6f305a32c422d Gerrit-Change-Number: 21830 Gerrit-PatchSet: 4 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[staging]: fixup! Convert flashrom to git
by Nico Huber (Code Review) 05 Oct '17

05 Oct '17

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/21829 ) Change subject: fixup! Convert flashrom to git ...................................................................... fixup! Convert flashrom to git Rename getrevision's local_revision function to just revision. All revisions are local in git and we certainly wont go back to a non-distributed VCS :) Change-Id: I6689ac24077b3981b471ed69de7cc3ef79d435b1 Signed-off-by: Stefan Tauner <stefan.tauner(a)gmx.at> Reviewed-on: https://review.coreboot.org/21829 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> --- M Makefile M util/getrevision.sh 2 files changed, 9 insertions(+), 9 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved diff --git a/Makefile b/Makefile index 3349f03..d014580 100644 --- a/Makefile +++ b/Makefile @@ -530,7 +530,7 @@ # export rule. If versioninfo.inc is not found, version info will be obtained # using util/getrevision.sh. ifeq ($(wildcard versioninfo.inc),) -VERSION ?= $(shell ./util/getrevision.sh --local) +VERSION ?= $(shell ./util/getrevision.sh --revision) MAN_DATE ?= $(shell ./util/getrevision.sh --date $(PROGRAM).8.tmpl 2>/dev/null) else include versioninfo.inc diff --git a/util/getrevision.sh b/util/getrevision.sh index 9dd4dbe..80812b4 100755 --- a/util/getrevision.sh +++ b/util/getrevision.sh @@ -130,8 +130,7 @@ echo "${t}" } -# Retrieve local revision info. -local_revision() { +revision() { local r if git_is_file_tracked "$1" ; then r=$(git describe $(git_last_commit "$1")) @@ -158,8 +157,9 @@ this message -c or --check test if path is under version control at all - -l or --local - local revision information including an indicator for uncommitted changes + -r or --revision + return unique revision information including an indicator for + uncommitted changes -U or --url URL associated with the latest commit -d or --date @@ -188,10 +188,6 @@ -h|--help) action=show_help; shift;; - -l|--local) - check_action $1 - action=local_revision - shift;; -U|--url) check_action $1 action=scm_url @@ -200,6 +196,10 @@ check_action $1 action="timestamp +%Y-%m-%d" # refrain from suffixing 'Z' to indicate it's UTC shift;; + -r|--revision) + check_action $1 + action=revision + shift;; -t|--timestamp) check_action $1 action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601 -- To view, visit https://review.coreboot.org/21829 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: merged Gerrit-Change-Id: I6689ac24077b3981b471ed69de7cc3ef79d435b1 Gerrit-Change-Number: 21829 Gerrit-PatchSet: 5 Gerrit-Owner: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit