Re: Typo in tasks/debian-installer
On Wed, Jun 30, 2004 at 01:05:00AM +0200, Petter Reinholdtsen wrote:
> While building using the current CVS version of debian-cd, I noticed a
> warning when generating the tasks. Notice the 'garbage' line:
>
> Building Dependency Tree...
> /bin/echo -e "mawk\nexim4-daemon-light\nunifont" >>/tmp/debian-cd/woody-i386/rawlist
> In file included from :15:
> /home/debian-cd/tasks/debian-installer:329: warning: garbage at end of `#ifdef' argument
How convenient. I have a tested patch for this one already that I was
meaning to send back:
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/debian-cd/Makefile,v
retrieving revision 1.92
diff -p -u -r1.92 Makefile
--- Makefile 9 Jun 2004 18:54:34 -0000 1.92
+++ Makefile 29 Jun 2004 23:52:53 -0000
@@ -354,7 +354,7 @@ ifdef FORCENONUSONCD1
| tr ' ' '\n' >>$(BDIR)/rawlist; \
fi
$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
- cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
+ cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
-U $(ARCH) -U i386 -U linux -U unix \
-DFORCENONUSONCD1=$(forcenonusoncd1) \
-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist
@@ -367,7 +367,7 @@ endif
$(BDIR)/rawlist-exclude:
$(Q)if [ -n "$(EXCLUDE)" ]; then \
perl -npe 's/\@ARCH\@/$(ARCH)/g' $(EXCLUDE) | \
- cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \
+ cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(subst -,_,$(ARCH)) \
-U $(ARCH) -U i386 -U linux -U unix \
-DFORCENONUSONCD1=$(forcenonusoncd1) \
-I $(BASEDIR)/tasks -I $(BDIR) - - >> $(BDIR)/rawlist-exclude; \
Index: tools/generate_di_list
===================================================================
RCS file: /cvs/debian-boot/debian-cd/tools/generate_di_list,v
retrieving revision 1.6
diff -p -u -r1.6 generate_di_list
--- tools/generate_di_list 10 Mar 2004 22:03:03 -0000 1.6
+++ tools/generate_di_list 29 Jun 2004 23:52:53 -0000
@@ -20,7 +20,8 @@ EOF
my @common_excludes = read_exclude("exclude-udebs");
foreach my $arch (@ARCHES) {
- print OUT "#ifdef ARCH_$arch\n";
+ (my $cpparch = $arch) =~ s/-/_/g;
+ print OUT "#ifdef ARCH_$cpparch\n";
my @exclude = @common_excludes;
push @exclude, read_exclude("exclude-udebs-$arch")
if -e exclude_path("exclude-udebs-$arch");
@@ -33,7 +34,7 @@ UDEB: foreach my $udeb (map { chomp; $_
}
print OUT "$udeb\n";
}
- print OUT "#endif /* ARCH_$arch */\n";
+ print OUT "#endif /* ARCH_$cpparch */\n";
}
sub read_exclude {
--
Colin Watson [cjwatson@flatline.org.uk]
Reply to: