Raspi2-3_GenImage Commit - r769:84547e7b6839 · Collaboration Tremplin des Sciences

Merge branch 'master' of http://depot.tremplin.ens-lyon.fr/Raspi2-3_GenImage

vidal -

r769:84547e7b6839

parent child

Context file:

r769:84547e7b6839

templates/raspife3-buster_20-11-01 created 644 +148 0

@@ -0,0 +1,148
	1	#
	2	# Configuration file raspi3 Buster IFÉ 2020/11/01
	3	#
	4	#---------------------
	5	#--- APT settings ----
	6	#---------------------
	7	APT_SERVER=ftp.fr.debian.org
	8	APT_INCLUDES="jed terminator nginx curl wget htop"
	9	APT_INCLUDES_LATE="pcre2-utils libpcre3-dev \
	10	openjdk-11-jdk openjdk-11-jre openjdk-11-jdk-headless openjdk-11-jre-headless \
	11	libpython3-all-dev bison byacc python-pip python3-pip python-pkgconfig python3-pkgconfig \
	12	python3-netcdf4 python-netcdf4 python-libxml2 libxslt1-dev python-libxslt1 \
	13	libxml2 libjavascriptcoregtk-4.0-dev \
	14	libffi-dev screen sqlite3 libsqlite3-dev liblua5.3-dev doxygen libftdi-dev \
	15	libconfuse-dev libcereal-dev libopenblas-dev libnetcdf-dev libhdf5-dev \
	16	git lxdm pcmanfm-qt libffi-dev tightvncserver \
	17	libssl-dev python-openssl python3-openssl libcrypto++-dev \
	18	mate-backgrounds gnome-backgrounds \
	19	fcgiwrap automake libtool libboost1.67-dev \
	20	php-fpm libfcgi-dev php7.3-mysql icedtea-netx \
	21	tigervnc-standalone-server tigervnc-common \
	22	docker.io openvswitch-switch wireshark imagemagick tk tcllib util-linux \
	23	xfonts-base fonts-liberation gsfonts libxfont-dev libfontenc-dev \
	24	ttf-mscorefonts-installer xfonts-100dpi xfonts-75dpi xfonts-base \
	25	xfonts-utils"
	26	#-------------------------------
	27	#--- General System Settings ---
	28	#-------------------------------
	29	SET_ARCH=32
	30	RPI_MODEL=3
	31	RELEASE="buster"
	32	HOSTNAME="raspife3"
	33	DEFLOCAL="fr_FR.UTF-8"
	34	TIMEZONE="Europe/Paris"
	35	EXPANDROOT=false
	36	#---------------------
	37	#--- User Settings ---
	38	#---------------------
	39	ENABLE_ROOT=false
	40	ROOT_PASSWORD="Achanger1$"
	41	ENABLE_USER=true
	42	USER_NAME=ens-ife
	43	USER_PASSWORD="AChanger1$"
	44	#-------------------------
	45	#--- Keyboard Settings ---
	46	#-------------------------
	47	XKB_MODEL="pc105"
	48	XKB_LAYOUT="fr"
	49	XKB_VARIANT="latin9"
	50	XKB_OPTIONS=""
	51	#------------------------
	52	#--- Network Settings ---
	53	#------------------------
	54	ENABLE_IPV6=true
	55	ENABLE_WIRELESS=true
	56	ENABLE_IPTABLES=false
	57	ENABLE_IFNAMES=true
	58	ENABLE_HARDNET=true
	59	ENABLE_ETH_DHCP=true
	60	ENABLE_WIFI_DHCP=true
	61	NET_WIFI_SSID=MobileClimatEtMeteo
	62	NET_WIFI_PSK=ClimatEtMeteo
	63	#---------------------
	64	#--- Basic features---
	65	#---------------------
	66	ENABLE_CONSOLE=false
	67	ENABLE_BLUETOOTH=false
	68	ENABLE_MINIUART_OVERLAY=false
	69	ENABLE_TURBO=false
	70	ENABLE_I2C=true
	71	ENABLE_SPI=true
	72	SSH_ENABLE=true
	73	ENABLE_NONFREE=true
	74	ENABLE_RSYSLOG=true
	75	ENABLE_SOUND=true
	76	ENABLE_HWRANDOM=true
	77	ENABLE_MINGPU=true
	78	ENABLE_XORG=true
	79	ENABLE_WM="lxqt"
	80	ENABLE_SYSVINIT=true
	81	ENABLE_SPLASH=true
	82	ENABLE_LOGO=true
	83	ENABLE_SILENT_BOOT=false
	84	#--------------------------------
	85	#--- Advanced System features ---
	86	#--------------------------------
	87	ENABLE_DPHYSSWAP=false
	88	ENABLE_QEMU=false
	89	ENABLE_MINBASE=false
	90	ENABLE_SPLITFS=false
	91	ENABLE_INITRAMFS=true
	92	ENABLE_DBUS=true
	93	ENABLE_USBBOOT=false
	94	ENABLE_UBOOT=false
	95	ENABLE_FBTURBO=true
	96	ENABLE_VIDEOCORE=true
	97	ENABLE_NEXMON=false
	98	#--------------------
	99	#--- ssh settings ---
	100	#--------------------
	101	SSH_ENABLE_ROOT=false
	102	SSH_DISABLE_PASSWORD_AUTH=false
	103	SSH_LIMIT_USERS=false
	104	SSH_ROOT_PUB_KEY="/home/vidal/.ssh/authorized_keys"
	105	SSH_USER_PUB_KEY="/home/vidal/.ssh/authorized_keys"
	106	#-----------------------
	107	#--- Kernel settings ---
	108	#-----------------------
	109	BUILD_KERNEL=true
	110	KERNEL_BRANCH=rpi-4.19.y
	111	KERNEL_REDUCE=false
	112	KERNEL_HEADERS=true
	113	KERNEL_MENUCONFIG=false
	114	KERNEL_CCACHE=true
	115	KERNEL_REMOVESRC=true
	116	KERNELSRC_CLEAN=true
	117	KERNELSRC_CONFIG=true
	118	KERNEL_DEFAULT_GOV=ondemand
	119	KERNEL_VIRT=false
	120	KERNEL_SECURITY=false
	121	KERNEL_DHKEY=true
	122	#------------------------
	123	#--- Reduce disk usage --
	124	#------------------------
	125	ENABLE_REDUCE=false
	126	REDUCE_APT=false
	127	REDUCE_DOC=true
	128	REDUCE_MAN=false
	129	REDUCE_VIM=false
	130	REDUCE_BASH=false
	131	REDUCE_HWDB=false
	132	REDUCE_BASH=false
	133	REDUCE_SSHD=false
	134	REDUCE_LOCALE=false
	135	REDUCE_KERNEL=false
	136	#--------------------------------
	137	#--- Encrypted root partition ---
	138	#--------------------------------
	139	ENABLE_CRYPTFS=false
	140	#----------------------
	141	#--- Build settings ---
	142	#----------------------
	143	BASEDIR=/data/RpiGenImage/Images/${RELEASE}
	144	#BASEDIR=/media/*****/*******/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE}
	145	DATE=`date +%Y-%m-%d`
	146	IMAGE_NAME=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE}
	147
	148

