Raspi2-3_GenImage Commit - r67:4aa8ac698568 · Collaboration Tremplin des Sciences

spliting more files, fix-uboot, fix-fbturbo, fix-locale

Jan Wagner -

r67:4aa8ac698568

parent child

Context file:

r67:4aa8ac698568

Expand all files

files/apt/10proxy created 644 +1 0

	@@ -0,0 +1,1
				1	Acquire::http:Proxy "";

files/apt/flash-kernel created 644 +3 0

@@ -0,0 +1,3
	1	Package: flash-kernel
	2	Pin: origin repositories.collabora.co.uk
	3	Pin-Priority: 1000

files/apt/sources.list created 644 +10 0

@@ -0,0 +1,10
	1	deb http://ftp.debian.org/debian jessie main contrib
	2	#deb-src http://ftp.debian.org/debian jessie main contrib
	3
	4	deb http://ftp.debian.org/debian/ jessie-updates main contrib
	5	#deb-src http://ftp.debian.org/debian/ jessie-updates main contrib
	6
	7	deb http://security.debian.org/ jessie/updates main contrib
	8	#deb-src http://security.debian.org/ jessie/updates main contrib
	9
	10	deb https://repositories.collabora.co.uk/debian jessie rpi2

files/boot/uboot.mkimage created 644 +11 0

@@ -0,0 +1,11
	1	# Tell Linux that it is booting on a Raspberry Pi2
	2	setenv machid 0x00000c42
	3
	4	# Save these changes to u-boot's environment
	5	saveenv
	6
	7	# Load the existing Linux kernel into RAM
	8	fatload mmc 0:1 ${kernel_addr_r} kernel7.img
	9
	10	# Boot the kernel we have just loaded
	11	bootz ${kernel_addr_r}

files/locales/locale created 644 +3 0

@@ -0,0 +1,3
	1	# File generated by rpi2-gen-image
	2	LANG=C
	3	LC_ALL=C

files/network/eth.network created 644 +5 0

@@ -0,0 +1,5
	1	[Match]
	2	Name=eth0
	3
	4	[Network]
	5	DHCP=yes

files/network/hostname created 644 +1 0

	@@ -0,0 +1,1
				1	rpi2-jessie

files/network/hosts created 644 +2 0

@@ -0,0 +1,2
	1	127.0.0.1 localhost
	2	127.0.1.1 rpi2-jessie

files/network/interfaces created 644 +2 0

@@ -0,0 +1,2
	1	# Debian switched to systemd-networkd configuration files.
	2	# please configure your networks in '/etc/systemd/network/'

files/xorg/99-fbturbo.conf created 644 +6 0

@@ -0,0 +1,6
	1	Section "Device"
	2	Identifier "Allwinner A10/A13 FBDEV"
	3	Driver "fbturbo"
	4	Option "fbdev" "/dev/fb0"
	5	Option "SwapbuffersWait" "true"
	6	EndSection

README.md +20 -12

             ENABLE_HARDNET=true ENABLE_IPTABLES=true /rpi2-gen-image.sh
             APT_SERVER=ftp.de.debian.org APT_PROXY="http://127.0.0.1:3142/" ./rpi2-gen-image.sh
             ENABLE_MINBASE=true ./rpi2-gen-image.sh
-             ```
+            BUILD_KERNEL=true ENABLE_MINBASE=true ENABLE_IPV6=false ./rpi2-gen-image.sh
+            ```
             #### APT settings:
             ##### `APT_SERVER`="ftp.debian.org"
             #### Keyboard settings:
             These options are used to configure keyboard layout in `/etc/default/keyboard` for console and Xorg. These settings can also be changed inside the running OS using the `dpkg-reconfigure keyboard-configuration` command.
-            ##### `XKBMODEL`=""
+            ##### `XKB_MODEL`=""
             Set the name of the model of your keyboard type.
-            ##### `XKBLAYOUT`=""
+            ##### `XKB_LAYOUT`=""
             Set the supported keyboard layout(s).
-            ##### `XKBVARIANT`=""
+            ##### `XKB_VARIANT`=""
             Set the supported variant(s) of the keyboard layout(s).
-            ##### `XKBOPTIONS`=""
+            ##### `XKB_OPTIONS`=""
             Set extra xkb configuration options.
-            #### Networking settings (DHCP)
+            #### Networking settings (DHCP):
             This setting is used to set up networking auto configuration in `/etc/systemd/network/eth.network`.
             #####`ENABLE_DHCP`=true
             Set the system to use DHCP. This requires an DHCP server.
-            #### Networking settings (static)
+            #### Networking settings (static):
             These settings are used to set up a static networking configuration in /etc/systemd/network/eth.network. The following static networking settings are only supported if `ENABLE_DHCP` was set to `false`.
             #####`NET_ADDRESS`=""
             ##### `BUILD_KERNEL`=false
             Build and install the latest RPi2 linux kernel. Currently only the default RPi2 kernel configuration is used. Detailed configuration parameters for customizing the kernel and minor bug fixes still need to get implemented. feel free to help.
+            ##### `KERNEL_THREADS`=1
+            Number of parallel kernel building threads. If the parameter is left untouched the script will automatically determine the number of CPU cores to set the number of parallel threads to speed the kernel compilation.
             ##### `KERNEL_HEADERS`=true
-            If true, also install kernel headers with built kernel.
+            Install kernel headers with built kernel.
+            ##### `KERNEL_RMSRC`=true
+            Remove all kernel sources from the generated OS image after building.
             ## Understanding the script
             The functions of this script that are required for the different stages of the bootstrapping are split up into single files located inside the `bootstrap.d` directory. During the bootstrapping every script in this directory gets executed in lexicographical order:
             | `12-locale.sh` | Setup Locales and keyboard settings |
             | `13-kernel.sh` | Build and install RPi2 Kernel |
             | `20-networking.sh` | Setup Networking |
-            | `21-firewall.sh` | Setup iptables Firewall |
+            | `21-firewall.sh` | Setup Firewall |
-            | `30-security.sh` | Setup users and security settings |
+            | `30-security.sh` | Setup Users and Security settings |
-            | `31-logging.sh` | Setup logging |
+            | `31-logging.sh` | Setup Logging |
             | `41-uboot.sh` | Build and Setup Uboot |
-            | `42-fbturbo.sh` | Buld and Setup fbturbo Xorg driver |
+            | `42-fbturbo.sh` | Build and Setup fbturbo Xorg driver |
             | `50-firstboot.sh` | First boot actions |
             All the required configuration files that will be copied to the generated OS image are located inside the `files` directory. It is not recommended to modify these configuration files manually.
             | `boot` | Boot and RPi2 configuration files |
             | `firstboot` | Scripts that get executed on first boot  |
             | `iptables` | Firewall configuration files |
+            | `locales` | Locales configuration |
             | `modprobe.d` | Kernel Module Blacklist configuration |
             | `mount` | Fstab configuration |
             | `network` | Networking configuration files |

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

             # Debootstrap basic system
             #
+            # Load utility functions
             . ./functions.sh
             # Base debootstrap (unpack only)

bootstrap.d/11-apt.sh +7 -18

             # Setup APT repositories
             #
+            # Load utility functions
             . ./functions.sh
             # Use proxy inside chroot
             if [ -z "$APT_PROXY" ] ; then
-              echo "Acquire::http::Proxy \"$APT_PROXY\";" >> $R/etc/apt/apt.conf.d/10proxy
+              install_readonly files/apt/10proxy $R/etc/apt/apt.conf.d/10proxy
+              sed -i -e "s/\"\"/\"${APT_PROXY}\"/" $R/etc/apt/apt.conf.d/10proxy
             fi
             # Pin package flash-kernel to repositories.collabora.co.uk
-            cat <<EOM >$R/etc/apt/preferences.d/flash-kernel
+            install_readonly files/apt/flash-kernel $R/etc/apt/preferences.d/flash-kernel
-            Package: flash-kernel
-            Pin: origin repositories.collabora.co.uk
-            Pin-Priority: 1000
-            EOM
             # Upgrade collabora package index and install collabora keyring
             echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/apt/sources.list
             chroot_exec apt-get -qq -y --force-yes install collabora-obs-archive-keyring
             # Set up initial sources.list
-            cat <<EOM >$R/etc/apt/sources.list
+            install_readonly files/apt/sources.list $R/etc/apt/sources.list
-            deb http://${APT_SERVER}/debian ${RELEASE} main contrib
+            sed -i -e "s/\/ftp.debian.org\//\/${APT_SERVER}\//" $R/etc/apt/sources.list
-            #deb-src http://${APT_SERVER}/debian ${RELEASE} main contrib
+            sed -i -e "s/ jessie/ ${RELEASE}/" $R/etc/apt/sources.list
-            deb http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
-            #deb-src http://${APT_SERVER}/debian/ ${RELEASE}-updates main contrib
-            deb http://security.debian.org/ ${RELEASE}/updates main contrib
-            #deb-src http://security.debian.org/ ${RELEASE}/updates main contrib
-            deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2
-            EOM
             # Upgrade package index and update all installed packages and changed dependencies
             chroot_exec apt-get -qq -y update

bootstrap.d/12-locale.sh +15 -9

             #
-            # Setup locales and keyboard settings
+            # Setup Locales and keyboard settings
             #
+            # Load utility functions
             . ./functions.sh
             # Set up timezone
                 chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections
                 chroot_exec sed -i "/en_US.UTF-8/s/^#//" /etc/locale.gen
               fi
               chroot_exec sed -i "/${DEFLOCAL}/s/^#//" /etc/locale.gen
               chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections
               chroot_exec locale-gen
               chroot_exec update-locale LANG=${DEFLOCAL}
               # Keyboard configuration, if requested
-              if [ "$XKBMODEL" != "" ] ; then
+              if [ "$XKB_MODEL" != "" ] ; then
-                chroot_exec sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKBMODEL}\"/" /etc/default/keyboard
+                chroot_exec sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" /etc/default/keyboard
               fi
-              if [ "$XKBLAYOUT" != "" ] ; then
+              if [ "$XKB_LAYOUT" != "" ] ; then
-                chroot_exec sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKBLAYOUT}\"/" /etc/default/keyboard
+                chroot_exec sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" /etc/default/keyboard
               fi
-              if [ "$XKBVARIANT" != "" ] ; then
+              if [ "$XKB_VARIANT" != "" ] ; then
-                chroot_exec sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKBVARIANT}\"/" /etc/default/keyboard
+                chroot_exec sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" /etc/default/keyboard
               fi
-              if [ "$XKBOPTIONS" != "" ] ; then
+              if [ "$XKB_OPTIONS" != "" ] ; then
-                chroot_exec sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKBOPTIONS}\"/" /etc/default/keyboard
+                chroot_exec sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" /etc/default/keyboard
               fi
               chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration
               # Set up font console
               case "${DEFLOCAL}" in
                 *UTF-8)
                   ;;
               esac
               chroot_exec dpkg-reconfigure -f noninteractive console-setup
+            else
+              # Set POSIX default locales
+              install_readonly files/locales/locale $R/etc/default/locale
             fi

bootstrap.d/13-kernel.sh +28 -15

             #
-            # Kernel installation
+            # Build and Setup RPi2 Kernel
             #
+            # Load utility functions
             . ./functions.sh
             # Fetch and build latest raspberry kernel
             if [ "$BUILD_KERNEL" = true ] ; then
               # Fetch current raspberrypi kernel sources
-              git -C $R/usr/local/src clone --depth=1 https://github.com/raspberrypi/linux
+              git -C $R/usr/src clone --depth=1 https://github.com/raspberrypi/linux
               # Load default raspberry kernel configuration
-              make -C $R/usr/local/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2709_defconfig
+              make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- bcm2709_defconfig
+              # Calculate optimal number of kernel building threads
+              if [ "KERNEL_THREADS" = 1 ] ; then
+                if [ -f /proc/cpuinfo ] ; then
+                  KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
+                fi
+              fi
               # Cross compile kernel and modules
-              make -C $R/usr/local/src/linux -j$(grep -c processor /proc/cpuinfo) ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- zImage modules dtbs
+              make -C $R/usr/src/linux -j${KERNEL_THREADS} ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- zImage modules dtbs
               # Install kernel modules
-              make -C $R/usr/local/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_MOD_PATH=../.. modules_install
+              make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_MOD_PATH=../../.. modules_install
               # Install kernel headers
               if [ "$KERNEL_HEADERS" = true ]; then
-                make -C $R/usr/local/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_HDR_PATH=../../usr headers_install
+                make -C $R/usr/src/linux ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- INSTALL_HDR_PATH=../.. headers_install
               fi
               # Copy and rename compiled kernel to boot directory
               mkdir $R/boot/firmware/
-              $R/usr/local/src/linux/scripts/mkknlimg $R/usr/local/src/linux/arch/arm/boot/zImage $R/boot/firmware/kernel7.img
+              $R/usr/src/linux/scripts/mkknlimg $R/usr/src/linux/arch/arm/boot/zImage $R/boot/firmware/kernel7.img
               # Copy dts and dtb device definitions
               mkdir $R/boot/firmware/overlays/
-              cp $R/usr/local/src/linux/arch/arm/boot/dts/*.dtb $R/boot/firmware/
+              cp $R/usr/src/linux/arch/arm/boot/dts/*.dtb $R/boot/firmware/
-              cp $R/usr/local/src/linux/arch/arm/boot/dts/overlays/*.dtb* $R/boot/firmware/overlays/
+              cp $R/usr/src/linux/arch/arm/boot/dts/overlays/*.dtb* $R/boot/firmware/overlays/
-              cp $R/usr/local/src/linux/arch/arm/boot/dts/overlays/README $R/boot/firmware/overlays/
+              cp $R/usr/src/linux/arch/arm/boot/dts/overlays/README $R/boot/firmware/overlays/
+              # Remove kernel sources
+              if [ "$KERNEL_RMSRC" = true ]; then
+                rm -fr $R/usr/src/linux
+              fi
               # Install raspberry bootloader and flash-kernel
               chroot_exec apt-get -qq -y --no-install-recommends install raspberrypi-bootloader-nokernel
             else
               # Kernel installation
-              chroot_exec apt-get -qq -y --no-install-recommends install linux-image-${KERNEL} raspberrypi-bootloader-nokernel
+              chroot_exec apt-get -qq -y --no-install-recommends install linux-image-${COLLABORA_KERNEL} raspberrypi-bootloader-nokernel
               # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot
               chroot_exec apt-get -qq -y install flash-kernel
             echo "${CMDLINE}" >$R/boot/firmware/cmdline.txt
             # Set up firmware config
-            install -o root -g root -m 644 files/config.txt $R/boot/firmware/config.txt
+            install_readonly files/boot/config.txt $R/boot/firmware/config.txt
             # Load snd_bcm2835 kernel module at boot time
             if [ "$ENABLE_SOUND" = true ] ; then
             mkdir -p $R/etc/modprobe.d/
             # Blacklist sound modules
-            install -o root -g root -m 644 files/modprobe.d/raspi-blacklist.conf $R/etc/modprobe.d/raspi-blacklist.conf
+            install_readonly files/modprobe.d/raspi-blacklist.conf $R/etc/modprobe.d/raspi-blacklist.conf
             # Create default fstab
-            install -o root -g root -m 644 files/fstab $R/etc/fstab
+            install_readonly files/mount/fstab $R/etc/fstab
             # Avoid swapping and increase cache sizes
-            install -o root -g root -m 644 files/sysctl.d/81-rpi-vm.conf $R/etc/sysctl.d/81-rpi-vm.conf
+            install_readonly files/sysctl.d/81-rpi-vm.conf $R/etc/sysctl.d/81-rpi-vm.conf

bootstrap.d/20-networking.sh +17 -26

             #
-            # Setup networking
+            # Setup Networking
             #
+            # Load utility functions
             . ./functions.sh
             # Set up IPv4 hosts
-            echo ${HOSTNAME} >$R/etc/hostname
+            install_readonly files/network/hostname $R/etc/hostname
-            cat <<EOM >$R/etc/hosts
+            sed -i -e "s/^rpi2-jessie/${HOSTNAME}/" $R/etc/hostname
-.0.0.1       localhost
-.0.1.1       ${HOSTNAME}
+            install_readonly files/network/hosts $R/etc/hosts
-            EOM
+            sed -i -e "s/rpi2-jessie/${HOSTNAME}/" $R/etc/hosts
             if [ "$NET_ADDRESS" != "" ] ; then
-            NET_IP=$(echo ${NET_ADDRESS} | cut -f 1 -d'/')
+              NET_IP=$(echo ${NET_ADDRESS} | cut -f 1 -d'/')
-            sed -i "s/^127.0.1.1/${NET_IP}/" $R/etc/hosts
+              sed -i "s/^127.0.1.1/${NET_IP}/" $R/etc/hosts
             fi
             # Set up IPv6 hosts
             if [ "$ENABLE_IPV6" = true ] ; then
-            cat <<EOM >>$R/etc/hosts
+              cat <<EOM >>$R/etc/hosts
             ::1             localhost ip6-localhost ip6-loopback
             ff02::1         ip6-allnodes
             fi
             # Place hint about network configuration
-            cat <<EOM >$R/etc/network/interfaces
+            install_readonly files/network/interfaces $R/etc/network/interfaces
-            # Debian switched to systemd-networkd configuration files.
-            # please configure your networks in '/etc/systemd/network/'
-            source /etc/interfaces.d/*.conf
-            EOM
             if [ "$ENABLE_DHCP" = true ] ; then
             # Enable systemd-networkd DHCP configuration for interface eth0
-            cat <<EOM >$R/etc/systemd/network/eth.network
+            install_readonly files/network/eth.network $R/etc/systemd/network/eth.network
-            [Match]
-            Name=eth0
-            [Network]
-            DHCP=yes
-            EOM
             # Set DHCP configuration to IPv4 only
-            if [ "$ENABLE_IPV6" = false ] ; then
+              if [ "$ENABLE_IPV6" = false ] ; then
-              sed -i "s/^DHCP=yes/DHCP=v4/" $R/etc/systemd/network/eth.network
+                sed -i "s/^DHCP=yes/DHCP=v4/" $R/etc/systemd/network/eth.network
-            fi
+              fi
             else # ENABLE_DHCP=false
-            cat <<EOM >$R/etc/systemd/network/eth.network
+              cat <<EOM >$R/etc/systemd/network/eth.network
             [Match]
             Name=eth0
             # Enable network stack hardening
             if [ "$ENABLE_HARDNET" = true ] ; then
-              install -o root -g root -m 644 files/sysctl.d/81-rpi-net-hardening.conf $R/etc/sysctl.d/81-rpi-net-hardening.conf
+              install_readonly files/sysctl.d/81-rpi-net-hardening.conf $R/etc/sysctl.d/81-rpi-net-hardening.conf
             # Enable resolver warnings about spoofed addresses
               cat <<EOM >>$R/etc/host.conf

bootstrap.d/21-firewall.sh +8 -7

             #
-            # Enable firewall based on iptables started by systemd service
+            # Setup Firewall
             #
+            # Load utility functions
             . ./functions.sh
             if [ "$ENABLE_IPTABLES" = true ] ; then
               mkdir -p "$R/etc/iptables"
               # Create iptables systemd service
-              install -o root -g root -m 644 files/iptables/iptables.service $R/etc/systemd/system/iptables.service
+              install_readonly files/iptables/iptables.service $R/etc/systemd/system/iptables.service
               # Create flush-table script called by iptables service
-              install -o root -g root -m 755 files/iptables/flush-iptables.sh $R/etc/iptables/flush-iptables.sh
+              install_exec files/iptables/flush-iptables.sh $R/etc/iptables/flush-iptables.sh
               # Create iptables rule file
-              install -o root -g root -m 644 files/iptables/iptables.rules $R/etc/iptables/iptables.rules
+              install_readonly files/iptables/iptables.rules $R/etc/iptables/iptables.rules
               # Reload systemd configuration and enable iptables service
               chroot_exec systemctl daemon-reload
               if [ "$ENABLE_IPV6" = true ] ; then
                 # Create ip6tables systemd service
-                install -o root -g root -m 644 files/iptables/ip6tables.service $R/etc/systemd/system/ip6tables.service
+                install_readonly files/iptables/ip6tables.service $R/etc/systemd/system/ip6tables.service
                 # Create ip6tables file
-                install -o root -g root -m 755 files/iptables/flush-ip6tables.sh $R/etc/iptables/flush-ip6tables.sh
+                install_exec files/iptables/flush-ip6tables.sh $R/etc/iptables/flush-ip6tables.sh
-                install -o root -g root -m 644 files/iptables/ip6tables.rules $R/etc/iptables/ip6tables.rules
+                install_readonly files/iptables/ip6tables.rules $R/etc/iptables/ip6tables.rules
                 # Reload systemd configuration and enable iptables service
                 chroot_exec systemctl daemon-reload

bootstrap.d/30-security.sh +1 0

             # Setup users and security settings
             #
+            # Load utility functions
             . ./functions.sh
             # Generate crypt(3) password string

bootstrap.d/31-logging.sh +2 -1

             #
-            # Setup logging
+            # Setup Logging
             #
+            # Load utility functions
             . ./functions.sh
             # Disable rsyslog

bootstrap.d/41-uboot.sh +5 -18

@@ -1,7 +1,8
1	#	1	#
2	# Setup Uboot	2	# Build and Setup Uboot
3	#	3	#
4		4
		5	# Load utility functions
5	. ./functions.sh	6	. ./functions.sh
6		7
7	# Install gcc/c++ build environment inside the chroot	8	# Install gcc/c++ build environment inside the chroot
@@ -22,23 +23,9 if [ "$ENABLE_UBOOT" = true ] ; then
22	printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> $R/boot/firmware/config.txt	23	printf "\n# boot u-boot kernel\nkernel=u-boot.bin\n" >> $R/boot/firmware/config.txt
23		24
24	# Set U-Boot command file	25	# Set U-Boot command file
25	cat <<EOM >$R/boot/firmware/uboot.mkimage	26	install_readonly files/boot/uboot.mkimage $R/boot/firmware/uboot.mkimage
26	# Tell Linux that it is booting on a Raspberry Pi2	27	printf "# Set the kernel boot command line\nsetenv bootargs \"earlyprintk ${CMDLINE}\"\n\n$(cat $R/boot/firmware/uboot.mkimage)" > $R/boot/firmware/uboot.mkimage
27	setenv machid 0x00000c42
28
29	# Set the kernel boot command line
30	setenv bootargs "earlyprintk ${CMDLINE}"
31
32	# Save these changes to u-boot's environment
33	saveenv
34
35	# Load the existing Linux kernel into RAM
36	fatload mmc 0:1 \${kernel_addr_r} kernel7.img
37
38	# Boot the kernel we have just loaded
39	bootz \${kernel_addr_r}
40	EOM
41		28
42	# Generate U-Boot image from command file	29	# Generate U-Boot image from command file
43	chroot_exec 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	30	chroot_exec /tmp/u-boot/tools/mkimage -A arm -O linux -T script -C none -a 0x00000000 -e 0x00000000 -n RPi2 -d /boot/firmware/uboot.mkimage /boot/firmware/boot.scr
44	fi	31	fi

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

             #
-            # Fetch and build fbturbo Xorg driver
+            # Build and Setup fbturbo Xorg driver
             #
+            # Load utility functions
             . ./functions.sh
             if [ "$ENABLE_FBTURBO" = true ] ; then
               chroot_exec apt-get install -q -y --no-install-recommends xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
               # Build and install fbturbo driver inside chroot
-              chroot_exec /bin/bash -c "cd /tmp/xf86-video-fbturbo; autoreconf -vi; ./configure --prefix=/usr; make; make install"
+              chroot_exec /bin/bash -x <<'EOF'
+            cd /tmp/xf86-video-fbturbo
+            autoreconf -vi
+            ./configure --prefix=/usr
+            make
+            make install
+            EOF
               # Add fbturbo driver to Xorg configuration
-              cat <<EOM >$R/usr/share/X11/xorg.conf.d/99-fbturbo.conf
+              install_readonly files/xorg/99-fbturbo.conf $R/usr/share/X11/xorg.conf.d/99-fbturbo.conf
-            Section "Device"
-                    Identifier "Allwinner A10/A13 FBDEV"
-                    Driver "fbturbo"
-                    Option "fbdev" "/dev/fb0"
-                    Option "SwapbuffersWait" "true"
-            EndSection
-            EOM
               # Remove Xorg build dependencies
               chroot_exec apt-get -q -y purge --auto-remove xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev

bootstrap.d/50-firstboot.sh +5 0

             # First boot actions
             #
+            # Load utility functions
             . ./functions.sh
+            # Prepare rc.firstboot script
             cat files/firstboot/10-begin.sh > $R/etc/rc.firstboot
             # Ensure openssh server host keys are regenerated on first boot
               rm -f $R/etc/ssh/ssh_host_*
             fi
+            # Prepare filesystem auto expand
             if [ "$EXPANDROOT" = true ] ; then
               cat files/firstboot/22-expandroot.sh >> $R/etc/rc.firstboot
             fi
+            # Finalize rc.firstboot script
             cat files/firstboot/99-finish.sh >> $R/etc/rc.firstboot
             chmod +x $R/etc/rc.firstboot
+            # Add rc.firstboot script to rc.local
             sed -i '/exit 0/d' $R/etc/rc.local
             echo /etc/rc.firstboot >> $R/etc/rc.local
             echo exit 0 >> $R/etc/rc.local

files/boot/config.txt ~~files/config.txt~~ renamed 0 0

NO CONTENT: file renamed from files/config.txt to files/boot/config.txt

files/mount/fstab ~~files/fstab~~ renamed 0 0

NO CONTENT: file renamed from files/fstab to files/mount/fstab

functions.sh +16 -1

+            # This file contains utility functions used by rpi2-gen-image.sh
             cleanup (){
-              # Clean up all temporary mount points
               set +x
               set +e
+              # Identify and kill all processes still using files
               echo "killing processes using mount point ..."
               fuser -k $R
               sleep 3
               fuser -9 -k -v $R
+              # Clean up all temporary mount points
               echo "removing temporary mount points ..."
               umount -l $R/proc 2> /dev/null
               umount -l $R/sys 2> /dev/null
               # Exec command in chroot
               LANG=C LC_ALL=C DEBIAN_FRONTEND=noninteractive chroot $R $*
             }
+            install_readonly() {
+              # Install file with user read-only permissions
+              install -o root -g root -m 644 $*
+            }
+            install_exec() {
+              # Install file with root exec permissions
+              install -o root -g root -m 744 $*
+            }

rpi2-gen-image.sh +18 -10

             # Copyright (C) 2015 Luca Falavigna <dktrkranz@debian.org>
             ########################################################################
-            source ./functions.sh
+            # Load utility functions
+            . ./functions.sh
             set -e
+            echo -n -e "\n#\n# RPi2 Bootstrap Settings\n#\n"
             set -x
             # Debian release
             RELEASE=${RELEASE:=jessie}
-            KERNEL=${KERNEL:=3.18.0-trunk-rpi2}
+            COLLABORA_KERNEL=${COLLABORA_KERNEL:=3.18.0-trunk-rpi2}
             # Build settings
             BASEDIR=$(pwd)/images/${RELEASE}
             PASSWORD=${PASSWORD:=raspberry}
             DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"}
             TIMEZONE=${TIMEZONE:="Europe/Berlin"}
-            XKBMODEL=${XKBMODEL:=""}
-            XKBLAYOUT=${XKBLAYOUT:=""}
-            XKBVARIANT=${XKBVARIANT:=""}
-            XKBOPTIONS=${XKBOPTIONS:=""}
             EXPANDROOT=${EXPANDROOT:=true}
-            # Network settings
+            # Keyboard settings
+            XKB_MODEL=${XKB_MODEL:=""}
+            XKB_LAYOUT=${XKB_LAYOUT:=""}
+            XKB_VARIANT=${XKB_VARIANT:=""}
+            XKB_OPTIONS=${XKB_OPTIONS:=""}
+            # Network settings (DHCP)
             ENABLE_DHCP=${ENABLE_DHCP:=true}
-            # NET_* settings are ignored when ENABLE_DHCP=true
-            # NET_ADDRESS is an IPv4 or IPv6 address and its prefix, separated by "/"
+            # Network settings (static)
+            # only used on ENABLE_DHCP=false
             NET_ADDRESS=${NET_ADDRESS:=""}
             NET_GATEWAY=${NET_GATEWAY:=""}
             NET_DNS_1=${NET_DNS_1:=""}
             # Kernel compilation settings
             BUILD_KERNEL=${BUILD_KERNEL:=false}
+            KERNEL_THREADS=${KERNEL_THREADS:=1}
             KERNEL_HEADERS=${KERNEL_HEADERS:=true}
+            KERNEL_RMSRC=${KERNEL_RMSRC:=true}
             # Image chroot path
             R=${BUILDDIR}/chroot
             ## Main bootstrap
             for i in bootstrap.d/*.sh; do
+              head -n 3 $i
               . $i
             done
             # Unmount all temporary loop devices and mount points
             cleanup
-            # (optinal) create block map file for "bmaptool"
+            # Create block map file for "bmaptool"
             bmaptool create -o "$BASEDIR/${DATE}-debian-${RELEASE}.bmap" "$BASEDIR/${DATE}-debian-${RELEASE}.img"
             # Image was successfully created

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