summaryrefslogtreecommitdiff
path: root/scripts/getver.sh
Commit message (Collapse)AuthorAgeFilesLines
* scripts/getver.sh: append short git hash based on upstream commitMagnus Kroken2017-02-011-1/+2
| | | | | | | | | | | The short git hash suffix printed by getver.sh is taken from the latest local commit, change this to use the hash from latest upstream commit if available. This is considered the intended behavior based on commit message a642a11faca87e2a7bddc1fadb54253e2fc26e84, introducing getver.sh. Signed-off-by: Magnus Kroken <mkroken@gmail.com> Signed-off-by: Felix Fietkau <nbd@nbd.name>
* scripts: getver.sh: append Git short hash to revisionJo-Philipp Wich2016-12-021-1/+1
| | | | | | | | | | | Change getver.sh to append a short Git commit hash to the end of the artifical revision number. This way we still have order- and comparable commit numbers but also a direct relation to the Git commit. The new output format will look like "r2400+2-882472e" for dirty trees or like "r2402-882472e" for clean ones. Signed-off-by: Jo-Philipp Wich <jo@mein.io>
* scripts/getver.sh: treat all commits as local if can't find upstreamRafał Miłecki2016-11-211-1/+1
| | | | | | | | | | | | | | | If something goes wrong and script can't find upstream revision it will return something like: r2220 which looks like a valid upstream revision 2220. We cant' distinguish it from e.g. 2200 upstream commits and 20 local ones. The new format still provides revision number but also points clearly that is may be not the upstream one: r0+2220 Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Acked-by: John Crispin < john@phrozen.org>
* scripts/getver.sh: fix older git versions from printing stuff to stdoutJonas Gorski2016-07-161-2/+2
| | | | | | | | | Older git versions seem output the original argument to stdout if there is no upstream, presumably because they try to do things with it internally. This can be prevented by passing --verify to it, which should be safe on newer git versions. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts/getver.sh: stop relying on the reboot tagFelix Fietkau2016-07-141-3/+4
| | | | | | It may not be present when cloning a staging tree or another fork Signed-off-by: Felix Fietkau <nbd@nbd.name>
* scripts/getver.sh: fix one more wc -l callJonas Gorski2016-07-131-1/+1
| | | | | | The revision to hash conversion was missed when fixing up the script. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts/getver.sh: try to get branch/upstream automaticallyJonas Gorski2016-07-131-5/+14
| | | | | | | | Instead of assuming master is the current branch and origin the right upstream, try to get both dynamically. If the current branch is not tracking any upstream, use the origin of the master branch. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts/getver.sh: fix revision number on BSD/MacOSFelix Fietkau2016-07-091-2/+2
| | | | | | Strip leading whitespace from wc -l output Signed-off-by: Felix Fietkau <nbd@nbd.name>
* scripts/getver.sh: avoid use of git rev-list --countJonas Gorski2016-07-091-3/+3
| | | | | | | This is not a valid option in older git version, used in e.g. RHEL6. Reported-by: Steven Haigh <netwiz@crc.id.au> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts/getver.sh: improve revision outputJonas Gorski2016-07-091-2/+7
| | | | | | | | | | | | | Change the revision output to r<upstream-revision>+<local commits> so it is easier to get the base revision (and see if there are local commits). Example: $ ./scripts/getver.sh r794+3 $ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts/getver.sh: allow conversion between git hash and revisionJonas Gorski2016-07-091-2/+18
| | | | | | | | | | | | | | | Add code allowing easy conversion between git commit ids and revisions. Example: $ ./scripts/getver.sh r792 $ ./scripts/getver.sh r123 b7fc892eb56b52d25bc00578af9d1ee058dcf6b3 $ ./scrpts/getver.sh b7fc892eb56b52d25bc00578af9d1ee058dcf6b3 r123 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts/getver.sh: simplify revision calculationJonas Gorski2016-07-091-1/+1
| | | | | | Use git rev-list --count to get the revision number. Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
* scripts: add "r" to revisionJohn Crispin2016-04-291-1/+2
| | | | | | 343c3be45451e4a11f03109bd6cb1dd9061ec5eb accidentially removed the "r" Signed-off-by: John Crispin <john@phrozen.org>
* branding: add LEDE brandingJohn Crispin2016-03-241-1/+1
| | | | Signed-off-by: John Crispin <blogic@openwrt.org>
* scripts/getver.sh: generate revision relative to the reboot tagJohn Crispin2016-03-241-10/+2
| | | | Signed-off-by: John Crispin <blogic@openwrt.org>
* scripts/getver.sh: Use 'git-rev-parse' to detect if tree lies in Git repositoryVasilis Tsiligiannis2016-04-131-1/+1
| | | | | | | | | | | Path to the Git repository directory can be overriden by using the '$GIT_DIR' environment variable. This patch improves detection of Git repository by using 'git-rev-parse', which respects '$GIT_DIR' environment variable, instead of just checking the existence of '.git' directory. Signed-off-by: Vasilis Tsiligiannis <acinonyx@openwrt.gr> SVN-Revision: 49165
* scripts: fix getver git dir checkJohn Crispin2015-02-141-1/+1
| | | | | | | | | | | | | | | | | | | Git internals are referenced by .git which isn't necessarily a directory. It may also be a file that references the actual .git directory using the gitdir directive. If .git is assumed to be a directory the build will not be able to get the correct version when openwrt is included as a git submodule because when used as a submodule .git will actually be a file referencing to a subdirectory in the parent's git dir. When the correct version is not detected some image generation tools will fail because the OpenWrt string will be 'OpenWrtunknown' which is too long for some header formats. Signed-off-by: Felix Kaechele <heffer@fedoraproject.org> SVN-Revision: 44452
* getver.sh: cope with varying "git log" line formats to reliably extract the ↵Jo-Philipp Wich2011-10-261-1/+1
| | | | | | git-svn rev (#10268) SVN-Revision: 28604
* getver: don't use "-r COMMITTED" arg which needs network access to the ↵Nicolas Thill2009-10-051-1/+1
| | | | | | repository, use the "Last Changed Rev:" line instead SVN-Revision: 17864
* getver: get svn rev from last commit so that we have consistent revision ↵Nicolas Thill2009-09-281-1/+1
| | | | | | numbers between git and svn SVN-Revision: 17781
* add hg support to getver.sh (patch from #5763)Felix Fietkau2009-08-281-1/+8
| | | | SVN-Revision: 17432
* some more s/git-/git /Felix Fietkau2008-08-241-1/+1
| | | | SVN-Revision: 12380
* Also export LC_ALL to C to work properly (#2926)Florian Fainelli2007-12-301-0/+1
| | | | SVN-Revision: 10059
* clean up openwrt version handling, use a separate script that is executed at ↵Felix Fietkau2007-12-131-0/+26
the beginning of the build process, fix revision checking with git SVN-Revision: 9723
generated by cgit v1.1 at 2024-11-07 21:15:05 +0000