| @@ -28,10 +28,10 if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then | |||
|
|
28 | 28 | chroot_exec update-locale LANG="${DEFLOCAL}" |
|
|
29 | 29 | |
|
|
30 | 30 | # Install and setup default keyboard configuration |
|
|
31 | if [ "$XKB_MODEL" != "" ] ; then | |
|
|
31 | if [ "$XKB_MODEL" != "pc105" ] ; then | |
|
|
32 | 32 | sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard" |
|
|
33 | 33 | fi |
|
|
34 | if [ "$XKB_LAYOUT" != "" ] ; then | |
|
|
34 | if [ "$XKB_LAYOUT" != "us" ] ; then | |
|
|
35 | 35 | sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard" |
|
|
36 | 36 | fi |
|
|
37 | 37 | if [ "$XKB_VARIANT" != "" ] ; then |
| @@ -239,7 +239,7 elif [ BUILD_KERNEL = false ] | |||
|
|
239 | 239 | #"The Linux kernel "${COLLABORA_KERNEL}" and modules for use on ARMv7 kernel for Raspberry pi 2 model B+" |
|
|
240 | 240 | # nested if to be easily extended for more precompiled kernels |
|
|
241 | 241 | if [ "$SET_ARCH" = 32 ] ; then |
|
|
242 | if [ RPI_MODEL = 2 ] ; then | |
|
|
242 | if [ "$RPI_MODEL" = 2 ] ; then | |
|
|
243 | 243 | # Kernel installation |
|
|
244 | 244 | chroot_exec apt-get -qq -y --no-install-recommends install linux-image-"${COLLABORA_KERNEL}" raspberrypi-bootloader-nokernel |
|
|
245 | 245 | |
| @@ -256,11 +256,15 elif [ BUILD_KERNEL = false ] | |||
|
|
256 | 256 | # Copy vmlinuz kernel to the boot directory |
|
|
257 | 257 | install_readonly "${VMLINUZ}" "${BOOT_DIR}/${KERNEL_IMAGE}" |
|
|
258 | 258 | fi |
|
|
259 | if [ RPI_MODEL = 0 ] || [ RPI_MODEL = 1 ] || [ RPI_MODEL = 1P ] ; then | |
|
|
260 | # insert precompiled Kernel here | |
|
|
259 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then | |
|
|
260 | echo "error: no precompiled kernel found" | |
|
|
261 | exit 1 | |
|
|
262 | # insert precompiled Kernel code here | |
|
|
261 | 263 | fi |
|
|
262 | 264 | #if [ "$SET_ARCH" = 64 ] |
|
|
263 | 265 | else |
|
|
264 |
|
|
|
|
266 | echo " error: no precompiled 64bit kernel found" | |
|
|
267 | exit 1 | |
|
|
268 | # inset precompiled 64 bit kernel code here | |
|
|
265 | 269 | fi |
|
|
266 | 270 | fi |
| @@ -95,7 +95,7 if [ "$ENABLE_INITRAMFS" = true ] ; then | |||
|
|
95 | 95 | fi |
|
|
96 | 96 | |
|
|
97 | 97 | # Disable RPi3 Bluetooth and restore ttyAMA0 serial device |
|
|
98 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then | |
|
|
98 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |
|
|
99 | 99 | if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then |
|
|
100 | 100 | echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" |
|
|
101 | 101 | echo "enable_uart=1" >> "${BOOT_DIR}/config.txt" |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