templates/raspife4-buster_20-11-01 created 644 +148 0

@@ -0,0 +1,148
	1	#
	2	# Configuration file raspi3 Buster IFÉ 2020/11/01
	3	#
	4	#---------------------
	5	#--- APT settings ----
	6	#---------------------
	7	APT_SERVER=ftp.fr.debian.org
	8	APT_INCLUDES="jed terminator nginx curl wget htop"
	9	APT_INCLUDES_LATE="pcre2-utils libpcre3-dev \
	10	openjdk-11-jdk openjdk-11-jre openjdk-11-jdk-headless openjdk-11-jre-headless \
	11	libpython3-all-dev bison byacc python-pip python3-pip python-pkgconfig python3-pkgconfig \
	12	python3-netcdf4 python-netcdf4 python-libxml2 libxslt1-dev python-libxslt1 \
	13	libxml2 libjavascriptcoregtk-4.0-dev \
	14	libffi-dev screen sqlite3 libsqlite3-dev liblua5.3-dev doxygen libftdi-dev \
	15	libconfuse-dev libcereal-dev libopenblas-dev libnetcdf-dev libhdf5-dev \
	16	git lxdm pcmanfm-qt libffi-dev tightvncserver \
	17	libssl-dev python-openssl python3-openssl libcrypto++-dev \
	18	mate-backgrounds gnome-backgrounds \
	19	fcgiwrap automake libtool libboost1.67-dev \
	20	php-fpm libfcgi-dev php7.3-mysql icedtea-netx \
	21	tigervnc-standalone-server tigervnc-common \
	22	docker.io openvswitch-switch wireshark imagemagick tk tcllib util-linux \
	23	xfonts-base fonts-liberation gsfonts libxfont-dev libfontenc-dev \
	24	ttf-mscorefonts-installer xfonts-100dpi xfonts-75dpi xfonts-base \
	25	xfonts-utils"
	26	#-------------------------------
	27	#--- General System Settings ---
	28	#-------------------------------
	29	SET_ARCH=32
	30	RPI_MODEL=4
	31	RELEASE="buster"
	32	HOSTNAME="raspife4"
	33	DEFLOCAL="fr_FR.UTF-8"
	34	TIMEZONE="Europe/Paris"
	35	EXPANDROOT=false
	36	#---------------------
	37	#--- User Settings ---
	38	#---------------------
	39	ENABLE_ROOT=false
	40	ROOT_PASSWORD="Achanger1$"
	41	ENABLE_USER=true
	42	USER_NAME=ens-ife
	43	USER_PASSWORD="AChanger1$"
	44	#-------------------------
	45	#--- Keyboard Settings ---
	46	#-------------------------
	47	XKB_MODEL="pc105"
	48	XKB_LAYOUT="fr"
	49	XKB_VARIANT="latin9"
	50	XKB_OPTIONS=""
	51	#------------------------
	52	#--- Network Settings ---
	53	#------------------------
	54	ENABLE_IPV6=true
	55	ENABLE_WIRELESS=true
	56	ENABLE_IPTABLES=false
	57	ENABLE_IFNAMES=true
	58	ENABLE_HARDNET=true
	59	ENABLE_ETH_DHCP=true
	60	ENABLE_WIFI_DHCP=true
	61	NET_WIFI_SSID=MobileClimatEtMeteo
	62	NET_WIFI_PSK=ClimatEtMeteo
	63	#---------------------
	64	#--- Basic features---
	65	#---------------------
	66	ENABLE_CONSOLE=false
	67	ENABLE_BLUETOOTH=false
	68	ENABLE_MINIUART_OVERLAY=false
	69	ENABLE_TURBO=false
	70	ENABLE_I2C=true
	71	ENABLE_SPI=true
	72	SSH_ENABLE=true
	73	ENABLE_NONFREE=true
	74	ENABLE_RSYSLOG=true
	75	ENABLE_SOUND=true
	76	ENABLE_HWRANDOM=true
	77	ENABLE_MINGPU=true
	78	ENABLE_XORG=true
	79	ENABLE_WM="lxqt"
	80	ENABLE_SYSVINIT=true
	81	ENABLE_SPLASH=true
	82	ENABLE_LOGO=true
	83	ENABLE_SILENT_BOOT=false
	84	#--------------------------------
	85	#--- Advanced System features ---
	86	#--------------------------------
	87	ENABLE_DPHYSSWAP=false
	88	ENABLE_QEMU=false
	89	ENABLE_MINBASE=false
	90	ENABLE_SPLITFS=false
	91	ENABLE_INITRAMFS=true
	92	ENABLE_DBUS=true
	93	ENABLE_USBBOOT=false
	94	ENABLE_UBOOT=false
	95	ENABLE_FBTURBO=true
	96	ENABLE_VIDEOCORE=true
	97	ENABLE_NEXMON=false
	98	#--------------------
	99	#--- ssh settings ---
	100	#--------------------
	101	SSH_ENABLE_ROOT=false
	102	SSH_DISABLE_PASSWORD_AUTH=false
	103	SSH_LIMIT_USERS=false
	104	SSH_ROOT_PUB_KEY="/home/vidal/.ssh/authorized_keys"
	105	SSH_USER_PUB_KEY="/home/vidal/.ssh/authorized_keys"
	106	#-----------------------
	107	#--- Kernel settings ---
	108	#-----------------------
	109	BUILD_KERNEL=true
	110	KERNEL_BRANCH=rpi-4.19.y
	111	KERNEL_REDUCE=false
	112	KERNEL_HEADERS=true
	113	KERNEL_MENUCONFIG=false
	114	KERNEL_CCACHE=true
	115	KERNEL_REMOVESRC=true
	116	KERNELSRC_CLEAN=true
	117	KERNELSRC_CONFIG=true
	118	KERNEL_DEFAULT_GOV=ondemand
	119	KERNEL_VIRT=false
	120	KERNEL_SECURITY=false
	121	KERNEL_DHKEY=true
	122	#------------------------
	123	#--- Reduce disk usage --
	124	#------------------------
	125	ENABLE_REDUCE=false
	126	REDUCE_APT=false
	127	REDUCE_DOC=true
	128	REDUCE_MAN=false
	129	REDUCE_VIM=false
	130	REDUCE_BASH=false
	131	REDUCE_HWDB=false
	132	REDUCE_BASH=false
	133	REDUCE_SSHD=false
	134	REDUCE_LOCALE=false
	135	REDUCE_KERNEL=false
	136	#--------------------------------
	137	#--- Encrypted root partition ---
	138	#--------------------------------
	139	ENABLE_CRYPTFS=false
	140	#----------------------
	141	#--- Build settings ---
	142	#----------------------
	143	BASEDIR=/data/RpiGenImage/Images/${RELEASE}
	144	#BASEDIR=/media/*****/*******/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE}
	145	DATE=`date +%Y-%m-%d`
	146	IMAGE_NAME=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE}
	147
	148

