Gitweb links:
...log
http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/f24a01b39c3a9eedd992daba382b0c8bd92ecbf0
...commit
http://git.netsurf-browser.org/netsurf-wiki.git/commit/f24a01b39c3a9eedd992daba382b0c8bd92ecbf0
...tree
http://git.netsurf-browser.org/netsurf-wiki.git/tree/f24a01b39c3a9eedd992daba382b0c8bd92ecbf0
The branch, master has been updated
via f24a01b39c3a9eedd992daba382b0c8bd92ecbf0 (commit)
from 1daa8be315a0ff88077747c504f82af99843d705 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf-wiki.git/commit/?id=f24a01b39c3a9eedd992daba382b0c8bd92ecbf0
commit f24a01b39c3a9eedd992daba382b0c8bd92ecbf0
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
update pbuilder instructions
diff --git a/continuous_integration/debian_stretch_setup.mdwn
b/continuous_integration/debian_stretch_setup.mdwn
index bfbc50e..c135861 100644
--- a/continuous_integration/debian_stretch_setup.mdwn
+++ b/continuous_integration/debian_stretch_setup.mdwn
@@ -186,6 +186,7 @@ edit /etc/default/openvpn to have
AUTOSTART="netsurf"
reload config and restart openvpn
+
# systemctl daemon-reload
# service restart openvpn
# systemctl status [email protected]
@@ -338,67 +339,69 @@ installed as a normal CI worker node and then:
as superuser on node:
-- apt-get install pbuilder
-- addgroup pbuilder
-- addgroup jenkins pbuilder
-- create /etc/sudoers.d/pbuilder
+ # apt-get install pbuilder
+ # addgroup pbuilder
+ # addgroup jenkins pbuilder
+
+create /etc/sudoers.d/pbuilder
-`jenkins ALL = NOPASSWD:/usr/sbin/pbuilder`
+ jenkins ALL = NOPASSWD:/usr/sbin/pbuilder
-- visudo and alter Defaults
+`visudo` and alter Defaults
`Defaults env_reset,env_keep="DIST ARCH"`
-- replace /etc/pbuilderrc
-
-`# this is your configuration file for pbuilder.`
-`# the file in /usr/share/pbuilder/pbuilderrc is the default template.`
-`# /etc/pbuilderrc is the one meant for overwriting defaults in`
-`# the default template`
-`#`
-`# read pbuilderrc.5 document for notes on specific options.`
-`# List of Debian suites.`
-`DEBIAN_SUITES=("sid", "stretch", "stretch", "wheezy", "squeeze")`
-``
-`# List of Ubuntu suites.`
-`UBUNTU_SUITES=("vivid" "utopic" "trusty" "saucy" "raring" "quantal" "precise"
"oneiric" "natty" "lucid" "hardy")`
-``
-`# Mirrors to use. Update these to your preferred mirror.`
-`DEBIAN_MIRROR="ftp.uk.debian.org"`
-`UBUNTU_MIRROR="mirrors.kernel.org"`
-``
-`# set a default distribution if none is used.`
-`: ${DIST:="$(lsb_release --short --codename)"}`
-``
-`# set the architecture to the host architecture if none set.`
-`: ${ARCH:="$(dpkg --print-architecture)"}`
-``
-`NAME="$DIST"`
-`if [ -n "${ARCH}" ]; then`
-` NAME="$NAME-$ARCH"`
-` DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")`
-`fi`
-`BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"`
-`DISTRIBUTION="$DIST"`
-`BUILDRESULT="/var/cache/pbuilder/$NAME/result/"`
-`APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"`
-`BUILDPLACE="/var/cache/pbuilder/build/"`
-``
-`if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then`
-` # Debian configuration`
-` MIRRORSITE="http://$DEBIAN_MIRROR/debian/"`
-` COMPONENTS="main contrib non-free"`
-` if $(echo "$STABLE_CODENAME stable" | grep -q $DIST); then`
-` OTHERMIRROR="$OTHERMIRROR | deb $MIRRORSITE $STABLE_BACKPORTS_SUITE
$COMPONENTS"`
-` fi`
-`elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then`
-` # Ubuntu configuration`
-` MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/"`
-` COMPONENTS="main restricted universe multiverse"`
-`else`
-` echo "Unknown distribution: $DIST"`
-` exit 1`
-`fi`
+replace /etc/pbuilderrc
+
+ # this is your configuration file for pbuilder.
+ # the file in /usr/share/pbuilder/pbuilderrc is the default template.
+ # /etc/pbuilderrc is the one meant for overwriting defaults in
+ # the default template
+ #
+ # read pbuilderrc.5 document for notes on specific options.
+
+ # List of Debian suites.
+ DEBIAN_SUITES=("sid", "stretch", "jessie", "wheezy", "squeeze")
+
+ # List of Ubuntu suites.
+ UBUNTU_SUITES=("vivid" "utopic" "trusty" "saucy" "raring" "quantal"
"precise" "oneiric" "natty" "lucid" "hardy")
+
+ # Mirrors to use. Update these to your preferred mirror.
+ DEBIAN_MIRROR="ftp.uk.debian.org"
+ UBUNTU_MIRROR="mirrors.kernel.org"
+
+ # set a default distribution if none is used.
+ : ${DIST:="$(lsb_release --short --codename)"}
+
+ # set the architecture to the host architecture if none set.
+ : ${ARCH:="$(dpkg --print-architecture)"}
+
+ NAME="$DIST"
+ if [ -n "${ARCH}" ]; then
+ NAME="$NAME-$ARCH"
+ DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
+ fi
+ BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"
+ DISTRIBUTION="$DIST"
+ BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
+ APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
+ BUILDPLACE="/var/cache/pbuilder/build/"
+
+ if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then
+ # Debian configuration
+ MIRRORSITE="http://$DEBIAN_MIRROR/debian/";
+ COMPONENTS="main contrib non-free"
+ if $(echo "$STABLE_CODENAME stable" | grep -q $DIST); then
+ OTHERMIRROR="$OTHERMIRROR | deb $MIRRORSITE
$STABLE_BACKPORTS_SUITE $COMPONENTS"
+ fi
+ elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then
+ # Ubuntu configuration
+ MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/";
+ COMPONENTS="main restricted universe multiverse"
+ else
+ echo "Unknown distribution: $DIST"
+ exit 1
+ fi
The architecture is assumed to be the native one from
@@ -410,9 +413,9 @@ for each distribution this node will build for:
- create pbuilder result directory and set ownership permissions
-`mkdir -p /var/cache/pbuilder/stretch-armhf/result`
-`chown root:pbuilder /var/cache/pbuilder/stretch-armhf/result`
-`chmod g+w /var/cache/pbuilder/stretch-armhf/result`
+ # mkdir -p /var/cache/pbuilder/stretch-armhf/result
+ # chown root:pbuilder /var/cache/pbuilder/stretch-armhf/result
+ # chmod g+w /var/cache/pbuilder/stretch-armhf/result
- become jenkins user
@@ -435,7 +438,7 @@ Do a basic OS install but \*not\* a CI worker setup.
A recommended hostname for distcc worker is something like "cicpu0" this
allows us to use systems as processing node for other purposes than just
distcc in future. See debians
-[[https://wiki.debian.org/HowTo/ChangeHostname changing
hostname|https///wiki.debian.org/howto/changehostname_changing_hostname]] on
how to achive this.
+[[changing
hostname|https://wiki.debian.org/howto/changehostname_changing_hostname]] on
how to achive this.
The Netsurf repository has necessary updated packages in it and can be
accessed by doing the following:
@@ -457,10 +460,10 @@ accessed by doing the following:
- edit /etc/default/distcc
-`STARTDISTCC="true"`
-`ALLOWEDNETS="192.168.211.0/24"`
-`LISTEN="0.0.0.0"`
-`JOBS="8"`
+ STARTDISTCC="true"
+ ALLOWEDNETS="192.168.211.0/24"
+ LISTEN="0.0.0.0"
+ JOBS="8"
- start the service
-----------------------------------------------------------------------
Summary of changes:
continuous_integration/debian_stretch_setup.mdwn | 131 +++++++++++-----------
1 file changed, 67 insertions(+), 64 deletions(-)
diff --git a/continuous_integration/debian_stretch_setup.mdwn
b/continuous_integration/debian_stretch_setup.mdwn
index bfbc50e..c135861 100644
--- a/continuous_integration/debian_stretch_setup.mdwn
+++ b/continuous_integration/debian_stretch_setup.mdwn
@@ -186,6 +186,7 @@ edit /etc/default/openvpn to have
AUTOSTART="netsurf"
reload config and restart openvpn
+
# systemctl daemon-reload
# service restart openvpn
# systemctl status [email protected]
@@ -338,67 +339,69 @@ installed as a normal CI worker node and then:
as superuser on node:
-- apt-get install pbuilder
-- addgroup pbuilder
-- addgroup jenkins pbuilder
-- create /etc/sudoers.d/pbuilder
+ # apt-get install pbuilder
+ # addgroup pbuilder
+ # addgroup jenkins pbuilder
+
+create /etc/sudoers.d/pbuilder
-`jenkins ALL = NOPASSWD:/usr/sbin/pbuilder`
+ jenkins ALL = NOPASSWD:/usr/sbin/pbuilder
-- visudo and alter Defaults
+`visudo` and alter Defaults
`Defaults env_reset,env_keep="DIST ARCH"`
-- replace /etc/pbuilderrc
-
-`# this is your configuration file for pbuilder.`
-`# the file in /usr/share/pbuilder/pbuilderrc is the default template.`
-`# /etc/pbuilderrc is the one meant for overwriting defaults in`
-`# the default template`
-`#`
-`# read pbuilderrc.5 document for notes on specific options.`
-`# List of Debian suites.`
-`DEBIAN_SUITES=("sid", "stretch", "stretch", "wheezy", "squeeze")`
-``
-`# List of Ubuntu suites.`
-`UBUNTU_SUITES=("vivid" "utopic" "trusty" "saucy" "raring" "quantal" "precise"
"oneiric" "natty" "lucid" "hardy")`
-``
-`# Mirrors to use. Update these to your preferred mirror.`
-`DEBIAN_MIRROR="ftp.uk.debian.org"`
-`UBUNTU_MIRROR="mirrors.kernel.org"`
-``
-`# set a default distribution if none is used.`
-`: ${DIST:="$(lsb_release --short --codename)"}`
-``
-`# set the architecture to the host architecture if none set.`
-`: ${ARCH:="$(dpkg --print-architecture)"}`
-``
-`NAME="$DIST"`
-`if [ -n "${ARCH}" ]; then`
-` NAME="$NAME-$ARCH"`
-` DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")`
-`fi`
-`BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"`
-`DISTRIBUTION="$DIST"`
-`BUILDRESULT="/var/cache/pbuilder/$NAME/result/"`
-`APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"`
-`BUILDPLACE="/var/cache/pbuilder/build/"`
-``
-`if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then`
-` # Debian configuration`
-` MIRRORSITE="http://$DEBIAN_MIRROR/debian/"`
-` COMPONENTS="main contrib non-free"`
-` if $(echo "$STABLE_CODENAME stable" | grep -q $DIST); then`
-` OTHERMIRROR="$OTHERMIRROR | deb $MIRRORSITE $STABLE_BACKPORTS_SUITE
$COMPONENTS"`
-` fi`
-`elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then`
-` # Ubuntu configuration`
-` MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/"`
-` COMPONENTS="main restricted universe multiverse"`
-`else`
-` echo "Unknown distribution: $DIST"`
-` exit 1`
-`fi`
+replace /etc/pbuilderrc
+
+ # this is your configuration file for pbuilder.
+ # the file in /usr/share/pbuilder/pbuilderrc is the default template.
+ # /etc/pbuilderrc is the one meant for overwriting defaults in
+ # the default template
+ #
+ # read pbuilderrc.5 document for notes on specific options.
+
+ # List of Debian suites.
+ DEBIAN_SUITES=("sid", "stretch", "jessie", "wheezy", "squeeze")
+
+ # List of Ubuntu suites.
+ UBUNTU_SUITES=("vivid" "utopic" "trusty" "saucy" "raring" "quantal"
"precise" "oneiric" "natty" "lucid" "hardy")
+
+ # Mirrors to use. Update these to your preferred mirror.
+ DEBIAN_MIRROR="ftp.uk.debian.org"
+ UBUNTU_MIRROR="mirrors.kernel.org"
+
+ # set a default distribution if none is used.
+ : ${DIST:="$(lsb_release --short --codename)"}
+
+ # set the architecture to the host architecture if none set.
+ : ${ARCH:="$(dpkg --print-architecture)"}
+
+ NAME="$DIST"
+ if [ -n "${ARCH}" ]; then
+ NAME="$NAME-$ARCH"
+ DEBOOTSTRAPOPTS=("--arch" "$ARCH" "${DEBOOTSTRAPOPTS[@]}")
+ fi
+ BASETGZ="/var/cache/pbuilder/$NAME-base.tgz"
+ DISTRIBUTION="$DIST"
+ BUILDRESULT="/var/cache/pbuilder/$NAME/result/"
+ APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
+ BUILDPLACE="/var/cache/pbuilder/build/"
+
+ if $(echo ${DEBIAN_SUITES[@]} | grep -q $DIST); then
+ # Debian configuration
+ MIRRORSITE="http://$DEBIAN_MIRROR/debian/";
+ COMPONENTS="main contrib non-free"
+ if $(echo "$STABLE_CODENAME stable" | grep -q $DIST); then
+ OTHERMIRROR="$OTHERMIRROR | deb $MIRRORSITE
$STABLE_BACKPORTS_SUITE $COMPONENTS"
+ fi
+ elif $(echo ${UBUNTU_SUITES[@]} | grep -q $DIST); then
+ # Ubuntu configuration
+ MIRRORSITE="http://$UBUNTU_MIRROR/ubuntu/";
+ COMPONENTS="main restricted universe multiverse"
+ else
+ echo "Unknown distribution: $DIST"
+ exit 1
+ fi
The architecture is assumed to be the native one from
@@ -410,9 +413,9 @@ for each distribution this node will build for:
- create pbuilder result directory and set ownership permissions
-`mkdir -p /var/cache/pbuilder/stretch-armhf/result`
-`chown root:pbuilder /var/cache/pbuilder/stretch-armhf/result`
-`chmod g+w /var/cache/pbuilder/stretch-armhf/result`
+ # mkdir -p /var/cache/pbuilder/stretch-armhf/result
+ # chown root:pbuilder /var/cache/pbuilder/stretch-armhf/result
+ # chmod g+w /var/cache/pbuilder/stretch-armhf/result
- become jenkins user
@@ -435,7 +438,7 @@ Do a basic OS install but \*not\* a CI worker setup.
A recommended hostname for distcc worker is something like "cicpu0" this
allows us to use systems as processing node for other purposes than just
distcc in future. See debians
-[[https://wiki.debian.org/HowTo/ChangeHostname changing
hostname|https///wiki.debian.org/howto/changehostname_changing_hostname]] on
how to achive this.
+[[changing
hostname|https://wiki.debian.org/howto/changehostname_changing_hostname]] on
how to achive this.
The Netsurf repository has necessary updated packages in it and can be
accessed by doing the following:
@@ -457,10 +460,10 @@ accessed by doing the following:
- edit /etc/default/distcc
-`STARTDISTCC="true"`
-`ALLOWEDNETS="192.168.211.0/24"`
-`LISTEN="0.0.0.0"`
-`JOBS="8"`
+ STARTDISTCC="true"
+ ALLOWEDNETS="192.168.211.0/24"
+ LISTEN="0.0.0.0"
+ JOBS="8"
- start the service
--
NetSurf Developer Wiki Backing Store
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
