From 2b83afcb2f2cbad254a8d1f46b50170f78f6f13a Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 21 Jul 2013 22:28:59 +0000 Subject: [PATCH] linux-source: Switch compression of tarball and patch to xz svn path=/dists/sid/linux/; revision=20398 --- debian/changelog | 1 + debian/rules.real | 12 ++++++------ debian/templates/control.source.in | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 559c6cf62..d6ac98259 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ linux (3.10.1-2) UNRELEASED; urgency=low * rtlwifi: rtl8723ae: Fix typo in firmware names * [x86] Change INTEL_MEI_ME back to a module (Closes: #717383) * [armhf/armmp] Enable NET_CALXEDA_XGMAC as module (Closes: #717269) + * linux-source: Switch compression of tarball and patch to xz -- Arnaud Patard Tue, 16 Jul 2013 08:19:29 +0200 diff --git a/debian/rules.real b/debian/rules.real index 76150506e..42015c14a 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -76,22 +76,22 @@ mkdir -p '$(1)' cp -al $(filter-out debian .pc .svk .svn .git, $(wildcard * .[^.]*)) '$(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.xz: DIR = $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION) +$(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.xz: $(STAMPS_DIR)/source rm -rf '$@' '$(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)' + cd '$(BUILD_DIR)'; tar -caf 'linux-source-$(UPSTREAMVERSION).tar.xz' 'linux-source-$(UPSTREAMVERSION)' rm -rf '$(DIR)' -$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.bz2: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_% +$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-%.patch.xz: $(STAMPS_DIR)/source_none $(STAMPS_DIR)/source_% set -o pipefail; \ (cd '$(BUILD_DIR)'; \ set +e; \ diff -urN -p -x debian -x .pc -x .svk -x .svn -x .git source_none source_$*; \ test $$? -eq 1) | \ filterdiff --remove-timestamps --strip=1 --addoldprefix=a/ --addnewprefix=b/ | \ - bzip2 -c >$@ || \ + xz -c >$@ || \ (rm -f $@; exit 1) define patch_cmd @@ -496,7 +496,7 @@ install-udeb_$(ARCH): dh_builddeb install-source: DH_OPTIONS = -plinux-source-$(VERSION) -install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2 $(foreach FEATURESET,$(filter-out none,$(ALL_FEATURESETS)),$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-$(FEATURESET).patch.bz2) +install-source: $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.xz $(foreach FEATURESET,$(filter-out none,$(ALL_FEATURESETS)),$(BUILD_DIR)/linux-patch-$(UPSTREAMVERSION)-$(FEATURESET).patch.xz) dh_testdir dh_testroot dh_install '$^' /usr/src diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index ba123f081..60df3ac75 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Frederik Schüler , maximilian attems , Ben Hutchings Standards-Version: 3.9.4 Build-Depends: debhelper (>> 7), cpio, kmod | module-init-tools, python (>= 2.7), lzma [armel], kernel-wedge (>= 2.84), quilt, patchutils, bc -Build-Depends-Indep: bzip2, xmlto +Build-Depends-Indep: xz, xmlto Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux/ Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux/ Homepage: https://www.kernel.org/