README.md +2 0

             `rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for Raspberry Pi 2 (RPi2), Raspberry Pi 3 (RPi3) and Raspberry Pi 4 (RPi4) computers. The script at this time supports the bootstrapping of the Debian (armhf) releases `jessie`, `stretch`, `buster` and 'bullseye'. Raspberry Pi 3 images are generated for 32-bit mode only. Raspberry Pi 3 and  Raspberry Pi 4 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.
             |ENABLE_UBOOT|boolean|false|`true`\|`false`|Replace the default RPi 0/1/2/3 second stage bootloader (bootcode.bin) with [U-Boot bootloader](https://git.denx.de/?p=u-boot.git;a=summary). U-Boot can boot images via the network using the BOOTP/TFTP protocol. RPI4 needs tbd|
             |UBOOTSRC_DIR|string||`FullPathToUBootFolder`|Full path to a directory named `u-boot` of [U-Boot bootloader sources](https://git.denx.de/?p=u-boot.git;a=summary) that will be copied, configured, build and installed inside the chroot|
             |ENABLE_FBTURBO|boolean|false|`true`\|`false`|Install and enable the [hardware accelerated Xorg video driver](https://github.com/ssvb/xf86-video-fbturbo) `fbturbo`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling|
+            |ENABLE_GR_ACCEL|boolean|false|`true`\|`false`|Install and enable [one of the 3D graphics accelerators for Raspi4](https://www.raspberrypi.org/documentation/configuration/config-txt/video.md) `vc4-fkms-v3d`.  Not compatible with `fbturbo` mutually excluded and installed for Raspberry4 only|
             |FBTURBOSRC_DIR|string||`FullPathToFbTurboFolder`|Full path to a directory named `xf86-video-fbturbo` of [hardware accelerated Xorg video driver sources](https://github.com/ssvb/xf86-video-fbturbo) that will be copied, configured, build and installed inside the chroot|
             |ENABLE_VIDEOCORE|boolean|false|`true`\|`false`|Install and enable the [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) `vcgencmd`. Please note that this driver is currently limited to hardware accelerated window moving and scrolling|
             |VIDEOCORESRC_DIR|string||`FullPathToVideoSrcFolder`|Full path to a directory named `userland` of [ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) that will be copied, configured, build and installed inside the chroot|

bootstrap.d/13-kernel.sh +2 -2

                 # Create temporary directory for kernel sources
                 temp_dir=$(as_nobody mktemp -d)
-                # Fetch current RPi2/3 kernel sources
+                # Fetch current RPi2/3/4 kernel sources
                 if [ -z "${KERNEL_BRANCH}" ] ; then
                   as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                 else
                 cleanup
                 exit 1
               fi
-            fi
  No newline at end of file
+            fi

bootstrap.d/15-rpi-config.sh +21 -3

               cp "${RPI_FIRMWARE_DIR}"/boot/fixup4x.dat "${BOOT_DIR}"/fixup4x.dat
               cp "${RPI_FIRMWARE_DIR}"/boot/start4cd.elf "${BOOT_DIR}"/start4cd.elf
               cp "${RPI_FIRMWARE_DIR}"/boot/start4db.elf "${BOOT_DIR}"/start4db.elf
-              cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4x.elf
+              cp "${RPI_FIRMWARE_DIR}"/boot/start4.elf "${BOOT_DIR}"/start4.elf
               cp "${RPI_FIRMWARE_DIR}"/boot/start4x.elf "${BOOT_DIR}"/start4x.elf
             else
               # Create temporary directory for boot binaries
               as_nobody wget -q -O "${temp_dir}/fixup4x.dat" "${FIRMWARE_URL}/fixup4x.dat"
               as_nobody wget -q -O "${temp_dir}/start4cd.elf" "${FIRMWARE_URL}/start4cd.elf"
               as_nobody wget -q -O "${temp_dir}/start4db.elf" "${FIRMWARE_URL}/start4db.elf"
-              as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf"
+              as_nobody wget -q -O "${temp_dir}/start4.elf" "${FIRMWARE_URL}/start4.elf"
               as_nobody wget -q -O "${temp_dir}/start4x.elf" "${FIRMWARE_URL}/start4x.elf"
               # Move downloaded boot binaries
             # Setup minimal GPU memory allocation size: 16MB (no X)
             if [ "$ENABLE_MINGPU" = true ] ; then
-              echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
+              if [ "$ENABLE_GR_ACCEL" = false ]  ; then
+                echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
+              else
+                ### Cannot reduce memory if graphics acceleration is requested
+                echo "gpu_mem=128" >> "${BOOT_DIR}/config.txt"
+              fi
             fi
             # Setup boot with initramfs
               echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"
             fi
+            #Enable graphics acceleration for Model 4
+            if [ "$RPI_MODEL" = 4 ] && [ "$ENABLE_GR_ACCEL" = true ] ; then
+              echo "max_framebuffers=2" >> "${BOOT_DIR}/config.txt"
+              echo "arm_64bit=1" >> "${BOOT_DIR}/config.txt"
+              echo "cmdline=cmdline.txt" >> "${BOOT_DIR}/config.txt"
+              echo "dtparam=audio=on" >> "${BOOT_DIR}/config.txt"
+              if [ "$ENABLE_MINGPU" = false ] ; then
+                echo "gpu_mem=128" >> "${BOOT_DIR}/config.txt"
+              fi
+              echo "dtoverlay=vc4-fkms-v3d, cma-128" >> "${BOOT_DIR}/config.txt"
+            fi
             # Install kernel modules blacklist
             mkdir -p "${ETC_DIR}/modprobe.d/"
             install_readonly files/modules/raspi-blacklist.conf "${ETC_DIR}/modprobe.d/raspi-blacklist.conf"

bootstrap.d/42-fbturbo.sh +1 -1

             # Load utility functions
             . ./functions.sh
-            if [ "$ENABLE_FBTURBO" = true ] ; then
+            if [ "$ENABLE_FBTURBO" = true ] && [ "$ENABLE_GR_ACCEL" = false ] ; then
               # Install c/c++ build environment inside the chroot
               chroot_install_cc

rpi23-gen-image.sh +25 -21

             # Debian release
             RELEASE=${RELEASE:=buster}
             if [ $RELEASE = "bullseye" ] ; then
-             RELEASE=testing
+              RELEASE=testing
             fi
             # Kernel Branch
             ENABLE_UBOOT=${ENABLE_UBOOT:=false}
             UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
             ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
+            ENABLE_GR_ACCEL=${ENABLE_GR_ACCEL:=true}
             FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
             ENABLE_VIDEOCORE=${ENABLE_VIDEOCORE:=false}
             VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
             # Setup architecture specific settings
             if [ -n "$SET_ARCH" ] ; then
-              # 64-bit configuration
+              ## 64-bit configuration
               if [ "$SET_ARCH" = 64 ] ; then
-                # General 64-bit depended settings
+                ### General 64-bit depended settings
                 QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-aarch64-static}
                 KERNEL_ARCH=${KERNEL_ARCH:=arm64}
                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"}
-                # Raspberry Pi model specific settings
+                ### Raspberry Pi model specific settings
                 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                   if [ "$RPI_MODEL" != 4 ] ; then
                     KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig}
                   RELEASE_ARCH=${RELEASE_ARCH:=arm64}
                   KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img}
                   CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-}
                 else
                   echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit"
                   exit 1
                 fi
               fi
-              # 32-bit configuration
+              ## 32-bit configuration
               if [ "$SET_ARCH" = 32 ] ; then
-                # General 32-bit dependend settings
+                ### General 32-bit dependend settings
                 QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
                 KERNEL_ARCH=${KERNEL_ARCH:=arm}
                 KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="zImage"}
-                # Raspberry Pi model specific settings
+                ### Raspberry Pi (0-1P) model specific settings
                 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 1 ] || [ "$RPI_MODEL" = 1P ] ; then
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armel"
                   KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi_defconfig}
             	    fi
             	  fi
                 fi
-                # Raspberry Pi model specific settings
+                ### Raspberry Pi (2-4) model specific settings
                 if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
                   if [ "$RPI_MODEL" != 4 ] ; then
                     KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig}
                 ;;
             esac
-            # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard
+            # Raspberry PI 0,3,3P,4 with Bluetooth and Wifi onboard
             if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then
-              # Include bluetooth packages on supported boards
+              ## Include bluetooth packages on supported boards
               if [ "$ENABLE_BLUETOOTH" = true ] ; then
                 APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez"
               fi
               if [ "$ENABLE_WIRELESS" = true ] ; then
                 APT_INCLUDES="${APT_INCLUDES},wireless-tools,crda,wireless-regdb,wpasupplicant"
               fi
-            else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
+            # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard
-              # Check if the internal wireless interface is not supported by the RPi model
+            else
+              ## Check if the internal wireless interface is not supported by the RPi model
               if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_BLUETOOTH" = true ]; then
                 echo "error: The selected Raspberry Pi model has no integrated interface for wireless or bluetooth"
                 exit 1
               read -r confirm
               [ "$confirm" != "y" ] && exit 1
-              # Make sure all missing required packages are installed
+              ## Make sure all missing required packages are installed
               apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
             fi
             # Check if specified CHROOT_SCRIPTS directory exists
             if [ -n "$CHROOT_SCRIPTS" ] && [ ! -d "$CHROOT_SCRIPTS" ] ; then
-               echo "error: ${CHROOT_SCRIPTS} specified directory not found (CHROOT_SCRIPTS)!"
+              echo "error: ${CHROOT_SCRIPTS} specified directory not found (CHROOT_SCRIPTS)!"
-               exit 1
+              exit 1
             fi
             # Check if specified device mapping already exists (will be used by cryptsetup)
             # Replace selected packages with smaller clones
             if [ "$ENABLE_REDUCE" = true ] ; then
-              # Add levee package instead of vim-tiny
+              ## Add levee package instead of vim-tiny
               if [ "$REDUCE_VIM" = true ] ; then
                 APT_INCLUDES="$(echo ${APT_INCLUDES} | sed "s/vim-tiny/levee/")"
               fi
-              # Add dropbear package instead of openssh-server
+              ## Add dropbear package instead of openssh-server
               if [ "$REDUCE_SSHD" = true ] ; then
                 APT_INCLUDES="$(echo "${APT_INCLUDES}" | sed "s/openssh-server/dropbear/")"
               fi
               dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count="${TABLE_SECTORS}"
               dd if=/dev/zero of="$IMAGE_NAME-root.img" bs=512 count=0 seek="${ROOT_SECTORS}"
-              # Write firmware/boot partition tables
+              ## Write firmware/boot partition tables
               sfdisk -q -L -uS -f "$IMAGE_NAME-frmw.img" 2> /dev/null <<EOM
             ${TABLE_SECTORS},${FRMW_SECTORS},c,*
             EOM
-              # Write root partition table
+              ## Write root partition table
               sfdisk -q -L -uS -f "$IMAGE_NAME-root.img" 2> /dev/null <<EOM
             ${TABLE_SECTORS},${ROOT_SECTORS},83
             EOM
-              # Setup temporary loop devices
+              ## Setup temporary loop devices
               FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME"-frmw.img)"
               ROOT_LOOP="$(losetup -o 1M -f --show "$IMAGE_NAME"-root.img)"
-            else # ENABLE_SPLITFS=false
+            # ENABLE_SPLITFS=false
+            else
               dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count="${TABLE_SECTORS}"
               dd if=/dev/zero of="$IMAGE_NAME.img" bs=512 count=0 seek="${IMAGE_SECTORS}"

templates/raspife3P-buster_20-11-01 ~~templates/raspife3-buster~~ renamed +26 -8

             #
-            # Configuration file raspi3 Buster IFÉ 2020/06/20
+            # Configuration file raspi3 Buster IFÉ 2020/11/01
             #
             #---------------------
             #--- APT settings ----
             #---------------------
-            APT_SERVER=debian.mirrors.ovh.net
+            APT_SERVER=ftp.fr.debian.org
-            APT_INCLUDES=""
+            APT_INCLUDES="jed terminator nginx curl wget htop"
-            APT_INCLUDES_LATE=""
+            APT_INCLUDES_LATE="pcre2-utils libpcre3-dev \
+            openjdk-11-jdk openjdk-11-jre openjdk-11-jdk-headless openjdk-11-jre-headless \
+            libpython3-all-dev bison byacc python-pip python3-pip python-pkgconfig python3-pkgconfig \
+            python3-netcdf4 python-netcdf4 python-libxml2 libxslt1-dev python-libxslt1 \
+            libxml2 libjavascriptcoregtk-4.0-dev \
+            libffi-dev screen sqlite3 libsqlite3-dev liblua5.3-dev doxygen libftdi-dev \
+            libconfuse-dev libcereal-dev libopenblas-dev libnetcdf-dev libhdf5-dev \
+            git lxdm pcmanfm-qt libffi-dev tightvncserver \
+            libssl-dev python-openssl python3-openssl libcrypto++-dev \
+            mate-backgrounds gnome-backgrounds \
+            fcgiwrap automake libtool libboost1.67-dev \
+            php-fpm  libfcgi-dev php7.3-mysql icedtea-netx \
+            tigervnc-standalone-server tigervnc-common \
+            docker.io openvswitch-switch wireshark imagemagick tk tcllib util-linux \
+            xfonts-base fonts-liberation gsfonts libxfont-dev libfontenc-dev \
+            ttf-mscorefonts-installer xfonts-100dpi xfonts-75dpi xfonts-base \
+            xfonts-utils"
             #-------------------------------
             #--- General System Settings ---
             #-------------------------------
             SET_ARCH=32
-            RPI_MODEL=3
+            RPI_MODEL=3P
             RELEASE="buster"
             HOSTNAME="raspife3P"
             DEFLOCAL="fr_FR.UTF-8"
             #---------------------
             ENABLE_CONSOLE=false
             ENABLE_BLUETOOTH=false
+            ENABLE_MINIUART_OVERLAY=false
             ENABLE_TURBO=false
             ENABLE_I2C=true
             ENABLE_SPI=true
             ENABLE_HWRANDOM=true
             ENABLE_MINGPU=true
             ENABLE_XORG=true
-            ENABLE_WM="lxdm"
+            ENABLE_WM="lxqt"
             ENABLE_SYSVINIT=true
             ENABLE_SPLASH=true
             ENABLE_LOGO=true
             #--- Advanced System features ---
             #--------------------------------
             ENABLE_DPHYSSWAP=false
-            ENABLE_QEMU=true
+            ENABLE_QEMU=false
             ENABLE_MINBASE=false
             ENABLE_SPLITFS=false
             ENABLE_INITRAMFS=true
             #-----------------------
             BUILD_KERNEL=true
             KERNEL_BRANCH=rpi-4.19.y
+            KERNEL_REDUCE=false
             KERNEL_HEADERS=true
             KERNEL_MENUCONFIG=false
             KERNEL_CCACHE=true
             REDUCE_VIM=false
             REDUCE_BASH=false
             REDUCE_HWDB=false
+            REDUCE_BASH=false
             REDUCE_SSHD=false
             REDUCE_LOCALE=false
             REDUCE_KERNEL=false
             IMAGE_NAME=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE}

templates/raspife2-stretch removed 0 -181

NO CONTENT: file was removed

templates/raspife3-jessie removed 0 -4

NO CONTENT: file was removed

templates/raspife3-stretch removed 0 -92

NO CONTENT: file was removed

templates/raspife3W-stretch removed 0 -91

NO CONTENT: file was removed

templates/rpi2buster removed 0 -4

NO CONTENT: file was removed

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