On Wed, 22 Apr 2015, David Lang wrote:
On Wed, 22 Apr 2015, Rainer Gerhards wrote:
Sent from phone, thus brief.
Am 22.04.2015 21:16 schrieb "David Lang" <[email protected]>:
On Wed, 22 Apr 2015, Rainer Gerhards wrote:
2015-04-21 19:50 GMT+02:00 David Lang <[email protected]>:
Mhhh, this should have been handled properly. Can you send me a full
log of the run, including executed comments (set -o xtrace). I would
need to set up a brand-new VM, and again I'd really like to look at
liblognorm instead...
Ok, this is looking pretty good. It now builds and now complains about
the signatures. I did the attached modification to my system to avoid it
trying to sign things and upload them to launchpad (and not delete the
resulting file)
The actual package build happens on launchpad. So without a ppa, this all
doesn't make much sense.
that clarifies things quite a bit. I'm continuing to work on this.
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
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;
_______________________________________________
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.
