| Message ID | 20190203165800.1370-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/buildscript b/buildscript index 06edf178..49737229 100755 --- a/buildscript +++ b/buildscript @@ -201,6 +201,9 @@ prebuild() { if [ 0 -ne $? ]; then version=$(git log -1 --pretty=format:%h) fi + if [ -n "$(cat selected_variant)" ]; then + version="$(cat selected_variant)-$version" + fi { echo "FIRMWARE_VERSION=\"$version\""
Hi Finde ich sehr gut, auch wenn es vermutlich das Filename Length Limit sprengen wird. Reviewed-by: Tim Niemeyer <tim@tn-x.org> Tim On Sun, 2019-02-03 at 17:58 +0100, Adrian Schmutzler wrote: > With this change, based on a tag "20190101" two firmwares > node-20190101 > layer3-20190101 > can be created based on build variant. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > buildscript | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/buildscript b/buildscript > index 06edf178..49737229 100755 > --- a/buildscript > +++ b/buildscript > @@ -201,6 +201,9 @@ prebuild() { > if [ 0 -ne $? ]; then > version=$(git log -1 --pretty=format:%h) > fi > + if [ -n "$(cat selected_variant)" ]; then > + version="$(cat selected_variant)-$version" > + fi > > { > echo "FIRMWARE_VERSION=\"$version\""
Hallo Tim, man könnte ggf. das „squashfs-“ rausschnippeln. Grüße Adrian From: Tim Niemeyer [mailto:tim@tn-x.org] Sent: Sonntag, 3. Februar 2019 18:02 To: Adrian Schmutzler <freifunk@adrianschmutzler.de>; franken-dev@freifunk.net Subject: Re: [PATCH] buildscript: Include build variant in firmware version label Hi Finde ich sehr gut, auch wenn es vermutlich das Filename Length Limit sprengen wird. Reviewed-by: Tim Niemeyer <tim@tn-x.org <mailto:tim@tn-x.org> > Tim On Sun, 2019-02-03 at 17:58 +0100, Adrian Schmutzler wrote: > With this change, based on a tag "20190101" two firmwares > node-20190101 > layer3-20190101 > can be created based on build variant. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de <mailto:freifunk@adrianschmutzler.de> > > --- > buildscript | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/buildscript b/buildscript > index 06edf178..49737229 100755 > --- a/buildscript > +++ b/buildscript > @@ -201,6 +201,9 @@ prebuild() { > if [ 0 -ne $? ]; then > version=$(git log -1 --pretty=format:%h) > fi > + if [ -n "$(cat selected_variant)" ]; then > + version="$(cat selected_variant)-$version" > + fi > > { > echo "FIRMWARE_VERSION=\"$version\""
Applied. > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf Of > Adrian Schmutzler > Sent: Sonntag, 3. Februar 2019 17:58 > To: franken-dev@freifunk.net > Subject: [PATCH] buildscript: Include build variant in firmware version label > > With this change, based on a tag "20190101" two firmwares > node-20190101 > layer3-20190101 > can be created based on build variant. > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > buildscript | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/buildscript b/buildscript > index 06edf178..49737229 100755 > --- a/buildscript > +++ b/buildscript > @@ -201,6 +201,9 @@ prebuild() { > if [ 0 -ne $? ]; then > version=$(git log -1 --pretty=format:%h) > fi > + if [ -n "$(cat selected_variant)" ]; then > + version="$(cat selected_variant)-$version" > + fi > > { > echo "FIRMWARE_VERSION=\"$version\"" > -- > 2.11.0
With this change, based on a tag "20190101" two firmwares node-20190101 layer3-20190101 can be created based on build variant. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- buildscript | 3 +++ 1 file changed, 3 insertions(+)