Raspi2-3_GenImage Commit - r91:491ef8b44865 · Collaboration Tremplin des Sciences

Added ENABLE_NONFREE support and more

drtyhlpr -

r91:491ef8b44865

parent child

Context file:

r91:491ef8b44865

Collapse all files

README.md +3 0

             ##### `ENABLE_SSHD`=true
             Install and enable OpenSSH service. The default configuration of the service doesn't allow `root` to login. Please use the user `pi` instead and `su -` or `sudo` to execute commands as root.
+            ##### `ENABLE_NONFREE`=false
+            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_RSYSLOG`=true
             If set to false, disable and uninstall rsyslog (so logs will be available only
             in journal files)

bootstrap.d/10-bootstrap.sh +13 -4

@@ -5,13 +5,22
5	# Load utility functions	5	# Load utility functions
6	. ./functions.sh	6	. ./functions.sh
7		7
8	# Base debootstrap (unpack only)	8	VARIANT=""
		9	COMPONENTS="main"
		10
		11	# Use non-free Debian packages if needed
		12	if [ "$ENABLE_NONFREE" = true ] ; then
		13	COMPONENTS="main,non-free"
		14	fi
		15
		16	# Use minbase bootstrap variant which only includes essential packages
9	if [ "$ENABLE_MINBASE" = true ] ; then	17	if [ "$ENABLE_MINBASE" = true ] ; then
10	http_proxy=${APT_PROXY} debootstrap --arch="${RELEASE_ARCH}" --foreign --variant=minbase --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"	18	VARIANT="--variant=minbase"
11	else
12	http_proxy=${APT_PROXY} debootstrap --arch="${RELEASE_ARCH}" --foreign --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
13	fi	19	fi
14		20
		21	# Base debootstrap (unpack only)
		22	http_proxy=${APT_PROXY} debootstrap --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}/debian"
		23
15	# Copy qemu emulator binary to chroot	24	# Copy qemu emulator binary to chroot
16	install_exec "${QEMU_BINARY}" "${R}${QEMU_BINARY}"	25	install_exec "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
17		26

bootstrap.d/11-apt.sh +6 -1

               # Install APT sources.list
               install_readonly files/apt/sources.list "${ETCDIR}/apt/sources.list"
-              echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >> "${ETCDIR}/apt/sources.list"
+              echo "deb ${COLLABORA_URL} ${RELEASE} rpi2" >> "${ETCDIR}/apt/sources.list"
               # Upgrade collabora package index and install collabora keyring
               chroot_exec apt-get -qq -y update
               sed -i "s/ jessie/ ${RELEASE}/" "${ETCDIR}/apt/sources.list"
             fi
+            # Allow the installation of non-free Debian packages
+            if [ "$ENABLE_NONFREE" = true ] ; then
+              sed -i "s/ contrib/ contrib non-free/" "${ETCDIR}/apt/sources.list"
+            fi
             # Upgrade package index and update all installed packages and changed dependencies
             chroot_exec apt-get -qq -y update
             chroot_exec apt-get -qq -y -u dist-upgrade

bootstrap.d/13-kernel.sh +8 -8

                 fi
               else # KERNELSRC_DIR=""
                 # Fetch current raspberrypi kernel sources
-                git -C "${R}/usr/src" clone --depth=1 https://github.com/raspberrypi/linux
+                git -C "${R}/usr/src" clone --depth=1 "${KERNEL_URL}"
               fi
               # Calculate optimal number of kernel building threads
                 cp ${FIRMWAREDIR}/boot/start_x.elf ${BOOTDIR}/start_x.elf
               else
                 # Install latest boot binaries from raspberry/firmware github
-                wget -q -O "${BOOTDIR}/bootcode.bin" https://github.com/raspberrypi/firmware/raw/master/boot/bootcode.bin
+                wget -q -O "${BOOTDIR}/bootcode.bin" "${FIRMWARE_URL}/bootcode.bin"
-                wget -q -O "${BOOTDIR}/fixup.dat" https://github.com/raspberrypi/firmware/raw/master/boot/fixup.dat
+                wget -q -O "${BOOTDIR}/fixup.dat" "${FIRMWARE_URL}/fixup.dat"
-                wget -q -O "${BOOTDIR}/fixup_cd.dat" https://github.com/raspberrypi/firmware/raw/master/boot/fixup_cd.dat
+                wget -q -O "${BOOTDIR}/fixup_cd.dat" "${FIRMWARE_URL}/fixup_cd.dat"
-                wget -q -O "${BOOTDIR}/fixup_x.dat" https://github.com/raspberrypi/firmware/raw/master/boot/fixup_x.dat
+                wget -q -O "${BOOTDIR}/fixup_x.dat" "${FIRMWARE_URL}/fixup_x.dat"
-                wget -q -O "${BOOTDIR}/start.elf" https://github.com/raspberrypi/firmware/raw/master/boot/start.elf
+                wget -q -O "${BOOTDIR}/start.elf" "${FIRMWARE_URL}/start.elf"
-                wget -q -O "${BOOTDIR}/start_cd.elf" https://github.com/raspberrypi/firmware/raw/master/boot/start_cd.elf
+                wget -q -O "${BOOTDIR}/start_cd.elf" "${FIRMWARE_URL}/start_cd.elf"
-                wget -q -O "${BOOTDIR}/start_x.elf" https://github.com/raspberrypi/firmware/raw/master/boot/start_x.elf
+                wget -q -O "${BOOTDIR}/start_x.elf" "${FIRMWARE_URL}/start_x.elf"
               fi
             else # BUILD_KERNEL=false

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

             # Fetch and build U-Boot bootloader
             if [ "$ENABLE_UBOOT" = true ] ; then
               # Fetch U-Boot bootloader sources
-              git -C "${R}/tmp" clone git://git.denx.de/u-boot.git
+              git -C "${R}/tmp" clone "${UBOOT_URL}"
               # Build and install U-Boot inside chroot
               chroot_exec make -C /tmp/u-boot/ ${UBOOT_CONFIG} all

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

             if [ "$ENABLE_FBTURBO" = true ] ; then
               # Fetch fbturbo driver sources
-              git -C "${R}/tmp" clone https://github.com/ssvb/xf86-video-fbturbo.git
+              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

rpi2-gen-image.sh +8 0

             UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_2_defconfig}
             QEMU_BINARY=${QEMU_BINARY:=/usr/bin/qemu-arm-static}
+            # URLs
+            KERNEL_URL=${KERNEL_URL:=https://github.com/raspberrypi/linux}
+            FIRMWARE_URL=${FIRMWARE_URL:=https://github.com/raspberrypi/firmware/raw/master/boot}
+            COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
+            FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
+            UBOOT_URL=${UBOOT_URL:=git://git.denx.de/u-boot.git}
             # Build directories
             BASEDIR="$(pwd)/images/${RELEASE}"
             BUILDDIR="${BASEDIR}/build"
             ENABLE_CONSOLE=${ENABLE_CONSOLE:=true}
             ENABLE_IPV6=${ENABLE_IPV6:=true}
             ENABLE_SSHD=${ENABLE_SSHD:=true}
+            ENABLE_NONFREE=${ENABLE_NONFREE:=false}
             ENABLE_SOUND=${ENABLE_SOUND:=true}
             ENABLE_DBUS=${ENABLE_DBUS:=true}
             ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true}

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