On Tue, Dec 19, 2000 at 10:56:58PM +0100, J.A. Bezemer wrote:
On Tue, 19 Dec 2000, Steve McIntyre wrote:
I think I've found a bug in the debian-cd Makefile in the "sources"
target. If NONUS is set but there are no non-US packages on the CD
we're currently working on, the following error comes out:
invalid top directory at /usr/lib/perl5/5.6/File/Find.pm line 279.
You're building CDs on a woody box? In that case the problem might
also be perl itself (IIRC there were problems with the new perl that
caused all sorts of problems).
It's not a perl bug. The following diff makes things work again. I'm
about to commit it into CVS.
===
RCS file: /cvs/debian-boot/debian-cd/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile2000/11/30 16:43:18 1.29
+++ Makefile2000/12/19 23:05:49
@@ -440,19 +440,30 @@
n=$${dir##$(SDIR)/}; \
dir=$(SDIR)/CD$$n; \
echo -n "$$n ... "; \
- grep -vE "(non-US/|/local/)" $$i | xargs $(addfiles) \
-$$dir $(MIRROR); \
+ echo -n "main ... "; \
+ grep -vE "(non-US/|/local/)" $$i $(SDIR)/$$.main || true ; \
+ if [ -s $(SDIR)/$$.main ] ; then \
+ cat $(SDIR)/$$.main | xargs $(addfiles) $$dir $(MIRROR); \
+ fi ; \
if [ -n "$(LOCAL)" ]; then \
- if [ -n "$(LOCALDEBS)" ]; then \
- grep "/local/" $$i | xargs $(addfiles) \
- $$dir $(LOCALDEBS); \
- else \
- grep "/local/" $$i | xargs $(addfiles) \
- $$dir $(MIRROR); \
+ echo -n "local ... "; \
+ grep "/local/" $$i $(SDIR)/$$.localn || true ; \
+ if [ -s $(SDIR)/$$.local ] ; then \
+ if [ -n "$(LOCALDEBS)" ] ; then \
+ cat $(SDIR)/$$.local | xargs $(addfiles) \
+ $$dir $(LOCALDEBS); \
+ else \
+ cat $(SDIR)/$$.local | xargs $(addfiles) \
+ $$dir $(MIRROR); \
+ fi; \
fi; \
fi; \
if [ -n "$(NONUS)" ]; then \
- grep "non-US/" $$i | xargs $(addfiles) $$dir $(NONUS); \
+ echo -n "non-US ... "; \
+ grep "non-US/" $$i $(SDIR)/$$.nonusn || true ; \
+ if [ -s $(SDIR)/$$.nonus ] ; then \
+ cat $(SDIR)/$$.nonus | xargs $(addfiles) $$dir
+$(NONUS); \
+ fi; \
fi; \
$(scansources) $$dir; \
echo "done."; \
--
Steve McIntyre, Cambridge, UK. [EMAIL PROTECTED]
"It's actually quite entertaining to watch ag129 prop his foot up on
the desk so he can get a better aim." [ seen in ucam.chat ]
Finger for PGP key
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
