##// END OF EJS Templates
Fixes for Debian stretch release support
drtyhlpr -
r93:d975bb85d0ff
parent child
Show More
@@ -70,13 +70,13 Set the supported variant(s) of the keyboard layout(s).
70 Set extra xkb configuration options.
70 Set extra xkb configuration options.
71
71
72 #### Networking settings (DHCP):
72 #### Networking settings (DHCP):
73 This parameter is used to set up networking auto configuration in `/etc/systemd/network/eth.network`.
73 This parameter is used to set up networking auto configuration in `/etc/systemd/network/eth.network`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.`
74
74
75 #####`ENABLE_DHCP`=true
75 #####`ENABLE_DHCP`=true
76 Set the system to use DHCP. This requires an DHCP server.
76 Set the system to use DHCP. This requires an DHCP server.
77
77
78 #### Networking settings (static):
78 #### Networking settings (static):
79 These parameters are used to set up a static networking configuration in /etc/systemd/network/eth.network. The following static networking parameters are only supported if `ENABLE_DHCP` was set to `false`.
79 These parameters are used to set up a static networking configuration in `/etc/systemd/network/eth.network`. The following static networking parameters are only supported if `ENABLE_DHCP` was set to `false`. The default location of network configuration files in the Debian `stretch` release was changed to `/lib/systemd/network`.
80
80
81 #####`NET_ADDRESS`=""
81 #####`NET_ADDRESS`=""
82 Set a static IPv4 or IPv6 address and its prefix, separated by "/", eg. "192.169.0.3/24".
82 Set a static IPv4 or IPv6 address and its prefix, separated by "/", eg. "192.169.0.3/24".
@@ -281,6 +281,7 All the required configuration files that will be copied to the generated OS ima
281 | `apt` | APT management configuration files |
281 | `apt` | APT management configuration files |
282 | `boot` | Boot and RPi2 configuration files |
282 | `boot` | Boot and RPi2 configuration files |
283 | `dpkg` | Package Manager configuration |
283 | `dpkg` | Package Manager configuration |
284 | `etc` | Configuration files and rc scripts |
284 | `firstboot` | Scripts that get executed on first boot |
285 | `firstboot` | Scripts that get executed on first boot |
285 | `initramfs` | Initramfs scripts |
286 | `initramfs` | Initramfs scripts |
286 | `iptables` | Firewall configuration files |
287 | `iptables` | Firewall configuration files |
@@ -7,7 +7,8
7
7
8 # Install gcc/c++ build environment inside the chroot
8 # Install gcc/c++ build environment inside the chroot
9 if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ] ; then
9 if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ] ; then
10 chroot_exec apt-get -q -y --force-yes --no-install-recommends install linux-compiler-gcc-4.8-arm g++ make bc
10 COMPILER_PACKAGES=$(chroot_exec apt-get -s install ${COMPILER_PACKAGES} | grep "^Inst " | awk -v ORS=" " '{ print $2 }')
11 chroot_exec apt-get -q -y --force-yes --no-install-recommends install ${COMPILER_PACKAGES}
11 fi
12 fi
12
13
13 # Fetch and build U-Boot bootloader
14 # Fetch and build U-Boot bootloader
@@ -10,7 +10,7 if [ "$ENABLE_FBTURBO" = true ] ; then
10 git -C "${R}/tmp" clone "${FBTURBO_URL}"
10 git -C "${R}/tmp" clone "${FBTURBO_URL}"
11
11
12 # Install Xorg build dependencies
12 # Install Xorg build dependencies
13 chroot_exec apt-get -q -y --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
13 chroot_exec apt-get -q -y --force-yes --no-install-recommends install xorg-dev xutils-dev x11proto-dri2-dev libltdl-dev libtool automake libdrm-dev
14
14
15 # Build and install fbturbo driver inside chroot
15 # Build and install fbturbo driver inside chroot
16 chroot_exec /bin/bash -x <<'EOF'
16 chroot_exec /bin/bash -x <<'EOF'
@@ -30,5 +30,5 fi
30
30
31 # Remove gcc/c++ build environment from the chroot
31 # Remove gcc/c++ build environment from the chroot
32 if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ] ; then
32 if [ "$ENABLE_UBOOT" = true ] || [ "$ENABLE_FBTURBO" = true ] ; then
33 chroot_exec apt-get -qq -y --auto-remove purge bc binutils cpp cpp-4.8 cpp-4.9 g++ g++-4.8 g++-4.9 gcc gcc-4.8 gcc-4.9 libasan1 libatomic1 libc-dev-bin libc6-dev libcloog-isl4 libgcc-4.8-dev libgcc-4.9-dev libgomp1 libisl10 libmpc3 libmpfr4 libstdc++-4.9-dev libubsan0 linux-compiler-gcc-4.8-arm linux-libc-dev make
33 chroot_exec apt-get -qq -y --auto-remove purge ${COMPILER_PACKAGES}
34 fi
34 fi
@@ -56,7 +56,9 if [ "$ENABLE_REDUCE" = true ] ; then
56 fi
56 fi
57
57
58 # Re-install tools for managing kernel moduless
58 # Re-install tools for managing kernel moduless
59 if [ "$RELEASE" = "jessie" ] ; then
59 chroot_exec apt-get -qq -y --force-yes install module-init-tools
60 chroot_exec apt-get -qq -y --force-yes install module-init-tools
61 fi
60
62
61 # Remove GPU kernels
63 # Remove GPU kernels
62 if [ "$ENABLE_MINGPU" = true ] ; then
64 if [ "$ENABLE_MINGPU" = true ] ; then
@@ -68,6 +68,9 KERNELDIR="${R}/usr/src/linux"
68 # Firmware directory: Blank if download from github
68 # Firmware directory: Blank if download from github
69 FIRMWAREDIR=${FIRMWAREDIR:=""}
69 FIRMWAREDIR=${FIRMWAREDIR:=""}
70
70
71 # Packages for gcc/c++ inside the chroot
72 COMPILER_PACKAGES=${COMPILER_PACKAGES:="linux-compiler-gcc-4.8-arm g++ make bc"}
73
71 # General settings
74 # General settings
72 HOSTNAME=${HOSTNAME:=rpi2-${RELEASE}}
75 HOSTNAME=${HOSTNAME:=rpi2-${RELEASE}}
73 PASSWORD=${PASSWORD:=raspberry}
76 PASSWORD=${PASSWORD:=raspberry}
@@ -175,6 +178,7 set +x
175 # Build latest RPi2 Linux kernel if required by Debian release
178 # Build latest RPi2 Linux kernel if required by Debian release
176 if [ "$RELEASE" = "stretch" ] ; then
179 if [ "$RELEASE" = "stretch" ] ; then
177 BUILD_KERNEL=true
180 BUILD_KERNEL=true
181 COMPILER_PACKAGES=$(echo $COMPILER_PACKAGES | sed s/-4.8-arm/-5-arm/)
178 fi
182 fi
179
183
180 # Add packages required for kernel cross compilation
184 # Add packages required for kernel cross compilation
@@ -388,7 +392,9 EOF
388 fi
392 fi
389
393
390 # Remove apt-utils
394 # Remove apt-utils
395 if [ "$RELEASE" = "jessie" ] ; then
391 chroot_exec apt-get purge -qq -y --force-yes apt-utils
396 chroot_exec apt-get purge -qq -y --force-yes apt-utils
397 fi
392
398
393 # Generate required machine-id
399 # Generate required machine-id
394 MACHINE_ID=$(dbus-uuidgen)
400 MACHINE_ID=$(dbus-uuidgen)
@@ -432,8 +438,8 ROOT_OFFSET=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS})
432
438
433 # The root partition is EXT4
439 # The root partition is EXT4
434 # This means more space than the actual used space of the chroot is used.
440 # This means more space than the actual used space of the chroot is used.
435 # As overhead for journaling and reserved blocks 20% are added.
441 # As overhead for journaling and reserved blocks 25% are added.
436 ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 20) \* 1024 \/ 512)
442 ROOT_SECTORS=$(expr $(expr ${CHROOT_SIZE} + ${CHROOT_SIZE} \/ 100 \* 25) \* 1024 \/ 512)
437
443
438 # Calculate required image size in 512 Byte sectors
444 # Calculate required image size in 512 Byte sectors
439 IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS})
445 IMAGE_SECTORS=$(expr ${TABLE_SECTORS} + ${FRMW_SECTORS} + ${ROOT_SECTORS})
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant