[elbe-devel] [PATCH 2/8] elbepack: commands: drop internal buildsysroot command

Thomas Weißschuh thomas.weissschuh at linutronix.de
Mon Jul 8 11:23:55 CEST 2024


The buildsysroot command is a remnant from the time before the SOAP service
managing all buildenv interaction.
Nowadays it is only a maintenance burden, remove it.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh at linutronix.de>
---
 debian/python3-elbe-buildenv.install    |  1 -
 docs/elbe-buildsysroot.rst              | 64 ---------------------------------
 docs/elbe.rst                           |  3 --
 elbepack/commands/buildsysroot.py       | 38 --------------------
 newsfragments/+buildsysroot.removal.rst |  1 +
 5 files changed, 1 insertion(+), 106 deletions(-)

diff --git a/debian/python3-elbe-buildenv.install b/debian/python3-elbe-buildenv.install
index 0fa636f09a08..a0acffe537d6 100644
--- a/debian/python3-elbe-buildenv.install
+++ b/debian/python3-elbe-buildenv.install
@@ -1,7 +1,6 @@
 usr/lib/python3.*/*-packages/elbepack/commands/adjustpkgs.py
 usr/lib/python3.*/*-packages/elbepack/commands/buildchroot.py
 usr/lib/python3.*/*-packages/elbepack/commands/buildsdk.py
-usr/lib/python3.*/*-packages/elbepack/commands/buildsysroot.py
 usr/lib/python3.*/*-packages/elbepack/commands/chroot.py
 usr/lib/python3.*/*-packages/elbepack/commands/db.py
 usr/lib/python3.*/*-packages/elbepack/commands/fetch_initvm_pkgs.py
diff --git a/docs/elbe-buildsysroot.rst b/docs/elbe-buildsysroot.rst
deleted file mode 100644
index 7eee33dcca37..000000000000
--- a/docs/elbe-buildsysroot.rst
+++ /dev/null
@@ -1,64 +0,0 @@
-************************
-elbe-buildsysroot
-************************
-
-NAME
-====
-
-elbe-buildsysroot - Build a sysroot archive.
-
-SYNOPSIS
-========
-
-   ::
-
-      elbe buildsysroot \
-              [ --buildtype <type> ] \
-              [ --skip-validation ] \
-              <builddir>
-
-DESCRIPTION
-===========
-
-*elbe buildsysroot* builds a sysroot tar archive from the given build
-directory (built with ``elbe-buildchroot(1)`` before), containing the
-libraries and header files of the root filesystem. This can be used for
-cross-compiling. For example, if a Linaro 2014.02 toolchain is used, the
-archive can be unpacked into
-*gcc-linaro-arm-linux-gnueabihf-\*/arm-linux-gnueabihf/libc* to set up a
-cross-toolchain for the given root filesystem.
-
-The archive will be created as *sysroot.tar.xz* in the build directory.
-
-This command has to be run as root **inside the Elbe build VM**.
-
-Please note that the package *symlinks* has to be included in the
-package list of the project for this to work, as well as the relevant
-development packages. The XML file of the project also needs a *triplet*
-definition.
-
-OPTIONS
-=======
-
---buildtype <buildtype>
-   Override the build type specified in the XML file.
-
---skip-validation
-   Skip the validation of the XML file. (Not recommended)
-
-<builddir>
-   The build directory to generate the sysroot archive from.
-
-EXAMPLES
-========
-
--  Build a sysroot archive from the project located at */root/myarm*
-
-   ::
-
-      # elbe buildsysroot /root/myarm
-
-ELBE
-====
-
-Part of the ``elbe(1)`` suite
diff --git a/docs/elbe.rst b/docs/elbe.rst
index 236919dac426..3ded45773952 100644
--- a/docs/elbe.rst
+++ b/docs/elbe.rst
@@ -35,9 +35,6 @@ Elbe COMMANDS
 ``elbe-buildchroot(1)``
    build a root filesystem.
 
-``elbe-buildsysroot(1)``
-   build a sysroot archive.
-
 ``elbe-check_updates(1)``
    check whether package updates are available for a given project.
 
diff --git a/elbepack/commands/buildsysroot.py b/elbepack/commands/buildsysroot.py
deleted file mode 100644
index 85cce2b9ebca..000000000000
--- a/elbepack/commands/buildsysroot.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# ELBE - Debian Based Embedded Rootfilesystem Builder
-# SPDX-License-Identifier: GPL-3.0-or-later
-# SPDX-FileCopyrightText: 2014-2017 Linutronix GmbH
-
-import logging
-import sys
-from optparse import OptionParser
-
-from elbepack.elbeproject import ElbeProject
-from elbepack.elbexml import ValidationError
-from elbepack.log import elbe_logging
-
-
-def run_command(argv):
-    oparser = OptionParser(
-        usage='usage: %prog buildsysroot [options] <builddir>')
-    oparser.add_option('--skip-validation', action='store_true',
-                       dest='skip_validation', default=False,
-                       help='Skip xml schema validation')
-    oparser.add_option('--buildtype', dest='buildtype',
-                       help='Override the buildtype')
-
-    (opt, args) = oparser.parse_args(argv)
-
-    if len(args) != 1:
-        print('wrong number of arguments')
-        oparser.print_help()
-        sys.exit(99)
-
-    with elbe_logging({'streams': sys.stdout}):
-        try:
-            project = ElbeProject(args[0], override_buildtype=opt.buildtype,
-                                  skip_validate=opt.skip_validation)
-        except ValidationError:
-            logging.exception('XML validation failed.  Bailing out')
-            sys.exit(100)
-
-        project.build_sysroot()
diff --git a/newsfragments/+buildsysroot.removal.rst b/newsfragments/+buildsysroot.removal.rst
new file mode 100644
index 000000000000..ce31b731df38
--- /dev/null
+++ b/newsfragments/+buildsysroot.removal.rst
@@ -0,0 +1 @@
+The *internal* command `elbe buildsysroot`.

-- 
2.45.2



More information about the elbe-devel mailing list