diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2017-04-07 16:54:48 +0300 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2017-04-07 13:59:49 +0000 |
| commit | ae65062f69681bae2764ac6c2d446fa39c0dc9c8 (patch) | |
| tree | 531bf513da9b7a1aa2a2820c23f1df78c77fbe57 /kselftest | |
| parent | b8f7eb17ad9c679b317a24d083199d4dfa5cdf95 (diff) | |
kselftest: refactor the build script
* set ARCH based on dpkg-architecture output
* use only git describe to have a unique id
* re-use environment variables where appropriate
* add build information (in textile and json format)
Change-Id: Ibf9e7d8e7a540bb5aee94060bd793ba14afa876a
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'kselftest')
| -rwxr-xr-x | kselftest/builders.sh | 45 |
1 files changed, 39 insertions, 6 deletions
diff --git a/kselftest/builders.sh b/kselftest/builders.sh index 6ea4d2b680..c226a42f04 100755 --- a/kselftest/builders.sh +++ b/kselftest/builders.sh @@ -8,7 +8,19 @@ fi pkg_list="git libcap-dev libcap-ng-dev libfuse-dev libmount-dev libpopt-dev pkg-config pxz rsync" deb_host_arch=$(dpkg-architecture -qDEB_HOST_ARCH) -[ "${deb_host_arch}" != "armhf" ] && pkg_list+=" libnuma-dev" +case "${deb_host_arch}" in + amd64) + export ARCH=x86_64 + pkg_list+=" libnuma-dev" + ;; + arm64) + export ARCH=arm64 + pkg_list+=" libnuma-dev" + ;; + armhf) + export ARCH=arm + ;; +esac if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then echo "INFO: apt install error - try again in a moment" @@ -23,13 +35,34 @@ WORKSPACE=${WORKSPACE:-"${PWD}"} set -x git clone -b ${KSELFTEST_BRANCH} ${KSELFTEST_URL} ${WORKSPACE} -echo "#${BUILD_NUMBER}-$(git rev-parse --short=8 HEAD)" > version.txt +git_describe=$(git describe) +echo "#${BUILD_NUMBER}-${git_describe}" > version.txt -make headers_install +make ARCH=${ARCH} headers_install export INSTALL_PATH=kselftest -make -C tools/testing/selftests -make -C tools/testing/selftests install +make ARCH=${ARCH} -C tools/testing/selftests +make ARCH=${ARCH} -C tools/testing/selftests install mkdir -p tools/testing/selftests/out cd tools/testing/selftests -tar -I pxz -cf out/kselftest_${deb_host_arch}_$(git describe).tar.xz kselftest +tar -I pxz -cf out/kselftest_${ARCH}_${git_describe}.tar.xz kselftest + +# Build information +cat > out/HEADER.textile << EOF + +h4. kselftest + +Build description: +* Build URL: "${BUILD_URL}":${BUILD_URL} +* Kernel URL: ${KSELFTEST_URL} +* Kernel branch: ${KSELFTEST_BRANCH} +* Kernel commit: ${git_describe} +EOF + +cat > out/build_config.json <<EOF +{ + "kernel_repo" : "${KSELFTEST_URL}", + "kernel_branch" : "${KSELFTEST_BRANCH}", + "kernel_commit_id" : "${git_describe}" +} +EOF |