aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiku Voipio <riku.voipio@linaro.org>2018-04-24 22:04:07 +0300
committerRiku Voipio <riku.voipio@linaro.org>2018-04-24 22:04:07 +0300
commit7db4c3f5ad8c330b7b30b245081e2908cc9d2523 (patch)
tree1d72b0715728785b822127aa5452ae74b60399ee
parent821548d7c28d7f0224e6b540689367047263bf73 (diff)
rpb-kernel-enterprise-rpm: Updates
- correct xz output path - set xz to use max threads - move to stretch and arm64 - Use new repo as default Change-Id: I84035efa89e0b87a36dc71c96b4fd8a8e990cba6
-rw-r--r--rpb-kernel-enterprise-rpm.yaml9
1 files changed, 5 insertions, 4 deletions
diff --git a/rpb-kernel-enterprise-rpm.yaml b/rpb-kernel-enterprise-rpm.yaml
index c576959a4a..317911c01b 100644
--- a/rpb-kernel-enterprise-rpm.yaml
+++ b/rpb-kernel-enterprise-rpm.yaml
@@ -25,9 +25,9 @@
default: 'https://github.com/Linaro/rpk.git'
- string:
name: TARGET_REPO
- default: 'ERP-RPM:17.08:staging'
+ default: 'ERP-RPM:staging'
disabled: false
- node: docker-jessie-rp
+ node: docker-stretch-arm64
display-name: 'Reference Platform - Linux Kernel (EE) for RPM'
scm:
- git:
@@ -59,7 +59,7 @@
set -ex
sudo DEBIAN_FRONTEND=noninteractive apt-get update -qq
- sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -q osc rpm-common xz-utils
+ sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -q osc rpm-common
cat > $HOME/.oscrc <<EOF
[general]
@@ -82,7 +82,8 @@
kernel_rpm_pkg_version=$(echo ${kernel_version} | sed -e 's/\.0-rc/~rc/')
kernel_git=$(git rev-parse --short=7 HEAD)
pname=linux-${kernel_rpm_pkg_version}-${kernel_git}
- git archive --prefix=${pname}/ --format=tar ${kernel_git} | xz -c > ~/${WORKSPACE}/${TARGET_REPO}/kernel-aarch64/${pname}.tar.xz
+ export XZ_DEFAULTS="--threads 0"
+ git archive --prefix=${pname}/ --format=tar ${kernel_git} | xz -c > ${WORKSPACE}/${TARGET_REPO}/kernel-aarch64/${pname}.tar.xz
# Update OBS checkout
cd ${WORKSPACE}/${TARGET_REPO}/kernel-aarch64