Raspi2-3_GenImage Commit - r328:e2911c7f0091 · Collaboration Tremplin des Sciences

141

export ENABLE_REDUCE=${ENABLE_REDUCE:=false}

141

export ENABLE_REDUCE=${ENABLE_REDUCE:=false}

142

export ENABLE_UBOOT=${ENABLE_UBOOT:=false}

142

export ENABLE_UBOOT=${ENABLE_UBOOT:=false}

143

export UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}

143

export UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}

144

export ENABLE_UBOOTUSB=${ENABLE_UBOOTUSB=false}

144

export ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}

145

export ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}

145

export FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}

146

export FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}

146

~~export~~ export ENABLE_HARDNET=${ENABLE_HARDNET:=false}

147

export ENABLE_HARDNET=${ENABLE_HARDNET:=false}

147

export ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}

148

export ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}

148

export ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}

149

export ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}

149

export ENABLE_INITRAMFS=${ENABLE_INITRAMFS:=false}

150

export ENABLE_INITRAMFS=${ENABLE_INITRAMFS:=false}

362

# Add device-tree-compiler required for building the U-Boot bootloader

363

# Add device-tree-compiler required for building the U-Boot bootloader

363

if [ "$ENABLE_UBOOT" = true ] ; then

364

if [ "$ENABLE_UBOOT" = true ] ; then

364

APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"

365

APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"

366

else

367

if [ "$ENABLE_UBOOTUSB" = true ] ; then

368

echo "error: Enabling UBOOTUSB requires u-boot to be enabled"

369

exit 1

370

fi

365

fi

371

fi

366

372

367

# Check if root SSH (v2) public key file exists

373

# Check if root SSH (v2) public key file exists

	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

             export ENABLE_REDUCE=${ENABLE_REDUCE:=false}
             export ENABLE_UBOOT=${ENABLE_UBOOT:=false}
             export UBOOTSRC_DIR=${UBOOTSRC_DIR:=""}
+            export ENABLE_UBOOTUSB=${ENABLE_UBOOTUSB=false}
             export ENABLE_FBTURBO=${ENABLE_FBTURBO:=false}
             export FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
-            export export ENABLE_HARDNET=${ENABLE_HARDNET:=false}
+            export ENABLE_HARDNET=${ENABLE_HARDNET:=false}
             export ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
             export ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}
             export ENABLE_INITRAMFS=${ENABLE_INITRAMFS:=false}
             # Add device-tree-compiler required for building the U-Boot bootloader
             if [ "$ENABLE_UBOOT" = true ] ; then
               APT_INCLUDES="${APT_INCLUDES},device-tree-compiler,bison,flex,bc"
+            else
+              if [ "$ENABLE_UBOOTUSB" = true ] ; then
+                echo "error: Enabling UBOOTUSB requires u-boot to be enabled"
+            	exit 1
+              fi
             fi
             # Check if root SSH (v2) public key file exists