Miscellany

kernelpackage.recipe: changed
Index: kernelpackage.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- kernelpackage.recipe /conary.rpath.com@rpl:devel/0.0.0-22
+++ kernelpackage.recipe /conary.rpath.com@rpl:devel//kernelbits.rpath.org@rpl:1/0.0.0-19.2
@@ -78,6 +78,9 @@
         )),
         ('x86', ('i686',), (
             {},
+        )),
+        ('x86', ('i686', 'cmov'), (
+            {},
             {'smp':True},
         )),
         ('x86', ('i686', 'use.xen', 'use.dom0'), (
@@ -127,13 +130,8 @@
             r.macros.serial = r.serial
         else:
             if 'sourceVersion' in r.__dict__:
-                if hasattr(r.sourceVersion, 'trailingRevision'):
-                    # if r.sourceVersion is a NewVersion object, it may
-                    # not have a trailingRevision object
-                    r.macros.serial = str(r.sourceVersion.trailingRevision(
-                        ).getSourceCount())
-                else:
-                    r.macros.serial = ''
+                r.macros.serial = str(r.sourceVersion.trailingRevision(
+                    ).getSourceCount())
             else:
                 raise KernelPackageError(
                     'no serial number set and source version is unavailable')
@@ -278,7 +276,7 @@
         os.path.walk(builddir, self.copyDepinfo,
                      (destdir, len(builddir), self.time.time(), arch,
                       re.compile(
-                        r'(Kconfig(|\.[^/]*)|\.config|\.h?depend|Rules\.make|Makefile(\..+)?'
+                        r'(Kconfig|\.config|\.h?depend|Rules\.make|Makefile(\..+)?'
                          '|asm-offsets\.s|\.tmp_versions|gcc-version\.sh)$')))
         util.copyfile('Module.symvers', destdir)

@@ -467,7 +465,7 @@
     def mergefile(self, config, filename, unamePrefix=False, unameArch=False):
         # searchAll because it is allowed to fail
         f = self.lookaside.searchAll(self.recipe.cfg, self.recipe.laReposCache,
-            filename, self.recipe.name, self.recipe.srcdirs, localOnly=True)
+            filename, self.recipe.name, self.recipe.srcdirs)
         if f:
             self.sourcemap[filename] = f