Merge branch 'alpha' into gm-marte2-fixes

MDSplus · May 2, 2022 · d019691 · d019691
2 parents abb9507 + c9dd541
commit d019691
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/deploy/os/debian11-64.opts b/deploy/os/debian11-64.opts
@@ -0,0 +1 @@
+--platform=debian --valgrind=memcheck,helgrind --dockerimage=mdsplus/builder:debian_bullseye-64 --distname=DebianBullseye --arch=amd64
diff --git a/deploy/packaging/linux.xml b/deploy/packaging/linux.xml
@@ -829,6 +829,13 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2&gt;/dev/null
    <readline package="libreadline8"/>
  </external_packages>
 
+ <external_packages dist="DebianBullseye">
+   <numpy package="python3-numpy"/>
+   <java package="java-runtime"/>
+   <xinetd package="busybox"/>
+   <readline package="libreadline8"/>
+ </external_packages>
+
  <external_packages dist="Ubuntu18">
    <numpy package="python3-numpy"/>
    <java package="java-runtime"/>

diff --git a/deploy/packaging/linux_build_packages.py b/deploy/packaging/linux_build_packages.py
@@ -36,7 +36,7 @@ def get_root():
 
 
 def external_package(info, root, package):
-    for extpackages in root.getiterator('external_packages'):
+    for extpackages in root.iter('external_packages'):
         dist = extpackages.attrib.get('dist', None)
         if dist:
             if info['dist'] != dist:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		--platform=debian --valgrind=memcheck,helgrind --dockerimage=mdsplus/builder:debian_bullseye-64 --distname=DebianBullseye --arch=amd64