Raspi2-3_GenImage Commit - r775:6cd6af4bd9a0 · Collaboration Tremplin des Sciences

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

vidal -

r775:6cd6af4bd9a0 master

parent child

Context file:

r775:6cd6af4bd9a0

Collapse all files

packages/python3-weewx_4.5.1-1_all.deb created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

README.md +1 -3

             # rpi23-gen-image
             ## Introduction
+            `rpi23-gen-image.sh` is an advanced Debian Linux bootstrapping shell script for generating Debian OS images for all Raspberry Pi computers. The script at this time supports the bootstrapping of the Debian (armhf/armel) releases `stretch` and `buster`. Raspberry Pi 0/1/2/3/4 images are generated for 32-bit mode only. Raspberry Pi 3 supports 64-bit images that can be generated using custom configuration parameters (```templates/rpi3-stretch-arm64-4.14.y```).
-            `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.

bootstrap.d/11-apt.sh +5 -5

             # Use specified APT server and release
             sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list"
-            #Fix for changing path for security updates in testing
+            #Fix for changing path for security updates in oldstable / buster
-            if [ "$RELEASE" = "testing" ] ; then
+            if [ "$RELEASE" = "oldstable" ] || [ "$RELEASE" = "buster " ] ; then
-            sed -i "s,buster\\/updates,testing-security," "${ETC_DIR}/apt/sources.list"
+            sed -i "s:bullseye-security:${RELEASE}\\/updates:" "${ETC_DIR}/apt/sources.list"
-            sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
+            sed -i "s:security.debian.org/debian-security:security.debian.org:" "${ETC_DIR}/apt/sources.list"
             fi
             if [ "$ENABLE_NONFREE" = "true" ] ; then
             if [ -z "$RELEASE" ] ; then
             # Change release in sources list
-            sed -i "s/ buster/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
+            sed -i "s/ bullseye/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
             fi
             # Upgrade package index and update all installed packages and changed dependencies

bootstrap.d/20-networking.sh +8 -5

             install_readonly files/network/hosts "${ETC_DIR}/hosts"
             sed -i "s/RaspberryPI/${HOSTNAME}/" "${ETC_DIR}/hosts"
+            # Ensure /etc/systemd/network directory is available
+            mkdir -p "${ETC_DIR}/systemd/network"
             # Setup hostname entry with static IP
             if [ "$NET_ETH_ADDRESS" != "" ] ; then
               NET_IP=$(echo "${NET_ETH_ADDRESS}" | cut -f 1 -d'/')
             if [ "$ENABLE_WIRELESS" = true ] ; then
+              mkdir -p "${ETC_DIR}/wpa_supplicant"
               if [ "$ENABLE_WIFI_DHCP" = true ] ; then
                 # Enable DHCP configuration for interface eth0
                 sed -i -e "s/DHCP=.*/DHCP=yes/" -e "/DHCP/q" "${ETC_DIR}/systemd/network/wlan0.network"
             	fi
               fi
-              if [ -z "$NET_WIFI_SSID" ] && [ -z "$NET_WIFI_PSK" ] ; then
+              if [ ! -z "$NET_WIFI_SSID" ] && [ ! -z "$NET_WIFI_PSK" ] ; then
-              printf "
+              chroot_exec printf "
               ctrl_interface=/run/wpa_supplicant
-              ctrl_interface_group=wheel
               update_config=1
               eapol_version=1
               ap_scan=1
               fast_reauth=1
-              " > /etc/wpa_supplicant/wpa_supplicant-wlan0.conf
+              " > "${ETC_DIR}/wpa_supplicant/wpa_supplicant-wlan0.conf"
               #Configure WPA_supplicant
-              chroot_exec wpa_passphrase "$NET_SSID" "$NET_WPAPSK" >> /etc/wpa_supplicant/wpa_supplicant-wlan0.conf
+              chroot_exec wpa_passphrase "$NET_WIFI_SSID" "$NET_WIFI_PSK" >> "${ETC_DIR}/wpa_supplicant/wpa_supplicant-wlan0.conf"
               chroot_exec systemctl enable wpa_supplicant.service
               chroot_exec systemctl enable wpa_supplicant@wlan0.service

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

               # Remove sound utils and libraries
               if [ "$ENABLE_SOUND" = false ] ; then
-                chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data
+            	if [ "$ENABLE_BLUETOOTH" = false ] ; then
+            		chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0 libasound2 libasound2-data
+            	else
+            		chroot_exec apt-get -qq -y purge alsa-utils libsamplerate0
+            	fi
               fi
               # Remove GPU kernels
                 rm -f "${R}/boot/vmlinuz-*"
                 rm -f "${R}/boot/initrd.img-*"
               fi
+              #Reduce BOOT
+              #Only necessary files for my gen pi
               # Clean APT list of repositories
               rm -fr "${R}/var/lib/apt/lists/*"

files/apt/sources.list +6 -6

@@ -1,8 +1,8
1	deb http://~~ftp.~~debian.~~org~~/debian bu~~ster~~ main contrib	1	deb http://debian.proxad.net/debian/ bullseye main contrib
2	#deb-src http://ftp.debian.org/debian bu~~ster~~ main contrib	2	#deb-src http://ftp.debian.org/debian bullseye main contrib
3		3
4	deb http://~~ftp.~~debian.~~org~~/debian/ bu~~ster~~-updates main contrib	4	deb http://debian.proxad.net/debian/ bullseye-updates main contrib
5	#deb-src http://ftp.debian.org/debian/ bu~~ster~~-updates main contrib	5	#deb-src http://ftp.debian.org/debian/ bullseye-updates main contrib
6		6
7	deb http://security.debian.org/ bu~~ster/updates~~ main contrib	7	deb http://security.debian.org/debian-security bullseye-security main contrib
8	#deb-src http://security.debian.org/ bu~~ster~~/updates main contrib	8	#deb-src http://security.debian.org/ bullseye/updates main contrib

functions.sh +2 -2

                 COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
-                if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
+                if [ "$RELEASE" = "bookworm" ] || [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
                   chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES}
-                elif [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] ; then
+                elif [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "bookworm" ]; then
                   chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
                 fi

rpi23-gen-image.sh +14 -12

-            #!/bin/sh
+            #!/bin/bash
             ########################################################################
             # rpi23-gen-image.sh					       2015-2017
             #
-            # Advanced Debian "buster" and "bullseye" bootstrap script for Raspberry Pi
+            # Advanced Debian "bullseye" and "bookworm" bootstrap script for Raspberry Pi
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             echo -n -e "\n#\n# RPi 0/1/2/3/4 Bootstrap Settings\n#\n"
             set -x
-            # Raspberry Pi model configuration
+            # Raspberry Pi model configuration defaults to 3P
             RPI_MODEL=${RPI_MODEL:=3P}
-            # Debian release
+            # Debian release defaults to bullseye
-            RELEASE=${RELEASE:=buster}
+            RELEASE=${RELEASE:=bullseye}
-            if [ $RELEASE = "bullseye" ] ; then
+            if [ "$RELEASE" = "bookworm" ] ; then
               RELEASE=testing
             fi
+            echo "Debian release value used : " $RELEASE
             # Kernel Branch
             KERNEL_BRANCH=${KERNEL_BRANCH:=""}
             # URLs
             KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
             FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
-            WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
+            #WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
+            WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/bullseye/debian/config/brcm80211/brcm}
             FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
             UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
             VIDEOCORE_URL=${VIDEOCORE_URL:=https://github.com/raspberrypi/userland}
             # Calculate the amount of needed 512 Byte sectors
             TABLE_SECTORS=$(expr 1 \* 1024 \* 1024 \/ 512)
-            FRMW_SECTORS=$(expr 64 \* 1024 \* 1024 \/ 512)
+            FRMW_SECTORS=$(expr 128 \* 1024 \* 1024 \/ 512)
             ROOT_OFFSET=$(expr "${TABLE_SECTORS}" + "${FRMW_SECTORS}")
             # The root partition is EXT4
             ${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)"
+              FRMW_LOOP="$(losetup -o 1M --sizelimit 128M -f --show "$IMAGE_NAME"-frmw.img)"
               ROOT_LOOP="$(losetup -o 1M -f --show "$IMAGE_NAME"-root.img)"
             # ENABLE_SPLITFS=false
             else
             EOM
               # Setup temporary loop devices
-              FRMW_LOOP="$(losetup -o 1M --sizelimit 64M -f --show "$IMAGE_NAME".img)"
+              FRMW_LOOP="$(losetup -o 1M --sizelimit 128M -f --show "$IMAGE_NAME".img)"
-              ROOT_LOOP="$(losetup -o 65M -f --show "$IMAGE_NAME".img)"
+              ROOT_LOOP="$(losetup -o 129M -f --show "$IMAGE_NAME".img)"
             fi
             if [ "$ENABLE_CRYPTFS" = true ] ; then

templates/raspife3-buster_20-11-01 +2 -1

             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 \
+            git lxdm pcmanfm-qt libffi-dev ffmpeg \
             libssl-dev python-openssl python3-openssl libcrypto++-dev \
             mate-backgrounds gnome-backgrounds \
             fcgiwrap automake libtool libboost1.67-dev \
             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 \
+            autogen automake libtool libboost-system-dev libboost-thread-dev \
             xfonts-utils"
             #-------------------------------
             #--- General System Settings ---

templates/raspife3P-buster_20-11-01 +3 -2

             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 \
+            git lxdm pcmanfm-qt libffi-dev ffmpeg \
             libssl-dev python-openssl python3-openssl libcrypto++-dev \
-            mate-backgrounds gnome-backgrounds \
+            mate-backgrounds gnome-backgrounds libjson-c-dev \
             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 \
+            autogen automake libtool libboost-system-dev libboost-thread-dev \
             xfonts-utils"
             #-------------------------------
             #--- General System Settings ---

templates/raspife4-buster_20-11-01 +4 -3

             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 \
+            git lxdm pcmanfm-qt libffi-dev ffmpeg \
             libssl-dev python-openssl python3-openssl libcrypto++-dev \
             mate-backgrounds gnome-backgrounds \
             fcgiwrap automake libtool libboost1.67-dev \
             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 \
+            autogen automake libtool libboost-system-dev libboost-thread-dev \
             xfonts-utils"
             #-------------------------------
             #--- General System Settings ---
             #-------------------------------
-            SET_ARCH=32
             RPI_MODEL=4
+            SET_ARCH=32
             RELEASE="buster"
             HOSTNAME="raspife4"
             DEFLOCAL="fr_FR.UTF-8"
             #--- Kernel settings ---
             #-----------------------
             BUILD_KERNEL=true
-            KERNEL_BRANCH=rpi-4.19.y
+            KERNEL_BRANCH=rpi-5.4.y
             KERNEL_REDUCE=false
             KERNEL_HEADERS=true
             KERNEL_MENUCONFIG=false

packages/weewx_3.7.1-1_all.deb removed binary 0 0

NO CONTENT: file was removed, binary diff hidden

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