vidal/rpiGenImage
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mise à jour image météo et quelques scripts.

Browse Source
This commit is contained in:
Administrateur Général
2026-02-21 21:01:19 +01:00
parent 5057e21226
commit 2fe1f37596
6 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bootstrap.d/10-bootstrap.sh
View File

@@ -8,10 +8,12 @@
VARIANT="" VARIANT=""
COMPONENTS="main" COMPONENTS="main"
if [ "$BUILD_KERNEL" != "uselocal" ]; then #ajout 2025
# Use non-free Debian packages if needed # Use non-free Debian packages if needed
# One use variable which is only needed by wifi firmware blob => reworked to use non free in /etc/apt/sources.list - we could just use ENABLE_WIRELESS here # One use variable which is only needed by wifi firmware blob
# => reworked to use non free in /etc/apt/sources.list
#- we could just use ENABLE_WIRELESS here
if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_NONFREE" = true ] ; then if [ "$ENABLE_WIRELESS" = true ] || [ "$ENABLE_NONFREE" = true ] ; then
COMPONENTS="main,non-free,contrib,non-free-firmware" COMPONENTS="main,non-free,contrib,non-free-firmware"
fi fi
@@ -30,7 +32,7 @@ fi
# Base debootstrap (unpack only) # Base debootstrap (unpack only)
http_proxy=${APT_PROXY} debootstrap ${APT_EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian" http_proxy=${APT_PROXY} debootstrap ${APT_EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
if [ "$BUILD_KERNEL" != "uselocal" ]; then # added to enable reuse the environment
# Copy qemu emulator binary to chroot # Copy qemu emulator binary to chroot
install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}" install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
@@ -39,8 +41,6 @@ install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
mkdir -p "${R}/usr/share/keyrings" mkdir -p "${R}/usr/share/keyrings"
install_readonly /usr/share/keyrings/debian-archive-keyring.gpg "${R}/usr/share/keyrings/debian-archive-keyring.gpg" install_readonly /usr/share/keyrings/debian-archive-keyring.gpg "${R}/usr/share/keyrings/debian-archive-keyring.gpg"
# Complete the bootstrapping process # Complete the bootstrapping process
chroot_exec /debootstrap/debootstrap --second-stage chroot_exec /debootstrap/debootstrap --second-stage

20
bootstrap.d/11-apt.sh
View File

@@ -11,25 +11,25 @@ if [ -z "$APT_PROXY" ] ; then
sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy" sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETC_DIR}/apt/apt.conf.d/10proxy"
fi fi
# Install APT sources.list # Install APT sources.list.d/debian.sources
install_readonly files/apt/sources.list "${ETC_DIR}/apt/sources.list" install_readonly files/apt/sources.list.d/debian.sources "${ETC_DIR}/apt/sources.list.d/debian.sources"
# Use specified APT server and release # Use specified APT server and release
sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list" sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETC_DIR}/apt/sources.list.d/debian.sources"
#Fix for changing path for security updates in oldstable / bullseye #Fix for changing path for security updates in oldstable / bullseye
if [ "$RELEASE" = "oldstable" ] || [ "$RELEASE" = "bullseye " ] ; then # not necessary anymore ?????
sed -i "s:bookworm-security:${RELEASE}\\/updates:" "${ETC_DIR}/apt/sources.list" #if [ "$RELEASE" = "oldstable" ] || [ "$RELEASE" = "bullseye " ] ; then
sed -i "s:security.debian.org/debian-security:security.debian.org:" "${ETC_DIR}/apt/sources.list" #sed -i "s:bookworm-security:${RELEASE}\\/updates:" "${ETC_DIR}/apt/sources.list"
fi #sed -i "s:security.debian.org/debian-security:security.debian.org:" "${ETC_DIR}/apt/sources.list"
#fi
if [ "$ENABLE_NONFREE" = "true" ] ; then if [ "$ENABLE_NONFREE" = "true" ] ; then
sed -i "s,main contrib,main contrib non-free non-free-firmware," "${ETC_DIR}/apt/sources.list" sed -i "s,main contrib,main contrib non-free non-free-firmware," "${ETC_DIR}/apt/sources.list.d/debian.sources"
fi fi
if [ "$RELEASE" != "$RELEASE" ] ; then if [ "$RELEASE" != "$RELEASE" ] ; then
# Change release in sources list sed -i "s/ ${HOSTRELEASE}/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list.d/debian.sources"
sed -i "s/ ${HOSTRELEASE}/ ${RELEASE}/" "${ETC_DIR}/apt/sources.list"
fi fi
# Upgrade package index and update all installed packages and changed dependencies # Upgrade package index and update all installed packages and changed dependencies

12
functions.sh
View File

