Add version to uboot image name #29

Avinash95 · 2017-01-04T15:14:38Z

This connects #28
Name of the file when top commit is annotated and EXTRAVERSION = v1.0.4 -> u-boot-pistachio_marduk-2015.10-v1.0.4.img
else
u-boot-pistachio_marduk-2015.10-v1.0.4-00004-gcd3b541.img
Signed-off-by: Avinash Tahakik [email protected]

abhijit-mahajani-imgtec

u-boot-pistachio_marduk-2015.10.img
should really be
u-boot-pistachio_marduk-2015.10-1.0.3.img in case the tag is equal to last commit
or
u-boot-pistachio_marduk-2015.10-99b3c1690c8b0e581daea1c5902619a66844c24f.img
githash should be used in case there are extra commits after the last tag(which is the current case)
For this EXTRAVERSION in the Makefile should be 1.0.3 (or whatever the current tag), once this is approved, tested and tagged as git tag -a 1.0.4 and EXTRAVERSION would be 1.0.4

abhijit-mahajani-imgtec · 2017-01-05T05:34:25Z

Makefile

+ifeq ($(UBOOTRELEASE),)
+	-mv  u-boot-pistachio-nor.img u-boot-$(subst $\",,$(CONFIG_SYS_CONFIG_NAME))-$(UBOOTVERSION).img
+else
+	-mv u-boot-pistachio-nor.img "u-boot-$(subst $\",,$(CONFIG_SYS_CONFIG_NAME))-\


Need to change JenkinsFile too .. It has still u-boot-pistachio-nor.img that's why it has failed
http://jenkins.creatordev.io/job/CreatorDev/job/u-boot/job/PR-29/lastBuild/console

It seems that UBOOTRELEASE is not set for the first CI build of this PR, which leads to the image being created as "u-boot-pistachio_marduk-2015.10.img", but for subsequent CI builds, UBOOTRELEASE gets a value and an image in the name "u-boot-pistachio_marduk-2015.10-g77f85c3.img" is being generated along with the image from first build.

There are 2 problems:

The first build itself should create image with the proper name that include the git commit hash

The subsequent builds should be made clean

Shpinkso · 2017-01-05T08:30:42Z

shouldn't this connect to #28?

nikhil-zinjurde-imgtec · 2017-01-05T09:44:18Z

Verified the u-boot version now shown as below:

U-Boot 2015.10-gb9ed160 (Jan 05 2017 - 09:30:29 +0000)
mips-img-linux-gnu-gcc (Codescape GNU Tools 2016.05-03 for MIPS IMG Linux) 4.9.2
GNU ld (Codescape GNU Tools 2016.05-03 for MIPS IMG Linux) 2.24.90

Also, checked the boot-up version

U-Boot SPL 2015.10-gb9ed160 (Jan 05 2017 - 09:30:29)

U-Boot 2015.10-gb9ed160 (Jan 05 2017 - 09:30:29 +0000), Build: jenkins-CreatorDev-u-boot-PR-29-1

Ham22

Needs the README file updated too

Ham22 · 2017-01-05T16:04:00Z

Jenkinsfile

            checkout scm
        }
        stage('Build') {
            sh 'make CROSS_COMPILE=/opt/toolchains/mips-img-linux-gnu/2016.05-03/bin/mips-img-linux-gnu- pistachio_marduk_defconfig'
            sh 'make CROSS_COMPILE=/opt/toolchains/mips-img-linux-gnu/2016.05-03/bin/mips-img-linux-gnu-'
        }
        stage('Upload') {
-            archiveArtifacts 'u-boot-pistachio-nor.img'
+            archiveArtifacts 'u-boot-pistachio*.img'
+            deleteDir() // clean up the workspace to save space


Not really needed for such a small build?

Ham22 · 2017-01-05T16:06:25Z

Jenkinsfile

@@ -3,14 +3,16 @@ node('docker && imgtec') {
    docker_image = docker.image "imgtec/creator-builder:latest" // TODO for now using the creator one
    docker_image.inside {
        stage('Prepare') {
+            deleteDir() // clean up the workspace to save space


This seems to be causing build issues. Perhaps just better to go with the clean checkout, instead of 'checkout scm' you can use a full custom one:

checkout([$class: 'GitSCM', userRemoteConfigs: scm.userRemoteConfigs, branches: scm.branches, doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations, submoduleCfg: scm.submoduleCfg, browser: scm.browser, gitTool: scm.gitTool, extensions: scm.extensions + [ [$class: 'CleanCheckout'], [$class: 'PruneStaleBranch'], ], ])

abhijit-mahajani-imgtec · 2017-01-06T07:25:02Z

README.md

@@ -11,7 +11,8 @@ For the MIPS official toolchain see
 	$ make CROSS_COMPILE=<toolchain-prefix> pistachio_marduk_defconfig
 	$ make CROSS_COMPILE=<toolchain-prefix>

-This will generate u-boot-pistachio-nor.img
+This will generate u-boot-pistachio_<board_name>-<version>.img
+eg. u-boot-pistachio_marduk-2015.10-v1.0.4.img


Also mention that both conditions. i.e. if there are extra commits above the tag then it will add githash.
e.g. u-boot-pistachio_marduk-2015.10-g75cbe38.img or
u-boot-pistachio_marduk-2015.10-v1.0.4-ga6d02dd.img

May be version command output would be useful to add.

nikhil-zinjurde-imgtec · 2017-01-06T09:41:35Z

README.md

+This will generate u-boot-pistachio_<board_name>-<version>.img
+eg. u-boot-pistachio_marduk-2015.10-v1.0.4.img OR
+u-boot-pistachio_<board_name>-<version>-<githash>.img, if there are extra commits above the tag.
+e.g. u-boot-pistachio_marduk-2015.10-v1.0.4-g75cbe38.img


This doesn't look good on the Readme home page. Please add proper indentation as follows

This will generate 'u-boot-pistachio_<board_name>-<tag_version>.img'

eg. u-boot-pistachio_marduk-2015.10-v1.0.4.img

OR 'u-boot-pistachio_<board_name>-<tag_version>-<git_hash>.img', if there are extra commits above the tag.

e.g. u-boot-pistachio_marduk-2015.10-v1.0.4-g75cbe38.img

abhijit-mahajani-imgtec · 2017-01-06T10:06:10Z

README.md

@@ -11,7 +11,13 @@ For the MIPS official toolchain see
 	$ make CROSS_COMPILE=<toolchain-prefix> pistachio_marduk_defconfig
 	$ make CROSS_COMPILE=<toolchain-prefix>

-This will generate u-boot-pistachio-nor.img
+This will generate 'u-boot-pistachio_<board_name>-<tag_version>.img'


This should be u-boot-pistachio_<board_name>-<tag-version>.img
it should be ` not, '

Signed-off-by: Avinash Tahakik <[email protected]>

abhijit-mahajani-imgtec

Verified, the filenameu-boot-pistachio_marduk-2015.10-v1.0.4-gbae8add.img once flashed, gives the version command output as

pistachio # version

U-Boot 2015.10-v1.0.4-gbae8add (Jan 06 2017 - 10:18:02 +0000)
mips-img-linux-gnu-gcc (Codescape GNU Tools 2016.05-03 for MIPS IMG Linux) 4.9.2
GNU ld (Codescape GNU Tools 2016.05-03 for MIPS IMG Linux) 2.24.90

and bootlog shows as
U-Boot SPL 2015.10-v1.0.4-gbae8add (Jan 06 2017 - 10:18:02)

U-Boot 2015.10-v1.0.4-gbae8add (Jan 06 2017 - 10:18:02 +0000), Build: jenkins-CreatorDev-u-boot-PR-29-15

Ham22

Looks to work for building and cleaning in all 3 cases I could thing of:

u-boot-pistachio_marduk-2015.10-v1.0.4-00146-gbae8add-dirty.img
u-boot-pistachio_marduk-2015.10-v1.0.4-00146-gbae8add.img
u-boot-pistachio_marduk-2015.10-v1.0.4.img

abhijit-mahajani-imgtec suggested changes Jan 5, 2017

View reviewed changes

Avinash95 force-pushed the image_version branch from 74aa336 to 77f85c3 Compare January 5, 2017 07:53

nikhil-zinjurde-imgtec closed this Jan 5, 2017

nikhil-zinjurde-imgtec reopened this Jan 5, 2017

Avinash95 force-pushed the image_version branch 2 times, most recently from 38fbf7c to b9ed160 Compare January 5, 2017 09:04

nikhil-zinjurde-imgtec closed this Jan 5, 2017

nikhil-zinjurde-imgtec reopened this Jan 5, 2017

nikhil-zinjurde-imgtec closed this Jan 5, 2017

nikhil-zinjurde-imgtec reopened this Jan 5, 2017

Avinash95 force-pushed the image_version branch 2 times, most recently from 18b7b62 to 5ab0d9e Compare January 5, 2017 10:51

Ham22 requested changes Jan 5, 2017

View reviewed changes

Avinash95 force-pushed the image_version branch 2 times, most recently from 948e698 to 75cbe38 Compare January 6, 2017 07:10

abhijit-mahajani-imgtec reviewed Jan 6, 2017

View reviewed changes

Avinash95 force-pushed the image_version branch from d102904 to b1b898f Compare January 6, 2017 09:32

nikhil-zinjurde-imgtec suggested changes Jan 6, 2017

View reviewed changes

Avinash95 force-pushed the image_version branch from 996b550 to 8820f9e Compare January 6, 2017 09:52

abhijit-mahajani-imgtec reviewed Jan 6, 2017

View reviewed changes

Avinash95 force-pushed the image_version branch 2 times, most recently from ff28c25 to bae8add Compare January 6, 2017 10:17

Avinash Tahakik and others added 2 commits January 6, 2017 15:47

Add version to uboot image name

3fb743e

Signed-off-by: Avinash Tahakik <[email protected]>

upload correct image to artifact server

bae8add

Signed-off-by: Avinash Tahakik <[email protected]>

abhijit-mahajani-imgtec approved these changes Jan 6, 2017

View reviewed changes

nikhil-zinjurde-imgtec approved these changes Jan 6, 2017

View reviewed changes

abhijit-mahajani-imgtec approved these changes Jan 6, 2017

View reviewed changes

Ham22 approved these changes Jan 6, 2017

View reviewed changes

Ham22 merged commit adaab9b into CreatorDev:2015.10 Jan 6, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add version to uboot image name #29

Add version to uboot image name #29

Uh oh!

Avinash95 commented Jan 4, 2017 •

edited

Loading

Uh oh!

abhijit-mahajani-imgtec left a comment •

edited

Loading

Uh oh!

abhijit-mahajani-imgtec Jan 5, 2017

Uh oh!

nikhil-zinjurde-imgtec Jan 5, 2017

Uh oh!

Shpinkso commented Jan 5, 2017

Uh oh!

nikhil-zinjurde-imgtec commented Jan 5, 2017 •

edited

Loading

Uh oh!

Ham22 left a comment

Uh oh!

Ham22 Jan 5, 2017

Uh oh!

Ham22 Jan 5, 2017

Uh oh!

abhijit-mahajani-imgtec Jan 6, 2017 •

edited

Loading

Uh oh!

nikhil-zinjurde-imgtec Jan 6, 2017 •

edited

Loading

Uh oh!

abhijit-mahajani-imgtec Jan 6, 2017

Uh oh!

abhijit-mahajani-imgtec left a comment •

edited

Loading

Uh oh!

Ham22 left a comment

Uh oh!

Uh oh!

Add version to uboot image name #29

Add version to uboot image name #29

Uh oh!

Conversation

Avinash95 commented Jan 4, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abhijit-mahajani-imgtec left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abhijit-mahajani-imgtec Jan 5, 2017

Choose a reason for hiding this comment

Uh oh!

nikhil-zinjurde-imgtec Jan 5, 2017

Choose a reason for hiding this comment

Uh oh!

Shpinkso commented Jan 5, 2017

Uh oh!

nikhil-zinjurde-imgtec commented Jan 5, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Ham22 left a comment

Choose a reason for hiding this comment

Uh oh!

Ham22 Jan 5, 2017

Choose a reason for hiding this comment

Uh oh!

Ham22 Jan 5, 2017

Choose a reason for hiding this comment

Uh oh!

abhijit-mahajani-imgtec Jan 6, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nikhil-zinjurde-imgtec Jan 6, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abhijit-mahajani-imgtec Jan 6, 2017

Choose a reason for hiding this comment

Uh oh!

abhijit-mahajani-imgtec left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ham22 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Avinash95 commented Jan 4, 2017 •

edited

Loading

abhijit-mahajani-imgtec left a comment •

edited

Loading

nikhil-zinjurde-imgtec commented Jan 5, 2017 •

edited

Loading

abhijit-mahajani-imgtec Jan 6, 2017 •

edited

Loading

nikhil-zinjurde-imgtec Jan 6, 2017 •

edited

Loading

abhijit-mahajani-imgtec left a comment •

edited

Loading