Commit a6d934bd authored by Mike Hibler's avatar Mike Hibler

Changes for building FreeBSD 11.2 server packages.

parent 207f55e3
......@@ -379,7 +379,7 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
PC
PL
10. Updating the Emulab package repo (10.3 specific).
10. Updating the Emulab package repo (11.2 specific).
[ This is a condensed version of the steps above. ]
......@@ -394,28 +394,28 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
couple of mysterious updates of things that didn't change, but I
can live with that...
a. Make sure the ports tree in /share/freebsd/10.3/ports on ops
a. Make sure the ports tree in /share/freebsd/11.2/ports on ops
is up to date. [ Note that there is not actually an svn repo branch
called "quarterly" so you have to make sure you are tracking the
current quarter. ]
cd /share/freebsd/10.3/ports
cd /share/freebsd/11.2/ports
sudo svn update
b. Make sure the Emulab ports are up to date.
cd /share/freebsd/10.3/ports/misc
cd /share/freebsd/11.2/ports/misc
diff -r ~mike/testbed-clean/install/ports .
<update anything that is out of sync>
c. Swapin a FreeBSD 10.3 node (emulab-ops/freebsd103-64). This will
c. Swapin a FreeBSD 11.2 node (experiment emulab-ops/freebsd112-64). This will
give you a d430 which is the best thing to use.
d. Mount the ports and source trees.
cd /usr
sudo mount -o ro fs:/share/freebsd/10.3/ports /usr/ports
sudo mount -o ro fs:/share/freebsd/10.3/src /usr/src
sudo mount -o ro fs:/share/freebsd/11.2/ports /usr/ports
sudo mount -o ro fs:/share/freebsd/11.2/src /usr/src
e. Cleanse the port environment:
......@@ -434,7 +434,7 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
run up against certificate issues, the it won't reinstall it.
In that case, I have found the easiest thing to do is:
pushd /share/freebsd/10.3/packages-64
pushd /share/freebsd/11.2/packages-64
pkg add pkg-*
pkg add ca_root*
popd
......@@ -452,9 +452,8 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
and select:
XAW
- in graphics/cairo, "make config" and deselect OPENGL.
- in www/apache22, "make config" and select: SUEXEC, PROXY, PROXY_HTTP
or
- in www/apache24, "make config" and select: SUEXEC (proxing should be enabled already)
- in www/apache24, "make config" and select: SUEXEC
(PROXY should be enabled already)
h. Build em all:
......@@ -467,7 +466,7 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
end
i. Check for vulnerabilities. If any are revealed, you can either try
to update /share/freebsd/10.3/ports with a newer version of the port
to update /share/freebsd/11.2/ports with a newer version of the port
(e.g., from /share/freebsd/current/ports) or just live with the
vulnerability for now.
......@@ -488,20 +487,20 @@ d. When packages are installed on boss/ops/etc., we need to make sure to use
l. Save packages and update tarball and repo. On boss:
cd /share/freebsd/10.3
cd /share/freebsd/11.2
mkdir packages
scp pcXXX:/usr/obj/ports/packages/All/\* packages/
sudo chown -R root:wheel packages
set www=/usr/testbed/www
set tball="FreeBSD-10.3-packages-64-`date +%Y%m%d`.tar.gz"
set tball="FreeBSD-11.2-packages-64-`date +%Y%m%d`.tar.gz"
sudo tar czf $tball packages
sudo cp $tball $www/downloads/
sudo ln -sf $tball $www/downloads/FreeBSD-10.3-packages-64.tar.gz
sudo mv $www/FreeBSD/10.3/{packages,Opackages}
sudo cp -rp packages $www/FreeBSD/10.3/
sudo pkg repo $www/FreeBSD/10.3/packages
sudo ln -sf $tball $www/downloads/FreeBSD-11.2-packages-64.tar.gz
sudo mv $www/FreeBSD/11.2/{packages,Opackages}
sudo cp -rp packages $www/FreeBSD/11.2/
sudo pkg repo $www/FreeBSD/11.2/packages
sudo mv packages-64 packages-64.bak
sudo mv packages packages-64
......
......@@ -156,6 +156,7 @@ RUN_DEPENDS+= \
# apache related ports
RUN_DEPENDS+= \
${LOCALBASE}/${APACHEMODDIR}/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/${APACHEMODDIR}/libphp5.so:${PORTSDIR}/www/mod_php$(PHP_VER) \
${LOCALBASE}/${APACHEMODDIR}/mod_fcgid.so:${PORTSDIR}/www/mod_fcgid
# Port versions of current or former "core" utilties
......@@ -168,7 +169,7 @@ RUN_DEPENDS+= \
man2html:${PORTSDIR}/textproc/man2html
USE_PERL5= yes
USES= python:2.7
USES= perl5 python:2.7 php
NO_BUILD= yes
......
......@@ -37,6 +37,7 @@ EMULAB_PORTVERSION= 6.1
# Select PHP and Apache versions
# Fix up some port diffs
#
PHP_VER=56
.if (${EMULAB_PORTVERSION} == "7.1" || ${EMULAB_PORTVERSION} == "7.2")
DEFAULT_VERSIONS= perl5=5.26 python=2.7 tcltk=8.6 php=5.6 mysql=5.7 apache=2.4
APACHE_PORT=www/apache24
......
......@@ -108,6 +108,7 @@ RUN_DEPENDS+= \
# apache related ports
RUN_DEPENDS+= \
${LOCALBASE}/${APACHEMODDIR}/mod_ssl.so:${PORTSDIR}/${APACHE_PORT} \
${LOCALBASE}/${APACHEMODDIR}/libphp5.so:${PORTSDIR}/www/mod_php$(PHP_VER) \
${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi
# PHP packages
......@@ -130,7 +131,7 @@ RUN_DEPENDS+= \
${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/xorg-libraries
USE_PERL5= yes
USES= python:2.7
USES= perl5 python:2.7 php
NO_BUILD= yes
......
......@@ -78,7 +78,7 @@ RUN_DEPENDS+= \
p5-FCGI>=0.74:${PORTSDIR}/www/p5-FCGI
USE_PERL5= yes
USES= python:2.7
USES= perl5 python:2.7 php
NO_BUILD= yes
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment