On Mon, Jun 04, 2012 at 04:58:42AM +0100, Ben Hutchings wrote: > Here's what that change looks like: > > -$(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 > + > $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: DIR = > $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION) > -$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: $(STAMPS_DIR)/source > +$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: > rm -rf '$@' '$(DIR)' > - cp -al '$(SOURCE_DIR)' '$(DIR)' > + $(call copy_source,$(DIR)) > chmod -R u+rw,go=rX '$(DIR)' > cd '$(BUILD_DIR)'; tar -cjf 'linux-source-$(UPSTREAMVERSION).tar.bz2' > 'linux-source-$(UPSTREAMVERSION)' > rm -rf '$(DIR)'
This uses still bzip2? > ifeq ($(TAR_ORIG),) > $(error Cannot find orig tarball $(TAR_ORIG_NAME)) > else > mkdir -p ../orig > - tar -C ../orig -xzf $(TAR_ORIG) > + tar -C ../orig -xJf $(TAR_ORIG) When extracting, you don't need to pass compression option to tar anymore (so it can be removed). > =================================================================== > --- debian/templates/control.source.in (revision 19077) > +++ debian/templates/control.source.in (working copy) > @@ -3,7 +3,7 @@ > Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org> > Uploaders: Bastian Blank <wa...@debian.org>, Frederik Schüler > <f...@debian.org>, maximilian attems <m...@debian.org>, Ben Hutchings > <b...@decadent.org.uk> > Standards-Version: 3.9.2 > -Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= > 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83), quilt > +Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= > 2.6.6-3~), lzma [armel], kernel-wedge (>= 2.83), quilt, rsync > Build-Depends-Indep: bzip2, xmlto Shouldn't lzma build-depend be now set on all architectures? -- To UNSUBSCRIBE, email to debian-kernel-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120604091950.GA30694@tiikeri.vuoristo.local
