Raspi2-3_GenImage Commit - r471:88966a4516b3 · Collaboration Tremplin des Sciences

Unknown -

r471:88966a4516b3

parent child

Context file:

r471:88966a4516b3

README.md +1 -1

             ##### `ENABLE_NEXMON`=false
             Install and enable the [Source code for a C-based firmware patching framework for Broadcom/Cypress WiFi chips that enables you to write your own firmware patches, for example, to enable monitor mode with radiotap headers and frame injection](https://github.com/seemoo-lab/nexmon.git).
-            ##### `NEXMON_DIR`=""
+            ##### `NEXMONSRC_DIR`=""
             Path to a directory (`nexmon`) of [Source code for ARM side libraries for interfacing to Raspberry Pi GPU](https://github.com/raspberrypi/userland) that will be copied, configured, build and installed inside the chroot.
             ##### `ENABLE_IPTABLES`=false

bootstrap.d/13-kernel.sh 0 -1

                     as_nobody -H git -C "${temp_dir}" clone --depth=1 --branch "${KERNEL_BRANCH}" "${KERNEL_URL}" linux
                   fi
                 fi
                 # Copy downloaded kernel sources
                 cp -r "${temp_dir}/linux/"* "${KERNEL_DIR}"

bootstrap.d/15-rpi-config.sh +2 -2

             # Load utility functions
             . ./functions.sh
-            if [ "$BUILD_KERNEL" = true ] ; then
+            #if [ "$BUILD_KERNEL" = true ] ; then
               if [ -n "$RPI_FIRMWARE_DIR" ] && [ -d "$RPI_FIRMWARE_DIR" ] ; then
                 # Install boot binaries from local directory
                 cp "${RPI_FIRMWARE_DIR}"/boot/bootcode.bin "${BOOT_DIR}"/bootcode.bin
                 chown -R root:root "${BOOT_DIR}"
                 chmod -R 600 "${BOOT_DIR}"
               fi
-            fi
+            #fi
             # Setup firmware boot cmdline
             if [ "$ENABLE_UBOOTUSB" = true ] ; then

bootstrap.d/44-nexmon_monitor_patch.sh +15 -10

             . ./functions.sh
             if [ "$ENABLE_NEXMON" = true ] && [ "$ENABLE_WIRELESS" = true ]; then
+              # Copy existing nexmon sources into chroot directory
+              if [ -n "$NEXMONSRC_DIR" ] && [ -d "$NEXMONSRC_DIR" ] ; then
+                # Copy local U-Boot sources
+                cp -r "${NEXMONSRC_DIR}" "${R}/tmp"
+              else
                 # Create temporary directory for nexmon sources
                 temp_dir=$(as_nobody mktemp -d)
                 # Set permissions of the nexmon sources
                 chown -R root:root "${R}"/tmp/nexmon
-              # Set script Root
-              export NEXMON_ROOT="${R}"/tmp/nexmon
                 # Remove temporary directory for nexmon sources
                 rm -fr "${temp_dir}"
+              fi
+              # Set script Root
+              export NEXMON_ROOT="${R}"/tmp/nexmon
               # Build nexmon firmware outside the build system, if we can.
               cd "${NEXMON_ROOT}" || exit
+              # Make ancient isl build
+              cd buildtools/isl-0.10 || exit
+              CC="${CC}"gcc
+              ./configure
+              make
               # Disable statistics
               touch DISABLE_STATISTICS
               # Make nexmon
               make
-              # Make ancient isl build
-              cd buildtools/isl-0.10 || exit
-              CC="${CC}"gcc
-              ./configure
-              make
               # Backup stock broadcom wlan driver - "${LIB_DIR}"/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/broadcom/brcm80211/brcmfmac/brcmfmac.ko
               brcmfmac_path=$(modinfo brcmfmac | grep -m 1 -oP "^filename:(\s*?)(.*)$" | sed -e 's/^filename:\(\s*\)\(.*\)$/\2/g')
               mv "${brcmfmac_path}" "${brcmfmac_path}".orig

rpi23-gen-image.sh +9 -4

             ENABLE_NEXMON=${ENABLE_NEXMON:=false}
             VIDEOCORESRC_DIR=${VIDEOCORESRC_DIR:=""}
             FBTURBOSRC_DIR=${FBTURBOSRC_DIR:=""}
-            NEXMON_DIR=${NEXMON_DIR:=""}
+            NEXMONSRC_DIR=${NEXMONSRC_DIR:=""}
             ENABLE_HARDNET=${ENABLE_HARDNET:=false}
             ENABLE_IPTABLES=${ENABLE_IPTABLES:=false}
             ENABLE_SPLITFS=${ENABLE_SPLITFS:=false}
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} cmake"
             fi
+            # Add deps for nexmon
+            if [ "$ENABLE_NEXMON" = true ] ; then
+              REQUIRED_PACKAGES="${REQUIRED_PACKAGES},libgmp3-dev,gawk,qpdf,bison,flex,make,autoconf,automake,build-essential,libtool"
+            fi
             # Add libncurses5 to enable kernel menuconfig
             if [ "$KERNEL_MENUCONFIG" = true ] ; then
               REQUIRED_PACKAGES="${REQUIRED_PACKAGES} libncurses-dev"
               exit 1
             fi
-            # Check if specified NEXMON_DIR directory exists
+            # Check if specified NEXMONSRC_DIR directory exists
-            if [ -n "$NEXMON_DIR" ] && [ ! -d "$NEXMON_DIR" ] ; then
+            if [ -n "$NEXMONSRC_DIR" ] && [ ! -d "$NEXMONSRC_DIR" ] ; then
-              echo "error: '${NEXMON_DIR}' specified directory not found (NEXMON_DIR)!"
+              echo "error: '${NEXMONSRC_DIR}' specified directory not found (NEXMONSRC_DIR)!"
               exit 1
             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