Raspi2-3_GenImage Commit - r390:78b6fc34812f · Collaboration Tremplin des Sciences

Unknown -

r390:78b6fc34812f

parent child

Context file:

r390:78b6fc34812f

templates/ALL-configparams created 644 +61 0

@@ -0,0 +1,61
	1	RPI_MODEL=3
	2	RELEASE=buster
	3
	4	CROSS_COMPILE=aarch64-linux-gnu-
	5	QEMU_BINARY=/usr/bin/qemu-aarch64-static
	6
	7	DEFLOCAL=de_DE.UTF-8
	8
	9	SET_ARCH=64
	10	BUILD_KERNEL=true
	11	#KERNEL_BRANCH=rpi-4.18.y
	12	KERNEL_CCACHE=true
	13
	14	HOSTNAME=pihole
	15	USER_NAME=pi
	16	USER_PASSWORD=password
	17	PASSWORD=password
	18
	19	ENABLE_IPTABLES=true
	20	ENABLE_I2C=true
	21	ENABLE_SPI=true
	22	ENABLE_NONFREE=true
	23	ENABLE_WIRELESS=true
	24	ENABLE_SOUND=true
	25	ENABLE_MINGPU=true
	26	ENABLE_DBUS=true
	27	ENABLE_SYSVINIT=false
	28	ENABLE_IFNAMES=false
	29	ENABLE_UBOOT=TRUE
	30	ENABLE_SPLITFS=false
	31	ENABLE_INITRAMFS=true
	32	ENABLE_SYSVINIT=true
	33	ENABLE_ROOT=false
	34	ENABLE_MINBASE=false
	35	ENABLE_XORG=false
	36	ENABLE_RSYSLOG=true
	37	ENABLE_HWRANDOM=true
	38	ENABLE_IPV6=true
	39	ENABLE_DHCP=true
	40
	41	ENABLE_REDUCE=true
	42	REDUCE_APT=true
	43	REDUCE_DOC=true
	44	REDUCE_MAN=true
	45	REDUCE_VIM=false
	46	REDUCE_BASH=false
	47	REDUCE_HWDB=false
	48	REDUCE_SSHD=false
	49	REDUCE_LOCALE=false
	50
	51
	52	SSH_LIMIT_USERS=true
	53
	54	KERNELSRC_DIR=/home/helge/linux
	55	RPI_FIRMWARE_DIR=/home/helge/firmware
	56	UBOOTSRC_DIR=/home/helge/u-boot
	57
	58	APT_INCLUDES=busybox,kbd,net-tools,wireless-tools,git,crda,wireless-regdb,build-essential
	59
	60	IMAGE_NAME=RPI-3-64bit
	61	CHROOT_SCRIPTS=/home/helge/rpi23-gen-image/chroot_scripts

