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

                   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
                     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
             	  #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
                         echo "CONFIG_CRYPTO_XTS=y"
                         echo "CONFIG_CRYPTO_SHA512=y"
                         echo "CONFIG_CRYPTO_MANAGER=y"
-                      } >> "${KERNEL_DIR}"/.config
+                      } >> "${KERNEL_DIR}/.config"
                     fi
                   fi
               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
               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

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

                 # 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
                 # 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

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