##// END OF EJS Templates
Still errors on 11-apt.sh
vidal -
r730:47ebd0c00694
parent child
Show More
@@ -1,63 +1,50
1 #
1 #
2 # Setup APT repositories
2 # Setup APT repositories
3 #
3 #
4
4
5 # Load utility functions
5 # Load utility functions
6 . ./functions.sh
6 . ./functions.sh
7
7
8 # Install and setup APT proxy configuration
8 # Install and setup APT proxy configuration
9 if [ -z "$APT_PROXY" ] ; then
9 if [ -z "$APT_PROXY" ] ; then
10 install_readonly files/apt/10proxy "${ETC_DIR}/apt/apt.conf.d/10proxy"
10 install_readonly files/apt/10proxy "${ETC_DIR}/apt/apt.conf.d/10proxy"
11 sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
11 sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
12 fi
12 fi
13
13
14 if [ "$BUILD_KERNEL" = false ] ; then
14 # Install APT sources.list
15 # Install APT pinning configuration for flash-kernel package
15 install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
16 install_readonly files/apt/flash-kernel "${ETC_DIR}/apt/preferences.d/flash-kernel"
17
18 # Install APT sources.list
19 install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
20 echo "deb ${COLLABORA_URL} ${RELEASE} rpi2" >> "${ETC_DIR}/apt/sources.list"
21
22 # Upgrade collabora package index and install collabora keyring
23 chroot_exec apt-get -qq -y update
24 # Removed --allow-unauthenticated as suggested after modification on _apt privileges
25 chroot_exec apt-get -qq -y install collabora-obs-archive-keyring
26 else # BUILD_KERNEL=true
27 # Install APT sources.list
28 install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list"
29
16
30 # Use specified APT server and release
17 # Use specified APT server and release
31 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
18 sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
32
19
33 #Fix for changing path for security updates in testing
20 #Fix for changing path for security updates in testing
34 if [ "$RELEASE" = "testing" ] ; then
21 if [ "$RELEASE" = "testing" ] ; then
35 sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
22 sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
36 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
23 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
37 fi
24 fi
38
25
39 if [ -z "$RELEASE" ] ; then
26 if [ -z "$RELEASE" ] ; then
40 # Change release in sources list
27 # Change release in sources list
41 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
28 sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
42 fi
29 fi
43
30
44 # Upgrade package index and update all installed packages and changed dependencies
31 # Upgrade package index and update all installed packages and changed dependencies
45 chroot_exec apt-get -qq -y update
32 chroot_exec apt-get -qq -y update
46 chroot_exec apt-get -qq -y -u dist-upgrade
33 chroot_exec apt-get -qq -y -u dist-upgrade
47
34
48 # Install additional packages
35 # Install additional packages
49 if [ "$APT_INCLUDES_LATE" ] ; then
36 if [ "$APT_INCLUDES_LATE" ] ; then
50 chroot_exec apt-get -qq -y install $(echo "$APT_INCLUDES_LATE" |tr , ' ')
37 chroot_exec apt-get -qq -y install $(echo "$APT_INCLUDES_LATE" |tr , ' ')
51 fi
38 fi
52
39
53 # Install Debian custom packages
40 # Install Debian custom packages
54 if [ -d packages ] ; then
41 if [ -d packages ] ; then
55 for package in packages/*.deb ; do
42 for package in packages/*.deb ; do
56 cp "$package" "${R}"/tmp
43 cp "$package" "${R}"/tmp
57 chroot_exec dpkg --unpack /tmp/"$(basename "$package")"
44 chroot_exec dpkg --unpack /tmp/"$(basename "$package")"
58 done
45 done
59 fi
46 fi
60
47
61 chroot_exec apt-get -qq -y -f install
48 chroot_exec apt-get -qq -y -f install
62
49
63 chroot_exec apt-get -qq -y check
50 chroot_exec apt-get -qq -y check
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant