Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
6ff7c573
Commit
6ff7c573
authored
May 13, 2014
by
Mike Hibler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Still more FBSD 10 fixups.
parent
17e9b92d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
4 deletions
+13
-4
protogeni/scripts/initclrhouse.in
protogeni/scripts/initclrhouse.in
+7
-2
protogeni/scripts/initsite.in
protogeni/scripts/initsite.in
+6
-2
No files found.
protogeni/scripts/initclrhouse.in
View file @
6ff7c573
#!/usr/bin/perl -w
#
# Copyright (c) 2008-201
1
University of Utah and the Flux Group.
# Copyright (c) 2008-201
4
University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
...
...
@@ -115,13 +115,18 @@ my %packlist = ("libxml2>=2.6.26" => "/usr/ports/textproc/libxml2",
);
my
$needpkgs
=
0
;
# Check for new package tools
if
(
-
x
"
/usr/sbin/pkg
")
{
$PKG_INFO
=
"
/usr/sbin/pkg info -g
";
}
foreach
my
$pkgname
(
sort
(
keys
(
%packlist
)))
{
my
$pkgdir
=
$packlist
{
$pkgname
};
print
STDERR
"
Checking for package
$pkgname
\n
";
next
if
(
system
("
$PKG_INFO
-
E
'
${pkgname}
*' >/dev/null
")
==
0
);
if
(
system
("
$PKG_INFO
-
e
'
${pkgname}
*' >/dev/null
")
==
0
);
print
STDERR
"
Please install
$pkgdir
\n
";
$needpkgs
++
;
...
...
protogeni/scripts/initsite.in
View file @
6ff7c573
#!/usr/bin/perl -w
#
# Copyright (c) 2008-201
3
University of Utah and the Flux Group.
# Copyright (c) 2008-201
4
University of Utah and the Flux Group.
#
# {{{GENIPUBLIC-LICENSE
#
...
...
@@ -176,11 +176,15 @@ my %packlist =
my
$needpkgs
=
0
;
Phase
"
ports
",
"
Installing ports
",
sub
{
# Check for new package tools
if
(
-
x
"
/usr/sbin/pkg
")
{
$PKG_INFO
=
"
/usr/sbin/pkg info -g
";
}
foreach
my
$pkgname
(
sort
(
keys
(
%packlist
)))
{
my
$pkgdir
=
$packlist
{
$pkgname
};
Phase
"
$pkgname
",
"
Checking for
$pkgname
",
sub
{
if
(
!
ExecQuiet
("
$PKG_INFO
-
E
'
${pkgname}
*'
"))
{
if
(
!
ExecQuiet
("
$PKG_INFO
-
e
'
${pkgname}
*'
"))
{
PhaseSkip
("
Already installed
");
}
ExecQuietFatal
("
cd
$pkgdir
; make -DBATCH install
");
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment