[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 4 commits: simplify apt's sources.list of the arm64 hosts, disable restricted and multiverse
Mattia Rizzolo
gitlab at salsa.debian.org
Fri Jun 22 12:12:07 BST 2018
Mattia Rizzolo pushed to branch master at Debian QA / jenkins.debian.net
Commits:
bf8f6144 by Mattia Rizzolo at 2018-06-22T12:54:20+02:00
simplify apt's sources.list of the arm64 hosts, disable restricted and multiverse
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
6f915a55 by Mattia Rizzolo at 2018-06-22T12:57:21+02:00
update_jdn: stop installing lintian on our hosts, we really have no use for it
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
67fb58ea by Mattia Rizzolo at 2018-06-22T13:09:43+02:00
Use APT pinning instead of using `apt-get install -t`.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
42decf0c by Mattia Rizzolo at 2018-06-22T13:10:52+02:00
Move from jessie-backports to stretch-backports for pbuilder in the arm64 hosts
also here, drop the not used non-free repos.
Signed-off-by: Mattia Rizzolo <mattia at debian.org>
- - - - -
3 changed files:
- + hosts/common-arm64/etc/apt/preferences.d/pbuilder
- hosts/common-arm64/etc/apt/sources.list
- update_jdn.sh
Changes:
=====================================
hosts/common-arm64/etc/apt/preferences.d/pbuilder
=====================================
--- /dev/null
+++ b/hosts/common-arm64/etc/apt/preferences.d/pbuilder
@@ -0,0 +1,7 @@
+Package: pbuilder
+Pin: release o=Debian Backports
+Pin-Priority: 990
+
+Package: *
+Pin: release o=Debian Backports
+Pin-Priority: -1
=====================================
hosts/common-arm64/etc/apt/sources.list
=====================================
--- a/hosts/common-arm64/etc/apt/sources.list
+++ b/hosts/common-arm64/etc/apt/sources.list
@@ -1,58 +1,9 @@
-# deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial main restricted
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial main universe
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates main universe
+deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-backports main universe
-# deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted
-# deb http://ports.ubuntu.com/ubuntu-ports xenial-security main restricted
-
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial main restricted
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial universe
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial universe
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates universe
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates universe
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial multiverse
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial multiverse
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates multiverse
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-updates multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-deb http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted universe multiverse
-# deb-src http://gb.ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted universe multiverse
-
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu xenial partner
-# deb-src http://archive.canonical.com/ubuntu xenial partner
-
-deb http://ports.ubuntu.com/ubuntu-ports xenial-security main restricted
-# deb-src http://ports.ubuntu.com/ubuntu-ports xenial-security main restricted
-deb http://ports.ubuntu.com/ubuntu-ports xenial-security universe
-# deb-src http://ports.ubuntu.com/ubuntu-ports xenial-security universe
-deb http://ports.ubuntu.com/ubuntu-ports xenial-security multiverse
-# deb-src http://ports.ubuntu.com/ubuntu-ports xenial-security multiverse
-
-# < mapreri> best would be for the backports team to accept my backport to xenial... (currently in the mod queue)
-deb http://deb.debian.org/debian/ jessie-backports main contrib non-free
+deb http://ports.ubuntu.com/ubuntu-ports xenial-security main universe
+# Mattia would like to update pbuilder in ubuntu's backports, but the backports
+# team there is currently inactive.
+deb http://deb.debian.org/debian/ stretch-backports main
=====================================
update_jdn.sh
=====================================
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -252,7 +252,6 @@ if [ -f /etc/debian_version ] ; then
haveged
htop
less
- lintian
locales-all
lsof
molly-guard
@@ -456,12 +455,7 @@ if [ -f /etc/debian_version ] ; then
$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
# don't (re-)install pbuilder if it's on hold
if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' pbuilder)" != "hi " ] ; then
- case $HOSTNAME in
- codethink*) $UP2DATE || sudo apt-get install -t jessie-backports pbuilder
- ;;
- *) $UP2DATE || sudo apt-get install pbuilder lintian
- ;;
- esac
+ $UP2DATE || sudo apt-get install pbuilder
fi
# remove unattended-upgrades if it's installed
if [ "$(dpkg-query -W -f='${db:Status-Abbrev}\n' unattended-upgrades 2>/dev/null || true)" = "ii " ] ; then
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/e6af59dd4a9c6e5649d4fa68d8ac3992ce3ee454...42decf0c33f5f3f92cf9ff2af0c4a5cdc177aba3
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/e6af59dd4a9c6e5649d4fa68d8ac3992ce3ee454...42decf0c33f5f3f92cf9ff2af0c4a5cdc177aba3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20180622/acc596e4/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list