From mboxrd@z Thu Jan 1 00:00:00 1970 From: ng0 Subject: Re: Seeking advice: preparing releases on GuixSD. Date: Sat, 24 Dec 2016 16:34:55 +0000 Message-ID: <874m1tp9ow.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> References: <874m1uvkdz.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> <874m1ty6rd.fsf@elephly.net> <87a8blpeqs.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> <871swxxrzc.fsf@elephly.net> <877f6ppapf.fsf@wasp.i-did-not-set--mail-host-address--so-tickle-me> <87vau9nvnf.fsf@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59792) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cKpI0-0004Xr-1X for help-guix@gnu.org; Sat, 24 Dec 2016 11:35:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cKpHw-00033N-Rq for help-guix@gnu.org; Sat, 24 Dec 2016 11:35:20 -0500 Received: from aibo.runbox.com ([91.220.196.211]:36997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cKpHw-00032p-GK for help-guix@gnu.org; Sat, 24 Dec 2016 11:35:16 -0500 In-Reply-To: <87vau9nvnf.fsf@elephly.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org Sender: "Help-Guix" To: Ricardo Wurmus Cc: help-guix@gnu.org Ricardo Wurmus writes: > ng0 writes: > >> Ricardo Wurmus writes: >> >>> ng0 writes: >>> >>>> Ricardo Wurmus writes: >>>> >>>>> What I get is a tarball named “gnurl--.tar.gz” (because “configure.ac” >>>>> specifies the version as a dash). Unpacking it I see exactly *one* >>>>> reference to something in /gnu/store and that’s in “ltmain.sh”. >>>> >>>> Hm.. that's what I had too before I asked here, I just felt there >>>> must be 0 occurences of /gnu/store. >>> >>> You wrote earlier: >>> >>>> 3. Simply remove all occurences of any /gnu/store/… (if it's >>>> that simple) which could also happen in (2). >>> >>> That made it sound like there are countless references that need to be >>> corrected somehow. >> >> Well in 7.52.0 there are more than 1 reference to /gnu/store, and >> in 7.52.1 there were more than in 7.52.0 simply because I did not >> have the time to investigate what's wrong now. > > If you did what I did on GuixSD (exact sequence in my previous email) I > don’t see how there could have been any more references to store items. More or less, the tl;dr of updates right now is: old=7_50_1 new=7_50_2 git checkout upstream/master; git pull; git checkout -b gnurl-$new curl-$new # tag of desired version git cherry-pick `git log gnurl-$old | head -n 1 | cut -c8-` git mergetool # or whatever needs to be used to fix the broken ones git cherry-pick --continue # run the guix-gnurl.scm to test. ./buildconf ./configure --enable-ipv6 --with-gnutls --without-libssh2 --without-libmetalink \ --without-winidn --without-librtmp --without-nghttp2 --without-nss --without-cyassl \ --without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi \ --disable-ntlm-wb --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp \ --disable-pop3 --disable-imap --disable-smtp --disable-gopher \ --disable-file --disable-ftp --disable-smb make make clean git push -f origin gnurl-$new:master git diff HEAD^ HEAD >..&gnurl-$new.diff cp -a . ../gnurl-$new cd .. rm -rf gnurl-$new/.git tar cjf gnurl-$new.tar.bz2 gnurl-$new rm -rf gnurl-$new gpg --detach-sig gnurl-$new.tar.bz2 # login to gnunet.org and upload them Where some parts of this manual procedure have been changed now. I'll try a simple `make dist` next time. I will compare my nroff or whatever it was called package with yours and see if there's anything left to add, if you think it should go into guix, it's good for me. >>> “ltmain.sh” is instantiated from a template by libtool. It originally >>> contains a /bin/sh shebang, and I think it should not be patched when >>> installed to >> >> So I can assume that just changing the shebang in ltmain.sh back >> to /bin/sh is enough to make it distributable again, or is >> ltmain.sh something distributions have anyway and the local file >> is "just there"? > > ltmain.sh is included by “make dist”, so it’s supposed to be > distributed. One of the big ideas of autotools is that users don’t have > to have autotools to build a release tarball. > > -- > Ricardo > > GPG: BCA6 89B6 3655 3801 C3C6 2150 197A 5888 235F ACAC > http://elephly.net > > So the changed shebang in the ltmain.sh is a bug on my side or in the autotools in Guix? I'm not looking at the sources right now, but I think I could simply add a line (for make dist) which changes the shebang back to /bin/sh before assembling the tarball. After all it's just a shebang. -- ♥Ⓐ ng0 PGP keys and more: https://n0is.noblogs.org/ http://ng0.chaosnet.org