debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* debian/rules.real: Adopt command line interface changes. 

* debian/templates/patch.apply.in
  - Remove flavour.
  - Rename subarch to featureset.

svn path=/dists/trunk/linux-2.6/; revision=10937
This commit is contained in:
Bastian Blank 2008-03-22 12:51:45 +00:00
parent 88f80f09eb
commit 35a380f39d
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/rules.real vendored
View File

@ -94,7 +94,7 @@ $(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): DIR=$(BUILD_DIR)/source_$(ARCH)_$(FE
$(STAMPS_DIR)/source_$(ARCH)_$(FEATURESET): $(STAMPS_DIR)/source
rm -rf '$(DIR)'
cp -al '$(SOURCE_DIR)' '$(DIR)'
$(patch_cmd) -a $(ARCH) -s $(FEATURESET)
$(patch_cmd) -a $(ARCH) -f $(FEATURESET)
touch '$@'
setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_all: CONFIG=$(BUILD_DIR)/config.$(ARCH)_$(FEATURESET)_$(FLAVOUR)

19
debian/templates/patch.apply.in vendored
View File

@ -195,7 +195,7 @@ def main():
current = vfile.version
current_extra = vfile.extra
target_extra = MatchExtra(options.arch, options.subarch)
target_extra = MatchExtra(options.arch, options.featureset)
if current.revision not in revisions:
raise RuntimeError, "Current revision is not in our list of revisions"
@ -250,14 +250,9 @@ def parse_options():
help = "arch",
)
parser.add_option(
'-f', '--flavour',
dest = 'flavour',
help = "flavour",
)
parser.add_option(
'-s', '--subarch',
dest = 'subarch',
help = "subarch",
'-f', '--featureset',
dest = 'featureset',
help = "featureset",
)
parser.add_option(
'-C', '--overwrite-current',
@ -282,10 +277,8 @@ def parse_options():
options, args = parser.parse_args()
if options.arch is None and options.subarch is not None:
raise RuntimeError('You specified a subarch without an arch, this is not really working')
if options.subarch is None and options.flavour is not None:
raise RuntimeError('You specified a flavour without a subarch, this is not really working')
if options.arch is None and options.featureset is not None:
raise RuntimeError('You specified a featureset without an arch, this is not really working')
return options, args