move build to debball again

1 files changed, 10 insertions, 33 deletions

diff --git a/jenkins/xen-base b/jenkins/xen-base
index 6c92d77..afa148a 100644
--- a/jenkins/xen-base
+++ b/jenkins/xen-base
@@ -5,53 +5,30 @@ do_build() {
 rm -rf xen
 cp -a xen-dist xen
 cd xen
-schroot -c utopic-amd64-sbuild --begin-session --session-name xen || schroot --recover-session -c xen
 
-schroot --run-session -c xen -u root -- dpkg --add-architecture ${arch}
-schroot --run-session -c xen -u root -- apt-get update
-schroot --run-session -c xen -u root -- apt-get -y install crossbuild-essential-${arch}
-schroot --run-session -c xen -u root -- apt-get -y install libc6-dev:${arch} libncurses-dev:${arch} uuid-dev:${arch} libglib2.0-dev:${arch} libssl-dev:${arch} libssl1.0.0:${arch} libaio-dev:${arch} libyajl-dev:${arch} python gettext gcc git libpython2.7-dev:${arch} libfdt-dev:${arch} libpixman-1-dev:${arch} wget fakeroot
-# crude form of http://lists.xen.org/archives/html/xen-devel/2013-04/msg01127.html
-schroot --run-session -c xen -u root -- sed -i -e '/PSR/d' /usr/aarch64-linux-gnu/include/asm/ptrace.h||true
+apt-get update
+apt-get -y install build-essential libncurses-dev uuid-dev libglib2.0-dev libssl-dev libssl1.0.0 libaio-dev libyajl-dev python gettext gcc git libpython2.7-dev libfdt-dev libpixman-1-dev wget fakeroot
 
-schroot --run-session -c xen -- env CONFIG_SITE=/etc/dpkg-cross/cross-config.${arch} ./configure --build=x86_64-linux-gnu --host=${triplet} --prefix=/usr
-schroot --run-session -c xen -- make -j5 debball dist-xen CROSS_COMPILE=${triplet}- XEN_TARGET_ARCH=${xenarch}
+./configure --prefix=/usr
+make -j5 debball dist-xen i
 
 schroot --end-session -c xen
 
+arch=`dpkg-architecture -qDEB_HOST_ARCH`
 cp -L dist/install/boot/xen ${WORKSPACE}/upload/xen-${arch}
-# Avoid -rc${foo} in the debian package name
-mv dist/xen*.deb ${WORKSPACE}/upload/xen-${arch}.deb
-cd ..
+if [ $arch == arm64 ]
+then
+    mkimage -A arm -C none -T kernel -a 0x0200000 -e 0x00200000 -n Xen -d upload/xen-arm64 upload/uXen-arm64
+fi
 
 }
 
 set -e
 
-rm -rf xen xen-dist
+rm -rf xen xen-dist upload
 git clone -b staging git://xenbits.xen.org/xen.git xen-dist
-
-if ! dpkg -s utopic-crosschroot
-then
-    wget -nc http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/u/utopic-crosschroot/utopic-crosschroot_0.7.4-2_all.deb
-    sudo dpkg -i utopic-crosschroot_0.7.4-2_all.deb
-fi
-
-rm -rf upload
 mkdir upload 
 
-#armhf build
-arch=armhf
-triplet=arm-linux-gnueabihf
-xenarch=arm32
-
-do_build
-
-#arm64 build
-arch=arm64
-triplet=aarch64-linux-gnu
-xenarch=arm64
-
 do_build
 
 mkimage -A arm -C none -T kernel -a 0x0200000 -e 0x00200000 -n Xen -d upload/xen-arm64 upload/uXen-arm64