##// END OF EJS Templates
Merge branch 'ref+fix' of https://github.com/burnbabyburn/rpi23-gen-image into ref+fix
burnbabyburn -
r367:b388206deafe Fusion
parent child
Show More
@@ -19,7 +19,7 if [ "$ENABLE_MINBASE" = true ] ; then
19 fi
19 fi
20
20
21 # Base debootstrap (unpack only)
21 # Base debootstrap (unpack only)
22 http_proxy=${APT_PROXY} debootstrap ${APT_EXCLUDES} --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}"
22 http_proxy=${APT_PROXY} debootstrap "${APT_EXCLUDES}" --arch="${RELEASE_ARCH}" --foreign ${VARIANT} --components="${COMPONENTS}" --include="${APT_INCLUDES}" "${RELEASE}" "${R}" "http://${APT_SERVER}"
23
23
24 # Copy qemu emulator binary to chroot
24 # Copy qemu emulator binary to chroot
25 install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
25 install -m 755 -o root -g root "${QEMU_BINARY}" "${R}${QEMU_BINARY}"
@@ -379,7 +379,7 if [ "$KERNEL_ARCH" = arm64 ] && ( [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]
379 temp_dir=$(as_nobody mktemp -d)
379 temp_dir=$(as_nobody mktemp -d)
380
380
381 # Fetch kernel dl
381 # Fetch kernel dl
382 as_nobody wget -c "$RPI3_64_KERNEL_URL" "${temp_dir}"/kernel.tar.xz
382 as_nobody wget -O "${temp_dir}"/kernel.tar.xz -c "$RPI3_64_KERNEL_URL"
383 #extract download
383 #extract download
384 tar -xJf kernel.tar.xz -C "${R}"
384 tar -xJf kernel.tar.xz -C "${R}"
385
385
@@ -109,24 +109,49 if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 3P ]; then
109 if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
109 if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
110 echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
110 echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
111 echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
111 echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
112 #else
112 else
113 # Create temporary directory for U-Boot sources
113 # Create temporary directory for Bluetooth sources
114 #temp_dir=$(as_nobody mktemp -d)
114 temp_dir=$(as_nobody mktemp -d)
115
116 # Fetch Bluetooth sources
117 as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
118
119 # Copy downloaded sources
120 mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
121
122 # Set permissions
123 chown -R root:root "${R}/tmp/pi-bluetooth"
124
125 # Install files to chroot
126 # Install tools
127 install_readonly "${R}/tmp/pi-bluetooth/usr/bin/btuart" "${R}/usr/bin/btuart"
128 install_readonly "${R}/tmp/pi-bluetooth/usr/bin/bthelper" "${R}/usr/bin/bthelper"
115
129
116 # Fetch U-Boot sources
130 # Install bluetooth udev rule
117 #as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
131 install_readonly "${R}/tmp/pi-bluetooth/lib/udev/rules.d/90-pi-bluetooth.rules" "${LIB_DIR}/udev/rules.d/90-pi-bluetooth.rules"
132 #aur
133 #install_readonly "${R}/tmp/pi-bluetooth/50-bluetooth-hci-auto-poweron.rules" "${ETC_DIR}/udev/rules.d/50-bluetooth-hci-auto-poweron.rules"
118
134
119 # Copy downloaded U-Boot sources
135 # Install Firmware Flash file and apropiate licence
120 #mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
136 mkdir "${ETC_DIR}/firmware/"
121
137
122 # Set permissions of the U-Boot sources
138 #aur https://aur.archlinux.org/packages/pi-bluetooth/
123 #chown -R root:root "${R}/tmp/pi-bluetooth"
139 #install_readonly "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" "${ETC_DIR}/firmware/LICENCE.broadcom_bcm43xx"
140 #install_readonly "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" "${ETC_DIR}/firmware/BCM43430A1.hcd"
141
142 wget -O "${R}/tmp/pi-bluetooth/LICENCE.broadcom_bcm43xx" https://aur.archlinux.org/cgit/aur.git/plain/LICENCE.broadcom_bcm43xx?h=pi-bluetooth
143 wget -O "${R}/tmp/pi-bluetooth/BCM43430A1.hcd" https://aur.archlinux.org/cgit/aur.git/plain/BCM43430A1.hcd?h=pi-bluetooth
144
145 # Install systemd service for bluetooth
146 #install_readonly "${R}/tmp/pi-bluetooth/brcm43438.service" "${ETC_DIR}/systemd/system/brcm43438.service"
124
147
125 # Remove temporary directory for U-Boot sources
148 # Remove temporary directory
126 #rm -fr "${temp_dir}"
149 #rm -fr "${temp_dir}"
127
150
151 # Get /dev/serial back for compability
152 # Raspberry-sys-mod package
153 wget -O "${ETC_DIR}/udev/rules.d/99-com.rules" https://raw.githubusercontent.com/RPi-Distro/raspberrypi-sys-mods/master/etc.armhf/udev/rules.d/99-com.rules
128
154
129 #"${R}/tmp/userland"
130 fi
155 fi
131 fi
156 fi
132
157
@@ -63,7 +63,8 RPI3_64_DEF_KERNEL_URL=${RPI3_64_DEF_KERNEL_URL:=https://github.com/sakaki-/bcmr
63 #enhanced kernel
63 #enhanced kernel
64 RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_BIS_KERNEL_URL}
64 RPI3_64_KERNEL_URL=${RPI3_64_KERNEL_URL:=$RPI3_64_BIS_KERNEL_URL}
65 #https://aur.archlinux.org/packages/pi-bluetooth/
65 #https://aur.archlinux.org/packages/pi-bluetooth/
66 BLUETOOTH_URL=${BLUETOOTH_URL:=https://aur.archlinux.org/pi-bluetooth.git}
66 #BLUETOOTH_URL=${BLUETOOTH_URL:=https://aur.archlinux.org/pi-bluetooth.git}
67 BLUETOOTH_URL=${BLUETOOTH_URL:=https://github.com/RPi-Distro/pi-bluetooth.git}
67
68
68 # Build directories
69 # Build directories
69 BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
70 BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant