Debian.pm: Move standard_extradebs to ts-host-install

This makes it effect builds on Debian, too.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 60393ca9d717108ea3a004dff5226fc11591e339..2d30b3e9d680be3c05712cc36d45edfb009eb19a 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -51,6 +51,7 @@ BEGIN {
                       di_vg_name
                       debian_dhcp_rofs_fix
                      debian_write_random_seed_command
+                     some_extradebs standard_extradebs
                       );
     %EXPORT_TAGS = ( );
 

diff --git a/ts-host-install b/ts-host-install
index 253dbb5df51763dadf6c8c1da30d25f54bf91aba..924c1e06f0f087cbedd1b13670e2bd0d3d5c5eb8 100755 (executable)
--- a/ts-host-install
+++ b/ts-host-install
@@ -146,6 +146,8 @@ END
             qw(amd64-microcode intel-microcode));
     }
 
+    standard_extradebs($ho);
+
     my $ntpserver = get_target_property($ho, 'NtpServer');
     if ($ntpserver) {
        target_editfile_root($ho, '/etc/ntp.conf', sub {

diff --git a/ts-xen-install b/ts-xen-install
index 965fd51940a92812b84d8a29c2fe860d5db4a6df..5d4f8b0dc7cba43f42748501c67bd6fe5be97608 100755 (executable)
--- a/ts-xen-install
+++ b/ts-xen-install
@@ -74,8 +74,6 @@ sub packages () {
 sub extradebs () {
     my $suite = $ho->{Suite};
 
-    standard_extradebs($ho);
-
     # $c{ DebianExtraPackages_<firmware>_<arch>_<suite> }
     my $firmware = get_host_property($ho, "firmware");
     some_extradebs($ho, [ 'DebianExtraPackages', $firmware, $ho->{Arch}, $suite ]);