##// END OF EJS Templates
a
Unknown -
r457:a6984c48132d
parent child
Show More
@@ -88,7 +88,7 if [ "$BUILD_KERNEL" = true ] ; then
88 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
88 make -C "${KERNEL_DIR}" ARCH="${KERNEL_ARCH}" CROSS_COMPILE="${CROSS_COMPILE}" "${KERNEL_DEFCONFIG}"
89
89
90 #Switch to KERNELSRC_DIR so we can use set_kernel_config
90 #Switch to KERNELSRC_DIR so we can use set_kernel_config
91 cd "${KERNEL_DIR}"
91 cd "${KERNEL_DIR}" || exit
92
92
93 # enable ZSWAP see https://askubuntu.com/a/472227 or https://wiki.archlinux.org/index.php/zswap
93 # enable ZSWAP see https://askubuntu.com/a/472227 or https://wiki.archlinux.org/index.php/zswap
94 if [ "$KERNEL_ZSWAP" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
94 if [ "$KERNEL_ZSWAP" = true ] && { [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; } ; then
@@ -253,7 +253,7 if [ "$BUILD_KERNEL" = true ] ; then
253
253
254
254
255 #Revert to previous directory
255 #Revert to previous directory
256 cd "${WORKDIR}"
256 cd "${WORKDIR}" || exit
257
257
258 # Set kernel configuration parameters to enable qemu emulation
258 # Set kernel configuration parameters to enable qemu emulation
259 if [ "$ENABLE_QEMU" = true ] ; then
259 if [ "$ENABLE_QEMU" = true ] ; then
@@ -1,3 +1,4
1 #!/bin/sh
1 #
2 #
2 # Build and Setup nexmon with monitor mode patch
3 # Build and Setup nexmon with monitor mode patch
3 #
4 #
@@ -26,7 +27,7 if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
26 rm -fr "${temp_dir}"
27 rm -fr "${temp_dir}"
27
28
28 # Build nexmon firmware outside the build system, if we can.
29 # Build nexmon firmware outside the build system, if we can.
29 cd "${NEXMON_ROOT}"
30 cd "${NEXMON_ROOT}" || exit
30
31
31 # Disable statistics
32 # Disable statistics
32 touch DISABLE_STATISTICS
33 touch DISABLE_STATISTICS
@@ -34,51 +35,53 if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
34 # Setup Enviroment: see https://github.com/NoobieDog/nexmon/blob/master/setup_env.sh
35 # Setup Enviroment: see https://github.com/NoobieDog/nexmon/blob/master/setup_env.sh
35 #ARCH="${KERNEL_ARCH}"
36 #ARCH="${KERNEL_ARCH}"
36 #SUBARCH="${KERNEL_ARCH}"
37 #SUBARCH="${KERNEL_ARCH}"
37 #KERNEL="${KERNEL_IMAGE}"
38 KERNEL="${KERNEL_IMAGE}"
38 #CC="${NEXMON_ROOT}"/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
39 ARCH=arm
39 #CCPLUGIN="${NEXMON_ROOT}"/buildtools/gcc-nexmon-plugin/nexmon.so
40 SUBARCH=arm
40 #ZLIBFLATE="zlib-flate -compress"
41 CC="${NEXMON_ROOT}"/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
41 #Q=@
42 CCPLUGIN="${NEXMON_ROOT}"/buildtools/gcc-nexmon-plugin/nexmon.so
42 #NEXMON_SETUP_ENV=1
43 ZLIBFLATE="zlib-flate -compress"
43 . ./setup_env.sh
44 Q=@
45 NEXMON_SETUP_ENV=1
46 #. ./setup_env.sh
44
47
45 # Make nexmon
48 # Make nexmon
46 make
49 make
47
50
48 # Make ancient isl build
51 # Make ancient isl build
49 cd buildtools/isl-0.10
52 cd buildtools/isl-0.10 || exit
50 CC="${CC}"gcc
53 CC="${CC}"gcc
51 ./configure
54 ./configure
52 make
55 make
53
56
54 # build patches
57 # build patches
55 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] ; then
58 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] ; then
56 cd ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon
59 cd "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon || exit
57 make clean
60 make clean
58
61
59 # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
62 # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
60 LD_LIBRARY_PATH=${NEXMON_ROOT}/buildtools/isl-0.10/.libs make ARCH="${KERNEL_ARCH}" CC=${NEXMON_ROOT}/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
63 LD_LIBRARY_PATH="${NEXMON_ROOT}"/buildtools/isl-0.10/.libs make ARCH="${KERNEL_ARCH}" CC="${NEXMON_ROOT}"/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
61
64
62 # copy RPi0W & RPi3 firmware
65 # copy RPi0W & RPi3 firmware
63 mv "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.org.bin
66 mv "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.org.bin
64 cp ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.nexmon.bin
67 cp "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.nexmon.bin
65 cp -f ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin
68 cp -f "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon/brcmfmac43430-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43430-sdio.bin
66 fi
69 fi
67
70
68 if [ "$RPI_MODEL" = 3P ] ; then
71 if [ "$RPI_MODEL" = 3P ] ; then
69 cd ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon
72 cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit
70 make clean
73 make clean
71
74
72 # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
75 # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
73 LD_LIBRARY_PATH=${NEXMON_ROOT}/buildtools/isl-0.10/.libs make ARCH="${KERNEL_ARCH}" CC=${NEXMON_ROOT}/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
76 LD_LIBRARY_PATH=${NEXMON_ROOT}/buildtools/isl-0.10/.libs make ARCH="${KERNEL_ARCH}" CC="${NEXMON_ROOT}"/buildtools/gcc-arm-none-eabi-5_4-2016q2-linux-x86/bin/arm-none-eabi-
74
77
75 # RPi3B+ firmware
78 # RPi3B+ firmware
76 mv "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.org.bin
79 mv "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.org.bin
77 cp ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.nexmon.bin
80 cp "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.nexmon.bin
78 cp -f ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.bin
81 cp -f "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon/brcmfmac43455-sdio.bin "${WLAN_FIRMWARE_DIR}"/brcmfmac43455-sdio.bin
79 fi
82 fi
80
83
81 #Revert to previous directory
84 #Revert to previous directory
82 cd "${WORKDIR}"
85 cd "${WORKDIR}" || exit
83
86
84 fi
87 fi
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant