- flashrom-gerrit - mail.coreboot.org

Change in flashrom[staging]: fixup! Add a convenient libflashrom interface
by Nico Huber (Code Review) 19 Jun '17

19 Jun '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/20267 Change subject: fixup! Add a convenient libflashrom interface ...................................................................... fixup! Add a convenient libflashrom interface Update `enum flashrom_log_level` to match `enum msglevel` again. They diverged already. Found by clang. Change-Id: Icf175c5f2a415365bd756ca813e724f6797459b2 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M libflashrom.c M libflashrom.h 2 files changed, 6 insertions(+), 5 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/20267/1 diff --git a/libflashrom.c b/libflashrom.c index 1176e02..962e96f 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -90,7 +90,7 @@ int ret; va_list args; va_start(args, fmt); - ret = global_log_callback(level, fmt, args); + ret = global_log_callback((enum flashrom_log_level)level, fmt, args); va_end(args); return ret; } diff --git a/libflashrom.h b/libflashrom.h index 09a88c4..c5d972e 100644 --- a/libflashrom.h +++ b/libflashrom.h @@ -29,10 +29,11 @@ /** @ingroup flashrom-general */ enum flashrom_log_level { /* This has to match enum msglevel. */ FLASHROM_MSG_ERROR = 0, - FLASHROM_MSG_INFO = 1, - FLASHROM_MSG_DEBUG = 2, - FLASHROM_MSG_DEBUG2 = 3, - FLASHROM_MSG_SPEW = 4, + FLASHROM_MSG_WARN = 1, + FLASHROM_MSG_INFO = 2, + FLASHROM_MSG_DEBUG = 3, + FLASHROM_MSG_DEBUG2 = 4, + FLASHROM_MSG_SPEW = 5, }; /** @ingroup flashrom-general */ typedef int(flashrom_log_callback)(enum flashrom_log_level, const char *format, va_list); -- To view, visit https://review.coreboot.org/20267 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newchange Gerrit-Change-Id: Icf175c5f2a415365bd756ca813e724f6797459b2 Gerrit-Change-Number: 20267 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: fixup! Make read_ich_descriptors_from_dump() available in fl...
by Nico Huber (Code Review) 19 Jun '17

19 Jun '17

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/20265 Change subject: fixup! Make read_ich_descriptors_from_dump() available in flashrom ...................................................................... fixup! Make read_ich_descriptors_from_dump() available in flashrom Add a guard around read_ich_descriptors_via_fdo() which uses raw hardware access and is only called from `ichspi`. Fixes linking in case `NEED_RAW_ACCESS != 1`. Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M ich_descriptors.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/65/20265/1 diff --git a/ich_descriptors.c b/ich_descriptors.c index b6453ce..ecc2b95 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -846,6 +846,8 @@ return (1 << (19 + size_enc)); } +/* Only used by ichspi.c */ +#if CONFIG_INTERNAL == 1 && (defined(__i386__) || defined(__x86_64__)) static uint32_t read_descriptor_reg(uint8_t section, uint16_t offset, void *spibar) { uint32_t control = 0; @@ -917,6 +919,7 @@ msg_pdbg2(" done.\n"); return ICH_RET_OK; } +#endif /** * @brief Read a layout from the dump of an Intel ICH descriptor. -- To view, visit https://review.coreboot.org/20265 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newchange Gerrit-Change-Id: I5a35c607df44cdbcbacb960f8922c1bf9f1f2002 Gerrit-Change-Number: 20265 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>

1 0

Change in flashrom[staging]: ich_descriptors: Pretty print an assumed chipset
by Paul Menzel (Code Review) 19 Jun '17

19 Jun '17

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/20247 ) Change subject: ich_descriptors: Pretty print an assumed chipset ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/20247 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Id28cb3abc45c6e7f4c4accfc019579c7448c45d7 Gerrit-Change-Number: 20247 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 19 Jun 2017 10:25:40 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: util/getrevision.sh: Change version string
by David Hendricks (Code Review) 19 Jun '17

