| @@ -218,12 +218,6 EOM | |||||
| 218 | echo ${TIMEZONE} >$R/etc/timezone |
|
218 | echo ${TIMEZONE} >$R/etc/timezone | |
| 219 | LANG=C chroot $R dpkg-reconfigure -f noninteractive tzdata |
|
219 | LANG=C chroot $R dpkg-reconfigure -f noninteractive tzdata | |
| 220 |
|
220 | |||
| 221 | # Set up default locales to "en_US.UTF-8" default |
|
|||
| 222 | if [ "$ENABLE_MINBASE" = false ] ; then |
|
|||
| 223 | LANG=C chroot $R sed -i "/${DEFLOCAL}/s/^#//" /etc/locale.gen |
|
|||
| 224 | LANG=C chroot $R locale-gen ${DEFLOCAL} |
|
|||
| 225 | fi |
|
|||
| 226 |
|
||||
| 227 | # Upgrade collabora package index and install collabora keyring |
|
221 | # Upgrade collabora package index and install collabora keyring | |
| 228 | echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/apt/sources.list |
|
222 | echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/apt/sources.list | |
| 229 | LANG=C chroot $R apt-get -qq -y update |
|
223 | LANG=C chroot $R apt-get -qq -y update | |
| @@ -247,6 +241,24 EOM | |||||
| 247 | LANG=C chroot $R apt-get -qq -y update |
|
241 | LANG=C chroot $R apt-get -qq -y update | |
| 248 | LANG=C chroot $R apt-get -qq -y -u dist-upgrade |
|
242 | LANG=C chroot $R apt-get -qq -y -u dist-upgrade | |
| 249 |
|
243 | |||
|
|
244 | # Set up default locales to "en_US.UTF-8" default | |||
|
|
245 | if [ "$ENABLE_MINBASE" = false ] ; then | |||
|
|
246 | # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug | |||
|
|
247 | # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957 | |||
|
|
248 | # ... so we have to set locales manually | |||
|
|
249 | if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then | |||
|
|
250 | LANG=C chroot $R echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8" | debconf-set-selections | |||
|
|
251 | else | |||
|
|
252 | # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale | |||
|
|
253 | LANG=C chroot $R echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections | |||
|
|
254 | LANG=C chroot $R sed -i "/en_US.UTF-8/s/^#//" /etc/locale.gen | |||
|
|
255 | fi | |||
|
|
256 | LANG=C chroot $R sed -i "/${DEFLOCAL}/s/^#//" /etc/locale.gen | |||
|
|
257 | LANG=C chroot $R echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections | |||
|
|
258 | LANG=C chroot $R locale-gen | |||
|
|
259 | LANG=C chroot $R update-locale LANG=${DEFLOCAL} | |||
|
|
260 | fi | |||
|
|
261 | ||||
| 250 | # Kernel installation |
|
262 | # Kernel installation | |
| 251 | # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot |
|
263 | # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot | |
| 252 | LANG=C chroot $R apt-get -qq -y --no-install-recommends install linux-image-3.18.0-trunk-rpi2 |
|
264 | LANG=C chroot $R apt-get -qq -y --no-install-recommends install linux-image-3.18.0-trunk-rpi2 | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
