Raspi2-3_GenImage Commit - r671:ae0c8abd9bbc · Collaboration Tremplin des Sciences

Merge branch 'pull' into burn

Unknown -

r671:ae0c8abd9bbc

parent child

Context file:

r671:ae0c8abd9bbc

Collapse all files

README.md +1 0

             #### Advanced system features:
             ##### `ENABLE_KEYGEN`=false
             Recover your lost codec license
             ##### `ENABLE_SYSTEMDSWAP`=false
             Enables [Systemd-swap service](https://github.com/Nefelim4ag/systemd-swap). Usefull if `KERNEL_ZSWAP` is enabled.

bootstrap.d/13-kernel.sh +11 -10

                 KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
               fi
+              #Copy 32bit config to 64bit
               if [ "$ENABLE_QEMU" = true ] && [ "$KERNEL_ARCH" = arm64 ]; then
               cp "${KERNEL_DIR}"/arch/arm/configs/vexpress_defconfig "${KERNEL_DIR}"/arch/arm64/configs/
               fi
                     set_kernel_config CONFIG_VHOST_CROSS_ENDIAN_LEGACY y
                     set_kernel_config CONFIG_VHOST_NET m
                     set_kernel_config CONFIG_VIRTUALIZATION y
-                    set_kernel_config CONFIG_MMU_NOTIFIER y
+            		set_kernel_config CONFIG_SLAB_FREELIST_RANDOM=y
+            		set_kernel_config CONFIG_SLAB_FREELIST_HARDENED=y
-            	set_kernel_config CONFIG_SLAB_FREELIST_RANDOM=y
+            		set_kernel_config CONFIG_MMU_NOTIFIER y
-            	set_kernel_config CONFIG_SLAB_FREELIST_HARDENED=y
+            		# erratum
-            	# erratum
+            		set_kernel_config ARM64_ERRATUM_834220 y
-            	set_kernel_config ARM64_ERRATUM_834220 y
-            	# https://sourceforge.net/p/kvm/mailman/message/18440797/
+            		# https://sourceforge.net/p/kvm/mailman/message/18440797/
-            	set_kernel_config CONFIG_PREEMPT_NOTIFIERS y
+            		set_kernel_config CONFIG_PREEMPT_NOTIFIERS y
-              fi
+            	  fi
                   # enable apparmor,integrity audit,
             	  if [ "$KERNEL_SECURITY" = true ] ; then

bootstrap.d/15-rpi-config.sh +2 -2

               # Get Verion
               VERSION=$(git tag | tail -n 1)
-              sed -i "s/DEB_NAME=.*/DEB_NAME=systemd-swap_all/g" "${R}/tmp/systemd-swap/package.sh"
+              #sed -i "s/DEB_NAME=.*/DEB_NAME=systemd-swap_all/g" "${R}/tmp/systemd-swap/package.sh"
               # Build package
               bash ./package.sh debian
               chown -R root:root "${R}/tmp/systemd-swap"
               # Install package - IMPROVE AND MAKE IT POSSIBLE WITHOUT VERSION NR.
-              chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_all.deb
+              chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_"$VERSION"_all.deb
               # Enable service
               chroot_exec systemctl enable systemd-swap

rpi23-gen-image.sh +9 -8

             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}
             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}
             # Kernel has KVM and zswap enabled - use if KERNEL_* parameters and precompiled kernel are used
-            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}
+            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}
             # 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}
+            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}
-            # Sakaki BIS Kernel RPI4
+            # Sakaki BIS Kernel RPI4 - https://github.com/sakaki-/bcm2711-kernel-bis
-            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
+            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}
+            # Default precompiled 64bit kernel - https://github.com/sakaki-/bcm2711-kernel
+            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}
             # 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}
+            RPI4_64_KERNEL_URL=${RPI4_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}
             # Add deps for nexmon
             if [ "$ENABLE_NEXMON" = true ] ; then
-              REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf bison flex make autoconf automake build-essential libtool"
+              REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libgmp3-dev gawk qpdf make autoconf automake build-essential libtool"
             fi
             # Add libncurses5 to enable kernel menuconfig
               [ "$confirm" != "y" ] && exit 1
               # Make sure all missing required packages are installed
-              apt-get update
+              apt-get update && apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
-              apt-get -qq -y install `echo "${MISSING_PACKAGES}" | sed "s/ //"`
             fi
             # Check if ./bootstrap.d directory exists

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