From 4aa8ac6985680eb12ba5c82422ecc50e2bb55447 Mon Sep 17 00:00:00 2001
From: Jan Wagner <mail@jwagner.eu>
Date: Sat, 12 Mar 2016 16:07:25 +0100
Subject: spliting more files, fix-uboot, fix-fbturbo, fix-locale

---
 bootstrap.d/11-apt.sh | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

(limited to 'bootstrap.d/11-apt.sh')

diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 9a4739d..e70a6e7 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -2,19 +2,17 @@
 # Setup APT repositories
 #
 
+# Load utility functions
 . ./functions.sh
 
 # Use proxy inside chroot
 if [ -z "$APT_PROXY" ] ; then
-  echo "Acquire::http::Proxy \"$APT_PROXY\";" >> $R/etc/apt/apt.conf.d/10proxy
+  install_readonly files/apt/10proxy $R/etc/apt/apt.conf.d/10proxy
+  sed -i -e "s/\"\"/\"${APT_PROXY}\"/" $R/etc/apt/apt.conf.d/10proxy
 fi
 
 # Pin package flash-kernel to repositories.collabora.co.uk
-cat <<EOM >$R/etc/apt/preferences.d/flash-kernel
-Package: flash-kernel
-Pin: origin repositories.collabora.co.uk
-Pin-Priority: 1000
-EOM
+install_readonly files/apt/flash-kernel $R/etc/apt/preferences.d/flash-kernel
 
 # Upgrade collabora package index and install collabora keyring
 echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/apt/sources.list
@@ -22,18 +20,9 @@ chroot_exec apt-get -qq -y update
 chroot_exec apt-get -qq -y --force-yes install collabora-obs-archive-keyring
 
 # Set up initial sources.list
-cat <<EOM >$R/etc/apt/sources.list
-deb http://${APT_SERVER}/debian ${RELEASE} main contrib
-#deb-src http://${APT_SERVER}/debian ${RELEASE} main contrib
-
-deb http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
-#deb-src http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
-
-deb http://security.debian.org/ ${RELEASE}/updates main contrib
-#deb-src http://security.debian.org/ ${RELEASE}/updates main contrib
-
-deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2
-EOM
+install_readonly files/apt/sources.list $R/etc/apt/sources.list
+sed -i -e "s/\/ftp.debian.org\//\/${APT_SERVER}\//" $R/etc/apt/sources.list
+sed -i -e "s/ jessie/ ${RELEASE}/" $R/etc/apt/sources.list
 
 # Upgrade package index and update all installed packages and changed dependencies
 chroot_exec apt-get -qq -y update
-- 
cgit v1.2.3