Commit 8dad6454 authored by intrigeri's avatar intrigeri
Browse files

Update auto/config, APT sources and pinning for Stretch.

Note that we keep installing the kernel from Jessie,
until #10298 is solved.
parent 6ab5886a
...@@ -20,7 +20,7 @@ export LB_BOOTSTRAP_INCLUDE='eatmydata' ...@@ -20,7 +20,7 @@ export LB_BOOTSTRAP_INCLUDE='eatmydata'
RUN_LB_CONFIG="lb config noauto" RUN_LB_CONFIG="lb config noauto"
# init config/ with defaults for the target distribution # init config/ with defaults for the target distribution
$RUN_LB_CONFIG --distribution jessie ${@} $RUN_LB_CONFIG --distribution stretch ${@}
# set Amnesia's general options # set Amnesia's general options
$RUN_LB_CONFIG \ $RUN_LB_CONFIG \
......
Package: apparmor-profiles-extra
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: b43-fwcutter Package: b43-fwcutter
Pin: release o=Debian,a=unstable Pin: release o=Debian,a=unstable
Pin-Priority: 999 Pin-Priority: 999
Package: electrum
Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: firmware-amd-graphics Package: firmware-amd-graphics
Pin: release o=Debian,a=unstable Pin: release o=Debian,a=unstable
Pin-Priority: 999 Pin-Priority: 999
...@@ -66,10 +58,6 @@ Package: firmware-zd1211 ...@@ -66,10 +58,6 @@ Package: firmware-zd1211
Pin: release o=Debian,a=unstable Pin: release o=Debian,a=unstable
Pin-Priority: 999 Pin-Priority: 999
Package: libnet-dbus-perl
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: linux-base Package: linux-base
Pin: release o=Debian,n=jessie Pin: release o=Debian,n=jessie
Pin-Priority: 999 Pin-Priority: 999
...@@ -138,26 +126,10 @@ Package: obfs4proxy ...@@ -138,26 +126,10 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990 Pin-Priority: 990
Package: python-electrum
Pin: release o=Debian,n=stretch
Pin-Priority: 999
Package: ttdnsd Package: ttdnsd
Pin: release o=TorProject,a=unstable Pin: release o=TorProject,a=unstable
Pin-Priority: 999 Pin-Priority: 999
Package: torsocks
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: xserver-xorg-video-intel
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Package: xul-ext-torbirdy
Pin: release o=Debian Backports,n=jessie-backports
Pin-Priority: 999
Explanation: weirdness in chroot_apt install-binary Explanation: weirdness in chroot_apt install-binary
Package: * Package: *
Pin: release o=chroot_local-packages Pin: release o=chroot_local-packages
...@@ -168,15 +140,15 @@ Pin: origin deb.tails.boum.org ...@@ -168,15 +140,15 @@ Pin: origin deb.tails.boum.org
Pin-Priority: 1005 Pin-Priority: 1005
Package: * Package: *
Pin: release o=Debian,n=jessie-updates Pin: release o=Debian,n=stretch-updates
Pin-Priority: 990 Pin-Priority: 990
Package: * Package: *
Pin: release o=Debian,n=jessie Pin: release o=Debian,n=stretch
Pin-Priority: 990 Pin-Priority: 990
Package: * Package: *
Pin: release o=TorProject,n=jessie Pin: release o=TorProject,n=stretch
Pin-Priority: 990 Pin-Priority: 990
Package: * Package: *
......
jessie-backports.chroot
\ No newline at end of file
deb http://ftp.us.debian.org/debian/ jessie-backports main contrib non-free
jessie.chroot
\ No newline at end of file
deb http://security.debian.org/ jessie/updates main contrib non-free
deb http://ftp.us.debian.org/debian/ jessie main contrib non-free
testing.chroot
\ No newline at end of file
deb http://ftp.us.debian.org/debian/ testing main contrib non-free
deb http://deb.torproject.org/torproject.org jessie main deb http://deb.torproject.org/torproject.org stretch main
deb http://deb.torproject.org/torproject.org sid main deb http://deb.torproject.org/torproject.org sid main
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