[elbe-devel] [PATCH v2 6/6] elbe-bootstrap: remove remains of kinitrd and elbe-bootstrap

[Manuel Traut]

On Wed, Sep 26, 2018 at 12:13:52PM +0200, Torben Hohn wrote:
> elbe-bootstrap is not used anymore. the new code directly downloads
> dibian-installer kernel and initrd from the mirror.
> However, there is still some code dealing with elbe-bootstrap in
> packagelists and xml defaults.
> 
> Remove this, now unused, code.

Can you plese fold this also into patch 4/6. I'd somehow expected it to be
there. But just if it can be moved easily. If not, keep it in this location
for v3.

Thanks,

  Manu

> Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
> ---
>  elbepack/cdroms.py      | 6 +-----
>  elbepack/dump.py        | 6 ------
>  elbepack/pkgutils.py    | 7 -------
>  elbepack/xmldefaults.py | 1 -
>  4 files changed, 1 insertion(+), 19 deletions(-)
> 
> diff --git a/elbepack/cdroms.py b/elbepack/cdroms.py
> index 19790e6b..60ad877c 100644
> --- a/elbepack/cdroms.py
> +++ b/elbepack/cdroms.py
> @@ -97,11 +97,7 @@ def mk_source_cdrom(
>          if pkg.name in forbiddenPackages:
>              continue
>          try:
> -            p = cache[pkg.name]
> -            if pkg.name == 'elbe-bootstrap':
> -                pkgver = p.versions[0]
> -            else:
> -                pkgver = p.installed
> +            pkgver = cache[pkg.name].installed
>  
>              dsc = pkgver.fetch_source(
>                  '/var/cache/elbe/sources',
> diff --git a/elbepack/dump.py b/elbepack/dump.py
> index cce60315..377a18e9 100644
> --- a/elbepack/dump.py
> +++ b/elbepack/dump.py
> @@ -23,12 +23,6 @@ def get_initvm_pkglist():
>          cache = Cache()
>          cache.open()
>          pkglist = [APTPackage(p) for p in cache if p.is_installed]
> -        try:
> -            eb = APTPackage(cache['elbe-bootstrap'])
> -            pkglist.append(eb)
> -        # elbe bootstrap is not installed on pc running elbe
> -        except KeyError:
> -            pass
>  
>      return pkglist
>  
> diff --git a/elbepack/pkgutils.py b/elbepack/pkgutils.py
> index 1a619d6e..0c4e97fb 100644
> --- a/elbepack/pkgutils.py
> +++ b/elbepack/pkgutils.py
> @@ -32,13 +32,6 @@ def get_sources_list(prj, defs):
>          slist += "deb %s %s main\n" % (mirror, suite)
>          slist += "deb-src %s %s main\n" % (mirror, suite)
>  
> -    if prj.has("mirror/cdrom"):
> -        tmpdir = mkdtemp()
> -        kinitrd = prj.text("buildimage/kinitrd", default=defs, key="kinitrd")
> -        system('7z x -o%s "%s" pool/main/%s/%s dists' %
> -               (tmpdir, prj.text("mirror/cdrom"), kinitrd[0], kinitrd))
> -        slist += "deb file://%s %s main\n" % (tmpdir, suite)
> -
>      if prj.node("mirror/url-list"):
>          for n in prj.node("mirror/url-list"):
>              if n.has("binary"):
> diff --git a/elbepack/xmldefaults.py b/elbepack/xmldefaults.py
> index a42df002..3a9e8684 100644
> --- a/elbepack/xmldefaults.py
> +++ b/elbepack/xmldefaults.py
> @@ -138,7 +138,6 @@ i386_defaults = {
>  }
>  
>  archindep_defaults = {
> -    "kinitrd": "elbe-bootstrap",
>      "name": "elbe-buildenv",
>      "size": "20G",
>      "img": "qcow2",
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel