ood_packaging 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbc278058062ebfb69fbcd090aeff96b16f1b2a4bfe0f2aeba9b1e99559d19a
-  data.tar.gz: 77a0d0cd87a46086f596e9d13c89c1719ee6c5f4339fcbb37b4645c26bc70966
+  metadata.gz: f082a5843242b659daddd1a82d3ff849be6f7b5e803651c125c0954125433062
+  data.tar.gz: 86f980c5a0a28159a86e66e8a6b7739a5125d0d7acae028d77543d6d334cf051
 SHA512:
-  metadata.gz: fe2fea7d25e40e6db7e64312bbbaf71485239d846e73d608728106c1b4f7d4ddef4d246473384a7831b362c8887b3468b61d006f660922e9c4f0eb645578c72b
-  data.tar.gz: 90d926e3f8dbad788948ef1e128b0a4ea77026e95436e7561734741eb8fc94c49d970c198f41fefd9923b33b0d5c50bfcc064e672ea50fa56e6a1dba758041cf
+  metadata.gz: 16e4b52669d71c8655e7bd6a74ea7c84fabd3cbbb89e13429a255b4d45a13295607ea0689a5c6b22d00f48acffc48733577f8f5a23117c1aac9229a3cb1d0228
+  data.tar.gz: 922984845bc37dc32637fa72949de4c79fe97525e9cc573240df266a01510ce96ac5111c0ace5bc5d48eae3bf717016d87d27f704d0a8c0d8efc9b04c1831abe

data/lib/ood_packaging/build.rb

@@ -275,6 +275,7 @@ class OodPackaging::Build
 
   def install_deb_dependencies!
     sh "sudo apt update -y#{cmd_suffix}"
+    extra_depends = config.fetch(:extra_depends, nil)
     tool = [
       'DEBIAN_FRONTEND=noninteractive apt-cudf-get --solver aspcud',
       '-o APT::Get::Assume-Yes=1 -o APT::Get::Allow-Downgrades=1',
@@ -289,6 +290,7 @@ class OodPackaging::Build
       "#{package}-build-deps*.changes"
     ]
     Dir.chdir(deb_work_dir) do
+      sh "sed -i 's|@EXTRA_DEPENDS@|#{extra_depends}|g' debian/control#{cmd_suffix}" unless extra_depends.nil?
       sh "#{cmd.join(' ')}#{cmd_suffix}"
       sh "rm -f #{cleanup.join(' ')}#{cmd_suffix}"
     end

data/lib/ood_packaging/build_box/docker-image/Dockerfile.erb

@@ -42,7 +42,7 @@ RUN apt update -y && apt install -y apt-transport-https ca-certificates \
     init debhelper devscripts dh-make build-essential apt-cudf lintian equivs \
     sudo rake wget curl ruby bundler && \
     apt clean all -y
-<% if arch != 'ppc64le' %>
+<% if ! ['bookworm'].include?(codename) && arch != 'ppc64le' %>
 RUN echo "deb https://deb.nodesource.com/node_<%= nodejs_version %>.x <%= codename %> main" > /etc/apt/sources.list.d/nodesource.list
 RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor > /etc/apt/trusted.gpg.d/nodesource.gpg
 <% end %>

data/lib/ood_packaging/version.rb

@@ -2,7 +2,7 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.13.0'
+  VERSION = '0.13.2'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
       '(ubuntu|debian)' => '3.1.0',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ood_packaging
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Trey Dockendorf
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake