summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Laughlin <clark.laughlin@linaro.org>2014-05-17 21:35:13 -0500
committerClark Laughlin <clark.laughlin@linaro.org>2014-05-17 21:35:13 -0500
commit3904002bc3a6bb1b3bfc562720a83eb6e4625486 (patch)
tree63a32afba3a88e631f45fc407c833fc8aca80f28
parent51a9332a7e420df4ca02556c76bb47f1e1233c89 (diff)
fix for building on CI servers
-rwxr-xr-xbuild-from-upstream.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/build-from-upstream.sh b/build-from-upstream.sh
index 37be6cd..fbae708 100755
--- a/build-from-upstream.sh
+++ b/build-from-upstream.sh
@@ -78,6 +78,9 @@ sed -i 's/quilt/native/' ${code_git_checkout_dir}/debian/source/format
# update control file to add required build dependencies
sed -i 's/Build-Depends:/Build-Depends:\n automake,\n w3c-dtd-xhtml,\n xsltproc,\n libxml2-utils,/' ${code_git_checkout_dir}/debian/control
+# update rules file to add configure step
+sed -i 's/override_dh_auto_configure:/override_dh_auto_configure:\n NOCONFIGURE=yes GNULIB_SRCDIR=.gnulib ./autogen.sh --no-git/' ${code_git_checkout_dir}/debian/rules
+
# update changelog
currentdate=`date -R`
cat > ${code_git_checkout_dir}/debian/changelog << EOF
@@ -97,10 +100,10 @@ EOF
cat ${debian_git_checkout_dir}/debian/changelog >> ${code_git_checkout_dir}/debian/changelog
# prepare the source for building on this machine
-cd ${code_git_checkout_dir}
- ./autogen.sh
- make distclean
-cd ${WORKSPACE}
+#cd ${code_git_checkout_dir}
+# ./autogen.sh
+# make distclean
+#cd ${WORKSPACE}
# build it!
sbuild --chroot=${chroot_name} --no-source --dist=${build_dist} ${code_git_checkout_dir}