You should delete your local master branch and re-create it from the server. I had to overwrite the master add I couldn't force got to just overwrite the v1 version (and you can't merge from v1 to v2 due to the compatibility tricks I did).
Sent from phone, thus brief. Am 29.08.2015 15:22 schrieb "David Lang" <[email protected]>: > I got past this point, but the current git of rsyslog generates a lot of > warnings, some of which are treated as errors, causing teh build to fail > > David Lang > > On Wed, 26 Aug 2015, David Lang wrote: > > Date: Wed, 26 Aug 2015 23:35:56 -0700 (PDT) >> From: David Lang <[email protected]> >> Reply-To: rsyslog-users <[email protected]> >> To: rsyslog-users <[email protected]> >> Subject: Re: [rsyslog] liblognorm git master now v2 >> >> I got stuck for the day because rsyslog needs liblognorm >1.1.2 in it's >> build environment, but since it's built seprately from liblognorm (in a >> different temporary sandbox) and the upstream repos have 1.1.1 in them it's >> not able to build. >> >> I hope I don't have to build a special repo just for the one library, but >> I ran out of time to try and figure out how to include a specific extra >> .deb in a pbuilder environment. >> >> David Lang >> >> >> On Wed, 26 Aug 2015, David Lang wrote: >> >> Date: Wed, 26 Aug 2015 14:29:16 -0700 (PDT) >>> From: David Lang <[email protected]> >>> Reply-To: rsyslog-users <[email protected]> >>> To: rsyslog-users <[email protected]> >>> Subject: Re: [rsyslog] liblognorm git master now v2 >>> >>> I build it with a slightly modified (I've sent patches) >>> rsyslog-pkg-ubuntu >>> and the script: >>> >>> >>> cat update.rsyslog >>> #!/bin/bash >>> export LANG=C >>> echo "Subject: nightly fetch of git repos" >>> echo >>> find . -name .git |sed s/.git// |while read file >>> do >>> echo "$file" >>> cd $file >>> /usr/bin/git fetch >>> /usr/bin/git pull >>> /usr/bin/git fetch --tags >>> # /usr/bin/git gc -q --aggressive >>> autoreconf -fi >>> ./configure -q >>> rm *master* >>> make dist --quiet >>> cd - >>> done >>> echo "finished making source packages" >>> cd rsyslog-pkg-ubuntu >>> rm */LAST_VERSION.* >>> for i in libestr liblogging liblognorm librelp rsyslog >>> do >>> cd $i >>> rm ${i}_* >>> cp ../../$i/*master* . >>> ../scripts/auto_daily_project.sh trusty v8-devel master >>> ( >>> echo '1' >>> echo '1' >>> echo '1' >>> echo '1' >>> ) |../scripts/build.sh >>> echo "finished making $i" >>> cd - >>> done >>> >>> >>> On Wed, 26 Aug 2015, Rainer Gerhards wrote: >>> >>> Date: Wed, 26 Aug 2015 16:49:08 +0200 >>>> From: Rainer Gerhards <[email protected]> >>>> Reply-To: rsyslog-users <[email protected]> >>>> To: rsyslog-users <[email protected]> >>>> Subject: Re: [rsyslog] liblognorm git master now v2 >>>> >>>> Did you have the new liblognorm in rsyslog's build environment? >>>> >>>> Sent from phone, thus brief. >>>> Am 26.08.2015 16:34 schrieb "David Lang" <[email protected]>: >>>> >>>> Ok, I'll test that today. >>>>> >>>>> It didn't seem to be working before (liblognorm.so.3 was created, but >>>>> rsyslog was looking for liblognorm.so.2 specifically). >>>>> >>>>> I'll run a new set of builds when I get into the office and check what >>>>> they do. >>>>> >>>>> David Lang >>>>> >>>>> On Wed, 26 Aug 2015, Rainer Gerhards wrote: >>>>> >>>>> It depends.. If you update the rsyslog package from the daily builds, >>>>> that >>>>> >>>>>> should not be necessary. I do not specifically request a soname. The >>>>>> linker >>>>>> records it during linking. So it f the new liblognorm is installed >>>>>> during >>>>>> build, the new one if used without tricks. This is now during package >>>>>> build >>>>>> (if all works out as intended, it's the first time for the new >>>>>> system...). >>>>>> >>>>>> Rainer >>>>>> >>>>>> Sent from phone, thus brief. >>>>>> Am 26.08.2015 16:05 schrieb "David Lang" <[email protected]>: >>>>>> >>>>>> Ok, so I will still have to maintain the symlink to .so.2 when testing >>>>>> >>>>>>> this. >>>>>>> >>>>>>> David Lang >>>>>>> >>>>>>> On Wed, 26 Aug 2015, Rainer Gerhards wrote: >>>>>>> >>>>>>> That happens when the new packages are build. >>>>>>> >>>>>>> >>>>>>>> Sent from phone, thus brief. >>>>>>>> Am 26.08.2015 15:18 schrieb "David Lang" <[email protected]>: >>>>>>>> >>>>>>>> On Wed, 26 Aug 2015, Rainer Gerhards wrote: >>>>>>>> >>>>>>>> >>>>>>>>> Hi all, >>>>>>>>> >>>>>>>>> >>>>>>>>> in support of upcoming changes and enhancements, git master branch >>>>>>>>>> now >>>>>>>>>> contains liblognorm v2 code. >>>>>>>>>> >>>>>>>>>> Details: >>>>>>>>>> http://blog.gerhards.net/2015/08/moving-towards-liblognorm-v2.html >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Is rsyslog updated to use the new .so version? >>>>>>>>>> >>>>>>>>> >>>>>>>>> David Lang >>>>>>>>> _______________________________________________ >>>>>>>>> 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. >>>>>>>>> >>>>>>>>> _______________________________________________ >>>>>>>>> >>>>>>>>> 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. >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> >>>>>>>> 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. >>>>>>> >>>>>>> _______________________________________________ >>>>>>> >>>>>> 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. >>>>>> >>>>>> _______________________________________________ >>>>>> >>>>> 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. >>>>> >>>>> _______________________________________________ >>>> 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. >>>> >>>> _______________________________________________ >>> 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. >>> >>> _______________________________________________ >> 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. >> >> _______________________________________________ > 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. > _______________________________________________ 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.
