Raspi2-3_GenImage Commit - r21:b19241fdfd96 · Collaboration Tremplin des Sciences

fix: ENABLE_SOUND

Jan Wagner -

r21:b19241fdfd96

parent child

Context file:

r21:b19241fdfd96

Collapse all files

rpi2-gen-image.sh +37 -36

              # Copyright (C) 2015 Luca Falavigna <dktrkranz@debian.org>
              ########################################################################
+             # Clean up all temporary mount points
              cleanup (){
                set +x
                set +e
              set -e
              set -x
+             # Debian release
              RELEASE=${RELEASE:=jessie}
              # Build settings
                APT_INCLUDES="${APT_INCLUDES},openssh-server"
              fi
+             # Add alsa-utils package
+             if [ "$ENABLE_SOUND" = true ] ; then
+               APT_INCLUDES="${APT_INCLUDES},alsa-utils"
+             fi
              # Add rng-tools package
              if [ "$ENABLE_HWRANDOM" = true ] ; then
                APT_INCLUDES="${APT_INCLUDES},rng-tools"
              wget -q -O $R/boot/firmware/start_x.elf https://github.com/raspberrypi/firmware/raw/cd355a9dd4f1f4de2e79b0c8e102840885cdf1de/boot/start_x.elf
              cp $VMLINUZ $R/boot/firmware/kernel7.img
-             # Set up hosts
+             # Set up IPv4 hosts
              echo ${HOSTNAME} >$R/etc/hostname
              cat <<EOM >$R/etc/hosts
 .0.0.1       localhost
 .0.1.1       ${HOSTNAME}
              EOM
+             # Set up IPv6 hosts
              if [ "$ENABLE_IPV6" = true ] ; then
              cat <<EOM >>$R/etc/hosts
              EOM
              fi
+             # Place hint about network configuration
+             cat <<EOM >$R/etc/network/interfaces
+             # Debian switched to systemd-networkd configuration files.
+             # please configure your networks in '/etc/systemd/network/'
+             EOM
+             # Enable systemd-networkd DHCP configuration for interface eth0
+             cat <<EOM >$R/etc/systemd/network/eth.network
+             [Match]
+             Name=eth0
+             [Network]
+             DHCP=yes
+             EOM
+             # Set DHCP configuration to IPv4 only
+             if [ "$ENABLE_IPV6" = false ] ; then
+               sed -i "s/=yes/=v4/" $R/etc/systemd/network/eth.network
+             fi
+             # Enable systemd-networkd service
+             LANG=C chroot $R systemctl enable systemd-networkd
              # Generate crypt(3) password string
              ENCRYPTED_PASSWORD=`mkpasswd -m sha-512 ${PASSWORD}`
              # Set up root password
              LANG=C chroot $R usermod -p "${ENCRYPTED_PASSWORD}" root
-             # Set up interfaces
-             cat <<EOM >$R/etc/network/interfaces
-             # interfaces(5) file used by ifup(8) and ifdown(8)
-             # Include files from /etc/network/interfaces.d:
-             source-directory /etc/network/interfaces.d
-             # The loopback network interface
-             auto lo
-             iface lo inet loopback
-             # The primary network interface
-             allow-hotplug eth0
-             iface eth0 inet dhcp
-             EOM
              # Set up firmware boot cmdline
              CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait net.ifnames=1 console=tty1"
              #arm_freq=800
              EOM
+             # Load snd_bcm2835 kernel module at boot time
+             if [ "$ENABLE_SOUND" = true ] ; then
+               echo "snd_bcm2835" >>$R/etc/modules
+             fi
              # Set smallest possible GPU memory allocation size: 16MB (no X)
              if [ "$ENABLE_MINGPU" = true ] ; then
                echo "gpu_mem=16" >>$R/boot/firmware/config.txt
              # Install gcc/c++ build environment inside the chroot
              if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ]; then
-               # Install minimal gcc/g++ build environment
-               LANG=C chroot $R apt-get install -q -y --force-yes --no-install-recommends linux-compiler-gcc-4.9-arm g++ make bc
              fi
                LANG=C chroot $R mkimage -A arm -O linux -T script -C none -a 0x00000000 -e 0x00000000 -n "RPi2 Boot Script" -d /boot/firmware/uboot.mkimage /boot/firmware/boot.scr
              fi
              # Fetch and build fbturbo Xorg driver
              if [ "$ENABLE_FBTURBO" = true ] ; then
                # Fetch fbturbo driver sources
              # Remove gcc/c++ build environment from the chroot
              if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ]; then
-               # Remove minimal gcc/c++ build environment
-               LANG=C chroot $R apt-get -y -q purge --auto-remove bc binutils cpp cpp-4.9 g++ g++-4.9 gcc gcc-4.9 libasan1 libatomic1 libc-dev-bin libc6-dev libcloog-isl4 libgcc-4.9-dev libgomp1 libisl10 libmpc3 libmpfr4 libstdc++-4.9-dev libubsan0 linux-compiler-gcc-4.9-arm linux-libc-dev make
              fi
-             # Enable systemd-networkd DHCP configuration for the eth0 interface
-             printf "[Match]\nName=eth0\n\n[Network]\nDHCP=yes\n" > $R/etc/systemd/network/eth.network
-             # Set DHCP configuration to IPv4 only
-             if [ "$ENABLE_IPV6" = false ] ; then
-               sed -i "s/=yes/=v4/" $R/etc/systemd/network/eth.network
-             fi
-             # Enable systemd-networkd service
-             LANG=C chroot $R systemctl enable systemd-networkd
-             # Place hint about netowrk configuration
-             cat <<EOM >$R/etc/network/interfaces
-             # Debian switched to systemd-networkd configuration files.
-             # please configure your networks in '/etc/systemd/network/'
-             EOM
              # Clean cached downloads
              LANG=C chroot $R apt-get -y clean
              LANG=C chroot $R apt-get -y autoclean

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