diff --git a/bcmkernel/scripts/bcm_git.sh b/bcmkernel/scripts/bcm_git.sh index 325eada03aca8461dc1b519be4eb40b90600072b..9d73a0c29c63cb22d454d9f4b9b8464019b4e0c3 100755 --- a/bcmkernel/scripts/bcm_git.sh +++ b/bcmkernel/scripts/bcm_git.sh @@ -184,7 +184,7 @@ import_module() done ) ;; - wlan-all-src-*|wlan-bin-all-*) + wlan-all-src-*|wlan-bin-all-*|wifi_sdkdeps-*) # WLAN binaries and sources are versioned separately. So, the "module" is something # like wlan-all-src-17.10.157.2802 for a tarball like wlan-all-src-17.10.157.2802.cpe5.04L.02.tgz. # There can be multiple WLAN drivers implementations (impls) applied to the same release. @@ -199,6 +199,7 @@ import_module() # wlan tarballs are to be extracted over the existing tree (minus the readme, if it exists) rm -f $repo/git_tmp/readme.txt + rm -f $repo/git_tmp/INSTALL-src-wifi.txt # move the files rsync -a "$repo/git_tmp/" "$repo/bcm963xx/" # sometimes they also include patches @@ -210,6 +211,23 @@ import_module() echo "No bsp-patches script $apply_bsp_patch_script found." fi + ;; + wifi_src-*) + # The new wifi src packages from 5.04L.03 onwards will only contain the impl src files for the + # corresponding impl delivered in the wifi_sdkdeps tarball. + # These are to be applied after the wifi_sdkdeps tarball. + + # determine which impl this tarball contains (for commit message with parentheses and trailing space) + shopt -s failglob + impl=$(cd $repo/git_tmp && echo .impl*) + impl=${impl:1} + wlan_impl_hint="(wl $impl) " + shopt -u failglob + echo "$module contains wl driver source for $impl" + + # move the files + rsync -a --mkpath "$repo/git_tmp/" "$repo/bcm963xx/bcmdrivers/broadcom/net/wl/$impl/" + ;; *) echo -e "\t ${module} from ${tar} not supported" @@ -305,10 +323,14 @@ add_release () for module in $bcm_modules do case "$module" in - wlan-all-src-* | wlan-bin-all-*) + wlan-all-src-* | wlan-bin-all-* | wifi_sdkdeps-*) # WiFi drivers have their own naming convention like wlan-all-src-17.10.157.2802.cpe5.04L.02.tgz. tar="${module}.cpe${version}.tgz" ;; + wifi_src-*) + # New WiFi drivers from 5.04L.03 onwards have slightly different naming convention + tar="${module}.tgz" + ;; *) tar="bcm963xx_${version}_${module}.tar.gz" ;;