19 Jun '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/20263 ) Change subject: util/getrevision.sh: Change version string ...................................................................... Patch Set 1: Code-Review-2 (2 comments) Just to echo my previous comments from the other patch, I am not sold on this approach. I think it adds needless complexity to the script, has no valuable use case, and actually has negative utility since it makes it difficult to programmatically parse the version string. The git-fu is kind neat, though. https://review.coreboot.org/#/c/20263/1//COMMIT_MSG Commit Message: https://review.coreboot.org/#/c/20263/1//COMMIT_MSG@40 PS1, Line 40: 5 commits since last tag in upstream's stable branch: : flashrom v0.9.99-5-stable-e4f6643-dirty on Linux 3.13.0-76-generic (x86_64) : : 3 commits since last tag in upstream's staging branch and : 4 local commits on top of that: : flashrom v0.9.99-3-staging-4-e4f6643 on Linux 3.13.0-76-generic (x86_64) : : 3 commits since last tag in upstream's staging branch and : 4 local commits on top of that, and some local uncommitted changes too: : flashrom v0.9.99-3-staging-4-e4f6643-dirty on Linux 3.13.0-76-generic (x86_64) : : 3 commits since the last tag in an unrelated upstream branch : (e.g., a stable release *branch* such as 0.9.99.x) or local branch: : flashrom v0.9.99-3-e4f6643 on Linux 3.13.0-76-generic (x86_64) Honestly, who cares? If somebody gets on the mailing list and presents this info, what value does it provide? AFAICT the only interesting part is the sha and "-dirty". I suppose one could make an argument for the branch name, but as you pointed out there's no guarantee that the branches are synchronized so even that info may just be misleading. https://review.coreboot.org/#/c/20263/1/util/getrevision.sh File util/getrevision.sh: https://review.coreboot.org/#/c/20263/1/util/getrevision.sh@295 PS1, Line 295: r="$upstream_branch-$r" : r="$cnt_tag2upstream_branch-$r" These can also be merged into a single line, if preferred. -- To view, visit https://review.coreboot.org/20263 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Id6de60be4c751c070d4da648825a7e7b70e4a759 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 19 Jun 2017 02:41:10 +0000 Gerrit-HasComments: Yes

1 0

Change in flashrom[staging]: Convert flashrom to git
by David Hendricks (Code Review) 19 Jun '17

19 Jun '17

