On Mon, 2012-06-04 at 12:19 +0300, Touko Korpela wrote: > 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? This tarball gets installed. Changing the compression will be visible to users, whereas changing the compression of packages themselves is pretty much transparent. > > 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). True. > > =================================================================== > > --- 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 <waldi@debian.org>, Frederik Schüler <fs@debian.org>, maximilian attems <maks@debian.org>, Ben Hutchings <ben@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? Yes, thanks. 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