xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian.Jackson@eu.citrix.com, Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v4 08/16] osstest: add support for the FreeBSD package manager
Date: Thu, 6 Jul 2017 15:42:19 +0100	[thread overview]
Message-ID: <20170706144227.36580-9-roger.pau@citrix.com> (raw)
In-Reply-To: <20170706144227.36580-1-roger.pau@citrix.com>

FreeBSD support is added to target_install_packages and
target_install_packages_norec, although there's no equivalent to the
--no-install-recommends in the FreeBSD package manager.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Changes since v3:
 - New in this version.
---
 Osstest/TestSupport.pm | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index 5a9a6f8b..94ace09c 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -529,13 +529,30 @@ sub target_run_apt {
         "DEBIAN_PRIORITY=critical UCF_FORCE_CONFFOLD=y \\
             with-lock-ex -w /var/lock/osstest-apt apt-get @aptopts", 3000);
 }
+sub target_run_pkg {
+    my ($ho, @aptopts) = @_;
+    target_cmd_root($ho,"lockf /var/run/osstest-pkg-lock pkg-static @aptopts",
+                    3000);
+}
 sub target_install_packages {
     my ($ho, @packages) = @_;
-    target_run_apt($ho, qw(-y install), @packages);
+    my @hostflags = get_hostflags('host');
+
+    if (grep /^freebsd/i, @hostflags) {
+        target_run_pkg($ho, qw(install), @packages);
+    } else {
+        target_run_apt($ho, qw(-y install), @packages);
+    }
 }
 sub target_install_packages_norec {
     my ($ho, @packages) = @_;
-    target_run_apt($ho, qw(--no-install-recommends -y install), @packages);
+    my @hostflags = get_hostflags('host');
+
+    if (grep /^freebsd/i, @hostflags) {
+        target_run_pkg($ho, qw(install), @packages);
+    } else {
+        target_run_apt($ho, qw(--no-install-recommends -y install), @packages);
+    }
 }
 
 sub target_somefile_getleaf ($$$) {
-- 
2.11.0 (Apple Git-81)


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

  parent reply	other threads:[~2017-07-06 14:42 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-06 14:42 [PATCH v4 00/16] osstest: initial FreeBSD support Roger Pau Monne
2017-07-06 14:42 ` [PATCH v4 01/16] osstest: make built_stash_file store a path_ runvar for each file Roger Pau Monne
2017-07-06 14:42 ` [PATCH v4 02/16] osstest: move known_hosts generation to TestSupport Roger Pau Monne
2017-07-06 14:42 ` [PATCH v4 03/16] osstest: introduce helper to get per-host tftp prefix Roger Pau Monne
2017-07-06 14:42 ` [PATCH v4 04/16] osstest: introduce a helper to calculate the sha256 of a given file Roger Pau Monne
2017-07-06 14:43   ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 05/16] osstest: introduce a helper to setup a host to boot using memdisk Roger Pau Monne
2017-07-06 16:07   ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 06/16] osstest: add a FreeBSD host install recipe Roger Pau Monne
2017-07-06 14:53   ` Ian Jackson
2017-07-06 15:13   ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 07/16] osstest: introduce build helpers for FreeBSD Roger Pau Monne
2017-07-06 14:56   ` Ian Jackson
2017-07-06 14:42 ` Roger Pau Monne [this message]
2017-07-06 15:12   ` [PATCH v4 08/16] osstest: add support for the FreeBSD package manager Ian Jackson
2017-07-07  9:55     ` Roger Pau Monne
2017-07-06 14:42 ` [PATCH v4 09/16] osstest: introduce a FreeBSD build script Roger Pau Monne
2017-07-06 15:25   ` Ian Jackson
2017-07-06 17:11     ` Roger Pau Monne
2017-07-06 17:31       ` Ian Jackson
2017-07-06 17:39         ` Roger Pau Monne
2017-07-06 17:42           ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 10/16] osstest: add support for runtime_IDENT_hostflags Roger Pau Monne
2017-07-06 15:28   ` Ian Jackson
2017-07-06 17:34     ` Roger Pau Monne
2017-07-06 17:42       ` Ian Jackson
2017-07-07 13:07     ` Roger Pau Monne
2017-07-07 13:08       ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 11/16] osstest: introduce a script to set the runtime hostflags runvar for FreeBSD jobs Roger Pau Monne
2017-07-06 15:30   ` Ian Jackson
2017-07-06 16:03   ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 12/16] osstest: allow catching-otherwise to pass arguments to the called script Roger Pau Monne
2017-07-06 15:33   ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 13/16] osstest: change the meaning of need_build_host Roger Pau Monne
2017-07-06 15:37   ` Ian Jackson
2017-07-07 11:36     ` Roger Pau Monne
2017-07-07 13:00       ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 14/16] osstest: add support for FreeBSD buildjobs to sg-run-job Roger Pau Monne
2017-07-06 15:38   ` Ian Jackson
2017-07-06 14:42 ` [PATCH v4 15/16] osstest: introduce a script to create a FreeBSD flight Roger Pau Monne
2017-07-06 16:04   ` Ian Jackson
2017-07-07 14:39     ` Roger Pau Monne
2017-07-06 14:42 ` [PATCH v4 16/16] osstest: hook FreeBSD flight into cr-daily-branch Roger Pau Monne
2017-07-06 16:10   ` Ian Jackson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170706144227.36580-9-roger.pau@citrix.com \
    --to=roger.pau@citrix.com \
    --cc=Ian.Jackson@eu.citrix.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).