summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xqemu-pkg.sh54
-rwxr-xr-xqemu.sh79
2 files changed, 76 insertions, 57 deletions
diff --git a/qemu-pkg.sh b/qemu-pkg.sh
new file mode 100755
index 0000000..5f36fa3
--- /dev/null
+++ b/qemu-pkg.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+set -e
+
+pkg_source=qemu-linaro
+pkg_repository=git://git.linaro.org/qemu/qemu-linaro.git
+
+packaging_dir=qemu/debian
+packaging_repository=git://git.linaro.org/ci/qemu.git
+packaging_commit=`cd qemu && git log -n1 --pretty=format:%h`
+
+scm_commit=`cd qemu-linaro && git log -n1 --pretty=format:%h`
+if [ -z "${scm_commit}" ]; then
+ echo "Invalid git revision: ${scm_commit}" >&2
+ exit 1
+fi
+
+base_version=1.3.0-2012.12
+pkg_version=${base_version}+git${BUILD_NUMBER}+`date +%Y%m%d`+${scm_commit}
+pkg_dir=${pkg_source}-${pkg_version}
+
+tar -jxf ${pkg_source}_${pkg_version}.orig.tar.bz2
+mkdir ${pkg_dir}/debian
+
+distributions=(quantal)
+currentdate=`date -R`
+for distribution in ${distributions[@]}; do
+ echo "Prepare ${pkg_version} for ${distribution}"
+
+cat > ${pkg_dir}/debian/changelog << EOF
+${pkg_source} (${pkg_version}-0linaro1) ${distribution}; urgency=low
+
+ * CI - ${pkg_source} snapshot:
+ - repository: ${pkg_repository}
+ - commit: ${scm_commit}
+ - build: ${BUILD_URL}
+
+ - debian/ repository: ${packaging_repository}
+ - debian/ commit: ${packaging_commit}
+
+ -- Linaro Packagers <linaro-pkg@lists.launchpad.net> ${currentdate}
+
+EOF
+
+ cat ${packaging_dir}/changelog >> ${pkg_dir}/debian/changelog
+ rm -f ${packaging_dir}/changelog
+ cp -a ${packaging_dir}/* ${pkg_dir}/debian/
+
+ cd ${pkg_dir}
+ dpkg-buildpackage -us -uc -rfakeroot -S
+ cd ..
+done
+
+rm -rf ${pkg_dir}
diff --git a/qemu.sh b/qemu.sh
index a7a82d0..ab2a176 100755
--- a/qemu.sh
+++ b/qemu.sh
@@ -1,71 +1,36 @@
#!/bin/bash
+# Script used by CI to build QEMU
+# Requirements: qemu build-dep and libpixman-1-dev packages
set -e
pkg_source=qemu-linaro
-base_version=1.3.0-2012.12
pkg_repository=git://git.linaro.org/qemu/qemu-linaro.git
-packaging_dir=qemu-packaging
-packaging_repository=git://git.linaro.org/people/rikuvoipio/qemu-packaging.git
-git clone ${pkg_repository}
+if [ -z "${WORKSPACE}" ]; then
+ # Local build
+ export WORKSPACE=`pwd`
+ export BUILD_NUMBER=1
+ # Get the sources
+ git clone ${pkg_repository}
+fi
-git_commit=`cd ${pkg_source} && git log -n1 --pretty=format:%h`
-if [ -z "${git_commit}" ]; then
- echo "Invalid git revision: ${git_commit}" >&2
+scm_commit=`cd ${pkg_source} && git log -n1 --pretty=format:%h`
+if [ -z "${scm_commit}" ]; then
+ echo "Invalid git revision: ${scm_commit}" >&2
exit 1
fi
-pkg_version=${base_version}+git${BUILD_NUMBER}+`date +%Y%m%d`+${git_commit}
+base_version=1.3.0-2012.12
+pkg_version=${base_version}+git${BUILD_NUMBER}+`date +%Y%m%d`+${scm_commit}
pkg_dir=${pkg_source}-${pkg_version}
-cp -a ${pkg_source}/ ${pkg_dir}
-tar --exclude-vcs -jcf ${pkg_source}_${pkg_version}.orig.tar.bz2 ${pkg_dir}
-
-distributions=(quantal)
-currentdate=`date -R`
-for distribution in ${distributions[@]}; do
- echo "Prepare ${pkg_version} for ${distribution}"
-
- git clone ${packaging_repository}
- packaging_commit=`cd ${packaging_dir} && git log -n1 --pretty=format:%h`
- mkdir ${pkg_dir}/debian/
-
-cat > ${pkg_dir}/debian/changelog << EOF
-${pkg_source} (${pkg_version}-0linaro1) ${distribution}; urgency=low
-
- * CI - ${pkg_source} snapshot:
- - repository: ${pkg_repository}
- - commit: ${git_commit}
- - build: ${BUILD_URL}
-
- - debian/ repository: ${packaging_repository}
- - debian/ commit: ${packaging_commit}
-
- -- Linaro Packagers <linaro-pkg@lists.launchpad.net> ${currentdate}
-
-EOF
-
- cat ${packaging_dir}/changelog >> ${pkg_dir}/debian/changelog
- rm ${packaging_dir}/changelog
- mv ${packaging_dir}/* ${pkg_dir}/debian/
-
- dpkg-source -b ${pkg_dir}
- cd ${pkg_dir}
- pkg_version_dpkg=`dpkg-parsechangelog | sed -n 's/^Version: //p'`
- dpkg-genchanges -S > ../${pkg_source}_${pkg_version_dpkg}_source.changes
- cd ..
-done
-
-rm -rf ${pkg_source} ${pkg_dir} ${packaging_dir}
-
-keyid=B86C70FE
-debsign -k${keyid} ${pkg_source}_${pkg_version_dpkg}_source.changes
-dput ppa-linaro-staging-overlay-${distribution} ${pkg_source}_${pkg_version_dpkg}_source.changes
+# Create source tarball
+cd qemu-linaro
+git archive --format=tar --prefix=${pkg_dir}/ master | bzip2 > ${pkg_source}_${pkg_version}.orig.tar.bz2
+mv ${pkg_source}_${pkg_version}.orig.tar.bz2 ${WORKSPACE}
+cd ${WORKSPACE}
-# debsign/gpg and dput are assumed configured on the build system
-#[ppa-linaro-staging-overlay-${distribution}]
-#fqdn = ppa.launchpad.net
-#method = ftp
-#incoming = ~linaro-maintainers/staging-overlay/ubuntu/${distribution}
-#login = anonymous
+[ ! -f config-host.mak ] || $(MAKE) distclean
+./configure
+make -j`getconf _NPROCESSORS_ONLN`