diff options
| author | Daniel Díaz <daniel.diaz@linaro.org> | 2019-05-29 23:12:47 -0500 |
|---|---|---|
| committer | Daniel Díaz <daniel.diaz@linaro.org> | 2019-06-11 17:18:34 +0000 |
| commit | ff4147ff60bfb294396e6de2086d70a97ddeb51b (patch) | |
| tree | be111754e5f24bc793506cc48586d9cdaa1fe808 /openembedded-lkft | |
| parent | d7e89f53eb16e37df3697495e0c8982304cc1293 (diff) | |
openembedded-lkft: developer: Try to merge SRCREV_kernel/KERNEL_SRCREV
This needs thorough testing.
Change-Id: I33c19e76d5bcfff7f5bfce80f4a88a6e70eb64ca
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'openembedded-lkft')
| -rwxr-xr-x | openembedded-lkft/builders-generic.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openembedded-lkft/builders-generic.sh b/openembedded-lkft/builders-generic.sh index 34b867ae..37e99a8f 100755 --- a/openembedded-lkft/builders-generic.sh +++ b/openembedded-lkft/builders-generic.sh @@ -74,7 +74,7 @@ rm -rf conf build/conf build/tmp-*glibc/ # Accept EULA if/when needed export EULA_dragonboard410c=1 -export SRCREV_kernel=${KERNEL_SRCREV} +[ -v KERNEL_SRCREV ] && export SRCREV_kernel="${KERNEL_SRCREV}" source setup-environment build ########## vvv DISTRO DEPENDANT vvv ########## @@ -340,7 +340,7 @@ esac cat > ${DEPLOY_DIR_IMAGE}/build_config.json <<EOF { "kernel_repo" : "${KERNEL_REPO}", - "kernel_commit_id" : "${KERNEL_COMMIT}", + "kernel_commit_id" : "${SRCREV_kernel}", "make_kernelversion" : "${MAKE_KERNELVERSION}", "kernel_branch" : "${KERNEL_BRANCH}", "kernel_describe" : "${KERNEL_DESCRIBE}", @@ -373,7 +373,7 @@ RECOVERY_IMAGE_URL=${BASE_URL}/${PUB_DEST}/juno-oe-uboot.zip NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG} EXT4_IMAGE_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_EXT4} HDD_URL=${BASE_URL}/${PUB_DEST}/${HDD_IMG} -KERNEL_COMMIT=${KERNEL_COMMIT} +KERNEL_COMMIT=${SRCREV_kernel} KERNEL_CONFIG_URL=${BASE_URL}/${PUB_DEST}/config KERNEL_DEFCONFIG_URL=${BASE_URL}/${PUB_DEST}/defconfig KSELFTESTS_MAINLINE_URL=${KSELFTESTS_MAINLINE_URL} |