@@ -1,4 +1,4 @@
# This file contains utility functions used by rpi23-gen-image.sh # This file contains utility functions used by rpiGenImage.sh
cleanup (){ cleanup (){
set +x set +x
@@ -76,11 +76,11 @@ chroot_install_cc() {
COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }') COMPILER_PACKAGES=$(chroot_exec apt-get -s install g++ make bc | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
# if [ "$RELEASE" = "trixie" ] || [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "bookworm" ] ; then if [ "$RELEASE" = "forky" ] || [ "$RELEASE" = "trixie" ] || [ "$RELEASE" = "bookworm" ] ; then
# chroot_exec apt-get -q -y --no-install-recommends install ${COMPILER_PACKAGES} chroot_exec apt -y --no-install-recommends install ${COMPILER_PACKAGES}
# elif [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "bookworm" ] || [ "$RELEASE" = "bookworm" ]; then elif [ "$RELEASE" = "bullseye" ] || [ "$RELEASE" = "buster" ] || [ "$RELEASE" = "stretch" ]; then
chroot_exec apt-get -q -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES} chroot_exec apt -y --allow-unauthenticated --no-install-recommends install ${COMPILER_PACKAGES}
# fi fi
fi fi
} }

7
rpiGenImage.sh
View File

@@ -42,10 +42,10 @@ set -x
# Raspberry Pi model configuration defaults to 3P # Raspberry Pi model configuration defaults to 3P
RPI_MODEL=${RPI_MODEL:=3P} RPI_MODEL=${RPI_MODEL:=3P}
# Debian release defaults to trixie # Debian release defaults to trixie /stable
RELEASE=${RELEASE:=trixie} RELEASE=${RELEASE:=trixie}
if [ "$RELEASE" = "trixie" ] ; then if [ "$RELEASE" = "trixie" ] ; then
RELEASE=testing RELEASE=stable
fi fi
echo "Debian release value used : " $RELEASE echo "Debian release value used : " $RELEASE
@@ -55,8 +55,9 @@ KERNEL_BRANCH=${KERNEL_BRANCH:=""}
# URLs # URLs
KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux} KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot} FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
WLAN_FIRMWARE_URL=${https://github.com/RPi-Distro/firmware-nonfree/tree/trixie/debian/config/brcm80211/brcm}
#WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/armbian/firmware/tree/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://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm}
WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/armbian/firmware/tree/master/brcm}
#WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/reMarkable/brcmfmac-firmware/blob/master} #WLAN_FIRMWARE_URL=${WLAN_FIRMWARE_URL:=https://github.com/reMarkable/brcmfmac-firmware/blob/master}
FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git} FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git} UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}

4
templates/rpi3-Met-trixie.conf
View File

@@ -32,7 +32,7 @@ HOSTNAME="raspife3"
DEFLOCAL="fr_FR.UTF-8" DEFLOCAL="fr_FR.UTF-8"
TIMEZONE="Europe/Paris" TIMEZONE="Europe/Paris"
EXPANDROOT=false EXPANDROOT=false
ENABLE_QEMU=false ENABLE_QEMU=true
#--------------------- #---------------------
#--- User Settings --- #--- User Settings ---
#--------------------- #---------------------
@@ -136,6 +136,6 @@ ENABLE_CRYPTFS=false
BASEDIR=/home/vidal/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE} BASEDIR=/home/vidal/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE}
#BASEDIR=/media/*******/*********/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE} #BASEDIR=/media/*******/*********/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE}
DATE=`date +%Y-%m-%d` DATE=`date +%Y-%m-%d`
IMAGE_NAME=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE} IMAGE_NAME=${BASEDIR}/${DATE}-rpiRawMet${RPI_MODEL}-${RELEASE}

4
templates/rpi3-Met-trixie_26-01-02.conf → templates/rpi3-Met-trixie_26-02-21.conf
View File

@@ -32,7 +32,7 @@ HOSTNAME="raspife3"
DEFLOCAL="fr_FR.UTF-8" DEFLOCAL="fr_FR.UTF-8"
TIMEZONE="Europe/Paris" TIMEZONE="Europe/Paris"
EXPANDROOT=false EXPANDROOT=false
ENABLE_QEMU=false ENABLE_QEMU=true
#--------------------- #---------------------
#--- User Settings --- #--- User Settings ---
#--------------------- #---------------------
@@ -136,6 +136,6 @@ ENABLE_CRYPTFS=false
BASEDIR=/home/vidal/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE} BASEDIR=/home/vidal/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE}
#BASEDIR=/media/*******/*********/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE} #BASEDIR=/media/*******/*********/Nano-Ordinateurs/RaspberryPi/RpiGenImage/Images/${RELEASE}
DATE=`date +%Y-%m-%d` DATE=`date +%Y-%m-%d`
IMAGE_NAME=${BASEDIR}/${DATE}-rpi${RPI_MODEL}-${RELEASE} IMAGE_NAME=${BASEDIR}/${DATE}-rpiRawMet${RPI_MODEL}-${RELEASE}