Raspi2-3_GenImage Commit - r219:d1ce055920e0 · Collaboration Tremplin des Sciences

merge avec master

vidal -

r219:d1ce055920e0

parent child

Context file:

r219:d1ce055920e0

templates/rpi2buster created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=2
	3	RELEASE=buster
	4	BUILD_KERNEL=true

templates/rpi3buster created 644 +4 0

@@ -0,0 +1,4
	1	# Configuration template file used by rpi23-gen-image.sh
	2	RPI_MODEL=3
	3	RELEASE=buster
	4	BUILD_KERNEL=true

README.md +5 -3

             # rpi23-gen-image
             ## Introduction
-            `rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2) and Raspberry Pi 3 (RPi3) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie` and `stretch`. This fork enables also `buster` release. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 64-bit images can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.11.y raspife3-buster-arm64```).
+            `rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2) and Raspberry Pi 3 (RPi3) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie`, `stretch` and `buster`. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 64-bit images can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.11.y```).
             ## Build dependencies
             The following list of Debian packages must be installed on the build system because they are essentially required for the bootstrapping process. The script will check if all required packages are installed and missing packages will be installed automatically if confirmed by the user.
             Specifiy the target Raspberry Pi hardware model. The script at this time supports the Raspberry Pi models `2` and `3`. `BUILD_KERNEL`=true will automatically be set if the Raspberry Pi model `3` is used.
             ##### `RELEASE`="jessie"
-            Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases "jessie" and "stretch". `BUILD_KERNEL`=true will automatically be set if the Debian release `stretch` is used.
+            Set the desired Debian release name. The script at this time supports the bootstrapping of the Debian releases "jessie", "stretch" and "buster". `BUILD_KERNEL`=true will automatically be set if the Debian releases `stretch` or `buster` are used.
             ##### `RELEASE_ARCH`="armhf"
             Set the desired Debian release architecture.
             Create an initramfs that that will be loaded during the Linux startup process. `ENABLE_INITRAMFS` will automatically get enabled if `ENABLE_CRYPTFS`=true. This parameter will be ignored if `BUILD_KERNEL`=false.
             ##### `ENABLE_IFNAMES`=true
-            Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names. This parameter is only supported if the Debian release `stretch` is used.
+            Enable automatic assignment of predictable, stable network interface names for all local Ethernet, WLAN interfaces. This might create complex and long interface names. This parameter is only supported if the Debian releases `stretch` or `buster` are used.
             ##### `DISABLE_UNDERVOLT_WARNINGS`=
             Disable RPi2/3 under-voltage warnings and overlays. Setting the parameter to `1` will disable the warning overlay. Setting it to `2` will additionally allow RPi2/3 turbo mode when low-voltage is present.

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

               CMDLINE="${CMDLINE} net.ifnames=1"
             fi
-            # Set init to systemd if required by Debian release stretch or buster
+            # Set init to systemd if required by Debian release
             if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
               CMDLINE="${CMDLINE} init=/bin/systemd"
             fi

bootstrap.d/20-networking.sh +1 -1

             # Remove empty settings from network configuration
             sed -i "/.*=\$/d" "${ETC_DIR}/systemd/network/eth.network"
-            # Move systemd network configuration if required by Debian release stretch or buster
+            # Move systemd network configuration if required by Debian release
             if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
               mv -v "${ETC_DIR}/systemd/network/eth.network" "${LIB_DIR}/systemd/network/10-eth.network"
               rm -fr "${ETC_DIR}/systemd/network"

bootstrap.d/42-fbturbo.sh +2 0

               # Install Xorg build dependencies
               if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
                 chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
+              elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+                chroot_exec apt-get -q -y --no-install-recommends --allow-unauthenticated install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
               fi
               # Build and install fbturbo driver inside chroot

bootstrap.d/99-reduce.sh +1 -1

               # Replace bash shell by dash shell (experimental)
               if [ "$REDUCE_BASH" = true ] ; then
-                if [ "$RELEASE" = "stretch" ] ; then
+                if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
                   echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --allow-remove-essential bash
                 else
                   echo "Yes, do as I say!" | chroot_exec apt-get purge -qq -y --force-yes bash

functions.sh +2 0

                 if [ "$RELEASE" = "jessie" ] || [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
                   chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
+                elif [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
+                  chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
                 fi
               fi
             }

rpi23-gen-image.sh +3 -9

             ########################################################################
             # rpi23-gen-image.sh					       2015-2017
             #
-            # Advanced Debian "jessie" and "stretch"  bootstrap script for RPi2/3
+            # Advanced Debian "jessie", "stretch" and "buster" bootstrap script for RPi2/3
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             #
             # Copyright (C) 2015 Jan Wagner <mail@jwagner.eu>
             #
-            # Big thanks for patches and enhancements by 10+ github contributors!
+            # Big thanks for patches and enhancements by 20+ github contributors!
             ########################################################################
             # Are we running as root?
             APT_INCLUDES=${APT_INCLUDES:=""}
             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
-            # Package apt-transport-https has been removed from Debian Buster release
-            # this induces qemu error 383 which does not prevent building an image
-            if [ "$RELEASE" = "buster" ] ; then
-              APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/apt-transport-https,//")"
-            fi
             # Packages required for bootstrapping
             REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
             MISSING_PACKAGES=""
             fi
             # Build RPi2/3 Linux kernel if required by Debian release
-            if [ "$RELEASE" = "stretch" ] ; then
+            if [ "$RELEASE" = "stretch" ]  || [ "$RELEASE" = "buster" ] ; then
               BUILD_KERNEL=true
             fi

General Comments 0

Écrire
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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