[elbe-devel] [PATCH v2 2/6] Remove tunable size from binary/init CDROMs

[bage at linutronix.de]

From: Bastian Germann <bage at linutronix.de>

Signed-off-by: Bastian Germann <bage at linutronix.de>
Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>
---
 elbepack/cdroms.py                     | 7 +++----
 elbepack/commands/fetch_initvm_pkgs.py | 2 +-
 elbepack/commands/mkcdrom.py           | 3 +--
 elbepack/elbeproject.py                | 3 +--
 elbepack/pkgarchive.py                 | 3 +--
 elbepack/repomanager.py                | 9 +++------
 6 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
index d89191ce..5b9f1df8 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -96,8 +96,7 @@ def mk_source_cdrom(rfs, arch, codename, init_codename, target,
 
     return repo.buildiso(os.path.join(target, "src-cdrom.iso"), options=options)
 
-def mk_binary_cdrom(rfs, arch, codename, init_codename, xml, target,
-                    cdrom_size=CDROM_SIZE):
+def mk_binary_cdrom(rfs, arch, codename, init_codename, xml, target):
     # pylint: disable=too-many-arguments
     # pylint: disable=too-many-locals
     # pylint: disable=too-many-branches
@@ -130,10 +129,10 @@ def mk_binary_cdrom(rfs, arch, codename, init_codename, xml, target,
 
         do('mkdir -p "%s"' % repo_path)
 
-    repo = CdromInitRepo(init_codename, repo_path, cdrom_size, mirror)
+    repo = CdromInitRepo(init_codename, repo_path, mirror)
 
     target_repo = CdromBinRepo(arch, codename, None,
-                               target_repo_path, cdrom_size, mirror)
+                               target_repo_path, mirror)
 
     if xml is not None:
         cache = get_rpcaptcache(rfs, arch)
diff --git a/elbepack/commands/fetch_initvm_pkgs.py b/elbepack/commands/fetch_initvm_pkgs.py
index 54d9a404..46c3299d 100644
--- a/elbepack/commands/fetch_initvm_pkgs.py
+++ b/elbepack/commands/fetch_initvm_pkgs.py
@@ -91,7 +91,7 @@ def run_command(argv):
 
         # Binary Repo
         #
-        repo = CdromInitRepo(init_codename, opt.binrepo, 0, mirror)
+        repo = CdromInitRepo(init_codename, opt.binrepo, mirror)
 
         hostfs.mkdir_p(opt.archive)
 
diff --git a/elbepack/commands/mkcdrom.py b/elbepack/commands/mkcdrom.py
index 41700d87..0f3b42aa 100644
--- a/elbepack/commands/mkcdrom.py
+++ b/elbepack/commands/mkcdrom.py
@@ -101,8 +101,7 @@ def run_command(argv):
                                                    codename,
                                                    init_codename,
                                                    xml,
-                                                   builddir,
-                                                   opt.cdrom_size)
+                                                   builddir)
 
         logging.info("Image Build finished.")
         logging.info("Files generated:\n%s",
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index d18dfdf2..53f03986 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -452,8 +452,7 @@ class ElbeProject (object):
                                                     self.codename,
                                                     init_codename,
                                                     self.xml,
-                                                    self.builddir,
-                                                    cdrom_size=cdrom_size)
+                                                    self.builddir)
             if build_sources:
                 validation.info("Source CD %s", sysrootstr)
                 try:
diff --git a/elbepack/pkgarchive.py b/elbepack/pkgarchive.py
index 5f796b5f..48df110b 100644
--- a/elbepack/pkgarchive.py
+++ b/elbepack/pkgarchive.py
@@ -13,8 +13,7 @@ from elbepack.repomanager import RepoBase, RepoAttributes
 
 
 class ArchiveRepo(RepoBase):
-    def __init__(self, xml, pathname, origin, description, components,
-                 maxsize=None):
+    def __init__(self, xml, pathname, origin, description, components):
 
         # pylint: disable=too-many-arguments
 
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index 005bcea9..f8ec8a23 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -317,7 +317,7 @@ class UpdateRepo(RepoBase):
 
 
 class CdromInitRepo(RepoBase):
-    def __init__(self, init_codename, path, maxsize,
+    def __init__(self, init_codename, path,
                  mirror='http://ftp.de.debian.org/debian'):
 
         # pylint: disable=too-many-arguments
@@ -331,8 +331,7 @@ class CdromInitRepo(RepoBase):
                           None,
                           init_attrs,
                           "Elbe",
-                          "Elbe InitVM Cdrom Repo",
-                          maxsize)
+                          "Elbe InitVM Cdrom Repo")
 
 
 class CdromBinRepo(RepoBase):
@@ -342,7 +341,6 @@ class CdromBinRepo(RepoBase):
             codename,
             init_codename,
             path,
-            maxsize,
             mirror='http://ftp.debian.org/debian'):
 
         # pylint: disable=too-many-arguments
@@ -360,8 +358,7 @@ class CdromBinRepo(RepoBase):
                           init_attrs,
                           repo_attrs,
                           "Elbe",
-                          "Elbe Binary Cdrom Repo",
-                          maxsize)
+                          "Elbe Binary Cdrom Repo")
 
 
 class CdromSrcRepo(RepoBase):
-- 
2.20.1