Raspi2-3_GenImage Commit - r93:d975bb85d0ff · Collaboration Tremplin des Sciences

Fixes for Debian stretch release support

drtyhlpr -

r93:d975bb85d0ff

parent child

Context file:

r93:d975bb85d0ff

Collapse all files

README.md +3 -2

             Set extra xkb configuration options.
             #### Networking settings (DHCP):
-            This parameter is used to set up networking auto configuration in `/etc/systemd/network/eth.network`.
+            This parameter is used to set up networking auto configuration in `/etc/systemd/network/eth.network`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.`
             #####`ENABLE_DHCP`=true
             Set the system to use DHCP. This requires an DHCP server.
             #### Networking settings (static):
-            These parameters are used to set up a static networking configuration in /etc/systemd/network/eth.network. The following static networking parameters are only supported if `ENABLE_DHCP` was set to `false`.
+            These parameters are used to set up a static networking configuration in `/etc/systemd/network/eth.network`. The following static networking parameters are only supported if `ENABLE_DHCP` was set to `false`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.
             #####`NET_ADDRESS`=""
             Set a static IPv4 or IPv6 address and its prefix, separated by "/", eg. "192.169.0.3/24".
             | `apt` | APT management configuration files |
             | `boot` | Boot and RPi2 configuration files |
             | `dpkg` | Package Manager configuration |
+            | `etc` | Configuration files and rc scripts |
             | `firstboot` | Scripts that get executed on first boot  |
             | `initramfs` | Initramfs scripts |
             | `iptables` | Firewall configuration files |

bootstrap.d/41-uboot.sh +2 -1

             # Install gcc/c++ build environment inside the chroot
             if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ] ; then
-              chroot_exec apt-get -q -y --force-yes --no-install-recommends install linux-compiler-gcc-4.8-arm g++ make bc
+              COMPILER_PACKAGES=$(chroot_exec apt-get -s install ${COMPILER_PACKAGES} | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
+              chroot_exec apt-get -q -y --force-yes --no-install-recommends install ${COMPILER_PACKAGES}
             fi
             # Fetch and build U-Boot bootloader

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

               git -C "${R}/tmp" clone "${FBTURBO_URL}"
               # Install Xorg build dependencies
-              chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
+              chroot_exec apt-get -q -y --force-yes --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
               # Build and install fbturbo driver inside chroot
               chroot_exec /bin/bash -x <<'EOF'
             # Remove gcc/c++ build environment from the chroot
             if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ] ; then
-              chroot_exec apt-get -qq -y --auto-remove purge bc binutils cpp cpp-4.8 cpp-4.9 g++ g++-4.8 g++-4.9 gcc gcc-4.8 gcc-4.9 libasan1 libatomic1 libc-dev-bin libc6-dev libcloog-isl4 libgcc-4.8-dev libgcc-4.9-dev libgomp1 libisl10 libmpc3 libmpfr4 libstdc++-4.9-dev libubsan0 linux-compiler-gcc-4.8-arm linux-libc-dev make
+              chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
             fi

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

               fi
               # Re-install tools for managing kernel moduless
-              chroot_exec apt-get -qq -y --force-yes install module-init-tools
+              if [ "$RELEASE" = "jessie" ] ; then
+                chroot_exec apt-get -qq -y --force-yes install module-init-tools
+              fi
               # Remove GPU kernels
               if [ "$ENABLE_MINGPU" = true ] ; then

rpi2-gen-image.sh +9 -3

             # Firmware directory: Blank if download from github
             FIRMWAREDIR=${FIRMWAREDIR:=""}
+            # Packages for gcc/c++ inside the chroot
+            COMPILER_PACKAGES=${COMPILER_PACKAGES:="linux-compiler-gcc-4.8-arm g++ make bc"}
             # General settings
             HOSTNAME=${HOSTNAME:=rpi2-${RELEASE}}
             PASSWORD=${PASSWORD:=raspberry}
             # Build latest RPi2 Linux kernel if required by Debian release
             if [ "$RELEASE" = "stretch" ] ; then
               BUILD_KERNEL=true
+              COMPILER_PACKAGES=$(echo $COMPILER_PACKAGES | sed s/-4.8-arm/-5-arm/)
             fi
             # Add packages required for kernel cross compilation
             fi
             # Remove apt-utils
-            chroot_exec apt-get purge -qq -y --force-yes apt-utils
+            if [ "$RELEASE" = "jessie" ] ; then
+              chroot_exec apt-get purge -qq -y --force-yes apt-utils
+            fi
             # Generate required machine-id
             MACHINE_ID=$(dbus-uuidgen)
             # The root partition is EXT4
             # This means more space than the actual used space of the chroot is used.
-            # As overhead for journaling and reserved blocks 20% are added.
+            # As overhead for journaling and reserved blocks 25% are added.
-            ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 20) \* 1024 \/ 512)
+            ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 25) \* 1024 \/ 512)
             # Calculate required image size in 512 Byte sectors
             IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS})

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