##// END OF EJS Templates
fix netselect...
Unknown -
r308:3f44d3218629
parent child
Show More
@@ -1,63 +1,68
1 1 #
2 2 # Setup APT repositories
3 3 #
4 4
5 5 # Load utility functions
6 6 . ./functions.sh
7 7
8 8 # Install and setup APT proxy configuration
9 9 if [ -z "$APT_PROXY" ] ; then
10 10 install_readonly files/apt/10proxy "${ETC_DIR}/apt/apt.conf.d/10proxy"
11 11 sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
12 12 fi
13 13
14 14 if [ "$BUILD_KERNEL" = false ] ; then
15 15 if [ "$RPI_MODEL" = 2 ] ; then
16 16 # Install APT pinning configuration for flash-kernel package
17 17 install_readonly files/apt/flash-kernel "${ETC_DIR}/apt/preferences.d/flash-kernel"
18 18
19 19 # Install APT sources.list
20 20 install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
21 21 echo "deb ${COLLABORA_URL} ${RELEASE} rpi2" >> "${ETC_DIR}/apt/sources.list"
22 22
23 23 # Upgrade collabora package index and install collabora keyring
24 24 chroot_exec apt-get -qq -y update
25 25 chroot_exec apt-get -qq -y --allow-unauthenticated install collabora-obs-archive-keyring
26 26 # if RPI_MODEL = [0] || [1] || [1P]
27 27 else
28 28 echo "error: ATM there is just a precompiled kernel for model 2";
29 29 # insert apt configuration for precompiled kernel repository for RPI 0,1,1P
30 30 fi
31 31
32 32 else # BUILD_KERNEL=true
33 33 #autconfigure best apt server to not spam ftp.debian.org
34 34 rm files/apt/sources.list
35 #netselect-apt does not know buster yet
36 if [ "$RELEASE" = "buster" ] ; then
37 RLS = "testing"
38 fi
39
35 40 if [ "$ENABLE_NONFREE" ] ; then
36 41 netselect-apt --arch "$RELEASE_ARCH" --sources --nonfree --outfile "${ETC_DIR}/apt/sources.list" -d "$RELEASE"
37 42 else
38 43 netselect-apt --arch "$RELEASE_ARCH" --sources --nonfree --outfile "${ETC_DIR}/apt/sources.list" -d "$RELEASE"
39 44 fi
40 45 fi
41 46
42 47 # Allow the installation of non-free Debian packages
43 48 if [ "$ENABLE_NONFREE" = true ] ; then
44 49 sed -i "s/ contrib/ contrib non-free/" "${ETC_DIR}/apt/sources.list"
45 50 fi
46 51
47 52 # Upgrade package index and update all installed packages and changed dependencies
48 53 chroot_exec apt-get -qq -y update
49 54 chroot_exec apt-get -qq -y -u dist-upgrade
50 55
51 56 if [ "$APT_INCLUDES_LATE" ] ; then
52 57 chroot_exec apt-get -qq -y install $(echo $APT_INCLUDES_LATE |tr , ' ')
53 58 fi
54 59
55 60 if [ -d packages ] ; then
56 61 for package in packages/*.deb ; do
57 62 cp $package ${R}/tmp
58 63 chroot_exec dpkg --unpack /tmp/$(basename $package)
59 64 done
60 65 fi
61 66 chroot_exec apt-get -qq -y -f install
62 67
63 68 chroot_exec apt-get -qq -y check
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant