[kernel] r9143 - in people/waldi/linux-2.6/debian: . arch bin config lib/python/debian_linux

Bastian Blank waldi at alioth.debian.org
Sun Jul 15 13:50:24 UTC 2007 

Author: waldi
Date: Sun Jul 15 13:50:24 2007
New Revision: 9143

Log:
* debian/config: Move from debian/arch.
* debian/bin/abicheck.py, debian/bin/abiupdate.py, debian/bin/kconfig.py,
  debian/lib/python/debian_linux/gencontrol.py, debian/rules,
  debian/rules.real: Use debian/config instead of debian/arch.


Added:
   people/waldi/linux-2.6/debian/config/
      - copied from r9141, /people/waldi/linux-2.6/debian/arch/
Removed:
   people/waldi/linux-2.6/debian/arch/
Modified:
   people/waldi/linux-2.6/debian/bin/abicheck.py
   people/waldi/linux-2.6/debian/bin/abiupdate.py
   people/waldi/linux-2.6/debian/bin/kconfig.py
   people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
   people/waldi/linux-2.6/debian/rules
   people/waldi/linux-2.6/debian/rules.real

Modified: people/waldi/linux-2.6/debian/bin/abicheck.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/abicheck.py	(original)
+++ people/waldi/linux-2.6/debian/bin/abicheck.py	Sun Jul 15 13:50:24 2007
@@ -6,13 +6,13 @@
 
 class checker(object):
     def __init__(self, dir, arch, subarch, flavour):
-        self.config = ConfigReaderCore(["debian/arch"])
+        self.config = ConfigReaderCore(["debian/config"])
         self.filename_new = "%s/Module.symvers" % dir
         abiname = self.config['abi',]['abiname']
         if subarch == 'none':
-            self.filename_ref = "debian/arch/%s/abi-%s.%s" % (arch, abiname, flavour)
+            self.filename_ref = "debian/config/%s/abi-%s.%s" % (arch, abiname, flavour)
         else:
-            self.filename_ref = "debian/arch/%s/%s/abi-%s.%s" % (arch, subarch, abiname, flavour)
+            self.filename_ref = "debian/config/%s/%s/abi-%s.%s" % (arch, subarch, abiname, flavour)
 
     def __call__(self, out):
         ret = 0

Modified: people/waldi/linux-2.6/debian/bin/abiupdate.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/abiupdate.py	(original)
+++ people/waldi/linux-2.6/debian/bin/abiupdate.py	Sun Jul 15 13:50:24 2007
@@ -47,7 +47,7 @@
         self.version = changelog.version.linux_version
         self.version_source = changelog.version.complete
 
-        local_config = config_reader_arch(["debian/arch"])
+        local_config = config_reader_arch(["debian/config"])
 
         self.abiname = local_config['abi',]['abiname']
         self.version_abi = self.version + '-' + self.abiname
@@ -107,7 +107,7 @@
         return filename_out
 
     def save_abi(self, symbols, arch, subarch, flavour):
-        out = "debian/arch/%s" % arch
+        out = "debian/config/%s" % arch
         if subarch != 'none':
             out += "/%s" % subarch
         out += "/abi-%s.%s" % (self.abiname, flavour)

Modified: people/waldi/linux-2.6/debian/bin/kconfig.py
==============================================================================
--- people/waldi/linux-2.6/debian/bin/kconfig.py	(original)
+++ people/waldi/linux-2.6/debian/bin/kconfig.py	Sun Jul 15 13:50:24 2007
@@ -4,7 +4,7 @@
 from debian_linux.kconfig import *
 
 def merge(output, *config):
-    config = [os.path.join('debian/arch', c) for c in config]
+    config = [os.path.join('debian/config', c) for c in config]
 
     kconfig = KconfigFile()
     for c in config:

Modified: people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py
==============================================================================
--- people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	(original)
+++ people/waldi/linux-2.6/debian/lib/python/debian_linux/gencontrol.py	Sun Jul 15 13:50:24 2007
@@ -25,7 +25,7 @@
     makefile_targets = ('binary-arch', 'build', 'setup', 'source')
 
     def __init__(self, underlay = None):
-        self.config = ConfigReaderCore([underlay, "debian/arch"])
+        self.config = ConfigReaderCore([underlay, "debian/config"])
         self.templates = Templates()
 
     def __call__(self):

Modified: people/waldi/linux-2.6/debian/rules
==============================================================================
--- people/waldi/linux-2.6/debian/rules	(original)
+++ people/waldi/linux-2.6/debian/rules	Sun Jul 15 13:50:24 2007
@@ -68,7 +68,7 @@
 binary:	binary-indep binary-arch
 
 CONTROL_FILES = debian/changelog $(wildcard debian/templates/*.in)
-CONTROL_FILES += debian/arch/defines $(wildcard debian/arch/*/defines) $(wildcard debian/arch/*/*/defines)
+CONTROL_FILES += debian/config/defines $(wildcard debian/config/*/defines) $(wildcard debian/config/*/*/defines)
 debian/control debian/rules.gen: debian/bin/gencontrol.py $(CONTROL_FILES)
 	if [ -f debian/control.md5sum ]; then \
 		if [ "$(VERSION_DEBIAN_BINNMU)" ]; then \

Modified: people/waldi/linux-2.6/debian/rules.real
==============================================================================
--- people/waldi/linux-2.6/debian/rules.real	(original)
+++ people/waldi/linux-2.6/debian/rules.real	Sun Jul 15 13:50:24 2007
@@ -15,17 +15,6 @@
 export DH_OPTIONS
 export DEB_HOST_ARCH DEB_HOST_GNU_TYPE DEB_BUILD_ARCH
 
-#
-# Build the list of common config files to be included
-#
-ifeq ($(SUBARCH),none)
-  basedir := debian/arch/$(ARCH)
-else
-  basedir := debian/arch/$(ARCH)/$(SUBARCH)
-endif
-
--include $(basedir)/Makefile.inc
-
 include debian/rules.defs
 
 #
@@ -79,7 +68,7 @@
 source-arch: $(STAMPS_DIR)/source
 source-subarch: $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
 
-$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(foreach t,$(KCONFIG),debian/arch/$(t))
+$(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(foreach t,$(KCONFIG),debian/config/$(t))
 	python2.4 debian/bin/kconfig.py '$@' $(KCONFIG)
 
 $(BUILD_DIR)/linux-source-$(UPSTREAMVERSION).tar.bz2: SOURCE_DIR=$(BUILD_DIR)/source
@@ -365,7 +354,7 @@
 	dh_testroot
 	dh_clean -k -d
 	chmod a+x debian/modules/gencontrol.py
-	dh_install debian/arch debian/lib debian/modules /usr/src/$(PACKAGE_NAME)
+	dh_install debian/config debian/lib debian/modules /usr/src/$(PACKAGE_NAME)
 	dh_python -V 2.4 /usr/src/$(PACKAGE_NAME)/lib/python
 	echo -e "[version]\nsource: $(SOURCEVERSION)\nabiname: $(ABINAME)" > $(PACKAGE_DIR)/usr/src/$(PACKAGE_NAME)/version
 	$(MAKE) -f debian/rules.real install-base

More information about the Kernel-svn-changes mailing list