Raspi2-3_GenImage Commit - r329:02f0baa56ac1 · Collaboration Tremplin des Sciences

Merge pull request #3 from drtyhlpr/master...

burnbabyburn -

r329:02f0baa56ac1

parent child

Context file:

r329:02f0baa56ac1

Collapse all files

README.md +4 -1

             Allow the installation of non-free Debian packages that do not comply with the DFSG. This is required to install closed-source firmware binary blobs.
             ##### `ENABLE_WIRELESS`=false
-            Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
+            Download and install the [closed-source firmware binary blob](https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm) that is required to run the internal wireless interface of the Raspberry Pi model `3`. This parameter is ignored if the specified `RPI_MODEL` is not `3`.
             ##### `ENABLE_RSYSLOG`=true
             If set to false, disable and uninstall rsyslog (so logs will be available only
             ##### `ENABLE_WM`=""
             Install a user defined window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_WM` is used. The `rpi23-gen-image.sh` script has been tested with the following list of window managers: `blackbox`, `openbox`, `fluxbox`, `jwm`, `dwm`, `xfce4`, `awesome`.
+            ##### `ENABLE_SYSVINIT`=false
+            Support for halt,init,poweroff,reboot,runlevel,shutdown,telinit commands
             ---
             #### Advanced system features:

bootstrap.d/10-bootstrap.sh +1 -7

             VARIANT=""
             COMPONENTS="main"
-            EXCLUDES=""
             # Use non-free Debian packages if needed
             if [ "$ENABLE_NONFREE" = true ] ; then
               VARIANT="--variant=minbase"
             fi
-            # Exclude packages if required by Debian release
-            if [ "$RELEASE" = "stretch" ] || [ "$RELEASE" = "buster" ] ; then
-              EXCLUDES="--exclude=init,systemd-sysv"
-            fi
             # Base debootstrap (unpack only)
-            http_proxy=${APT_PROXY} debootstrap ${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"
             # Copy qemu emulator binary to chroot
             install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"

bootstrap.d/12-locale.sh +2 -2

               chroot_exec update-locale LANG="${DEFLOCAL}"
               # Install and setup default keyboard configuration
-              if [ "$XKB_MODEL" != "" ] ; then
+              if [ "$XKB_MODEL" != "pc105" ] ; then
                 sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard"
               fi
-              if [ "$XKB_LAYOUT" != "" ] ; then
+              if [ "$XKB_LAYOUT" != "us" ] ; then
                 sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard"
               fi
               if [ "$XKB_VARIANT" != "" ] ; then

bootstrap.d/15-rpi-config.sh +1 -1

             fi
             # Disable RPi3 Bluetooth and restore ttyAMA0 serial device
-            if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then
+            if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
               if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
                 echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
                 echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"

bootstrap.d/20-networking.sh +3 -3

               as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.txt"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.clm_blob" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.clm_blob"
-              else
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
               # Fetch firmware binary blob for RPI3
               as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.bin"
               as_nobody wget -q -O "${temp_dir}/brcmfmac43430-sdio.txt" "${WLAN_FIRMWARE_URL}/brcmfmac43430-sdio.txt"
               # Move downloaded firmware binary blob
               if [ "$RPI_MODEL" = 3P ] ; then
               mv "${temp_dir}/brcmfmac43455-sdio."* "${WLAN_FIRMWARE_DIR}/"
-              else
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
               mv "${temp_dir}/brcmfmac43430-sdio."* "${WLAN_FIRMWARE_DIR}/"
               fi
               if [ "$RPI_MODEL" = 3P ] ; then
               chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
               chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43455-sdio."*
-              else
+              elif [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 0 ] ; then
               chown root:root "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
               chmod 600 "${WLAN_FIRMWARE_DIR}/brcmfmac43430-sdio."*
               fi

bootstrap.d/21-firewall.sh +3 -3

               mkdir -p "${ETC_DIR}/iptables"
               # make sure iptables-legacy,iptables-legacy-restore and iptables-legacy-save are the used alternatives
-              chroot_exec update-alternatives --verbose --set iptables /usr/bin/iptables-legacy
+              chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
-              chroot_exec update-alternatives --verbose --set iptables-save /usr/bin/iptables-legacy-save
+              chroot_exec update-alternatives --verbose --set iptables-save /usr/sbin/iptables-legacy-save
-              chroot_exec update-alternatives --verbose --set iptables-restore /usr/bin/iptables-legacy-restore
+              chroot_exec update-alternatives --verbose --set iptables-restore /usr/sbin/iptables-legacy-restore
               # Install iptables systemd service
               install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"

rpi23-gen-image.sh +14 -5

             USER_NAME=${USER_NAME:="pi"}
             ENABLE_ROOT=${ENABLE_ROOT:=false}
             ENABLE_QEMU=${ENABLE_QEMU:=false}
+            ENABLE_SYSVINIT=${ENABLE_SYSVINIT:=false}
             # SSH settings
             SSH_ENABLE_ROOT=${SSH_ENABLE_ROOT:=false}
             APT_INCLUDES=${APT_INCLUDES:=""}
             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils"
+            #Packages to exclude from chroot build environment
+            APT_EXCLUDES=${APT_EXCLUDES:=""}
             # Packages required for bootstrapping
             REQUIRED_PACKAGES="debootstrap debian-archive-keyring qemu-user-static binfmt-support dosfstools rsync bmap-tools whois git bc psmisc dbus sudo"
             MISSING_PACKAGES=""
             set +x
+            #If init and systemd-sysv are wanted e.g. halt/reboot/shutdown scripts
+            if [ "$ENABLE_SYSVINIT" = false ] ; then
+            APT_EXCLUDES="--exclude=${APT_EXCLUDES},init,systemd-sysv"
+            fi
             # Set Raspberry Pi model specific configuration
             if [ "$RPI_MODEL" = 0 ] ; then
               DTB_FILE=${RPI0_DTB_FILE}
                 if [ "$RELEASE_ARCH" = "armhf" ]; then
                   REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf"
                 fi
-                if [ "$RELEASE_ARCH" = "arm64" ]; then
+              fi
-                  REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
+              if [ "$RELEASE_ARCH" = "arm64" ]; then
-                fi
+                REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64"
               fi
             fi
             fi
             # Add required locales packages
-            if [ "$DEFLOCAL" != "en_US.UTF-8" ] ; then
+            if [ "$DEFLOCAL" != "en_US.UTF-8" ] || ([ -n XKB_MODEL ] || [ -n XKB_LAYOUT ] ||  [ -n XKB_VARIANT ] ||  [ -n XKB_OPTIONS ]); then
               APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"
             fi
             # Add iptables IPv4/IPv6 package
             if [ "$ENABLE_IPTABLES" = true ] ; then
-              APT_INCLUDES="${APT_INCLUDES},iptables"
+              APT_INCLUDES="${APT_INCLUDES},iptables,iptables-persistent"
             fi
             # Add openssh server package

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