[Pkg-loop-aes-commits] r1478 - in /trunk/loop-aes: ./ debian/bin/gencontrol.py debian/rules debian/rules.real

[xam at users.alioth.debian.org]

Author: xam
Date: Sat Dec  8 20:10:27 2007
New Revision: 1478

URL: http://svn.debian.org/wsvn/pkg-loop-aes/?sc=1&rev=1478
Log:
More changes for linux-support-2.6.23-1 ..

Modified:
    trunk/loop-aes/   (props changed)
    trunk/loop-aes/debian/bin/gencontrol.py
    trunk/loop-aes/debian/rules
    trunk/loop-aes/debian/rules.real

Propchange: trunk/loop-aes/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Sat Dec  8 20:10:27 2007
@@ -1,4 +1,4 @@
-02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes:11729
+02a4734a-7125-4a10-a2dd-ccf7f6155d04:/local/pkg-loop-aes/trunk/loop-aes:11731
 21abe0f1-f0ee-4de9-8a33-02d62b012b6b:/local/pkg-loop-aes/trunk/loop-aes:9932
 21abe0f1-f0ee-4de9-8a33-02d62b012b6b:/local/temp:9926
 53348a03-e5de-0310-b097-96e6f85ea926:/loop-aes/trunk:1255

Modified: trunk/loop-aes/debian/bin/gencontrol.py
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/bin/gencontrol.py?rev=1478&op=diff
==============================================================================
--- trunk/loop-aes/debian/bin/gencontrol.py (original)
+++ trunk/loop-aes/debian/bin/gencontrol.py Sat Dec  8 20:10:27 2007
@@ -35,11 +35,11 @@
 		    for arch in self.config['base',]['arches']],
         )
 
-    def do_flavour_packages(self, packages, makefile, arch, subarch, flavour, vars, makeflags, extra):
-        config_entry = self.config.merge('base', arch, subarch, flavour)
+    def do_flavour_packages(self, packages, makefile, arch, featureset, flavour, vars, makeflags, extra):
+        config_entry = self.config.merge('base', arch, featureset, flavour)
         if config_entry.get('modules', True) is False:
             for i in self.makefile_targets:
-                makefile.add("%s-%s-%s-%s-real:" % (i, arch, subarch, flavour))
+                makefile.add("%s_%s_%s_%s_real" % (i, arch, featureset, flavour))
             return
 
         modules = self.templates["control.modules"]
@@ -61,9 +61,9 @@
         cmd_build = "$(MAKE) -f debian/rules.real build %s" % makeflags_string
         cmd_setup = "$(MAKE) -f debian/rules.real setup-flavour %s" % makeflags_string
 
-        makefile.add("binary-arch-%s-%s-%s-real:" % (arch, subarch, flavour), cmds = [cmd_binary_arch])
-        makefile.add("build-%s-%s-%s-real:" % (arch, subarch, flavour), cmds = [cmd_build])
-        makefile.add("setup-%s-%s-%s-real:" % (arch, subarch, flavour), cmds = [cmd_setup])
+        makefile.add("binary-arch_%s_%s_%s_real" % (arch, featureset, flavour), cmds = [cmd_binary_arch])
+        makefile.add("build_%s_%s_%s_real" % (arch, featureset, flavour), cmds = [cmd_build])
+        makefile.add("setup_%s_%s_%s_real" % (arch, featureset, flavour), cmds = [cmd_setup])
 
     def process_config_version(self):
         entry = self.config['version',]

Modified: trunk/loop-aes/debian/rules
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/rules?rev=1478&op=diff
==============================================================================
--- trunk/loop-aes/debian/rules (original)
+++ trunk/loop-aes/debian/rules Sat Dec  8 20:10:27 2007
@@ -1,13 +1,13 @@
 #!/usr/bin/make -f
 
-KERNELVERSION := 2.6.22-3
+KERNELVERSION := 2.6.23-1
 
 include /usr/src/linux-support-$(KERNELVERSION)/modules/rules.include
 
 setup: debian/control $(STAMPS_DIR)/setup-base
 $(STAMPS_DIR)/setup-base: $(BUILD_DIR) $(STAMPS_DIR)
 	dh_testdir
-	$(MAKE) -f debian/rules.gen setup-$(DEB_HOST_ARCH)
+	$(MAKE) -f debian/rules.gen setup_$(DEB_HOST_ARCH)
 	touch $@
 
 $(BUILD_STAMP): $(STAMPS_DIR)/setup-base

Modified: trunk/loop-aes/debian/rules.real
URL: http://svn.debian.org/wsvn/pkg-loop-aes/trunk/loop-aes/debian/rules.real?rev=1478&op=diff
==============================================================================
--- trunk/loop-aes/debian/rules.real (original)
+++ trunk/loop-aes/debian/rules.real Sat Dec  8 20:10:27 2007
@@ -8,8 +8,8 @@
 
 LOOP_AES_OPTIONS := KEYSCRUB=y PADLOCK=y EXTRA_CIPHERS=y
 
-BUILD_STAMP = $(STAMPS_DIR)/build_$(ARCH)_$(SUBARCH)_$(FLAVOUR)
-SETUP_STAMP = $(STAMPS_DIR)/setup_$(ARCH)_$(SUBARCH)_$(FLAVOUR)
+BUILD_STAMP = $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
+SETUP_STAMP = $(STAMPS_DIR)/setup_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
 build-module-source-pkg: PACKAGE = loop-aes-source
 build-module-source-pkg: PACKAGE_DIR = debian/$(PACKAGE)
@@ -56,7 +56,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-$(SETUP_STAMP) $(BUILD_STAMP) install: DIR=$(BUILD_DIR)/build_$(ARCH)_$(SUBARCH)_$(FLAVOUR)
+$(SETUP_STAMP) $(BUILD_STAMP) install: DIR=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
 
 setup-flavour: $(SETUP_STAMP)
 $(SETUP_STAMP):