From 7473bd66aa5763220bb1e36c4a00a5638e88701e 2019-07-30 00:01:42 From: a Date: 2019-07-30 00:01:42 Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test --- diff --git a/README-CN.md b/README-CN.md index 2c9f0d6..7a5f0de 100644 --- a/README-CN.md +++ b/README-CN.md @@ -1,5 +1,5 @@ ## 介绍 -`rpi23-gen-image.sh` 是一个自动生成树莓派2/3系统镜像的脚本工具, 当前支持自动生成32位 armhf 架构的Debian, 发行版本`jessie`, `stretch` 和 `buster`. 树莓派3 64位镜像需要使用特定的配置参数 (```templates/rpi3-stretch-arm64-4.11.y```). +`rpi23-gen-image.sh` 是一个自动生成树莓派2/3系统镜像的脚本工具, 当前支持自动生成32位 armhf 架构的Debian, 发行版本`jessie`, `stretch` 和 `buster`. 树莓派3 64位镜像需要使用特定的配置参数 (```templates/rpi3-stretch-arm64-4.14.y```). ## 构建环境所依赖的包 一定要安装好下列deb包, 他们是构建过程需要的核心包. 脚本会自动检查, 如果缺少,经用户确认后会自动安装. diff --git a/README.md b/README.md index 01021c5..5120a4f 100644 --- a/README.md +++ b/README.md @@ -96,6 +96,9 @@ Set default system timezone. All available timezones can be found in the `/usr/s ##### `EXPANDROOT`=true Expand the root partition and filesystem automatically on first boot. +##### `ENABLE_DPHYSSWAP`=true +Enable swap. The size of the swapfile is chosen relative to the size of the root partition. It'll use the `dphys-swapfile` package for that. + ##### `ENABLE_QEMU`=false Generate kernel (`vexpress_defconfig`), file system image (`qcow2`) and DTB files that can be used for QEMU full system emulation (`vexpress-A15`). The output files are stored in the `$(pwd)/images/qemu` directory. You can find more information about running the generated image in the QEMU section of this readme file. @@ -382,7 +385,8 @@ Enable Kernel Zswap support. Best use on high RAM load and mediocre CPU load use Allow attaching eBPF programs to a cgroup using the bpf syscall (CONFIG_BPF_SYSCALL CONFIG_CGROUP_BPF) [systemd compilations about it - File /lib/systemd/system/systemd-journald.server:36 configures an IP firewall (IPAddressDeny=all), but the local system does not support BPF/cgroup based firewalls] ##### `KERNEL_SECURITY`=false -Enables Apparmor, integrity subsystem, auditing +Enables Apparmor, integrity subsystem, auditing. + --- #### Reduce disk usage: @@ -540,5 +544,5 @@ qemu-system-arm -m 2048M -M vexpress-a15 -cpu cortex-a15 -kernel kernel7.img -no * [Official Raspberry Pi Kernel on github](https://github.com/raspberrypi/linux) * [U-BOOT git repository](https://git.denx.de/?p=u-boot.git;a=summary) * [Xorg DDX driver fbturbo](https://github.com/ssvb/xf86-video-fbturbo) -* [RPi3 Wireless interface firmware](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm80211/brcm) +* [RPi3 Wireless interface firmware](https://github.com/RPi-Distro/firmware-nonfree/tree/master/brcm) * [Collabora RPi2 Kernel precompiled](https://repositories.collabora.co.uk/debian/) diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh index 79496f5..c086ee2 100644 --- a/bootstrap.d/12-locale.sh +++ b/bootstrap.d/12-locale.sh @@ -23,15 +23,15 @@ if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957 # ... so we have to set locales manually if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then - chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8" | debconf-set-selections + chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8 | debconf-set-selections" else # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale - chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections + chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8 | debconf-set-selections" sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen" fi sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen" - chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections + chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL} | debconf-set-selections" chroot_exec locale-gen chroot_exec update-locale LANG="${DEFLOCAL}" diff --git a/bootstrap.d/13-kernel.sh b/bootstrap.d/13-kernel.sh index 607ec1d..557071b 100644 --- a/bootstrap.d/13-kernel.sh +++ b/bootstrap.d/13-kernel.sh @@ -564,20 +564,28 @@ if [ "$BUILD_KERNEL" = true ] ; then fi else # BUILD_KERNEL=false - if [ "$SET_ARCH" = 64 ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then + if [ "$SET_ARCH" = 64 ] + if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then + # Use Sakakis modified kernel if ZSWAP is active + if [ "$KERNEL_ZSWAP" = true ] || [ "$KERNEL_VIRT" = true ] || [ "$KERNEL_NF" = true ] || [ "$KERNEL_BPF" = true ] ; then + RPI3_64_KERNEL_URL="${RPI3_64_BIS_KERNEL_URL}" + fi - # Use Sakakis modified kernel if ZSWAP is active - if [ "$KERNEL_ZSWAP" = true ] || [ "$KERNEL_VIRT" = true ] || [ "$KERNEL_NF" = true ] || [ "$KERNEL_BPF" = true ] ; then - RPI3_64_KERNEL_URL="${RPI3_64_BIS_KERNEL_URL}" - fi + # Create temporary directory for dl + temp_dir=$(as_nobody mktemp -d) - # Create temporary directory for dl - temp_dir=$(as_nobody mktemp -d) - - # Fetch kernel dl - as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI3_64_KERNEL_URL" + # Fetch kernel dl + as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI3_64_KERNEL_URL" + fi + if [ "$SET_ARCH" = 64 ] && [ "$RPI_MODEL" = 4 ] ; then + # Create temporary directory for dl + temp_dir=$(as_nobody mktemp -d) - #extract download + # Fetch kernel dl + as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI4_64_KERNEL_URL" + fi + + #extract download tar -xJf "${temp_dir}"/kernel.tar.xz -C "${temp_dir}" #move extracted kernel to /boot/firmware @@ -593,15 +601,15 @@ else # BUILD_KERNEL=false chown -R root:root "${R}/lib/modules" fi - # Install Kernel from hypriot comptabile with all Raspberry PI - if [ "$SET_ARCH" = 32 ] ; then + # Install Kernel from hypriot comptabile with all Raspberry PI (dunno if its compatible with RPI4 - better compile your own kernel) + if [ "$SET_ARCH" = 32 ] && [ "$RPI_MODEL" != 4 ] ; then # Create temporary directory for dl temp_dir=$(as_nobody mktemp -d) # Fetch kernel as_nobody wget -O "${temp_dir}"/kernel.deb -c "$RPI_32_KERNEL_URL" - # Copy downloaded U-Boot sources + # Copy downloaded kernel package mv "${temp_dir}"/kernel.deb "${R}"/tmp/kernel.deb # Set permissions diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh index 382c6c9..9c763e9 100644 --- a/bootstrap.d/15-rpi-config.sh +++ b/bootstrap.d/15-rpi-config.sh @@ -127,7 +127,7 @@ if [ "$ENABLE_TURBO" = true ] ; then echo "boot_delay=1" >> "${BOOT_DIR}/config.txt" fi -if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then +if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ]; then # Bluetooth enabled if [ "$ENABLE_BLUETOOTH" = true ] ; then @@ -208,6 +208,11 @@ else echo "enable_uart=0" >> "${BOOT_DIR}/config.txt" fi +# Disable dphys-swapfile service. Will get enabled on first boot +if [ "$ENABLE_DPHYSSWAP" = true ] ; then + chroot_exec systemctl disable dphys-swapfile +fi + if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then # Create temporary directory for systemd-swap sources temp_dir=$(as_nobody mktemp -d) diff --git a/bootstrap.d/20-networking.sh b/bootstrap.d/20-networking.sh index f80f006..a1213db 100644 --- a/bootstrap.d/20-networking.sh +++ b/bootstrap.d/20-networking.sh @@ -106,7 +106,7 @@ if [ "$ENABLE_WIRELESS" = true ] ; then temp_dir=$(as_nobody mktemp -d) # Fetch firmware binary blob for RPI3B+ - if [ "$RPI_MODEL" = 3P ] ; then + if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then # Fetch firmware binary blob for RPi3P 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" diff --git a/bootstrap.d/44-nexmon_monitor_patch.sh b/bootstrap.d/44-nexmon_monitor_patch.sh index 5a260a2..1dc17b1 100644 --- a/bootstrap.d/44-nexmon_monitor_patch.sh +++ b/bootstrap.d/44-nexmon_monitor_patch.sh @@ -74,7 +74,7 @@ if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then cp -f "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin fi - if [ "$RPI_MODEL" = 3P ] ; then + if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/Makefile make clean diff --git a/bootstrap.d/50-firstboot.sh b/bootstrap.d/50-firstboot.sh index cc76f34..1b17876 100644 --- a/bootstrap.d/50-firstboot.sh +++ b/bootstrap.d/50-firstboot.sh @@ -8,30 +8,35 @@ # Prepare rc.firstboot script cat files/firstboot/10-begin.sh > "${ETC_DIR}/rc.firstboot" -# Ensure openssh server host keys are regenerated on first boot -if [ "$ENABLE_SSHD" = true ] ; then - cat files/firstboot/21-generate-ssh-keys.sh >> "${ETC_DIR}/rc.firstboot" -fi - # Prepare filesystem auto expand if [ "$EXPANDROOT" = true ] ; then if [ "$ENABLE_CRYPTFS" = false ] ; then - cat files/firstboot/22-expandroot.sh >> "${ETC_DIR}/rc.firstboot" + cat files/firstboot/20-expandroot.sh >> "${ETC_DIR}/rc.firstboot" else # Regenerate initramfs to remove encrypted root partition auto expand - cat files/firstboot/23-regenerate-initramfs.sh >> "${ETC_DIR}/rc.firstboot" + cat files/firstboot/21-regenerate-initramfs.sh >> "${ETC_DIR}/rc.firstboot" + fi + + # Restart dphys-swapfile so the size of the swap file is relative to the resized root partition + if [ "$ENABLE_DPHYSSWAP" = true ] ; then + cat files/firstboot/23-restart-dphys-swapfile.sh >> "${ETC_DIR}/rc.firstboot" fi fi +# Ensure openssh server host keys are regenerated on first boot +if [ "$ENABLE_SSHD" = true ] ; then + cat files/firstboot/30-generate-ssh-keys.sh >> "${ETC_DIR}/rc.firstboot" +fi + # Ensure that dbus machine-id exists -cat files/firstboot/24-generate-machineid.sh >> "${ETC_DIR}/rc.firstboot" +cat files/firstboot/40-generate-machineid.sh >> "${ETC_DIR}/rc.firstboot" # Create /etc/resolv.conf symlink -cat files/firstboot/25-create-resolv-symlink.sh >> "${ETC_DIR}/rc.firstboot" +cat files/firstboot/41-create-resolv-symlink.sh >> "${ETC_DIR}/rc.firstboot" # Configure automatic network interface names if [ "$ENABLE_IFNAMES" = true ] ; then - cat files/firstboot/26-config-ifnames.sh >> "${ETC_DIR}/rc.firstboot" + cat files/firstboot/42-config-ifnames.sh >> "${ETC_DIR}/rc.firstboot" fi # Finalize rc.firstboot script diff --git a/files/apt/flash-kernel b/files/apt/flash-kernel deleted file mode 100644 index 579e562..0000000 --- a/files/apt/flash-kernel +++ /dev/null @@ -1,3 +0,0 @@ -Package: flash-kernel -Pin: origin repositories.collabora.co.uk -Pin-Priority: 1000 diff --git a/files/firstboot/22-expandroot.sh b/files/firstboot/20-expandroot.sh similarity index 100% rename from files/firstboot/22-expandroot.sh rename to files/firstboot/20-expandroot.sh diff --git a/files/firstboot/23-regenerate-initramfs.sh b/files/firstboot/21-regenerate-initramfs.sh similarity index 100% rename from files/firstboot/23-regenerate-initramfs.sh rename to files/firstboot/21-regenerate-initramfs.sh diff --git a/files/firstboot/23-restart-dphys-swapfile.sh b/files/firstboot/23-restart-dphys-swapfile.sh new file mode 100644 index 0000000..32c8638 --- /dev/null +++ b/files/firstboot/23-restart-dphys-swapfile.sh @@ -0,0 +1,5 @@ +# Restart dphys-swapfile service if it exists +logger -t "rc.firstboot" "Restarting dphys-swapfile" + +systemctl enable dphys-swapfile +systemctl restart dphys-swapfile diff --git a/files/firstboot/21-generate-ssh-keys.sh b/files/firstboot/30-generate-ssh-keys.sh similarity index 100% rename from files/firstboot/21-generate-ssh-keys.sh rename to files/firstboot/30-generate-ssh-keys.sh diff --git a/files/firstboot/24-generate-machineid.sh b/files/firstboot/40-generate-machineid.sh similarity index 100% rename from files/firstboot/24-generate-machineid.sh rename to files/firstboot/40-generate-machineid.sh diff --git a/files/firstboot/25-create-resolv-symlink.sh b/files/firstboot/41-create-resolv-symlink.sh similarity index 100% rename from files/firstboot/25-create-resolv-symlink.sh rename to files/firstboot/41-create-resolv-symlink.sh diff --git a/files/firstboot/26-config-ifnames.sh b/files/firstboot/42-config-ifnames.sh similarity index 100% rename from files/firstboot/26-config-ifnames.sh rename to files/firstboot/42-config-ifnames.sh diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh index 048b9da..9e84dae 100755 --- a/rpi23-gen-image.sh +++ b/rpi23-gen-image.sh @@ -67,8 +67,11 @@ RPI_32_KERNELHEADER_URL=${RPI_32_KERNELHEADER_URL:=https://github.com/hypriot/rp RPI3_64_BIS_KERNEL_URL=${RPI3_64_BIS_KERNEL_URL:=https://github.com/sakaki-/bcmrpi3-kernel-bis/releases/download/4.14.80.20181113/bcmrpi3-kernel-bis-4.14.80.20181113.tar.xz} # Default precompiled 64bit kernel RPI3_64_DEF_KERNEL_URL=${RPI3_64_DEF_KERNEL_URL:=https://github.com/sakaki-/bcmrpi3-kernel/releases/download/4.14.80.20181113/bcmrpi3-kernel-4.14.80.20181113.tar.xz} +# Sakaki BIS Kernel RPI4 +RPI4_64_DEF_KERNEL_URL=https://github.com/sakaki-/bcm2711-kernel-bis/releases/download/4.19.59.20190724/bcm2711-kernel-bis-4.19.59.20190724.tar.xz # Generic RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_DEF_KERNEL_URL} +RPI4_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI4_64_DEF_KERNEL_URL} # Kali kernel src - used if ENABLE_NEXMON=true (they patch the wlan kernel modul) KALI_KERNEL_URL=${KALI_KERNEL_URL:=https://github.com/Re4son/re4son-raspberrypi-linux.git} @@ -97,6 +100,7 @@ USER_PASSWORD=${USER_PASSWORD:=raspberry} DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"} TIMEZONE=${TIMEZONE:="Europe/Berlin"} EXPANDROOT=${EXPANDROOT:=true} +ENABLE_DPHYSSWAP=${ENABLE_DPHYSSWAP:=true} # Keyboard settings XKB_MODEL=${XKB_MODEL:=""} @@ -243,27 +247,7 @@ if [ "${APT_CACHER_RUNNING}" = "apt-cacher-ng" ] ; then APT_PROXY=http://127.0.0.1:3142/ fi -# netselect-apt does not know buster yet -#if [ "$RELEASE" = "buster" ] ; then -# RLS=testing -#else -# RLS="$RELEASE" -#fi - -#if [ -f "$(pwd)/files/apt/sources.list" ] ; then -#rm "$(pwd)/files/apt/sources.list" -#fi - -#if [ "$ENABLE_NONFREE" = true ] ; then -# netselect-apt --arch "$RELEASE_ARCH" -t 3 --sources --nonfree --outfile "$(pwd)/files/apt/sources.list" -d "$RLS" -#else -# netselect-apt --arch "$RELEASE_ARCH" -t 3 --sources --outfile "$(pwd)/files/apt/sources.list" -d "$RLS" -#fi - -# sed and cut the result string so we can use it as APT_SERVER -#APT_SERVER=$(grep -m 1 http files/apt/sources.list | sed "s|http://| |g" | cut -d ' ' -f 3 | sed 's|/$|''|') - -# make script easier and more stable to use with convenient setup switch. Just setup SET_ARCH and RPI_MODEL and your good to go! +# Setup architecture specific settings if [ -n "$SET_ARCH" ] ; then # 64-bit configuration if [ "$SET_ARCH" = 64 ] ; then @@ -273,14 +257,19 @@ if [ -n "$SET_ARCH" ] ; then KERNEL_BIN_IMAGE=${KERNEL_BIN_IMAGE:="Image"} # Raspberry Pi model specific settings - if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then + if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then + if [ "$RPI_MODEL" != 4 ] ; then + KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig} + else + KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig} + fi + REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-arm64" - KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcmrpi3_defconfig} RELEASE_ARCH=${RELEASE_ARCH:=arm64} KERNEL_IMAGE=${KERNEL_IMAGE:=kernel8.img} CROSS_COMPILE=${CROSS_COMPILE:=aarch64-linux-gnu-} else - echo "error: Only Raspberry PI 3 and 3B+ support 64-bit" + echo "error: Only Raspberry PI 3, 3B+ and 4 support 64-bit" exit 1 fi fi @@ -302,9 +291,14 @@ if [ -n "$SET_ARCH" ] ; then fi # Raspberry Pi model specific settings - if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then + if [ "$RPI_MODEL" = 2 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then + if [ "$RPI_MODEL" != 4 ] ; then + KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig} + else + KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2711_defconfig} + fi + REQUIRED_PACKAGES="${REQUIRED_PACKAGES} crossbuild-essential-armhf" - KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG:=bcm2709_defconfig} RELEASE_ARCH=${RELEASE_ARCH:=armhf} KERNEL_IMAGE=${KERNEL_IMAGE:=kernel7.img} CROSS_COMPILE=${CROSS_COMPILE:=arm-linux-gnueabihf-} @@ -341,6 +335,10 @@ case "$RPI_MODEL" in DTB_FILE=${DTB_FILE:=bcm2710-rpi-3-b.dtb} UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_3_defconfig} ;; + 4) + DTB_FILE=${DTB_FILE:=bcm2711-rpi-4-b.dtb} + UBOOT_CONFIG=${UBOOT_CONFIG:=rpi_4_defconfig} + ;; *) echo "error: Raspberry Pi model $RPI_MODEL is not supported!" exit 1 @@ -348,13 +346,13 @@ case "$RPI_MODEL" in esac # Raspberry PI 0,3,3P with Bluetooth and Wifi onboard -if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then +if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then # Include bluetooth packages on supported boards if [ "$ENABLE_BLUETOOTH" = true ] ; then APT_INCLUDES="${APT_INCLUDES},bluetooth,bluez" fi if [ "$ENABLE_WIRELESS" = true ] ; then - APT_INCLUDES="${APT_INCLUDES},wireless-tools,crda,wireless-regdb,firmware-brcm80211" + APT_INCLUDES="${APT_INCLUDES},wireless-tools,crda,wireless-regdb" fi else # Raspberry PI 1,1P,2 without Wifi and bluetooth onboard # Check if the internal wireless interface is not supported by the RPi model @@ -571,6 +569,11 @@ if [ "$EXPANDROOT" = true ] ; then APT_INCLUDES="${APT_INCLUDES},parted" fi +# Add dphys-swapfile package, required to enable swap +if [ "$ENABLE_DPHYSSWAP" = true ] ; then + APT_INCLUDES="${APT_INCLUDES},dphys-swapfile" +fi + # Add dbus package, recommended if using systemd if [ "$ENABLE_DBUS" = true ] ; then APT_INCLUDES="${APT_INCLUDES},dbus" diff --git a/templates/rpi1buster b/templates/rpi1buster index b365f59..e63bb45 100644 --- a/templates/rpi1buster +++ b/templates/rpi1buster @@ -1,4 +1,4 @@ -# Configuration template file used by rpi23-gen-image.sh -RPI_MODEL=3 -RELEASE=buster -BUILD_KERNEL=true +# Configuration template file used by rpi23-gen-image.sh +RPI_MODEL=3 +RELEASE=buster +BUILD_KERNEL=true diff --git a/templates/rpi1buster~HEAD b/templates/rpi1buster~HEAD new file mode 100644 index 0000000..b365f59 --- /dev/null +++ b/templates/rpi1buster~HEAD @@ -0,0 +1,4 @@ +# Configuration template file used by rpi23-gen-image.sh +RPI_MODEL=3 +RELEASE=buster +BUILD_KERNEL=true diff --git a/templates/rpi1buster~test b/templates/rpi1buster~test new file mode 100644 index 0000000..b365f59 --- /dev/null +++ b/templates/rpi1buster~test @@ -0,0 +1,4 @@ +# Configuration template file used by rpi23-gen-image.sh +RPI_MODEL=3 +RELEASE=buster +BUILD_KERNEL=true diff --git a/templates/rpi2jessie b/templates/rpi2jessie deleted file mode 100644 index c4d27dd..0000000 --- a/templates/rpi2jessie +++ /dev/null @@ -1,2 +0,0 @@ -# Configuration template file used by rpi23-gen-image.sh -RELEASE=jessie diff --git a/templates/rpi3-stretch-arm64-4.14.y b/templates/rpi3-stretch-arm64-4.14.y index 0c5cfaf..fee8f07 100644 --- a/templates/rpi3-stretch-arm64-4.14.y +++ b/templates/rpi3-stretch-arm64-4.14.y @@ -1,15 +1,15 @@ -# Configuration template file used by rpi23-gen-image.sh -# Debian Stretch using the Arm64 for kernel compilation and Debian distribution. - -RPI_MODEL=3 -RELEASE=stretch -BUILD_KERNEL=true -KERNEL_ARCH=arm64 -RELEASE_ARCH=arm64 -CROSS_COMPILE=aarch64-linux-gnu- -QEMU_BINARY=/usr/bin/qemu-aarch64-static -KERNEL_DEFCONFIG=bcmrpi3_defconfig -KERNEL_BIN_IMAGE=Image -KERNEL_IMAGE=kernel8.img -KERNEL_BRANCH=rpi-4.14.y -ENABLE_WIRELESS=true +# Configuration template file used by rpi23-gen-image.sh +# Debian Stretch using the Arm64 for kernel compilation and Debian distribution. + +RPI_MODEL=3 +RELEASE=stretch +BUILD_KERNEL=true +KERNEL_ARCH=arm64 +RELEASE_ARCH=arm64 +CROSS_COMPILE=aarch64-linux-gnu- +QEMU_BINARY=/usr/bin/qemu-aarch64-static +KERNEL_DEFCONFIG=bcmrpi3_defconfig +KERNEL_BIN_IMAGE=Image +KERNEL_IMAGE=kernel8.img +KERNEL_BRANCH=rpi-4.14.y +ENABLE_WIRELESS=true diff --git a/templates/rpi3-stretch-arm64-4.14.y~HEAD b/templates/rpi3-stretch-arm64-4.14.y~HEAD new file mode 100644 index 0000000..0c5cfaf --- /dev/null +++ b/templates/rpi3-stretch-arm64-4.14.y~HEAD @@ -0,0 +1,15 @@ +# Configuration template file used by rpi23-gen-image.sh +# Debian Stretch using the Arm64 for kernel compilation and Debian distribution. + +RPI_MODEL=3 +RELEASE=stretch +BUILD_KERNEL=true +KERNEL_ARCH=arm64 +RELEASE_ARCH=arm64 +CROSS_COMPILE=aarch64-linux-gnu- +QEMU_BINARY=/usr/bin/qemu-aarch64-static +KERNEL_DEFCONFIG=bcmrpi3_defconfig +KERNEL_BIN_IMAGE=Image +KERNEL_IMAGE=kernel8.img +KERNEL_BRANCH=rpi-4.14.y +ENABLE_WIRELESS=true diff --git a/templates/rpi3-stretch-arm64-4.14.y~test b/templates/rpi3-stretch-arm64-4.14.y~test new file mode 100644 index 0000000..0c5cfaf --- /dev/null +++ b/templates/rpi3-stretch-arm64-4.14.y~test @@ -0,0 +1,15 @@ +# Configuration template file used by rpi23-gen-image.sh +# Debian Stretch using the Arm64 for kernel compilation and Debian distribution. + +RPI_MODEL=3 +RELEASE=stretch +BUILD_KERNEL=true +KERNEL_ARCH=arm64 +RELEASE_ARCH=arm64 +CROSS_COMPILE=aarch64-linux-gnu- +QEMU_BINARY=/usr/bin/qemu-aarch64-static +KERNEL_DEFCONFIG=bcmrpi3_defconfig +KERNEL_BIN_IMAGE=Image +KERNEL_IMAGE=kernel8.img +KERNEL_BRANCH=rpi-4.14.y +ENABLE_WIRELESS=true