| Message ID | 20161117062521.24104-1-zajec5@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
On 17/11/2016 07:25, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > 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> i tried to apply it but is fails. feel free to add my Acked-by and push it once rebased John > --- > scripts/getver.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/getver.sh b/scripts/getver.sh > index 9b84602..2fd6adb 100755 > --- a/scripts/getver.sh > +++ b/scripts/getver.sh > @@ -33,7 +33,7 @@ try_git() { > UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)" > UPSTREAM_REV="$(git rev-list --count ${REBOOT}..$UPSTREAM_BASE)" > else > - UPSTREAM_REV=$REV > + UPSTREAM_REV=0 > fi > > if [ "$REV" -gt "$UPSTREAM_REV" ]; then >
Hi, On Thu, Nov 17, 2016 at 07:25:21AM +0100, Rafał Miłecki wrote: > 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 I tried a LEDE snapshot yesterday, and the version number in the banner had this format (r0+22XX, can't remember which version exactly). So it seems that there is an issue either with the buildbots or with your patch. The exact snapshot I used is this one, for WR841 v11.0: https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/lede-ar71xx-generic-tl-wr841-v11-squashfs-factory-eu.bin Baptiste
Hi, neither the scripts nor the buildbots have an actual problem, its just that the buildbots clone the Git repo in a way that there is no remote declared, so the getver.sh logic detects all changes as local. I'll see if I can fix it during the next few days on the buildbot side, but it is low priority atm ~ Jo
diff --git a/scripts/getver.sh b/scripts/getver.sh index 9b84602..2fd6adb 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -33,7 +33,7 @@ try_git() { UPSTREAM_BASE="$(git merge-base $GET_REV $ORIGIN)" UPSTREAM_REV="$(git rev-list --count ${REBOOT}..$UPSTREAM_BASE)" else - UPSTREAM_REV=$REV + UPSTREAM_REV=0 fi if [ "$REV" -gt "$UPSTREAM_REV" ]; then