##// END OF EJS Templates
fix: collabora keyring fix
Jan Wagner -
r10:b30726a6ed52
parent child
Show More
@@ -176,20 +176,6 mount -t proc none $R/proc
176 176 mount -t sysfs none $R/sys
177 177 mount --bind /dev/pts $R/dev/pts
178 178
179 # Set up initial sources.list
180 cat <<EOM >$R/etc/apt/sources.list
181 deb http://${APT_SERVER}/debian ${RELEASE} main contrib
182 #deb-src http://${APT_SERVER}/debian ${RELEASE} main contrib
183
184 deb http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
185 #deb-src http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
186
187 deb http://security.debian.org/ ${RELEASE}/updates main contrib
188 #deb-src http://security.debian.org/ ${RELEASE}/updates main contrib
189
190 deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2
191 EOM
192
193 179 # Pin package flash-kernel to repositories.collabora.co.uk
194 180 cat <<EOM >$R/etc/apt/preferences.d/flash-kernel
195 181 Package: flash-kernel
@@ -205,18 +191,33 LANG=C chroot $R dpkg-reconfigure -f noninteractive tzdata
205 191 LANG=C chroot $R sed -i '/${DEFLOCAL}/s/^#//' /etc/locale.gen
206 192 LANG=C chroot $R locale-gen ${DEFLOCAL}
207 193
208 # Fetch APT public key "Collabora Raspbian Archive Signing Key <daniels@collabora.com>"
209 LANG=C chroot $R apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-keys ED4BF9140C50B1C5
194 # Upgrade collabora package index and install collabora keyring
195 echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/apt/sources.list
196 LANG=C chroot $R apt-get -qq -y update
197 LANG=C chroot $R apt-get -qq -y --force-yes install collabora-obs-archive-keyring
198
199 # Set up initial sources.list
200 cat <<EOM >$R/etc/apt/sources.list
201 deb http://${APT_SERVER}/debian ${RELEASE} main contrib
202 #deb-src http://${APT_SERVER}/debian ${RELEASE} main contrib
203
204 deb http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
205 #deb-src http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
206
207 deb http://security.debian.org/ ${RELEASE}/updates main contrib
208 #deb-src http://security.debian.org/ ${RELEASE}/updates main contrib
209
210 deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2
211 EOM
210 212
211 213 # Upgrade package index and update all installed packages and changed dependencies
212 LANG=C chroot $R apt-get -q -y update
213 LANG=C chroot $R apt-get -q -y -u dist-upgrade
214 LANG=C chroot $R apt-get -qq -y update
215 LANG=C chroot $R apt-get -qq -y -u dist-upgrade
214 216
215 217 # Kernel installation
216 218 # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot
217
218 LANG=C chroot $R apt-get -q -y --force-yes --no-install-recommends install linux-image-3.18.0-trunk-rpi2
219 LANG=C chroot $R apt-get -q -y --force-yes install flash-kernel
219 LANG=C chroot $R apt-get -qq -y --no-install-recommends install linux-image-3.18.0-trunk-rpi2
220 LANG=C chroot $R apt-get -qq -y install flash-kernel
220 221
221 222 VMLINUZ="$(ls -1 $R/boot/vmlinuz-* | sort | tail -n 1)"
222 223 [ -z "$VMLINUZ" ] && exit 1
@@ -258,7 +259,6 LANG=C chroot $R usermod -a -G sudo -p "${ENCRYPTED_PASSWORD}" pi
258 259 # Set up root password
259 260 LANG=C chroot $R usermod -p "${ENCRYPTED_PASSWORD}" root
260 261
261
262 262 # Set up interfaces
263 263 cat <<EOM >$R/etc/network/interfaces
264 264 # interfaces(5) file used by ifup(8) and ifdown(8)
@@ -656,7 +656,7 if [ "$ENABLE_UBOOT" = true ] ; then
656 656 git -C $R/tmp clone git://git.denx.de/u-boot.git
657 657
658 658 # Install minimal gcc/g++ build environment and build u-boot inside chroot
659 LANG=C chroot $R apt-get install -y --force-yes --no-install-recommends linux-compiler-gcc-4.9-arm g++ make bc
659 LANG=C chroot $R apt-get install -qq -y --force-yes --no-install-recommends linux-compiler-gcc-4.9-arm g++ make bc
660 660 LANG=C chroot $R make -C /tmp/u-boot/ rpi_2_defconfig all
661 661
662 662 # Copy compiled bootloader binary and set config.txt to load it
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant