[elbe-devel] [PATCH] add support for sid

[John Ogness]

The following items needed fixing so that Debian/sid could be used:
 - grub_version based on !jessie when it is really wheezy special case
 - pbuilder had "jessie" hard-coded
 - reprepro must handle sid's "surprise" dbgsym packages

Signed-off-by: John Ogness <john.ogness at linutronix.de>
---
 elbepack/elbeproject.py | 6 +++---
 elbepack/pbuilder.py    | 5 +++--
 elbepack/repomanager.py | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index e6616e1..4b8d4d7 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -296,10 +296,10 @@ class ElbeProject (object):
         #
         # We might also want support for legacy grub
         if self.get_rpcaptcache().is_installed( 'grub-pc' ):
-            if self.codename == "jessie":
-                grub_version = 202
-            else:
+            if self.codename == "wheezy":
                 grub_version = 199
+            else:
+                grub_version = 202
         elif self.get_rpcaptcache().is_installed( 'grub-legacy' ):
             self.log.printo( "package grub-legacy is installed, this is obsolete, skipping grub" )
             grub_version = 0
diff --git a/elbepack/pbuilder.py b/elbepack/pbuilder.py
index 47c9b53..77e7cfc 100644
--- a/elbepack/pbuilder.py
+++ b/elbepack/pbuilder.py
@@ -9,16 +9,17 @@ def pbuilder_ensure_chroot (builddir):
 
 
 def pbuilder_write_config (builddir, xml, log):
+    distname = xml.prj.text ('suite')
     pbuilderrc_fname = os.path.join (builddir, "pbuilderrc")
     fp = open (pbuilderrc_fname, "w")
 
     fp.write ('#!/bin/sh\n')
     fp.write ('set -e\n')
     fp.write ('MIRRORSITE="%s"\n' % xml.get_primary_mirror(False))
-    fp.write ('OTHERMIRROR="deb http://127.0.0.1:8080%s/repo jessie main"\n' % builddir)
+    fp.write ('OTHERMIRROR="deb http://127.0.0.1:8080%s/repo %s main"\n' % (builddir, distname))
     fp.write ('BASETGZ="%s"\n' % os.path.join (builddir, 'pbuilder', 'base.tgz'))
 
-    fp.write ('DISTRIBUTION="%s"\n' % xml.prj.text ('suite'))
+    fp.write ('DISTRIBUTION="%s"\n' % distname)
 
     fp.write ('BUILDRESULT="%s"\n' % os.path.join (builddir, 'pbuilder', 'result'))
     fp.write ('APTCACHE="%s"\n' % os.path.join (builddir, 'pbuilder', 'aptcache'))
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index 2e93168..280f2af 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -166,7 +166,7 @@ class RepoBase(object):
         self._includedeb (path, self.init_attr.codename, component)
 
     def _include( self, path, codename, component):
-        self.log.do( 'reprepro --ignore=wrongdistribution --keepunreferencedfiles --export=never --basedir "' + self.fs.path  + '" -C ' + component + ' -P normal -S misc include ' + codename + ' ' + path )
+        self.log.do( 'reprepro --ignore=wrongdistribution --ignore=surprisingbinary --keepunreferencedfiles --export=never --basedir "' + self.fs.path  + '" -C ' + component + ' -P normal -S misc include ' + codename + ' ' + path )
 
     def _removedeb(self, pkgname, codename, component):
         self.log.do( "reprepro --basedir %s remove %s %s" % (self.fs.path, codename, pkgname))
-- 
2.9.3