[elbe-devel] [PATCH v3 14/15] Remove toolchainextract command from ELBE
dion at linutronix.de
dion at linutronix.de
Wed Jun 26 10:40:18 CEST 2019
From: Olivier Dion <dion at linutronix.de>
Signed-off-by: Olivier Dion <dion at linutronix.de>
---
debian/python-elbe-buildenv.install | 1 -
debian/python3-elbe-buildenv.install | 1 -
docs/elbe-toolchainextract.txt | 87 -----------------------------------
elbepack/commands/toolchainextract.py | 81 --------------------------------
4 files changed, 170 deletions(-)
delete mode 100644 docs/elbe-toolchainextract.txt
delete mode 100644 elbepack/commands/toolchainextract.py
diff --git a/debian/python-elbe-buildenv.install b/debian/python-elbe-buildenv.install
index 3fb257b5..995aaf3d 100644
--- a/debian/python-elbe-buildenv.install
+++ b/debian/python-elbe-buildenv.install
@@ -8,7 +8,6 @@
./usr/lib/python2.*/*-packages/elbepack/commands/gen_update.py
./usr/lib/python2.*/*-packages/elbepack/commands/hdimg.py
./usr/lib/python2.*/*-packages/elbepack/commands/mkcdrom.py
-./usr/lib/python2.*/*-packages/elbepack/commands/toolchainextract.py
./usr/lib/python2.*/*-packages/elbepack/makofiles/preferences.mako
./usr/lib/python2.*/*-packages/elbepack/makofiles/environment-setup-elbe.mako
./usr/lib/python2.*/*-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
diff --git a/debian/python3-elbe-buildenv.install b/debian/python3-elbe-buildenv.install
index f7cd1efb..be0fd497 100644
--- a/debian/python3-elbe-buildenv.install
+++ b/debian/python3-elbe-buildenv.install
@@ -8,7 +8,6 @@
./usr/lib/python3.*/*-packages/elbepack/commands/gen_update.py
./usr/lib/python3.*/*-packages/elbepack/commands/hdimg.py
./usr/lib/python3.*/*-packages/elbepack/commands/mkcdrom.py
-./usr/lib/python3.*/*-packages/elbepack/commands/toolchainextract.py
./usr/lib/python3.*/*-packages/elbepack/makofiles/preferences.mako
./usr/lib/python3.*/*-packages/elbepack/makofiles/environment-setup-elbe.mako
./usr/lib/python3.*/*-packages/elbepack/makofiles/toolchain-shar-extract.sh.mako
diff --git a/docs/elbe-toolchainextract.txt b/docs/elbe-toolchainextract.txt
deleted file mode 100644
index 15d8d849..00000000
--- a/docs/elbe-toolchainextract.txt
+++ /dev/null
@@ -1,87 +0,0 @@
-elbe-toolchainextract(1)
-========================
-
-
-NAME
-----
-elbe-toolchainextract - extract libraries from a cross-toolchain
-
-
-SYNOPSIS
---------
-[verse]
-'elbe toolchainextract' \
- [ --path <path to toolchain> ] \
- [ --output <output repository path> ]
- [ --codename <distro codename for repository> ]
- [ --buildtype <shortname for the toolchain type> ]
-
-
-DESCRIPTION
------------
-'elbe toolchainextract' builds a debian repository containing debian packages
-that have been generated from a given cross-toolchain.
-
-This command has to be run as root *inside the Elbe build VM*.
-
-OPTIONS
--------
-
---path <path to toolchain>::
- basepath to the toolchain that is used to extract the debian packages.
-
---output <output repository path>::
- path were the debian repo will be generated.
-
---codename <distro codename for repository>::
- codename of the debian suite for which the repo should be built for.
-
---buildtype <shortname of the toolchain type>::
- currently armhf-linaro48 or armel-linaro48 can be used.
-
-EXAMPLES
---------
-* Build a repo containing the lib packages from a Linaro armhf toolchain.
-+
---------
-# elbe initvm attach
-
-login: root # (password root)
-
-# elbe toolchainextract \
- -p /opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_linux \
- -o /opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo \
- -c stretch \
- -b armhf-linaro48
-
-# ls /opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/*/*
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/liba/libasan0:
-libasan0_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/liba/libatomic1:
-libatomic1_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/libg/libgcc1:
-libgcc1_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/libg/libgfortran3:
-libgfortran3_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/libg/libgomp1:
-libgomp1_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/libm/libmudflap0:
-libmudflap0_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/libs/libssp0:
-libssp0_4.8.3_armhf.deb
-
-/opt/gcc-linaro-arm-linux-gnueabihf-4.8-2013.10_repo/pool/main/libs/libstdc++6:
-libstdc++6_4.8.3_armhf.deb
---------
-
-
-ELBE
-----
-Part of the linkgit:elbe[1] suite
diff --git a/elbepack/commands/toolchainextract.py b/elbepack/commands/toolchainextract.py
deleted file mode 100644
index aaf26ac2..00000000
--- a/elbepack/commands/toolchainextract.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# ELBE - Debian Based Embedded Rootfilesystem Builder
-# Copyright (c) 2014 Torben Hohn <torbenh at linutronix.de>
-# Copyright (c) 2015, 2017 Manuel Traut <manut at linutronix.de>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from optparse import OptionParser
-from tempfile import mkdtemp
-
-import os
-
-from elbepack.xmldefaults import ElbeDefaults
-from elbepack.repomanager import ToolchainRepo
-from elbepack.debpkg import build_binary_deb
-from elbepack.toolchain import get_toolchain
-from elbepack.asciidoclog import StdoutLog
-
-
-def run_command(argv):
- oparser = OptionParser(usage="usage: %prog toolchainextract [options]")
- oparser.add_option("-p", "--path", dest="path",
- help="path to toolchain")
- oparser.add_option("-o", "--output", dest="output",
- help="output repository path")
- oparser.add_option("-c", "--codename", dest="codename",
- help="distro codename for repository")
- oparser.add_option("-b", "--buildtype", dest="buildtype",
- help="Override the buildtype")
- (opt, _) = oparser.parse_args(argv)
-
- if not opt.path:
- oparser.print_help()
- return 0
- if not opt.output:
- oparser.print_help()
- return 0
- if not opt.codename:
- oparser.print_help()
- return 0
- if not opt.buildtype:
- oparser.print_help()
- return 0
-
- defaults = ElbeDefaults(opt.buildtype)
-
- toolchain = get_toolchain(
- defaults["toolchaintype"],
- opt.path,
- defaults["arch"])
-
- tmpdir = mkdtemp()
-
- for lib in toolchain.pkg_libs:
- files = toolchain.get_files_for_pkg(lib)
-
- pkglibpath = os.path.join("usr/lib", defaults["triplet"])
- fmap = [(f, pkglibpath) for f in files]
-
- build_binary_deb(
- lib,
- defaults["arch"],
- defaults["toolchainver"],
- lib +
- " extracted from toolchain",
- fmap,
- toolchain.pkg_deps[lib],
- tmpdir)
-
- pkgs = os.listdir(tmpdir)
-
- repo = ToolchainRepo(
- defaults["arch"],
- opt.codename,
- opt.output,
- StdoutLog())
-
- for p in pkgs:
- repo.includedeb(os.path.join(tmpdir, p))
-
- repo.finalize()
- os.system('rm -r "%s"' % tmpdir)
--
2.11.0
More information about the elbe-devel
mailing list