##// END OF EJS Templates
Raspi2-3_GenImage
RSS

Cloner depuis https://github.com/drtyhlpr/rpi23-gen-image.git

fix: collabora keyring fix
Jan Wagner -
r10:b30726a6ed52
parent child
Show More
Show file before | Show file after | Hide comments
@@ -92,7 +92,7 for package in $REQUIRED_PACKAGES ; do
92 fi
92 fi
93 done
93 done
94
94
95 # Ask if missing packages should get installed right now
95 # Ask if missing packages should get installed right now
96 if [ -n "$MISSING_PACKAGES" ] ; then
96 if [ -n "$MISSING_PACKAGES" ] ; then
97 echo "the following packages needed by this script are not installed:"
97 echo "the following packages needed by this script are not installed:"
98 echo "$MISSING_PACKAGES"
98 echo "$MISSING_PACKAGES"
@@ -104,7 +104,7 if [ -n "$MISSING_PACKAGES" ] ; then
104 fi
104 fi
105 fi
105 fi
106
106
107 # Make sure all required packages are installed
107 # Make sure all required packages are installed
108 apt-get -qq -y install ${REQUIRED_PACKAGES}
108 apt-get -qq -y install ${REQUIRED_PACKAGES}
109
109
110 # Don't clobber an old build
110 # Don't clobber an old build
@@ -176,20 +176,6 mount -t proc none $R/proc
176 mount -t sysfs none $R/sys
176 mount -t sysfs none $R/sys
177 mount --bind /dev/pts $R/dev/pts
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 # Pin package flash-kernel to repositories.collabora.co.uk
179 # Pin package flash-kernel to repositories.collabora.co.uk
194 cat <<EOM >$R/etc/apt/preferences.d/flash-kernel
180 cat <<EOM >$R/etc/apt/preferences.d/flash-kernel
195 Package: flash-kernel
181 Package: flash-kernel
@@ -205,18 +191,33 LANG=C chroot $R dpkg-reconfigure -f noninteractive tzdata
205 LANG=C chroot $R sed -i '/${DEFLOCAL}/s/^#//' /etc/locale.gen
191 LANG=C chroot $R sed -i '/${DEFLOCAL}/s/^#//' /etc/locale.gen
206 LANG=C chroot $R locale-gen ${DEFLOCAL}
192 LANG=C chroot $R locale-gen ${DEFLOCAL}
207
193
208 # Fetch APT public key "Collabora Raspbian Archive Signing Key <daniels@collabora.com>"
194 # Upgrade collabora package index and install collabora keyring
209 LANG=C chroot $R apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-keys ED4BF9140C50B1C5
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 # Upgrade package index and update all installed packages and changed dependencies
213 # Upgrade package index and update all installed packages and changed dependencies
212 LANG=C chroot $R apt-get -q -y update
214 LANG=C chroot $R apt-get -qq -y update
213 LANG=C chroot $R apt-get -q -y -u dist-upgrade
215 LANG=C chroot $R apt-get -qq -y -u dist-upgrade
214
216
215 # Kernel installation
217 # Kernel installation
216 # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot
218 # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot
217
219 LANG=C chroot $R apt-get -qq -y --no-install-recommends install linux-image-3.18.0-trunk-rpi2
218 LANG=C chroot $R apt-get -q -y --force-yes --no-install-recommends install linux-image-3.18.0-trunk-rpi2
220 LANG=C chroot $R apt-get -qq -y install flash-kernel
219 LANG=C chroot $R apt-get -q -y --force-yes install flash-kernel
220
221
221 VMLINUZ="$(ls -1 $R/boot/vmlinuz-* | sort | tail -n 1)"
222 VMLINUZ="$(ls -1 $R/boot/vmlinuz-* | sort | tail -n 1)"
222 [ -z "$VMLINUZ" ] && exit 1
223 [ -z "$VMLINUZ" ] && exit 1
@@ -258,7 +259,6 LANG=C chroot $R usermod -a -G sudo -p "${ENCRYPTED_PASSWORD}" pi
258 # Set up root password
259 # Set up root password
259 LANG=C chroot $R usermod -p "${ENCRYPTED_PASSWORD}" root
260 LANG=C chroot $R usermod -p "${ENCRYPTED_PASSWORD}" root
260
261
261
262 # Set up interfaces
262 # Set up interfaces
263 cat <<EOM >$R/etc/network/interfaces
263 cat <<EOM >$R/etc/network/interfaces
264 # interfaces(5) file used by ifup(8) and ifdown(8)
264 # interfaces(5) file used by ifup(8) and ifdown(8)
@@ -656,7 +656,7 if [ "$ENABLE_UBOOT" = true ] ; then
656 git -C $R/tmp clone git://git.denx.de/u-boot.git
656 git -C $R/tmp clone git://git.denx.de/u-boot.git
657
657
658 # Install minimal gcc/g++ build environment and build u-boot inside chroot
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 LANG=C chroot $R make -C /tmp/u-boot/ rpi_2_defconfig all
660 LANG=C chroot $R make -C /tmp/u-boot/ rpi_2_defconfig all
661
661
662 # Copy compiled bootloader binary and set config.txt to load it
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