David Hendricks has posted comments on this change. ( https://review.coreboot.org/19206 ) Change subject: Convert flashrom to git ...................................................................... Patch Set 6: Patch set 6 reverts all the changes to the version string, which are now in the follow-up patch. -- To view, visit https://review.coreboot.org/19206 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: david.hendricks(a)gmail.com Gerrit-Comment-Date: Mon, 19 Jun 2017 02:28:02 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Convert flashrom to git
by Philippe Mathieu-Daudé (Code Review) 19 Jun '17

19 Jun '17

Philippe Mathieu-Daudé has posted comments on this change. ( https://review.coreboot.org/19206 ) Change subject: Convert flashrom to git ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://review.coreboot.org/19206 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: david.hendricks(a)gmail.com Gerrit-Comment-Date: Mon, 19 Jun 2017 02:26:42 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: util/getrevision.sh: Change version string
by build bot (Jenkins) (Code Review) 19 Jun '17

19 Jun '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/20263 ) Change subject: util/getrevision.sh: Change version string ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/382/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/395/ : SUCCESS -- To view, visit https://review.coreboot.org/20263 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: Id6de60be4c751c070d4da648825a7e7b70e4a759 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 19 Jun 2017 02:24:02 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Make coreboot.org the upstream server
by build bot (Jenkins) (Code Review) 19 Jun '17

19 Jun '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19187 ) Change subject: Make coreboot.org the upstream server ...................................................................... Patch Set 5: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/381/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/394/ : SUCCESS -- To view, visit https://review.coreboot.org/19187 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I9461dc4d2d461fff253392c4a1249a8835d5c9a4 Gerrit-Change-Number: 19187 Gerrit-PatchSet: 5 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Mon, 19 Jun 2017 02:23:45 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: Convert flashrom to git
by build bot (Jenkins) (Code Review) 19 Jun '17

19 Jun '17

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/19206 ) Change subject: Convert flashrom to git ...................................................................... Patch Set 6: Verified+1 Build Successful https://qa.coreboot.org/job/flashrom_gerrit/380/ : SUCCESS https://qa.coreboot.org/job/flashrom-customrules/393/ : SUCCESS -- To view, visit https://review.coreboot.org/19206 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: comment Gerrit-Change-Id: I64eef21982cac0a0a7419bcd2c8a936672ae9cb2 Gerrit-Change-Number: 19206 Gerrit-PatchSet: 6 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philippe Mathieu-Daudé <philippe.mathieu.daude(a)gmail.com> Gerrit-Reviewer: Stefan Tauner <stefan.tauner(a)gmx.at> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: david.hendricks(a)gmail.com Gerrit-Comment-Date: Mon, 19 Jun 2017 02:23:37 +0000 Gerrit-HasComments: No

1 0

Change in flashrom[staging]: util/getrevision.sh: Change version string
by David Hendricks (Code Review) 19 Jun '17

19 Jun '17

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/20263 Change subject: util/getrevision.sh: Change version string ...................................................................... util/getrevision.sh: Change version string Previously, we included the last stable version according to a hard- coded string in the Makefile and appended the subversion revision number. With this patch the version string includes the last reachable git tag, number of commits since said tag in the upstream branches (if any), the name of said upstream branch, number of commits since that branch (if any), and the shortened git hash. In case there are uncommitted changes a "-dirty" indicator is also added. The case of unknown versions is explicitly handled in getrevision instead of simply appending "-unknown" to a hardcoded release number. The version information is either taken from an existing git remote pointing to an upstream repository (or a known mirror), or if that is not available - with the user's consent - a shadow copy is fetched from the upstream repo that is updated on every build (usually takes less than a second). In the following some examples of the version string changes are shown. Basically we print the distance to the last known upstream tag, which comprises any upstream commits since that tag as well as local commits on top of that. Additionally we handle upstream's stable and staging branches specially. Old output: flashrom v0.9.7-r1716 on Linux 3.8.0-6-generic (x86_64) New output variants: Build of the 0.9.99 release without any changes: flashrom v0.9.99-e4f6643 on Linux 3.13.0-76-generic (x86_64) 5 commits since last tag in upstream's stable branch: flashrom v0.9.99-5-stable-e4f6643-dirty on Linux 3.13.0-76-generic (x86_64) 3 commits since last tag in upstream's staging branch and 4 local commits on top of that: flashrom v0.9.99-3-staging-4-e4f6643 on Linux 3.13.0-76-generic (x86_64) 3 commits since last tag in upstream's staging branch and 4 local commits on top of that, and some local uncommitted changes too: flashrom v0.9.99-3-staging-4-e4f6643-dirty on Linux 3.13.0-76-generic (x86_64) 3 commits since the last tag in an unrelated upstream branch (e.g., a stable release *branch* such as 0.9.99.x) or local branch: flashrom v0.9.99-3-e4f6643 on Linux 3.13.0-76-generic (x86_64) No tags reachable from current commit (generic git fallback): flashrom d95935a version on Linux 3.13.0-76-generic (x86_64) Not in a repository: flashrom unknown version on Linux 3.13.0-76-generic (x86_64) Change-Id: Id6de60be4c751c070d4da648825a7e7b70e4a759 Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Signed-off-by: David Hendricks <dhendricks(a)fb.com> --- M Makefile M util/getrevision.sh 2 files changed, 182 insertions(+), 44 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/63/20263/1 diff --git a/Makefile b/Makefile index cf3cfe8..c28fd73 100644 --- a/Makefile +++ b/Makefile @@ -534,7 +534,7 @@ VERSION ?= unknown MAN_DATE ?= unknown else -VERSION ?= $(shell ./util/getrevision.sh --local) +VERSION ?= $(shell ./util/getrevision.sh --revision) MAN_DATE ?= $(shell ./util/getrevision.sh -d $(PROGRAM).8.tmpl 2>/dev/null) # This is also a convenient time to install hooks. $(shell ./util/git-hooks/install.sh) diff --git a/util/getrevision.sh b/util/getrevision.sh index 8816879..d7960d8 100755 --- a/util/getrevision.sh +++ b/util/getrevision.sh @@ -30,6 +30,77 @@ # nor local times or dates export TZ=UTC0 +# List of important upstream branches... +upstream_branches="stable staging" +upstream_url="https://flashrom.org/git/flashrom.git" +upstream_patterns="github\.com.flashrom/flashrom(\.git)?|flashrom\.org.git/flashrom(\.git)?" + +# Generate upcache_refs +upcache_refs="" +upcache_prefix="refs/flashrom_org/" +for b in $upstream_branches ; do + upcache_refs="$upcache_refs ${upcache_prefix}$b" +done + +# We need to update our upstream information sometimes so that we can +# create detailed version information. To that end the code below +# fetches parts of the upstream repository via https. This takes about +# one second or less under normal circumstances. +# +# It can be called manually, but is usually called via the Makefile +# (implicitly via revision()) when there is no upstream information +# in any existing remote. +force_update_upcache() { + local rev_remote_refs + for ref in $upcache_refs ; do + rev_remote_refs="$rev_remote_refs +${ref##*/}:$ref" + done + git fetch -q "$upstream_url" --tags $rev_remote_refs && echo "Success." +} + +update_upcache() { + offline=$(git config flashrom.offline-builds 2>/dev/null) + if [ -z "$offline" ]; then + echo "\ +To produce useful version information the build process needs access +to the commit history from an upstream repository. If no git remote +is pointing to one we can store the necessary information out of +sight and update it on every build. + +To enable this functionality and fetch the upstream commits from + ${upstream_url} +please execute the following: + git config flashrom.offline-builds false + +Alternatively, add one of the upstream repositories as a git remote +to rely on that information. + +If you want to work completely offline and generate possibly +meaningless version strings then disable it using: + git config flashrom.offline-builds true + +You can force updating the local commit cache using: + $0 --force-update-upcache" >&2 + return 1 + elif [ "x$offline" = "xfalse" ]; then + echo "\ +Fetching commit history from upstream repository: + ${upstream_url} + +To disable any network activity execute: + git config flashrom.offline-builds true" >&2 + force_update_upcache >/dev/null + else + echo "\ +Fetching commit history from upstream is disabled - version +strings might be misleading. + +To ensure proper version strings and allow network access execute: + git config flashrom.offline-builds false" >&2 + fi + return 0 +} + # Helper functions # First argument is the path to inspect (usually optional; without # it the whole repository will be considered) @@ -129,48 +200,103 @@ echo "${t}" } -# Retrieve local SCM revision info. This is useful if we're working in a different SCM than upstream and/or -# have local changes. -local_revision() { - local r= +tag() { + local t= if git_is_file_tracked "$1" ; then - r=$(git_last_commit "$1") - - local svn_base=$(git log --grep=git-svn-id -1 --format='%h') - if [ "$svn_base" != "" ] ; then - local diff_to_svn=$(git rev-list --count ${svn_base}..${r}) - if [ "$diff_to_svn" -gt 0 ] ; then - r="$r-$diff_to_svn" - fi - fi - - if git_has_local_changes "$1" ; then - r="$r-dirty" - fi - else - return ${EXIT_FAILURE} + local sha=$(git_last_commit "$1") + t=$(git describe --abbrev=0 "$sha") fi - - echo "${r}" + if [ -z "$t" ]; then + t="unknown" # default to unknown + fi + echo "${t}" } -# Get the upstream flashrom revision stored in SVN metadata. -upstream_revision() { - local r= +find_upremote() { + # Try to find upstream's remote name + for remote in $(git remote) ; do + local url=$(git ls-remote --get-url $remote) + if echo "$url" | grep -q -E "$upstream_patterns" ; then + echo "$remote" + return + fi + done +} - if git_is_file_tracked "$1" ; then - # If this is a "native" git-svn clone we could use git svn log: - # git svn log --oneline -1 | sed 's/^r//;s/[[:blank:]].*//' or even git svn find-rev - # but it is easier to just grep for the git-svn-id unconditionally - r=$(git log --grep=git-svn-id -1 -- "$1" | \ - grep git-svn-id | \ - sed 's/.*@/r/;s/[[:blank:]].*//') +revision() { + local sha=$(git_last_commit "$1" 2>/dev/null) + # No git no fun + if [ -z "$sha" ]; then + echo "unknown" + return fi - if [ -z "$r" ]; then - r="unknown" # default to unknown + local r="$sha" + if git_has_local_changes "$1" ; then + r="$r-dirty" fi + + # sha + possibly dirty info is not exactly verbose, therefore + # the code below tries to use tags and branches from the upstream + # repos to derive a more precise version string. + # + # To that end we try to use the existing remotes first. If the + # upstream repos (and mirrors) are not available as remotes, use + # a shadow copy instead. + + local up_refs + local up_remote=$(find_upremote) + if [ -n "$up_remote" ]; then + for b in $upstream_branches ; do + up_refs="$up_refs ${up_remote}/${b}" + done + else + update_upcache || { echo "offline" ; return ; } + up_refs=$upcache_refs + fi + + # Find nearest commit contained in this branch that is also in any of the up_refs, i.e. the branch point + # of the current branch. This might be the latest commit if it's in any of the upstream branches. + local merge_point=$(git merge-base ${sha} ${up_refs}) + local upstream_branch + if [ -z "$merge_point" ]; then + echo "$sha" + return + fi + + # If the current commit is reachable from any remote branch, append the branch name and its + # distance to the nearest earlier tag to that tag name itself (tag-distance-branch). + # If multiple branches are reachable then we use the newest one (by commit date). + # If none is reachable we use the nearest tag and ? for distances and remote branch name. + + local cnt_upstream_branch2sha=$(git rev-list --count "${merge_point}..${sha}" 2>/dev/null) + + local lasttag=$(git describe --abbrev=0 "$merge_point" 2>/dev/null) + if [ -z "$lasttag" ]; then + echo "Could not find tag reachable from merge point!">&2 + echo "$sha" + return + fi + + local cnt_tag2upstream_branch=-1 + for ref in $up_refs ; do + if git merge-base --is-ancestor ${merge_point} ${ref}; then + upstream_branch=${ref##*/} # remove everything till last / + cnt_tag2upstream_branch=$(git rev-list --count "${lasttag}..${merge_point}" 2>/dev/null) + break + fi + done + + if [ "$cnt_upstream_branch2sha" -gt 0 ]; then + r="$cnt_upstream_branch2sha-$r" + fi + if [ "$cnt_tag2upstream_branch" -gt 0 ]; then + r="$upstream_branch-$r" + r="$cnt_tag2upstream_branch-$r" + fi + r="$lasttag-$r" + echo "${r}" } @@ -187,16 +313,20 @@ 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 - -u or --upstream - upstream revision - -U or --url + -T or --tag + returns the name of the last release/tag + -r or --revision + return unique revision information including the last tag and an indicator for uncommitted changes + -u or --url URL associated with the latest commit -d or --date date of most recent modification -t or --timestamp timestamp of most recent modification + -U or --update_upcache + update local shadow copy of upstream commits if need be and offline builds are not enforced + --force-update-upcache + force updating the local shadow copy of upstream commits " return } @@ -219,15 +349,15 @@ -h|--help) action=show_help; shift;; - -l|--local) + -T|--tag) check_action $1 - action=local_revision + action=tag shift;; - -u|--upstream) + -r|--revision) check_action $1 - action=upstream_revision + action=revision shift;; - -U|--url) + -u|--url) check_action $1 action=scm_url shift;; @@ -239,6 +369,14 @@ check_action $1 action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601 shift;; + -U|--update_upcache) + check_action $1 + action=update_upcache + shift;; + --force-update-upcache) + check_action $1 + action=force_update_upcache + shift;; -c|--check) check_action $1 action=is_tracked -- To view, visit https://review.coreboot.org/20263 To unsubscribe, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: staging Gerrit-MessageType: newchange Gerrit-Change-Id: Id6de60be4c751c070d4da648825a7e7b70e4a759 Gerrit-Change-Number: 20263 Gerrit-PatchSet: 1 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit