Raspi2-3_GenImage Commit - r303:e39066375d3a · Collaboration Tremplin des Sciences

syntax bugfixes

Unknown -

r303:e39066375d3a

parent child

Context file:

r303:e39066375d3a

bootstrap.d/12-locale.sh +2 -2

               chroot_exec update-locale LANG="${DEFLOCAL}"
               # Install and setup default keyboard configuration
-              if [ "$XKB_MODEL" != "" ] ; then
+              if [ "$XKB_MODEL" != "pc105" ] ; then
                 sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard"
               fi
-              if [ "$XKB_LAYOUT" != "" ] ; then
+              if [ "$XKB_LAYOUT" != "us" ] ; then
                 sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard"
               fi
               if [ "$XKB_VARIANT" != "" ] ; then

bootstrap.d/13-kernel.sh +8 -4

               #"The Linux kernel "${COLLABORA_KERNEL}" and modules for use on ARMv7 kernel for Raspberry pi 2 model B+"
               # nested if to be easily extended for more precompiled kernels
               if [ "$SET_ARCH" = 32 ] ; then
-                if [ RPI_MODEL = 2 ] ; then
+                if [ "$RPI_MODEL" = 2 ] ; then
                   # Kernel installation
                   chroot_exec apt-get -qq -y --no-install-recommends install linux-image-"${COLLABORA_KERNEL}" raspberrypi-bootloader-nokernel
                   # Copy vmlinuz kernel to the boot directory
                   install_readonly "${VMLINUZ}" "${BOOT_DIR}/${KERNEL_IMAGE}"
                 fi
-            	if [ RPI_MODEL = 0 ] || [ RPI_MODEL = 1 ] || [ RPI_MODEL = 1P ] ; then
+            	if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
-            	# insert precompiled Kernel here
+            	  echo "error: no precompiled kernel found"
+            	  exit 1
+            	  # insert precompiled Kernel code here
             	fi
               #if [ "$SET_ARCH" = 64 ]
               else
-              # inset precompiled 64 bit kernel here
+                echo " error: no precompiled 64bit kernel found"
+                exit 1
+                # inset precompiled 64 bit kernel code here
               fi
             fi

bootstrap.d/15-rpi-config.sh +1 -1

             fi
             # Disable RPi3 Bluetooth and restore ttyAMA0 serial device
-            if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then
+            if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
               if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
                 echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
                 echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"

General Comments 0

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages