Author: waldi Date: Sat Aug 12 20:16:54 2006 New Revision: 7146 Added: dists/sid/linux-2.6/debian/templates/patch.apply.in - copied unchanged from r7145, /dists/sid/linux-2.6/debian/bin/apply.py dists/sid/linux-2.6/debian/templates/patch.unpatch.in - copied unchanged from r7074, /dists/sid/linux-2.6/debian/bin/unpatch Removed: dists/sid/linux-2.6/debian/bin/apply.py dists/sid/linux-2.6/debian/bin/unpatch Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py dists/sid/linux-2.6/debian/rules dists/sid/linux-2.6/debian/rules.real
Log: Remove on-the-fly generation of the apply and unpatch scripts. * debian/bin/gencontrol.py: Generate patch-apply and patch-unpatch. * debian/rules: Update maintainerclean. * debian/rules.real: Don't longer generate apply and unpatch scripts. Use the pregenerated versions. * debian/templates/patch.apply.in: Move from debian/bin/apply.py. * debian/templates/patch.unpatch.in: Move from debian/bin/unpatch. Modified: dists/sid/linux-2.6/debian/bin/gencontrol.py ============================================================================== --- dists/sid/linux-2.6/debian/bin/gencontrol.py (original) +++ dists/sid/linux-2.6/debian/bin/gencontrol.py Sat Aug 12 20:16:54 2006 @@ -13,7 +13,6 @@ def do_main_setup(self, vars, makeflags, extra): super(gencontrol, self).do_main_setup(vars, makeflags, extra) vars.update(self.config['image',]) - makeflags['REVISIONS'] = ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]) def do_main_packages(self, packages, extra): vars = self.vars @@ -172,6 +171,22 @@ makefile.append(("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds_setup)) makefile.append(("source-%s-%s-%s-real:" % (arch, subarch, flavour))) + def do_extra(self, packages, makefile): + apply = self.templates['patch.apply'] + unpatch = self.templates['patch.unpatch'] + + vars = { + 'home': '/usr/src/kernel-patches/all/%s' % self.version['source_upstream'], + 'revisions': ' '.join([i['Version']['debian'] for i in self.changelog[::-1]]), + } + vars.update(self.version) + + apply = self.substitute(apply, vars) + unpatch = self.substitute(unpatch, vars) + + file('debian/bin/patch-apply', 'w').write(apply) + file('debian/bin/patch-unpatch', 'w').write(unpatch) + def process_changelog(self): version = self.changelog[0]['Version'] self.process_version(version) Modified: dists/sid/linux-2.6/debian/rules ============================================================================== --- dists/sid/linux-2.6/debian/rules (original) +++ dists/sid/linux-2.6/debian/rules Sat Aug 12 20:16:54 2006 @@ -52,7 +52,7 @@ fi maintainerclean: - -rm debian/control debian/control.md5sum debian/rules.gen + -rm debian/control debian/control.md5sum debian/rules.gen debian/patch-* rm -rf $(filter-out debian .svn, $(wildcard * .[^.]*)) clean: debian/control Modified: dists/sid/linux-2.6/debian/rules.real ============================================================================== --- dists/sid/linux-2.6/debian/rules.real (original) +++ dists/sid/linux-2.6/debian/rules.real Sat Aug 12 20:16:54 2006 @@ -102,12 +102,12 @@ rm -rf '$(DIR)' define patch_cmd -cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/apply.py' --overwrite-home='$(CURDIR)/debian/patches' --overwrite-source='$(SOURCEVERSION)' --overwrite-revisions='$(REVISIONS)' +cd '$(DIR)'; python2.4 '$(CURDIR)/debian/bin/patch-apply' --overwrite-home='$(CURDIR)/debian/patches' endef srcfiles := $(filter-out debian, $(wildcard * .[^.]*)) $(STAMPS_DIR)/source: DIR=$(BUILD_DIR)/source -$(STAMPS_DIR)/source: debian/bin/apply.py +$(STAMPS_DIR)/source: rm -rf '$(DIR)' mkdir -p '$(DIR)' cp -al $(srcfiles) '$(DIR)' @@ -394,13 +394,8 @@ dh_clean -d -k $(DH_OPTIONS) dh_installdirs $(DH_OPTIONS) '$(pbase)/apply' '$(pbase)/debian' '$(pbase)/unpatch' dh_install $(DH_OPTIONS) debian/patches/* '$(pbase)/debian' - sed \ - -e 's,@home@,$(pbase)/debian,' \ - -e 's,@revisions@,$(REVISIONS),' \ - -e 's,@source@,$(SOURCEVERSION),' \ - debian/bin/apply.py > '$(pfull)/apply/debian' - sed -e 's/@upstream@/$(SOURCE_UPSTREAM)/g' debian/bin/unpatch > '$(pfull)/unpatch/debian' - chmod 755 '$(pfull)/apply/debian' '$(pfull)/unpatch/debian' + install debian/bin/patch-apply '$(pfull)/apply/debian' + install debian/bin/patch-unpatch '$(pfull)/unpatch/debian' chmod 644 '$(pfull)/debian/'*.patch bzip2 -9 '$(pfull)/debian/'*.patch $(MAKE) -f debian/rules.real install-base DH_OPTIONS='$(DH_OPTIONS)' _______________________________________________ Kernel-svn-changes mailing list Kernel-svn-changes@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes