Bug#706138: BDIR not respected
Hi Robert,
On Thu, Apr 25, 2013 at 12:43:03PM +0200, Robert Spencer wrote:
>Package: debian-cd
>Version: 3.1.12
>
>I've noticed that BDIR is not respected. For example if I change it
>in the Makefile (I prefer $CODENAME-$ARCH), the build fails when it
>gets to tools/start_new_disc as that script has it's own hard coded
>value for BDIR instead of using the one exported by Makefile.
Hmmm, OK. BDIR is only ever expected to be a temporary directory
within TDIR (as you'll see from the code below). I'd be happier just
to remove mention of it and let scripts do their own thing, to be
honest.
>To make things even more interesting the use of the build directory
>cd variable is inconsistent across the some of the scripts that set
>it.
>
>Makefile:78:BDIR=$(TDIR)/$(CODENAME)
>tools/add-bin-doc:6:BDIR=$TDIR/$CODENAME
>tools/create_control:28:BDIR=$TDIR/$CODENAME-$ARCH
>tools/make_disc_trees.pl:85:my $bdir = "$tdir/$codename";
>tools/make_disc_trees.pl:866: open(AP_LOG, ">>
>$tdir/$codename/add_packages.log")
>tools/sort_deps:34:my $dir = "$ENV{'TDIR'}/$ENV{'CODENAME'}";
>tools/sort_deps_edu:36:my $dir = "$ENV{'TDIR'}/$ENV{'CODENAME'}";
>tools/start_new_disc:20:BDIR=$TDIR/$CODENAME
Well, they're consistent *except* for create_control, which is only
ever used by update-cd (as you noted below). That's a special case.
>As a side issue, what was SDIR ever used for? I can't find it
>referenced anywhere.
>
>tools/add-bin-doc:7:SDIR=$TDIR/$CODENAME
It's a leftover from old days, back when we used to build source CDs
in the same run as binary CDs
>Removed it.
>
>I haven't changed tools/create_control as update-cd seems to be the
>only script that uses it and update-cd does not set BDIR.
I'm not going to take the patch right now, I'll look at this again
after we release Wheezy this weekend. I'm just about to upload the
last version of debian-cd ready to go into the release.
--
Steve McIntyre, Cambridge, UK. steve@einval.com
"This dress doesn't reverse." -- Alden Spiess
Reply to: