[elbe-devel] [PATCH 2/6] Remove tunable size from binary/init CDROMs
bage at linutronix.de
bage at linutronix.de
Fri Aug 30 12:58:26 CEST 2019
From: Bastian Germann <bage at linutronix.de>
Signed-off-by: Bastian Germann <bage 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 3ba67f7b..97dfd84e 100644
--- a/elbepack/cdroms.py
+++ b/elbepack/cdroms.py
@@ -117,8 +117,7 @@ def mk_binary_cdrom(
init_codename,
xml,
target,
- log,
- cdrom_size=CDROM_SIZE):
+ log):
# pylint: disable=too-many-arguments
# pylint: disable=too-many-locals
# pylint: disable=too-many-branches
@@ -150,10 +149,10 @@ def mk_binary_cdrom(
log.printo(' generated with --skip-build-bin')
log.do('mkdir -p "%s"' % repo_path)
- repo = CdromInitRepo(init_codename, repo_path, log, cdrom_size, mirror)
+ repo = CdromInitRepo(init_codename, repo_path, log, mirror)
target_repo = CdromBinRepo(arch, codename, None,
- target_repo_path, log, cdrom_size, mirror)
+ target_repo_path, log, mirror)
if xml is not None:
cache = get_rpcaptcache(rfs, "aptcache.log", arch)
diff --git a/elbepack/commands/fetch_initvm_pkgs.py b/elbepack/commands/fetch_initvm_pkgs.py
index b252179f..bb2db457 100644
--- a/elbepack/commands/fetch_initvm_pkgs.py
+++ b/elbepack/commands/fetch_initvm_pkgs.py
@@ -89,7 +89,7 @@ def run_command(argv):
# Binary Repo
#
- repo = CdromInitRepo(init_codename, opt.binrepo, log, 0, mirror)
+ repo = CdromInitRepo(init_codename, opt.binrepo, log, mirror)
hostfs.mkdir_p(opt.archive)
diff --git a/elbepack/commands/mkcdrom.py b/elbepack/commands/mkcdrom.py
index d8a71ded..a5f009a8 100644
--- a/elbepack/commands/mkcdrom.py
+++ b/elbepack/commands/mkcdrom.py
@@ -105,8 +105,7 @@ def run_command(argv):
init_codename,
xml,
builddir,
- log,
- opt.cdrom_size)
+ log)
print("")
print("Image Build finished !")
diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
index d9690321..2b900203 100644
--- a/elbepack/elbeproject.py
+++ b/elbepack/elbeproject.py
@@ -463,8 +463,7 @@ class ElbeProject (object):
init_codename,
self.xml,
self.builddir,
- self.log,
- cdrom_size=cdrom_size)
+ self.log)
if build_sources:
elog.h1("Source CD %s" % sysrootstr)
try:
diff --git a/elbepack/pkgarchive.py b/elbepack/pkgarchive.py
index 14e6bd46..14434e2c 100644
--- a/elbepack/pkgarchive.py
+++ b/elbepack/pkgarchive.py
@@ -12,8 +12,7 @@ from elbepack.repomanager import RepoBase, RepoAttributes
class ArchiveRepo(RepoBase):
- def __init__(self, xml, pathname, log, origin, description, components,
- maxsize=None):
+ def __init__(self, xml, pathname, log, origin, description, components):
# pylint: disable=too-many-arguments
diff --git a/elbepack/repomanager.py b/elbepack/repomanager.py
index 18fa6926..b17d5e62 100644
--- a/elbepack/repomanager.py
+++ b/elbepack/repomanager.py
@@ -343,7 +343,7 @@ class UpdateRepo(RepoBase):
class CdromInitRepo(RepoBase):
- def __init__(self, init_codename, path, log, maxsize,
+ def __init__(self, init_codename, path, log,
mirror='http://ftp.de.debian.org/debian'):
# pylint: disable=too-many-arguments
@@ -358,8 +358,7 @@ class CdromInitRepo(RepoBase):
None,
init_attrs,
"Elbe",
- "Elbe InitVM Cdrom Repo",
- maxsize)
+ "Elbe InitVM Cdrom Repo")
class CdromBinRepo(RepoBase):
@@ -370,7 +369,6 @@ class CdromBinRepo(RepoBase):
init_codename,
path,
log,
- maxsize,
mirror='http://ftp.debian.org/debian'):
# pylint: disable=too-many-arguments
@@ -389,8 +387,7 @@ class CdromBinRepo(RepoBase):
init_attrs,
repo_attrs,
"Elbe",
- "Elbe Binary Cdrom Repo",
- maxsize)
+ "Elbe Binary Cdrom Repo")
class CdromSrcRepo(RepoBase):
--
2.20.1
More information about the elbe-devel
mailing list