##// END OF EJS Templates
+fix:...
Unknown -
r479:1aba7e0acfd1
parent child
Show More
@@ -34,7 +34,7 if [ "$ENABLE_CRYPTFS" = true ] ; then
34 34 fi
35 35
36 36 # Generate initramfs file
37 if [ "$BUILD_KERNEL" = true ] && [ "$ENABLE_INITRAMFS" = true ] ; then
37 if [ "$ENABLE_INITRAMFS" = true ] ; then
38 38 if [ "$ENABLE_CRYPTFS" = true ] ; then
39 39 # Include initramfs scripts to auto expand encrypted root partition
40 40 if [ "$EXPANDROOT" = true ] ; then
@@ -44,8 +44,6 if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
44 44 touch DISABLE_STATISTICS
45 45
46 46 # Setup Enviroment: see https://github.com/NoobieDog/nexmon/blob/master/setup_env.sh
47 #ARCH="${KERNEL_ARCH}"
48 #SUBARCH="${KERNEL_ARCH}"
49 47 export KERNEL="${KERNEL_IMAGE}"
50 48 export ARCH=arm
51 49 export SUBARCH=arm
@@ -57,21 +55,14 if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
57 55 export NEXMON_SETUP_ENV=1
58 56 export HOSTUNAME=$(uname -s)
59 57 export PLATFORMUNAME=$(uname -m)
60 #. ./setup_env.sh
61 58
62 59 # Make nexmon
63 60 make
64 61
65 # Backup stock broadcom wlan driver - "${LIB_DIR}"/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
66 #brcmfmac_path=$(modinfo brcmfmac | grep -m 1 -oP "^filename:(\s*?)(.*)$" | sed -e 's/^filename:\(\s*\)\(.*\)$/\2/g')
67 #brcmfmac_path="${LIB_DIR}"/modules/"${KERNEL_VERSION}"/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
68 #mv "${brcmfmac_path}" "${brcmfmac_path}".orig
69
70 #
71
72 62 # build patches
73 63 if [ "$RPI_MODEL" = 0 ] || [ "$RPI_MODEL" = 3 ] ; then
74 64 cd "${NEXMON_ROOT}"/patches/bcm43430a1/7_45_41_46/nexmon || exit
65 sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43430a1/7_45_41_46/nexmon/Makefile
75 66 make clean
76 67
77 68 # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
@@ -87,6 +78,7 if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
87 78
88 79 if [ "$RPI_MODEL" = 3P ] ; then
89 80 cd "${NEXMON_ROOT}"/patches/bcm43455c0/7_45_154/nexmon || exit
81 sed -i -e 's/all:.*/all: $(RAM_FILE)/g' ${NEXMON_ROOT}/patches/bcm43455c0/7_45_154/nexmon/Makefile
90 82 make clean
91 83
92 84 # We do this so we don't have to install the ancient isl version into /usr/local/lib on systems.
General Comments 0
Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant