diff options
| author | Philip Hands <phil@hands.com> | 2017-02-25 18:05:47 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-03-06 10:53:38 +0100 |
| commit | e9c517887651dfdc1dd58c714c689c7a34f30a12 (patch) | |
| tree | 12f99f40e9fc68454addc818dbe5946c59dd15db /bin/d-i_build.sh | |
| parent | d514acdf5ea192f79ebdbad2baf3f32f94411584 (diff) | |
| download | jenkins.debian.net-e9c517887651dfdc1dd58c714c689c7a34f30a12.tar.xz | |
d-i: use make to build repo. for udebs
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/d-i_build.sh')
| -rwxr-xr-x | bin/d-i_build.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/d-i_build.sh b/bin/d-i_build.sh index 19059c5e..3d0ac570 100755 --- a/bin/d-i_build.sh +++ b/bin/d-i_build.sh @@ -58,6 +58,7 @@ preserve_artifacts() { if [ "$JOB_NAME" != "d-i_pu-triggered_debian-installer" ] ; then mkdir -p $udeb_dir cp ${RESULT_DIR}/*.udeb $udeb_dir + make -f /srv/jenkins/bin/repo.mak -C $udeb_dir Release fi # this is put into env.txt below, so that the variable(s) can be injected into the jenkins environment ENV_TO_INJECT="OUR_BRANCH=$GIT_BRANCH" @@ -136,7 +137,7 @@ pdebuild_package() { # then grab the generated udebs. FIXME -- we need to work out a way of cleaning up old branches # if udeb_dir=$(replace_origin_pu "/srv/udebs/" $TRIGGERING_BRANCH) ; then - cp $udeb_dir/* build/localudebs + cp $udeb_dir/*.udeb build/localudebs fi pdebuild --use-pdebuild-internal --debbuildopts "-j$NUM_CPU -b" --buildresult ${RESULT_DIR} -- --http-proxy $http_proxy # cleanup |