##// END OF EJS Templates
Merge pull request #24 from drtyhlpr/master...
Gérard Vidal -
r626:6a5b0d04eb30 Fusion
parent child
Show More
@@ -545,5 +545,5 qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -kernel kernel7.img -no
545 * [Official Raspberry Pi Kernel on github](https://github.com/raspberrypi/linux)
545 * [Official Raspberry Pi Kernel on github](https://github.com/raspberrypi/linux)
546 * [U-BOOT git repository](https://git.denx.de/?p=u-boot.git;a=summary)
546 * [U-BOOT git repository](https://git.denx.de/?p=u-boot.git;a=summary)
547 * [Xorg DDX driver fbturbo](https://github.com/ssvb/xf86-video-fbturbo)
547 * [Xorg DDX driver fbturbo](https://github.com/ssvb/xf86-video-fbturbo)
548 * [RPi3 Wireless interface firmware](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm)
548 * [RPi3 Wireless interface firmware](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm)
549 * [Collabora RPi2 Kernel precompiled](https://repositories.collabora.co.uk/debian/)
549 * [Collabora RPi2 Kernel precompiled](https://repositories.collabora.co.uk/debian/)
@@ -23,15 +23,15 if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then
23 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957
23 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957
24 # ... so we have to set locales manually
24 # ... so we have to set locales manually
25 if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then
25 if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then
26 chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8" | debconf-set-selections
26 chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8 | debconf-set-selections"
27 else
27 else
28 # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale
28 # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale
29 chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections
29 chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8 | debconf-set-selections"
30 sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen"
30 sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen"
31 fi
31 fi
32
32
33 sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen"
33 sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen"
34 chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections
34 chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL} | debconf-set-selections"
35 chroot_exec locale-gen
35 chroot_exec locale-gen
36 chroot_exec update-locale LANG="${DEFLOCAL}"
36 chroot_exec update-locale LANG="${DEFLOCAL}"
37
37
@@ -252,14 +252,19 if [ -n "$SET_ARCH" ] ; then
252 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
252 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
253
253
254 # Raspberry Pi model specific settings
254 # Raspberry Pi model specific settings
255 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
255 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
256 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
256 if [ "$RPI_MODEL" != 4 ] ; then
257 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
257 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
258 else
259 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig}
260 fi
261
262 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
258 RELEASE_ARCH=${RELEASE_ARCH:=arm64}
263 RELEASE_ARCH=${RELEASE_ARCH:=arm64}
259 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
264 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
260 CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
265 CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
261 else
266 else
262 echo "error: Only Raspberry PI 3 and 3B+ support 64-bit"
267 echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"
263 exit 1
268 exit 1
264 fi
269 fi
265 fi
270 fi
@@ -281,9 +286,14 if [ -n "$SET_ARCH" ] ; then
281 fi
286 fi
282
287
283 # Raspberry Pi model specific settings
288 # Raspberry Pi model specific settings
284 if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
289 if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
285 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
290 if [ "$RPI_MODEL" != 4 ] ; then
286 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
291 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
292 else
293 KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig}
294 fi
295
296 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
287 RELEASE_ARCH=${RELEASE_ARCH:=armhf}
297 RELEASE_ARCH=${RELEASE_ARCH:=armhf}
288 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
298 KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img}
289 CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
299 CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-}
@@ -320,6 +330,10 case "$RPI_MODEL" in
320 DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
330 DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb}
321 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
331 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig}
322 ;;
332 ;;
333 4)
334 DTB_FILE=${DTB_FILE:=bcm2711-rpi-4-b.dtb}
335 UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_4_defconfig}
336 ;;
323 *)
337 *)
324 echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
338 echo "error: Raspberry Pi model $RPI_MODEL is not supported!"
325 exit 1
339 exit 1
@@ -327,7 +341,7 case "$RPI_MODEL" in
327 esac
341 esac
328
342
329 # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
343 # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
330 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
344 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
331 # Include bluetooth packages on supported boards
345 # Include bluetooth packages on supported boards
332 if [ "$ENABLE_BLUETOOTH" = true ] ; then
346 if [ "$ENABLE_BLUETOOTH" = true ] ; then
333 APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
347 APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant