##// END OF EJS Templates
Raspi2-3_GenImage
RSS

Cloner depuis https://github.com/drtyhlpr/rpi23-gen-image.git

Merge branch 'pull' into burn
Unknown -
r671:ae0c8abd9bbc Fusion
parent child
Show More
Show file before | Show file after | Hide comments
@@ -218,6 +218,7 Support for halt,init,poweroff,reboot,runlevel,shutdown,telinit commands
218 218 #### Advanced system features:
219 219 ##### `ENABLE_KEYGEN`=false
220 220 Recover your lost codec license
221
221 222 ##### `ENABLE_SYSTEMDSWAP`=false
222 223 Enables [Systemd-swap service](https://github.com/Nefelim4ag/systemd-swap). Usefull if `KERNEL_ZSWAP` is enabled.
223 224
Show file before | Show file after | Hide comments
@@ -53,6 +53,7 if [ "$BUILD_KERNEL" = true ] ; then
53 53 KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
54 54 fi
55 55
56 #Copy 32bit config to 64bit
56 57 if [ "$ENABLE_QEMU" = true ] && [ "$KERNEL_ARCH" = arm64 ]; then
57 58 cp "${KERNEL_DIR}"/arch/arm/configs/vexpress_defconfig "${KERNEL_DIR}"/arch/arm64/configs/
58 59 fi
@@ -394,16 +395,16 if [ "$BUILD_KERNEL" = true ] ; then
394 395 set_kernel_config CONFIG_VHOST_CROSS_ENDIAN_LEGACY y
395 396 set_kernel_config CONFIG_VHOST_NET m
396 397 set_kernel_config CONFIG_VIRTUALIZATION y
397 set_kernel_config CONFIG_MMU_NOTIFIER y
398
399 set_kernel_config CONFIG_SLAB_FREELIST_RANDOM=y
400 set_kernel_config CONFIG_SLAB_FREELIST_HARDENED=y
401
402 # erratum
403 set_kernel_config ARM64_ERRATUM_834220 y
404 # https://sourceforge.net/p/kvm/mailman/message/18440797/
405 set_kernel_config CONFIG_PREEMPT_NOTIFIERS y
406 fi
398 set_kernel_config CONFIG_SLAB_FREELIST_RANDOM=y
399 set_kernel_config CONFIG_SLAB_FREELIST_HARDENED=y
400 set_kernel_config CONFIG_MMU_NOTIFIER y
401
402 # erratum
403 set_kernel_config ARM64_ERRATUM_834220 y
404
405 # https://sourceforge.net/p/kvm/mailman/message/18440797/
406 set_kernel_config CONFIG_PREEMPT_NOTIFIERS y
407 fi
407 408
408 409 # enable apparmor,integrity audit,
409 410 if [ "$KERNEL_SECURITY" = true ] ; then
Show file before | Show file after | Hide comments
@@ -213,7 +213,7 if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then
213 213
214 214 # Get Verion
215 215 VERSION=$(git tag | tail -n 1)
216 sed -i "s/DEB_NAME=.*/DEB_NAME=systemd-swap_all/g" "${R}/tmp/systemd-swap/package.sh"
216 #sed -i "s/DEB_NAME=.*/DEB_NAME=systemd-swap_all/g" "${R}/tmp/systemd-swap/package.sh"
217 217
218 218 # Build package
219 219 bash ./package.sh debian
@@ -225,7 +225,7 if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then
225 225 chown -R root:root "${R}/tmp/systemd-swap"
226 226
227 227 # Install package - IMPROVE AND MAKE IT POSSIBLE WITHOUT VERSION NR.
228 chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_all.deb
228 chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_"$VERSION"_all.deb
229 229
230 230 # Enable service
231 231 chroot_exec systemctl enable systemd-swap
Show file before | Show file after | Hide comments
@@ -66,14 +66,16 SYSTEMDSWAP_URL=${SYSTEMDSWAP_URL:=https://github.com/Nefelim4ag/systemd-swap.gi
66 66 RPI_32_KERNEL_URL=${RPI_32_KERNEL_URL:=https://github.com/hypriot/rpi-kernel/releases/download/v4.14.34/raspberrypi-kernel_20180422-141901_armhf.deb}
67 67 RPI_32_KERNELHEADER_URL=${RPI_32_KERNELHEADER_URL:=https://github.com/hypriot/rpi-kernel/releases/download/v4.14.34/raspberrypi-kernel-headers_20180422-141901_armhf.deb}
68 68 # Kernel has KVM and zswap enabled - use if KERNEL_* parameters and precompiled kernel are used
69 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}
69 RPI3_64_BIS_KERNEL_URL=${RPI3_64_BIS_KERNEL_URL:=https://github.com/sakaki-/bcmrpi3-kernel-bis/releases/download/4.19.80.20191022/bcmrpi3-kernel-bis-4.19.80.20191022.tar.xz}
70 70 # Default precompiled 64bit kernel
71 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}
72 # Sakaki BIS Kernel RPI4
73 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
71 RPI3_64_DEF_KERNEL_URL=${RPI3_64_DEF_KERNEL_URL:=https://github.com/sakaki-/bcmrpi3-kernel/releases/download/4.19.80.20191022/bcmrpi3-kernel-4.19.80.20191022.tar.xz}
72 # Sakaki BIS Kernel RPI4 - https://github.com/sakaki-/bcm2711-kernel-bis
73 RPI4_64_BIS_KERNEL_URL=${RPI4_64_BIS_KERNEL_URL:=https://github.com/sakaki-/bcm2711-kernel-bis/releases/download/4.19.59.20190724/bcm2711-kernel-bis-4.19.59.20190724.tar.xz}
74 # Default precompiled 64bit kernel - https://github.com/sakaki-/bcm2711-kernel
75 RPI4_64_DEF_KERNEL_URL=${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}
74 76 # Generic
75 77 RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_DEF_KERNEL_URL}
76 RPI4_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI4_64_DEF_KERNEL_URL}
78 RPI4_64_KERNEL_URL=${RPI4_64_KERNEL_URL:=$RPI4_64_DEF_KERNEL_URL}
77 79 # Kali kernel src - used if ENABLE_NEXMON=true (they patch the wlan kernel modul)
78 80 KALI_KERNEL_URL=${KALI_KERNEL_URL:=https://github.com/Re4son/re4son-raspberrypi-linux.git}
79 81
@@ -396,7 +398,7 fi
396 398
397 399 # Add deps for nexmon
398 400 if [ "$ENABLE_NEXMON" = true ] ; then
399 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf bison flex make autoconf automake build-essential libtool"
401 REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf make autoconf automake build-essential libtool"
400 402 fi
401 403
402 404 # Add libncurses5 to enable kernel menuconfig
@@ -481,8 +483,7 if [ -n "$MISSING_PACKAGES" ] ; then
481 483 [ "$confirm" != "y" ] && exit 1
482 484
483 485 # Make sure all missing required packages are installed
484 apt-get update
485 apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
486 apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
486 487 fi
487 488
488 489 # Check if ./bootstrap.d directory exists
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant