Skip to content
Merged
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
12 changes: 12 additions & 0 deletions deploy/packaging/linux.xml
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,12 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2>/dev/null
</packages>

<!-- dist first -->
<external_packages dist="Ubuntu24">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, after we drop support for Ubuntu18/DebianBuster we can change the debian default below and remove all these overrides

<numpy package="python3-numpy"/>
<java package="java-runtime"/>
<readline package="libreadline8"/>
</external_packages>

<external_packages dist="Ubuntu22">
<numpy package="python3-numpy"/>
<java package="java-runtime"/>
Expand All @@ -848,6 +854,12 @@ rm -f /etc/ld.so.conf.d/mdsplus.conf 2&gt;/dev/null
<readline package="libreadline8"/>
</external_packages>

<external_packages dist="DebianBookworm">
<numpy package="python3-numpy"/>
<java package="java-runtime"/>
<readline package="libreadline8"/>
</external_packages>

<external_packages dist="DebianBullseye">
<numpy package="python3-numpy"/>
<java package="java-runtime"/>
Expand Down