bootstrap.d/13-kernel.sh +12 -12

             #
             # Build and Setup RPi2/3 Kernel
             #
             # Load utility functions
             . ./functions.sh
             # Fetch and build latest raspberry kernel
             if [ "$BUILD_KERNEL" = true ] ; then
               # Setup source directory
               mkdir -p "${KERNEL_DIR}"
               # Copy existing kernel sources into chroot directory
               if [ -n "$KERNELSRC_DIR" ] && [ -d "$KERNELSRC_DIR" ] ; then
                 # Copy kernel sources and include hidden files
                 cp -r "${KERNELSRC_DIR}/". "${KERNEL_DIR}"
                 # Clean the kernel sources
                 if [ "$KERNELSRC_CLEAN" = true ] && [ "$KERNELSRC_PREBUILT" = false ] ; then
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" mrproper
                 fi
               else # KERNELSRC_DIR=""
                 # Create temporary directory for kernel sources
                 temp_dir=$(as_nobody mktemp -d)
                 # Fetch current RPi2/3 kernel sources
                 if [ -z "${KERNEL_BRANCH}" ] ; then
                   as_nobody -H git -C "${temp_dir}" clone --depth=1 "${KERNEL_URL}" linux
                 else
                   as_nobody -H git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
                 fi
                 # Copy downloaded kernel sources
                 cp -r "${temp_dir}/linux/"* "${KERNEL_DIR}"
                 # Remove temporary directory for kernel sources
                 rm -fr "${temp_dir}"
                 # Set permissions of the kernel sources
                 chown -R root:root "${R}/usr/src"
               fi
               # Calculate optimal number of kernel building threads
               if [ "$KERNEL_THREADS" = "1" ] && [ -r /proc/cpuinfo ] ; then
                 KERNEL_THREADS=$(grep -c processor /proc/cpuinfo)
               fi
               # Configure and build kernel
               if [ "$KERNELSRC_PREBUILT" = false ] ; then
                 # Remove device, network and filesystem drivers from kernel configuration
                 if [ "$KERNEL_REDUCE" = true ] ; then
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
                   sed -i\
                   -e "s/\(^CONFIG_SND.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_SOUND.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_AC97.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_VIDEO_.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_MEDIA_TUNER.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_DVB.*\=\)[ym]/\1n/"\
                   -e "s/\(^CONFIG_REISERFS.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_JFS.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_XFS.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_GFS2.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_OCFS2.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_BTRFS.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_HFS.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_JFFS2.*\=\)[ym]/\1n/"\
                   -e "s/\(^CONFIG_UBIFS.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_SQUASHFS.*\=\)[ym]/\1n/"\
                   -e "s/\(^CONFIG_W1.*\=\)[ym]/\1n/"\
                   -e "s/\(^CONFIG_HAMRADIO.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_CAN.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_IRDA.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_BT_.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_WIMAX.*\=\)[ym]/\1n/"\
                   -e "s/\(^CONFIG_6LOWPAN.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_IEEE802154.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_NFC.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_FB_TFT=.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_TOUCHSCREEN.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_USB_GSPCA_.*\=\).*/\1n/"\
                   -e "s/\(^CONFIG_DRM.*\=\).*/\1n/"\
                   "${KERNEL_DIR}/.config"
                 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
                   pushd "${KERNEL_DIR}"
                   # GPL v2.0
                   #https://github.com/sakaki-/bcmrpi3-kernel-bis/blob/master/conform_config.sh
                   if [ "$KERNEL_ZSWAP" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
                     # enable ZSWAP support for better performance during large builds etc.
                     # requires activation via kernel parameter or sysfs
                     # see e.g. https://askubuntu.com/a/472227 for a summary of ZSWAP (vs ZRAM etc.)
                     # and e.g. https://wiki.archlinux.org/index.php/zswap for parameters etc.
                     set_kernel_config ZPOOL y
                     set_kernel_config ZSWAP y
                     set_kernel_config ZBUD y
                     set_kernel_config Z3FOLD y
                     set_kernel_config ZSMALLOC y
                     set_kernel_config PGTABLE_MAPPING y
             	  fi
             	  if [ "$KERNEL_VIRT" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
                    # enable basic KVM support; see e.g.
                     # https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=210546&start=25#p1300453
                     set_kernel_config VIRTUALIZATION y
                     set_kernel_config KVM y
                     set_kernel_config VHOST_NET m
                     set_kernel_config VHOST_CROSS_ENDIAN_LEGACY y
             	  fi
             	  #See https://github.com/raspberrypi/linux/issues/2177#issuecomment-354647406
                   # Netfilter kernel support
             	  if [ "$KERNEL_NF" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
                     set_kernel_config CONFIG_NETFILTER_XTABLES m
                     set_kernel_config CONFIG_NF_DUP_NETDEV m
                     set_kernel_config CONFIG_NF_NAT_SIP m
                     set_kernel_config CONFIG_NF_TABLES_ARP m
                     set_kernel_config CONFIG_NF_TABLES_BRIDGE m
                     set_kernel_config NF_TABLES m
                     set_kernel_config CONFIG_BRIDGE_EBT_BROUTE m
                     set_kernel_config CONFIG_BRIDGE_EBT_T_FILTER m
                     set_kernel_config CONFIG_BRIDGE_NF_EBTABLES m
                     set_kernel_config CONFIG_IP6_NF_IPTABLES m
                     set_kernel_config CONFIG_IP6_NF_MATCH_AH m
                     set_kernel_config CONFIG_IP6_NF_MATCH_EUI64 m
                     set_kernel_config CONFIG_IP6_NF_NAT m
                     set_kernel_config CONFIG_IP6_NF_TARGET_MASQUERADE m
                     set_kernel_config CONFIG_IP6_NF_TARGET_NPT m
                     set_kernel_config CONFIG_IP_SET_BITMAP_IPMAC m
                     set_kernel_config CONFIG_IP_SET_BITMAP_PORT m
                     set_kernel_config CONFIG_IP_SET_HASH_IP m
                     set_kernel_config CONFIG_IP_SET_HASH_IPMARK m
                     set_kernel_config CONFIG_IP_SET_HASH_IPPORT m
                     set_kernel_config CONFIG_IP_SET_HASH_IPPORTIP m
                     set_kernel_config CONFIG_IP_SET_HASH_IPPORTNET m
                     set_kernel_config CONFIG_IP_SET_HASH_MAC m
                     set_kernel_config CONFIG_IP_SET_HASH_NET m
                     set_kernel_config CONFIG_IP_SET_HASH_NETIFACE m
                     set_kernel_config CONFIG_IP_SET_HASH_NETNET m
                     set_kernel_config CONFIG_IP_SET_HASH_NETPORT m
                     set_kernel_config CONFIG_IP_SET_HASH_NETPORTNET m
                     set_kernel_config CONFIG_IP_SET_LIST_SET m
                     set_kernel_config CONFIG_NFT_BRIDGE_META m
                     set_kernel_config CONFIG_NFT_BRIDGE_REJECT m
                     set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV4 m
                     set_kernel_config CONFIG_NFT_CHAIN_NAT_IPV6 m
                     set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV4 m
                     set_kernel_config CONFIG_NFT_CHAIN_ROUTE_IPV6 m
                     set_kernel_config CONFIG_NFT_COMPAT m
                     set_kernel_config CONFIG_NFT_COUNTER m
                     set_kernel_config CONFIG_NFT_CT m
                     set_kernel_config CONFIG_NFT_DUP_IPV4 m
                     set_kernel_config CONFIG_NFT_DUP_IPV6 m
                     set_kernel_config CONFIG_NFT_DUP_NETDEV m
                     set_kernel_config CONFIG_NFT_EXTHDR m
                     set_kernel_config CONFIG_NFT_FWD_NETDEV m
                     set_kernel_config CONFIG_NFT_HASH m
                     set_kernel_config CONFIG_NFT_LIMIT m
                     set_kernel_config CONFIG_NFT_LOG m
                     set_kernel_config CONFIG_NFT_MASQ m
                     set_kernel_config CONFIG_NFT_MASQ_IPV4 m
                     set_kernel_config CONFIG_NFT_MASQ_IPV6 m
                     set_kernel_config CONFIG_NFT_META m
                     set_kernel_config CONFIG_NFT_NAT m
                     set_kernel_config CONFIG_NFT_NUMGEN m
                     set_kernel_config CONFIG_NFT_QUEUE m
                     set_kernel_config CONFIG_NFT_QUOTA m
                     set_kernel_config CONFIG_NFT_REDIR m
                     set_kernel_config CONFIG_NFT_REDIR_IPV4 m
                     set_kernel_config CONFIG_NFT_REDIR_IPV6 m
                     set_kernel_config CONFIG_NFT_REJECT m
                     set_kernel_config CONFIG_NFT_REJECT_INET m
                     set_kernel_config CONFIG_NFT_REJECT_IPV4 m
                     set_kernel_config CONFIG_NFT_REJECT_IPV6 m
                     set_kernel_config CONFIG_NFT_SET_HASH m
                     set_kernel_config CONFIG_NFT_SET_RBTREE m
                     set_kernel_config CONFIG_NF_CONNTRACK_IPV4 m
                     set_kernel_config CONFIG_NF_CONNTRACK_IPV6 m
                     set_kernel_config CONFIG_NF_DEFRAG_IPV4 m
                     set_kernel_config CONFIG_NF_DEFRAG_IPV6 m
                     set_kernel_config CONFIG_NF_DUP_IPV4 m
                     set_kernel_config CONFIG_NF_DUP_IPV6 m
                     set_kernel_config CONFIG_NF_LOG_BRIDGE m
                     set_kernel_config CONFIG_NF_LOG_IPV4 m
                     set_kernel_config CONFIG_NF_LOG_IPV6 m
                     set_kernel_config CONFIG_NF_NAT_IPV4 m
                     set_kernel_config CONFIG_NF_NAT_IPV6 m
                     set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV4 m
                     set_kernel_config CONFIG_NF_NAT_MASQUERADE_IPV6 m
                     set_kernel_config CONFIG_NF_NAT_PPTP m
                     set_kernel_config CONFIG_NF_NAT_PROTO_GRE m
                     set_kernel_config CONFIG_NF_NAT_REDIRECT m
                     set_kernel_config CONFIG_NF_NAT_SNMP_BASIC m
                     set_kernel_config CONFIG_NF_NAT_TFTP m
                     set_kernel_config CONFIG_NF_REJECT_IPV4 m
                     set_kernel_config CONFIG_NF_REJECT_IPV6 m
                     set_kernel_config CONFIG_NF_TABLES_INET m
                     set_kernel_config CONFIG_NF_TABLES_IPV4 m
                     set_kernel_config CONFIG_NF_TABLES_IPV6 m
                     set_kernel_config CONFIG_NF_TABLES_NETDEV m
                     set_kernel_config NETFILTER_XTABLES m
                   fi
             	  #https://groups.google.com/forum/#!topic/linux.gentoo.user/_2aSc_ztGpA
             	  #https://github.com/torvalds/linux/blob/master/init/Kconfig#L848
             	  # Enables BPF syscall for systemd-journald
             	  if [ "$KERNEL_BPF" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
-                    set_kernel_config CONFIG_BPF_SYSCALL y
+                        set_kernel_config CONFIG_BPF_SYSCALL y
             	    set_kernel_config CONFIG_CGROUP_BPF y
             	  fi
             	  #Revert to previous directory
             	  popd
                   # Set kernel configuration parameters to enable qemu emulation
                   if [ "$ENABLE_QEMU" = true ] ; then
                     echo "CONFIG_FHANDLE=y" >> "${KERNEL_DIR}"/.config
                     echo "CONFIG_LBDAF=y" >> "${KERNEL_DIR}"/.config
                     if [ "$ENABLE_CRYPTFS" = true ] ; then
                       {
                         echo "CONFIG_EMBEDDED=y"
                         echo "CONFIG_EXPERT=y"
                         echo "CONFIG_DAX=y"
                         echo "CONFIG_MD=y"
                         echo "CONFIG_BLK_DEV_MD=y"
                         echo "CONFIG_MD_AUTODETECT=y"
                         echo "CONFIG_BLK_DEV_DM=y"
                         echo "CONFIG_BLK_DEV_DM_BUILTIN=y"
                         echo "CONFIG_DM_CRYPT=y"
                         echo "CONFIG_CRYPTO_BLKCIPHER=y"
                         echo "CONFIG_CRYPTO_CBC=y"
                         echo "CONFIG_CRYPTO_XTS=y"
                         echo "CONFIG_CRYPTO_SHA512=y"
                         echo "CONFIG_CRYPTO_MANAGER=y"
-                      } >> "${KERNEL_DIR}"/.config
+                      } >> "${KERNEL_DIR}/.config"
                     fi
                   fi
                   # Copy custom kernel configuration file
                   if [ -n "$KERNELSRC_USRCONFIG" ] ; then
                     cp "$KERNELSRC_USRCONFIG" "${KERNEL_DIR}"/.config
                   fi
                   # Set kernel configuration parameters to their default values
                   if [ "$KERNEL_OLDDEFCONFIG" = true ] ; then
                     make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" olddefconfig
                   fi
                   # Start menu-driven kernel configuration (interactive)
                   if [ "$KERNEL_MENUCONFIG" = true ] ; then
                     make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" menuconfig
                   fi
                 fi
                 # Use ccache to cross compile the kernel
                 if [ "$KERNEL_CCACHE" = true ] ; then
                   cc="ccache ${CROSS_COMPILE}gcc"
                 else
                   cc="${CROSS_COMPILE}gcc"
                 fi
                 # Cross compile kernel and dtbs
                 make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" "${KERNEL_BIN_IMAGE}" dtbs
                 # Cross compile kernel modules
                 if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
                   make -C "${KERNEL_DIR}" -j"${KERNEL_THREADS}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" CC="${cc}" modules
                 fi
               fi
               # Check if kernel compilation was successful
               if [ ! -r "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" ] ; then
                 echo "error: kernel compilation failed! (kernel image not found)"
                 cleanup
                 exit 1
               fi
               # Install kernel modules
               if [ "$ENABLE_REDUCE" = true ] ; then
                 if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=../../.. modules_install
                 fi
               else
                 if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_MOD_PATH=../../.. modules_install
                 fi
                 # Install kernel firmware
                 if grep -q "^firmware_install:" "${KERNEL_DIR}/Makefile" ; then
                   make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" INSTALL_FW_PATH=../../../lib firmware_install
                 fi
               fi
               # Install kernel headers
               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}"
               # Get kernel release version
               KERNEL_VERSION=$(cat "${KERNEL_DIR}/include/config/kernel.release")
               # Copy kernel configuration file to the boot directory
               install_readonly "${KERNEL_DIR}/.config" "${R}/boot/config-${KERNEL_VERSION}"
               # Prepare device tree directory
               mkdir "${BOOT_DIR}/overlays"
               # Ensure the proper .dtb is located
               if [ "$KERNEL_ARCH" = "arm" ] ; then
                 for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/"*.dtb ; do
                   if [ -f "${dtb}" ] ; then
                     install_readonly "${dtb}" "${BOOT_DIR}/"
                   fi
                 done
               else
                 for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/broadcom/"*.dtb ; do
                   if [ -f "${dtb}" ] ; then
                     install_readonly "${dtb}" "${BOOT_DIR}/"
                   fi
                 done
               fi
               # Copy compiled dtb device tree files
               if [ -d "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays" ] ; then
                 for dtb in "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/"*.dtb ; do
                   if [ -f "${dtb}" ] ; then
                     install_readonly "${dtb}" "${BOOT_DIR}/overlays/"
                   fi
                 done
                 if [ -f "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" ] ; then
                   install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/dts/overlays/README" "${BOOT_DIR}/overlays/README"
                 fi
               fi
               if [ "$ENABLE_UBOOT" = false ] ; then
                 # Convert and copy kernel image to the boot directory
                 "${KERNEL_DIR}/scripts/mkknlimg" "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
               else
                 # Copy kernel image to the boot directory
                 install_readonly "${KERNEL_DIR}/arch/${KERNEL_ARCH}/boot/${KERNEL_BIN_IMAGE}" "${BOOT_DIR}/${KERNEL_IMAGE}"
               fi
               # Remove kernel sources
               if [ "$KERNEL_REMOVESRC" = true ] ; then
                 rm -fr "${KERNEL_DIR}"
               else
                 # Prepare compiled kernel modules
                 if grep -q "CONFIG_MODULES=y" "${KERNEL_DIR}/.config" ; then
                   if grep -q "^modules_prepare:" "${KERNEL_DIR}/Makefile" ; then
                     make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" modules_prepare
                   fi
                   # Create symlinks for kernel modules
                   chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/build"
                   chroot_exec ln -sf /usr/src/linux "/lib/modules/${KERNEL_VERSION}/source"
                 fi
               fi
             else # BUILD_KERNEL=false
               #  echo Install precompiled kernel...
               #  echo error: not implemented
               if [ "$KERNEL_ARCH" = arm64 ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
                 # 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"
                 #extract download
                 tar -xJf "${temp_dir}"/kernel.tar.xz -C "${temp_dir}"
-            	#move extracted kernel to /boot/firmware
+                #move extracted kernel to /boot/firmware
-            	mkdir "${R}/boot/firmware"
+                mkdir "${R}/boot/firmware"
-            	cp "${temp_dir}"/boot/* "${R}"/boot/firmware/
+                cp "${temp_dir}"/boot/* "${R}"/boot/firmware/
-            	cp -r "${temp_dir}"/lib/* "${R}"/lib/
+                cp -r "${temp_dir}"/lib/* "${R}"/lib/
                 # Remove temporary directory for kernel sources
                 rm -fr "${temp_dir}"
                 # Set permissions of the kernel sources
                 chown -R root:root "${R}/boot/firmware"
                 chown -R root:root "${R}/lib/modules"
                 #Create cmdline.txt for 15-rpi-config.sh
                 touch "${BOOT_DIR}/cmdline.txt"
               fi
               # Check if kernel installation was successful
-              KERNEL="$(ls -1 "${R}"/boot/kernel* | sort | tail -n 1)"
+              KERNEL="$(ls -1 "${R}"/boot/firmware/kernel* | sort | tail -n 1)"
               if [ -z "$KERNEL" ] ; then
                 echo "error: kernel installation failed! (/boot/kernel* not found)"
                 cleanup
                 exit 1
               fi
             fi

bootstrap.d/15-rpi-config.sh +13 -11

             #
             # Setup RPi2/3 config and cmdline
             #
             # Load utility functions
             . ./functions.sh
             if [ "$BUILD_KERNEL" = true ] ; then
               if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
                 # Install boot binaries from local directory
                 cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
                 cp "${RPI_FIRMWARE_DIR}"/boot/fixup.dat "${BOOT_DIR}"/fixup.dat
                 cp "${RPI_FIRMWARE_DIR}"/boot/fixup_cd.dat "${BOOT_DIR}"/fixup_cd.dat
                 cp "${RPI_FIRMWARE_DIR}"/boot/fixup_x.dat "${BOOT_DIR}"/fixup_x.dat
                 cp "${RPI_FIRMWARE_DIR}"/boot/start.elf "${BOOT_DIR}"/start.elf
                 cp "${RPI_FIRMWARE_DIR}"/boot/start_cd.elf "${BOOT_DIR}"/start_cd.elf
                 cp "${RPI_FIRMWARE_DIR}"/boot/start_x.elf "${BOOT_DIR}"/start_x.elf
               else
                 # Create temporary directory for boot binaries
                 temp_dir=$(as_nobody mktemp -d)
                 # Install latest boot binaries from raspberry/firmware github
                 as_nobody wget -q -O "${temp_dir}/bootcode.bin" "${FIRMWARE_URL}/bootcode.bin"
                 as_nobody wget -q -O "${temp_dir}/fixup.dat" "${FIRMWARE_URL}/fixup.dat"
                 as_nobody wget -q -O "${temp_dir}/fixup_cd.dat" "${FIRMWARE_URL}/fixup_cd.dat"
                 as_nobody wget -q -O "${temp_dir}/fixup_x.dat" "${FIRMWARE_URL}/fixup_x.dat"
                 as_nobody wget -q -O "${temp_dir}/start.elf" "${FIRMWARE_URL}/start.elf"
                 as_nobody wget -q -O "${temp_dir}/start_cd.elf" "${FIRMWARE_URL}/start_cd.elf"
                 as_nobody wget -q -O "${temp_dir}/start_x.elf" "${FIRMWARE_URL}/start_x.elf"
                 # Move downloaded boot binaries
                 mv "${temp_dir}/"* "${BOOT_DIR}/"
                 # Remove temporary directory for boot binaries
                 rm -fr "${temp_dir}"
                 # Set permissions of the boot binaries
                 chown -R root:root "${BOOT_DIR}"
                 chmod -R 600 "${BOOT_DIR}"
               fi
             fi
             # Setup firmware boot cmdline
             if [ "$ENABLE_UBOOTUSB" = true ] ; then
               CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
             else
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 CMDLINE="dwc_otg.lpm_enable=0 root=/dev/sda1 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
               else
                 CMDLINE="dwc_otg.lpm_enable=0 root=/dev/mmcblk0p2 rootfstype=ext4 rootflags=commit=100,data=writeback elevator=deadline rootwait console=tty1"
               fi
             fi
             # Add encrypted root partition to cmdline.txt
             if [ "$ENABLE_CRYPTFS" = true ] ; then
               if [ "$ENABLE_SPLITFS" = true ] ; then
                 CMDLINE=$(echo "${CMDLINE}" | sed "s/sda1/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda1:${CRYPTFS_MAPPING}/")
               else
                 if [ "$ENABLE_UBOOTUSB" = true ] ; then
                   CMDLINE=$(echo "${CMDLINE}" | sed "s/sda2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/sda2:${CRYPTFS_MAPPING}/")
                 else
                   CMDLINE=$(echo "${CMDLINE}" | sed "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING} cryptdevice=\/dev\/mmcblk0p2:${CRYPTFS_MAPPING}/")
                 fi
               fi
             fi
             # Add serial console support
             if [ "$ENABLE_CONSOLE" = true ] ; then
               CMDLINE="${CMDLINE} console=ttyAMA0,115200 kgdboc=ttyAMA0,115200"
             fi
             # Remove IPv6 networking support
             if [ "$ENABLE_IPV6" = false ] ; then
               CMDLINE="${CMDLINE} ipv6.disable=1"
             fi
             # Automatically assign predictable network interface names
             if [ "$ENABLE_IFNAMES" = false ] ; then
               CMDLINE="${CMDLINE} net.ifnames=0"
             else
               CMDLINE="${CMDLINE} net.ifnames=1"
             fi
             # Install firmware boot cmdline
             echo "${CMDLINE}" > "${BOOT_DIR}/cmdline.txt"
             # Install firmware config
             install_readonly files/boot/config.txt "${BOOT_DIR}/config.txt"
             # Setup minimal GPU memory allocation size: 16MB (no X)
             if [ "$ENABLE_MINGPU" = true ] ; then
               echo "gpu_mem=16" >> "${BOOT_DIR}/config.txt"
             fi
             # Setup boot with initramfs
             if [ "$ENABLE_INITRAMFS" = true ] ; then
               echo "initramfs initramfs-${KERNEL_VERSION} followkernel" >> "${BOOT_DIR}/config.txt"
             fi
             # Disable RPi3 Bluetooth and restore ttyAMA0 serial device
             if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
               if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
                 echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
                 echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
               else
                 # Create temporary directory for Bluetooth sources
                 temp_dir=$(as_nobody mktemp -d)
                 # Fetch Bluetooth sources
                 as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
                 # Copy downloaded sources
                 mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
-            	# Raspberry-sys-mod package for /dev/serial device needed by bluetooth service
+                # Raspberry-sys-mod package for /dev/serial device needed by bluetooth service
-            	wget -O "${R}/tmp/pi-bluetooth/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
+                wget -O "${R}/tmp/pi-bluetooth/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
+                # Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
-            	# Bluetooth firmware from arch aur https://aur.archlinux.org/packages/pi-bluetooth/
+                wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
-            	wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
                 wget -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
                 # Set permissions
                 chown -R root:root "${R}/tmp/pi-bluetooth"
                 # Install files to chroot
                 # Install tools
                 install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
                 install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
                 # Install bluetooth udev rule
                 install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
                 # aur
                 # install_readonly "${R}/tmp/pi-bluetooth/50-bluetooth-hci-auto-poweron.rules" "${ETC_DIR}/udev/rules.d/50-bluetooth-hci-auto-poweron.rules"
                 # Install Firmware Flash file and apropiate licence
                 mkdir "${ETC_DIR}/firmware/"
                 # Install firmware and licence
                 # install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
                 # install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/BCM43430A1.hcd"
                 install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
-            	install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
+                install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
                 # Install systemd service for bluetooth
                 # install_readonly "${R}/tmp/pi-bluetooth/brcm43438.service" "${ETC_DIR}/systemd/system/brcm43438.service"
+            <<<<<<< HEAD
+                install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
+                install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
+                # Install udev rule for bluetooth device
+                install_readonly "${R}/tmp/pi-bluetooth/99-com.rules" "${ETC_DIR}/udev/rules.d/99-com.rules"
+            =======
             	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.bthelper@.service" "${ETC_DIR}/systemd/system/pi-bluetooth.bthelper@.service"
             	install_readonly "${R}/tmp/pi-bluetooth/debian/pi-bluetooth.hciuart.service" "${ETC_DIR}/systemd/system/pi-bluetooth.hciuart.service"
             	install_readonly "${R}/tmp/pi-bluetooth/99-com.rules" "${ETC_DIR}/udev/rules.d/99-com.rules"
+            >>>>>>> bc6d966f8243dd759dfc1c0811528e37879ceb1b
-            	# Remove temporary directory
+                # Remove temporary directory
                 rm -fr "${temp_dir}"
               fi
             fi
             # Create firmware configuration and cmdline symlinks
             ln -sf firmware/config.txt "${R}/boot/config.txt"
             ln -sf firmware/cmdline.txt "${R}/boot/cmdline.txt"
             # Install and setup kernel modules to load at boot
             mkdir -p "${LIB_DIR}/modules-load.d/"
             install_readonly files/modules/rpi2.conf "${LIB_DIR}/modules-load.d/rpi2.conf"
             # Load hardware random module at boot
             if [ "$ENABLE_HWRANDOM" = true ] && [ "$BUILD_KERNEL" = false ] ; then
               sed -i "s/^# bcm2708_rng/bcm2708_rng/" "${LIB_DIR}/modules-load.d/rpi2.conf"
             fi
             # Load sound module at boot
             if [ "$ENABLE_SOUND" = true ] ; then
               sed -i "s/^# snd_bcm2835/snd_bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
             else
               echo "dtparam=audio=off" >> "${BOOT_DIR}/config.txt"
             fi
             # Enable I2C interface
             if [ "$ENABLE_I2C" = true ] ; then
               echo "dtparam=i2c_arm=on" >> "${BOOT_DIR}/config.txt"
               sed -i "s/^# i2c-bcm2708/i2c-bcm2708/" "${LIB_DIR}/modules-load.d/rpi2.conf"
               sed -i "s/^# i2c-dev/i2c-dev/" "${LIB_DIR}/modules-load.d/rpi2.conf"
             fi
             # Enable SPI interface
             if [ "$ENABLE_SPI" = true ] ; then
               echo "dtparam=spi=on" >> "${BOOT_DIR}/config.txt"
               echo "spi-bcm2708" >> "${LIB_DIR}/modules-load.d/rpi2.conf"
               if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then
                 sed -i "s/spi-bcm2708/spi-bcm2835/" "${LIB_DIR}/modules-load.d/rpi2.conf"
               fi
             fi
             # Disable RPi2/3 under-voltage warnings
             if [ -n "$DISABLE_UNDERVOLT_WARNINGS" ] ; then
               echo "avoid_warnings=${DISABLE_UNDERVOLT_WARNINGS}" >> "${BOOT_DIR}/config.txt"
             fi
             # Install kernel modules blacklist
             mkdir -p "${ETC_DIR}/modprobe.d/"
             install_readonly files/modules/raspi-blacklist.conf "${ETC_DIR}/modprobe.d/raspi-blacklist.conf"
             # Install sysctl.d configuration files
             install_readonly files/sysctl.d/81-rpi-vm.conf "${ETC_DIR}/sysctl.d/81-rpi-vm.conf"

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