[kernel] r10937 - in dists/trunk/linux-2.6/debian: . templates

[Bastian Blank]

Author: waldi
Date: Sat Mar 22 12:51:45 2008
New Revision: 10937

Log:
* debian/rules.real: Adopt command line interface changes.
* debian/templates/patch.apply.in
  - Remove flavour.
  - Rename subarch to featureset.


Modified:
   dists/trunk/linux-2.6/debian/rules.real
   dists/trunk/linux-2.6/debian/templates/patch.apply.in

Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real	(original)
+++ dists/trunk/linux-2.6/debian/rules.real	Sat Mar 22 12:51:45 2008
@@ -94,7 +94,7 @@
 $(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)

Modified: dists/trunk/linux-2.6/debian/templates/patch.apply.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/patch.apply.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/patch.apply.in	Sat Mar 22 12:51:45 2008
@@ -195,7 +195,7 @@
     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 @@
         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 @@
 
     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