On Wed, 22 Apr 2015, David Lang wrote:
Ok, what appears to be working for me is to do the following
in git tree, do make dist
pbuilder-dist trusty create --mirror http://10.1.1.1
cd rsyslog-pkg-ubuntu/rsyslog
apply not_adiscon patch
cp cp /usr/src/raw/rsyslog/rsyslog-8.10.0.master.tar.gz .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
and the resulting packages are in /root/pbuilder/trusty_result/
now to go through and do this from scratch and make sure there aren't any
hidden dependencies :-) Also, test this on all packages, not just the rsyslog
one.
the not_adiscon patch does two things
1. it disables signing
2. it disables upload to launchpad (and deleting the files afterwords)
the signing should be disabled based on if KEY_ID is defined or not
uploading to launchpad should be conditional on running from an adiscon
system. If you are doing this from inside a git tree of rsyslog-pkg-ubuntu
then you can look at the git user e-mail and do the dput if the e-mail
address includes adiscon
Ok, I started from scratch (with all the needed packages installed) and followed
these steps to create the full set of packages, hopefully with all the
dependencies correct. I'll be testing these tomorrow so I don't guarantee that
this is bug-free
git clone https://github.com/rsyslog/rsyslog .
git clone https://github.com/rsyslog/rsyslog
git clone https://github.com/rsyslog/liblognorm
git clone https://github.com/rsyslog/rsyslog-doc
git clone https://github.com/rsyslog/liblogging
git clone https://github.com/rsyslog/librelp
git clone https://github.com/rsyslog/libestr
git clone https://github.com/rsyslog/rsyslog-pkg-ubuntu
pbuilder-dist trusty create --mirror http://10.1.50.100
find . -name .git |sed s/.git// |while read file; do echo "$file" ; cd $file;
autoreconf -fvi; ./configure; make dist; cd - ; done
cd rsyslog-pkg-ubuntu/
patch -p1 <../not_adiscon.patch
cd ../libestr/
cp ../../libestr/*master* .
../scripts/auto_daily_project.sh
vi config.sh
../scripts/auto_daily_project.sh trusty v8-stable master
../scripts/auto_daily_project.sh trusty v8-stable master
../scripts/build.sh
dpkg -i /root/pbuilder/trusty_result/libestr-dev_0.1.11.20150422220612-0adiscon1trusty_amd64.deb /root/pbuilder/trusty_result/libestr0_0.1.11.20150422220612-0adiscon1trusty_amd64.deb
cd ../liblogging
cp ../../liblogging/*master* .
../scripts/auto_daily_project.sh trusty v8-stable master
../scripts/build.sh
dpkg -i /root/pbuilder/trusty_result/liblogging-stdlog-dev_1.0.6.20150422221121-0adiscon1trusty_amd64.deb /root/pbuilder/trusty_result/liblogging-stdlog1_1.0.6.20150422221121-0adiscon1trusty_amd64.deb
cd ../liblognorm
cp ../../liblognorm/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
dpkg -i /root/pbuilder/trusty_result/liblognorm1-dev_1.1.2.20150422221409-0adiscon1trusty_amd64.deb /root/pbuilder/trusty_result/liblognorm1_1.1.2.20150422221409-0adiscon1trusty_amd64.deb
cd ../librelp/
cp ../../librelp/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
dpkg -i /root/pbuilder/trusty_result/librelp-dev_1.2.8.20150422223116-0adiscon1trusty_amd64.deb /root/pbuilder/trusty_result/librelp0_1.2.8.20150422223116-0adiscon1trusty_amd64.deb
cd ../rsyslog/
cp ../../rsyslog/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
resulting packages are all in /root/pbuilder/trusty_result/*.deb
There is old stuff left in the various directories, so I'm going to look at
automating this and doing some cleanup after the build is done.
Tomorrow I'll go through this again (so that the timestamps are different) and
see what breakd ;-)
Suggestions from those who are more experienced with debian/ubuntu builds are
very welcome.
David Lang
diff --git a/scripts/auto_daily_project.sh b/scripts/auto_daily_project.sh
index 1e77fb8..006ae31 100755
--- a/scripts/auto_daily_project.sh
+++ b/scripts/auto_daily_project.sh
@@ -62,7 +62,8 @@ echo " -- Adiscon package maintainers <[email protected]> `da
# Build Source package now!
ls *.tar.gz
-debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID"
+#debuild -S -sa -rfakeroot -k"$PACKAGE_SIGNING_KEY_ID"
+debuild -S -us -uc -sa -rfakeroot
if [ $? -ne 0 ]; then
echo "fail in debuild" | mutt -s "$PROJECT daily build failed!" [email protected]
exit 1
@@ -72,14 +73,14 @@ fi
# files are generated in the home directory.
cd ..
-# Upload changes to PPA now!
-dput -f ppa:adiscon/$UPLOAD_PPA `ls *.changes`
-if [ $? -ne 0 ]; then
- echo "fail in dput" | mutt -s "$PROJECT daily build failed!" [email protected]
- exit 1
-fi
+## Upload changes to PPA now!
+#dput -f ppa:adiscon/$UPLOAD_PPA `ls *.changes`
+#if [ $? -ne 0 ]; then
+# echo "fail in dput" | mutt -s "$PROJECT daily build failed!" [email protected]
+# exit 1
+#fi
#cleanup
echo $VERSION >$VERSION_FILE
#exit # do this for testing
rm -rf $LAUNCHPAD_VERSION
-rm -v $szReplaceFile*.dsc $szReplaceFile*.build $szReplaceFile*.changes $szReplaceFile*.upload *.tar.gz
+#rm -v $szReplaceFile*.dsc $szReplaceFile*.build $szReplaceFile*.changes $szReplaceFile*.upload *.tar.gz
diff --git a/scripts/build.sh b/scripts/build.sh
index b2630df..5715232 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -50,8 +50,8 @@ do
#echo "$szDscFile $szDscFileBase";
#exit;
- #pbuilder-dist precise create
+ #pbuilder-dist $szPlatform create
APPENDSUFFIX="_$szArchitect.changes"
pbuilder-dist $szPlatform $szArchitect build $szDscFile
- dput $szBranch ../pbuilder/$szPlatform$szAddArch\_result/$szDscFileBase$APPENDSUFFIX
+ #dput $szBranch ../pbuilder/$szPlatform$szAddArch\_result/$szDscFileBase$APPENDSUFFIX
done;
git clone https://github.com/rsyslog/rsyslog .
git clone https://github.com/rsyslog/rsyslog
git clone https://github.com/rsyslog/liblognorm
git clone https://github.com/rsyslog/rsyslog-doc
git clone https://github.com/rsyslog/liblogging
git clone https://github.com/rsyslog/librelp
git clone https://github.com/rsyslog/libestr
git clone https://github.com/rsyslog/rsyslog-pkg-ubuntu
pbuilder-dist trusty create --mirror http://10.1.50.100
find . -name .git |sed s/.git// |while read file; do echo "$file" ; cd $file;
autoreconf -fvi; ./configure; make dist; cd - ; done
cd rsyslog-pkg-ubuntu/
patch -p1 <../not_adiscon.patch
cd ../libestr/
cp ../../libestr/*master* .
../scripts/auto_daily_project.sh
vi config.sh
../scripts/auto_daily_project.sh trusty v8-stable master
../scripts/auto_daily_project.sh trusty v8-stable master
../scripts/build.sh
dpkg -i
/root/pbuilder/trusty_result/libestr-dev_0.1.11.20150422220612-0adiscon1trusty_amd64.deb
/root/pbuilder/trusty_result/libestr0_0.1.11.20150422220612-0adiscon1trusty_amd64.deb
cd ../liblogging
cp ../../liblogging/*master* .
../scripts/auto_daily_project.sh trusty v8-stable master
../scripts/build.sh
dpkg -i
/root/pbuilder/trusty_result/liblogging-stdlog-dev_1.0.6.20150422221121-0adiscon1trusty_amd64.deb
/root/pbuilder/trusty_result/liblogging-stdlog1_1.0.6.20150422221121-0adiscon1trusty_amd64.deb
cd ../liblognorm
cp ../../liblognorm/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
dpkg -i
/root/pbuilder/trusty_result/liblognorm1-dev_1.1.2.20150422221409-0adiscon1trusty_amd64.deb
/root/pbuilder/trusty_result/liblognorm1_1.1.2.20150422221409-0adiscon1trusty_amd64.deb
cd ../librelp/
cp ../../librelp/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
dpkg -i
/root/pbuilder/trusty_result/librelp-dev_1.2.8.20150422223116-0adiscon1trusty_amd64.deb
/root/pbuilder/trusty_result/librelp0_1.2.8.20150422223116-0adiscon1trusty_amd64.deb
cd ../rsyslog/
cp ../../rsyslog/*master* .
../scripts/auto_daily_project.sh trusty v8-devel master
../scripts/build.sh
_______________________________________________
rsyslog mailing list
http://lists.adiscon.net/mailman/listinfo/rsyslog
http://www.rsyslog.com/professional-services/
What's up with rsyslog? Follow https://twitter.com/rgerhards
NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of
sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE
THAT.
