On Mon, 2012-06-04 at 16:54 +0100, Ben Hutchings wrote: > On Mon, 2012-06-04 at 12:00 +0200, Bastian Blank wrote: > > On Mon, Jun 04, 2012 at 04:58:42AM +0100, Ben Hutchings wrote: > > > Index: debian/bin/genorig.py > > > =================================================================== > > > --- debian/bin/genorig.py (revision 19075) > > > +++ debian/bin/genorig.py (working copy) > > > > This is independant from the 3.0 switch. > > No, since only 3.0 allows non-gzip compression. Of course it can be > done as a second step. > > > > - cmdline = ['tar -czf', out, '-C', self.dir, self.orig] > > > + cmdline = ['tar -cJf', out, '-C', self.dir, self.orig] > > > > -a does autodetection. > > > > > Index: debian/rules.real > > > =================================================================== > > > --- debian/rules.real (revision 19077) > > > +++ debian/rules.real (working copy) > > > @@ -60,37 +60,31 @@ > > > $(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(KCONFIG) > > > python debian/bin/kconfig.py '$@' $(KCONFIG) $(KCONFIG_OPTIONS) > > > > > > -$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source > > > +define copy_source > > > +rsync --delete --exclude debian --exclude .pc --exclude .svk --exclude .svn --link-dest=. -a . '$(1)' > > > +endef > > > > Why rsync? > > Same reason we use it in the 'orig' rule: rsync can exclude; cp can't. But we could use the same filter as in the (removed) source target for this. > > > orig: $(DIR_ORIG) > > > + rm -rf .pc > > > > Redundant. > > That's what I thought, but rsync refuses to delete non-empty > directories. The problem is that .pc has a subdirectory called debian, which is excluded. Changing '--exclude debian' to '--exclude /debian' fixes this. I'll send another patch shortly. Ben. -- Ben Hutchings It is impossible to make anything foolproof because fools are so ingenious.
Attachment:
signature.asc
Description: This is a digitally signed message part