@@ -92,17 +92,9 if [ "$ENABLE_INITRAMFS" = true ] ; then | |||||
92 | fi |
|
92 | fi | |
93 |
|
93 | |||
94 | # Add cryptsetup modules to initramfs |
|
94 | # Add cryptsetup modules to initramfs | |
95 | <<<<<<< HEAD |
|
|||
96 | printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook" |
|
|||
97 | #printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook" |
|
95 | #printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook" | |
98 |
|
96 | |||
99 | # Dummy mapping required by mkinitramfs |
|
97 | # Dummy mapping required by mkinitramfs | |
100 | echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}" |
|
|||
101 | ======= |
|
|||
102 | #printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook" |
|
|||
103 |
|
||||
104 | # Dummy mapping required by mkinitramfs |
|
|||
105 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
106 | echo "0 1 crypt "${CRYPTFS_CIPHER}" ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}" |
|
98 | echo "0 1 crypt "${CRYPTFS_CIPHER}" ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}" | |
107 |
|
99 | |||
108 | # Generate initramfs with encrypted root partition support |
|
100 | # Generate initramfs with encrypted root partition support |
@@ -128,10 +128,6 if [ "$ENABLE_TURBO" = true ] ; then | |||||
128 | echo "boot_delay=1" >> "${BOOT_DIR}/config.txt" |
|
128 | echo "boot_delay=1" >> "${BOOT_DIR}/config.txt" | |
129 | fi |
|
129 | fi | |
130 |
|
130 | |||
131 | <<<<<<< HEAD |
|
|||
132 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then |
|
|||
133 | ======= |
|
|||
134 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
135 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ]; then |
|
131 | if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ]; then | |
136 |
|
132 | |||
137 | # Bluetooth enabled |
|
133 | # Bluetooth enabled | |
@@ -230,10 +226,6 if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then | |||||
230 |
|
226 | |||
231 | # Change into downloaded src dir |
|
227 | # Change into downloaded src dir | |
232 | cd "${R}/tmp/systemd-swap" || exit |
|
228 | cd "${R}/tmp/systemd-swap" || exit | |
233 | <<<<<<< HEAD |
|
|||
234 |
|
||||
235 | ======= |
|
|||
236 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
237 |
|
229 | |||
238 | # Get Verion |
|
230 | # Get Verion | |
239 | VERSION=$(git tag | tail -n 1) |
|
231 | VERSION=$(git tag | tail -n 1) | |
@@ -249,10 +241,6 if [ "$ENABLE_SYSTEMDSWAP" = true ] ; then | |||||
249 | chown -R root:root "${R}/tmp/systemd-swap" |
|
241 | chown -R root:root "${R}/tmp/systemd-swap" | |
250 |
|
242 | |||
251 | # Install package - IMPROVE AND MAKE IT POSSIBLE WITHOUT VERSION NR. |
|
243 | # Install package - IMPROVE AND MAKE IT POSSIBLE WITHOUT VERSION NR. | |
252 | <<<<<<< HEAD |
|
|||
253 | chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_4.0.1_any.deb |
|
|||
254 | ======= |
|
|||
255 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
256 | chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_"$VERSION"_all.deb |
|
244 | chroot_exec dpkg -i /tmp/systemd-swap/systemd-swap_"$VERSION"_all.deb | |
257 |
|
245 | |||
258 | # Enable service |
|
246 | # Enable service |
@@ -105,11 +105,7 if [ "$ENABLE_WIRELESS" = true ] ; then | |||||
105 | # Create temporary directory for firmware binary blob |
|
105 | # Create temporary directory for firmware binary blob | |
106 | temp_dir=$(as_nobody mktemp -d) |
|
106 | temp_dir=$(as_nobody mktemp -d) | |
107 |
|
107 | |||
108 | # Fetch firmware binary blob for RPI3B+ |
|
108 | # Fetch firmware binary blob for RPI3B+ or Pi4 | |
109 | <<<<<<< HEAD |
|
|||
110 | if [ "$RPI_MODEL" = 3P ] ; then |
|
|||
111 | ======= |
|
|||
112 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
113 | if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then |
|
109 | if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then | |
114 | # Fetch firmware binary blob for RPi3P |
|
110 | # Fetch firmware binary blob for RPi3P | |
115 | as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin" |
|
111 | as_nobody wget -q -O "${temp_dir}/brcmfmac43455-sdio.bin" "${WLAN_FIRMWARE_URL}/brcmfmac43455-sdio.bin" |
@@ -34,18 +34,10 if [ "$ENABLE_VIDEOCORE" = true ] ; then | |||||
34 | cd "${R}"/tmp/userland/build |
|
34 | cd "${R}"/tmp/userland/build | |
35 |
|
35 | |||
36 | if [ "$RELEASE_ARCH" = "arm64" ] ; then |
|
36 | if [ "$RELEASE_ARCH" = "arm64" ] ; then | |
37 | <<<<<<< HEAD |
|
|||
38 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" |
|
|||
39 | ======= |
|
|||
40 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
41 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="${R}"/tmp/userland/makefiles/cmake/toolchains/aarch64-linux-gnu.cmake -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" |
|
37 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="${R}"/tmp/userland/makefiles/cmake/toolchains/aarch64-linux-gnu.cmake -DARM64=ON -DCMAKE_C_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_CXX_COMPILER=aarch64-linux-gnu-g++ -DCMAKE_ASM_COMPILER=aarch64-linux-gnu-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" | |
42 | fi |
|
38 | fi | |
43 |
|
39 | |||
44 | if [ "$RELEASE_ARCH" = "armel" ] ; then |
|
40 | if [ "$RELEASE_ARCH" = "armel" ] ; then | |
45 | <<<<<<< HEAD |
|
|||
46 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_C_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabi-g++ -DCMAKE_ASM_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DCMAKE_SYSTEM_PROCESSOR="arm" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" |
|
|||
47 | ======= |
|
|||
48 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
49 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="${R}"/tmp/userland/makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_C_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabi-g++ -DCMAKE_ASM_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DCMAKE_SYSTEM_PROCESSOR="arm" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" |
|
41 | cmake -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_BUILD_TYPE=release -DCMAKE_TOOLCHAIN_FILE="${R}"/tmp/userland/makefiles/cmake/toolchains/arm-linux-gnueabihf.cmake -DCMAKE_C_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_CXX_COMPILER=arm-linux-gnueabi-g++ -DCMAKE_ASM_COMPILER=arm-linux-gnueabi-gcc -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -U_FORTIFY_SOURCE" -DCMAKE_ASM_FLAGS="${CMAKE_ASM_FLAGS} -c" -DCMAKE_SYSTEM_PROCESSOR="arm" -DVIDEOCORE_BUILD_DIR="${R}" "${R}/tmp/userland" | |
50 | fi |
|
42 | fi | |
51 |
|
43 |
@@ -74,10 +74,6 if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then | |||||
74 | cp -f "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin |
|
74 | cp -f "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin | |
75 | fi |
|
75 | fi | |
76 |
|
76 | |||
77 | <<<<<<< HEAD |
|
|||
78 | if [ "$RPI_MODEL" = 3P ] ; then |
|
|||
79 | ======= |
|
|||
80 | >>>>>>> af203dbe173e4e5ca755058b3284dc61375ca579 |
|
|||
81 | if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then |
|
77 | if [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 4 ] ; then | |
82 | cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit |
|
78 | cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit | |
83 | sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/Makefile |
|
79 | sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/Makefile |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant