Merge pull request #195 from epics-containers/RTEMS

Final fixes for RTEMS changes

src/ibek/ioc_cmds/assets.py

@@ -63,7 +63,9 @@ def extract_assets(
             GLOBALS.PVI_DEFS,
             GLOBALS.IBEK_DEFS,
             IOC_FOLDER,  # get the IOC folder symlink
-            Path.readlink(IOC_FOLDER),  # get contents of IOC folder
+            Path.readlink(
+                IOC_FOLDER
+            ).parent,  # get contents of IOC folder and its source (parent)
             Path("/venv"),  # get the virtualenv
         ] + list(
             source.glob("ibek*")

src/ibek/ioc_cmds/commands.py

@@ -68,6 +68,8 @@ def generate_schema(
         log.error("One or more `definitions` required with `--no-ibek-defs`")
         raise typer.Exit(1)
 
+    definitions = definitions or []
+
     if ibek_defs:
         # this allows us to use the definitions inside the container
         # which are in a known location after the container is built
@@ -108,4 +110,5 @@ def extract_runtime_assets(
     This should be performed in a throw away container stage (runtime_prep)
     as it is destructive of the source folder, because it uses move for speed.
     """
+    extras = extras or []
     extract_assets(destination, source, extras, defaults, dry_run)

src/ibek/support_cmds/commands.py

@@ -62,12 +62,15 @@ def _install_debs(debs: List[str]) -> None:
 
     If they have an http:// or https://
     prefix then they will be downloaded and installed from file.
+
+    args: debs: List[str] - list of debian packages to install - can also include
+                            any additional 'apt-get install' options required
     """
     temp = Path("/tmp")
     for i, pkg in enumerate(debs):
         if pkg.startswith("http://") or pkg.startswith("https://"):
             pkg_file = temp / pkg.split("/")[-1]
-            subprocess.call(["wget", pkg, "-O", str(pkg_file)])
+            subprocess.call(["busybox", "wget", pkg, "-O", str(pkg_file)])
             debs[i] = str(pkg_file)
 
     if len(debs) == 0:
@@ -86,11 +89,18 @@ def _install_debs(debs: List[str]) -> None:
 
 @support_cli.command()
 def apt_install(
-    debs: List[str] = typer.Argument(None, help="list of debian packages to install"),
+    debs: List[str] = typer.Argument(
+        None,
+        help=(
+            "list of debian packages to install. Also may include any "
+            "additional 'apt-get install' options required"
+        ),
+    ),
 ):
     """
     Install packages
     """
+    debs = debs or []
     _install_debs(debs)
 
 
@@ -100,7 +110,10 @@ def add_runtime_packages(
 ):
     """
     Add packages to RUNTIME_DEBS for later install with apt_install_runtime_packages
+
+    The list may include any additional 'apt-get install' options required.
     """
+    debs = debs or []
     add_list_to_file(RUNTIME_DEBS, debs)
 
 
@@ -137,6 +150,9 @@ def git_clone(
 ):
     """
     clone a support module from a remote repository
+
+    Add any additional arguments to the git clone command at the end of the
+    argument list.
     """
     url = org + repo_name
     location = SUPPORT / repo_name
@@ -191,6 +207,7 @@ def add_libs(
     """
     declare the libraries for this support module for inclusion in IOC Makefile
     """
+    libs = libs or []
     add_list_to_file(IOC_LIBS, libs)
 
 
@@ -201,6 +218,7 @@ def add_dbds(
     """
     declare the dbd files for this support module for inclusion in IOC Makefile
     """
+    dbds = dbds or []
     add_list_to_file(IOC_DBDS, dbds)
 
 
@@ -258,6 +276,8 @@ def compile(
 ):
     """
     compile a support module after preparation with `ibek support register` etc.
+
+    Add any extra compiler options to the end of the argument list
     """
     path = SUPPORT / module