Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/os/debian11-64.opts
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
7 changes: 7 additions & 0 deletions deploy/packaging/linux.xml
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,13 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2>/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"/>
Expand Down
2 changes: 1 addition & 1 deletion deploy/packaging/linux_build_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down