Raspi2-3_GenImage Commit - r524:213afb8eaa67 · Collaboration Tremplin des Sciences

may break - be caref

Unknown -

r524:213afb8eaa67

parent child

Context file:

r524:213afb8eaa67

Collapse all files

bootstrap.d/13-kernel.sh +2 -9

             # Need to use kali kernel src if nexmon is enabled
             if [ "$ENABLE_NEXMON" = true ] ; then
               KERNEL_URL="${KALI_KERNEL_URL}"
+              # Clear Branch and KernelSRC_DIR if using nexmon. Everyone will forget to clone kali kernel instead of nomrla kernel
               KERNEL_BRANCH=""
               KERNELSRC_DIR=""
             fi
                 if [ "$KERNELSRC_CONFIG" = true ] ; then
                   # Load default raspberry kernel configuration
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
                   #Switch to KERNELSRC_DIR so we can use set_kernel_config
                   cd "${KERNEL_DIR}" || exit
             	    unset_kernel_config CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE
             	  fi
             	  #Revert to previous directory
             	  cd "${WORKDIR}" || exit
               if [ "$KERNEL_HEADERS" = true ] && [ "$KERNEL_REDUCE" = false ] ; then
                 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_HDR_PATH=../.. headers_install
               fi
-            # make tar.gz kernel package - missing os bzw. modules
-            #** ** **  WARNING  ** ** **
-            #Your architecture did not define any architecture-dependent files
-            #to be placed into the tarball. Please add those to ./scripts/package/buildtar .
-            #  make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" targz-pkg
               # Prepare boot (firmware) directory
               mkdir "${BOOT_DIR}"
               fi
             else # BUILD_KERNEL=false
-              #  echo Install precompiled kernel...
-              #  echo error: not implemented
               if [ "$SET_ARCH" = 64 ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
             	# Use Sakakis modified kernel if ZSWAP is active

bootstrap.d/15-rpi-config.sh +29 -31

@@ -5,40 +5,38
5	# Load utility functions	5	# Load utility functions
6	. ./functions.sh	6	. ./functions.sh
7		7
8	#if [ "$BUILD_KERNEL" = true ] ; then	8	if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
9	if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then	9	# Install boot binaries from local directory
10	# Install boot binaries from local directory	10	cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
11	cp "${RPI_FIRMWARE_DIR}"/boot/~~bootcode.bin~~ "${BOOT_DIR}"/~~bootcode.bin~~	11	cp "${RPI_FIRMWARE_DIR}"/boot/fixup.dat "${BOOT_DIR}"/fixup.dat
12	cp "${RPI_FIRMWARE_DIR}"/boot/fixup.dat "${BOOT_DIR}"/fixup.dat	12	cp "${RPI_FIRMWARE_DIR}"/boot/fixup_cd.dat "${BOOT_DIR}"/fixup_cd.dat
13	cp "${RPI_FIRMWARE_DIR}"/boot/fixup_cd.dat "${BOOT_DIR}"/fixup_cd.dat	13	cp "${RPI_FIRMWARE_DIR}"/boot/fixup_x.dat "${BOOT_DIR}"/fixup_x.dat
14	cp "${RPI_FIRMWARE_DIR}"/boot/~~fixup_x.dat~~ "${BOOT_DIR}"/~~fixup_x.dat~~	14	cp "${RPI_FIRMWARE_DIR}"/boot/start.elf "${BOOT_DIR}"/start.elf
15	cp "${RPI_FIRMWARE_DIR}"/boot/start.elf "${BOOT_DIR}"/start.elf	15	cp "${RPI_FIRMWARE_DIR}"/boot/start_cd.elf "${BOOT_DIR}"/start_cd.elf
16	cp "${RPI_FIRMWARE_DIR}"/boot/start_cd.elf "${BOOT_DIR}"/start_cd.elf	16	cp "${RPI_FIRMWARE_DIR}"/boot/start_x.elf "${BOOT_DIR}"/start_x.elf
17	cp "${RPI_FIRMWARE_DIR}"/boot/start_x.elf "${BOOT_DIR}"/start_x.elf	17	else
18	else	18	# Create temporary directory for boot binaries
19	# Create temporary directory for boot binaries	19	temp_dir=$(as_nobody mktemp -d)
20	temp_dir=$(as_nobody mktemp -d)
21		20
22	# Install latest boot binaries from raspberry/firmware github	21	# Install latest boot binaries from raspberry/firmware github
23	as_nobody wget -q -O "${temp_dir}/bootcode.bin" "${FIRMWARE_URL}/bootcode.bin"	22	as_nobody wget -q -O "${temp_dir}/bootcode.bin" "${FIRMWARE_URL}/bootcode.bin"
24	as_nobody wget -q -O "${temp_dir}/fixup.dat" "${FIRMWARE_URL}/fixup.dat"	23	as_nobody wget -q -O "${temp_dir}/fixup.dat" "${FIRMWARE_URL}/fixup.dat"
25	as_nobody wget -q -O "${temp_dir}/fixup_cd.dat" "${FIRMWARE_URL}/fixup_cd.dat"	24	as_nobody wget -q -O "${temp_dir}/fixup_cd.dat" "${FIRMWARE_URL}/fixup_cd.dat"
26	as_nobody wget -q -O "${temp_dir}/fixup_x.dat" "${FIRMWARE_URL}/fixup_x.dat"	25	as_nobody wget -q -O "${temp_dir}/fixup_x.dat" "${FIRMWARE_URL}/fixup_x.dat"
27	as_nobody wget -q -O "${temp_dir}/start.elf" "${FIRMWARE_URL}/start.elf"	26	as_nobody wget -q -O "${temp_dir}/start.elf" "${FIRMWARE_URL}/start.elf"
28	as_nobody wget -q -O "${temp_dir}/start_cd.elf" "${FIRMWARE_URL}/start_cd.elf"	27	as_nobody wget -q -O "${temp_dir}/start_cd.elf" "${FIRMWARE_URL}/start_cd.elf"
29	as_nobody wget -q -O "${temp_dir}/start_x.elf" "${FIRMWARE_URL}/start_x.elf"	28	as_nobody wget -q -O "${temp_dir}/start_x.elf" "${FIRMWARE_URL}/start_x.elf"
30		29
31	# Move downloaded boot binaries	30	# Move downloaded boot binaries
32	mv "${temp_dir}/"* "${BOOT_DIR}/"	31	mv "${temp_dir}/"* "${BOOT_DIR}/"
33		32
34	# Remove temporary directory for boot binaries	33	# Remove temporary directory for boot binaries
35	rm -fr "${temp_dir}"	34	rm -fr "${temp_dir}"
36		35
37	# Set permissions of the boot binaries	36	# Set permissions of the boot binaries
38	chown -R root:root "${BOOT_DIR}"	37	chown -R root:root "${BOOT_DIR}"
39	chmod -R 600 "${BOOT_DIR}"	38	chmod -R 600 "${BOOT_DIR}"
40	fi	39	fi
41	#fi
42		40
43	# Setup firmware boot cmdline	41	# Setup firmware boot cmdline
44	if [ "$ENABLE_UBOOTUSB" = true ] ; then	42	if [ "$ENABLE_UBOOTUSB" = true ] ; then
@@ -164,7 +162,7 if [ "$ENABLE_CONSOLE" = true ] ; then
164	CMDLINE="${CMDLINE} console=serial0,115200"	162	CMDLINE="${CMDLINE} console=serial0,115200"
165		163
166	# Enable serial console systemd style	164	# Enable serial console systemd style
167	chroot_exec systemctl enable serial-getty@serial0.service	165	chroot_exec systemctl enable serial-getty\@serial0.service
168	else	166	else
169	echo "enable_uart=0" >> "${BOOT_DIR}/config.txt"	167	echo "enable_uart=0" >> "${BOOT_DIR}/config.txt"
170	fi	168	fi

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

               # Create iptables configuration directory
               mkdir -p "${ETC_DIR}/iptables"
-              # make sure iptables-legacy is the used alternatives
+              if [ "$KERNEL_NF" = false ] ; then
-              #iptables-save and -restore are slaves of iptables and thus are set accordingly
+                # iptables-save and -restore are slaves of iptables and thus are set accordingly
-              chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
+                chroot_exec update-alternatives --verbose --set iptables /usr/sbin/iptables-legacy
+              fi
               # Install iptables systemd service
               install_readonly files/iptables/iptables.service "${ETC_DIR}/systemd/system/iptables.service"
               chroot_exec systemctl enable iptables.service
               if [ "$ENABLE_IPV6" = true ] ; then
-                # make sure ip6tables-legacy is the used alternatives
+                if [ "$KERNEL_NF" = false ] ; then
-                chroot_exec update-alternatives --verbose --set ip6tables /usr/sbin/ip6tables-legacy
+                # iptables-save and -restore are slaves of iptables and thus are set accordingly
+                chroot_exec update-alternatives --verbose --set ip6tables /usr/sbin/ip6tables-legacy
+            	fi
                 # Install ip6tables systemd service
                 install_readonly files/iptables/ip6tables.service "${ETC_DIR}/systemd/system/ip6tables.service"

files/firstboot/23-regenerate-initramfs.sh +1 0

             # Extract kernel arch
             case "${KERNEL_ARCH}" in
               arm*) KERNEL_ARCH=arm ;;
+              aarch64) KERNEL_ARCH=arm64 ;;
             esac
             # Regenerate initramfs

rpi23-gen-image.sh +2 -1

             KERNEL_BPF=${KERNEL_BPF:=false}
             KERNEL_DEFAULT_GOV=${KERNEL_DEFAULT_GOV:=powersave}
             KERNEL_SECURITY=${KERNEL_SECURITY:=false}
+            KERNEL_NF=${KERNEL_NF:=false}
             # Kernel compilation from source directory settings
             KERNELSRC_DIR=${KERNELSRC_DIR:=""}
             APT_INCLUDES=${APT_INCLUDES:=""}
             APT_INCLUDES="${APT_INCLUDES},apt-transport-https,apt-utils,ca-certificates,debian-archive-keyring,dialog,sudo,systemd,sysvinit-utils,locales,keyboard-configuration,console-setup,libnss-systemd"
-            #Packages to exclude from chroot build environment
+            # Packages to exclude from chroot build environment
             APT_EXCLUDES=${APT_EXCLUDES:=""}
             # Packages required for bootstrapping

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