buildimg/downloadfiles: update kernel and add own build hostapd

Author: frank-w

buildimg.sh

@@ -44,7 +44,8 @@ case "$board" in
 esac
 
 if [[  "$board" == "bpi-r4" ]]; then
-	kernel="6.10" #r4 does not have LTS support yet
+	kernel="6.11" #r4 does not have LTS support yet
+	echo "replacehostapd=1" >> sourcefiles_${board}.conf
 fi
 
 if [[ -n "$3" ]] && [[ "$3" =~ ^[1-9]\.[0-9]+$ ]];then kernel=$3;fi
@@ -192,6 +193,12 @@ if [[ ${board} != "bpi-r2pro" ]];then
 		#add wifi.sh to rc.local (autostart)
 		sed -i '/^exit/s/^/\/usr\/sbin\/wifi.sh &\n/' $targetdir/etc/rc.local
 	else
+		if [[ -n "$replacehostapd" ]];then
+			tar -tzf $hostapdfile #currently only show content
+			echo "unpack hostapd to bpi-root loopdev..."
+			sudo tar -xzf $hostapdfile -C mnt/BPI-ROOT/usr/local/sbin/
+			ls -lh mnt/BPI-ROOT/usr/local/sbin/
+		fi
 		sudo chroot $targetdir bash -c "ln -fs hostapd_wlan0.conf /etc/hostapd/hostapd.conf"
 	fi
 	#copy firmware

downloadfiles.py

@@ -52,6 +52,7 @@ def download(url, file_name=None):
 
 uboot_release_url="https://api.github.com/repos/frank-w/u-boot/releases/latest"
 kernel_releases_url="https://api.github.com/repos/frank-w/BPI-Router-Linux/releases"
+bin_releases_url="https://api.github.com/repos/frank-w/arm-crosscompile/releases"
 
 uboot_data=download(uboot_release_url)
 uj=json.loads(uboot_data)
@@ -103,6 +104,24 @@ def download(url, file_name=None):
             #print("release-data:",json.dumps(rel,indent=2))
     #print("files:",json.dumps(kfiles,indent=2))
 
+bin_releases=download(bin_releases_url)
+brj=json.loads(bin_releases)
+
+if brj:
+    bfiles={}
+    for rel in brj:
+        bname=rel.get("name")
+
+        for f in rel.get("assets"):
+            fname=f.get("name")
+
+            if not fname in bfiles:
+                if re.search(r"^(hostapd|iproute2).*\.tar.gz$",fname):
+                    #fn=re.sub(boardpattern,r'\1',kfname)
+                    bfiles[fname]=f.get("browser_download_url")
+
+print("binfiles:",bfiles)
+
 ufile=None
 kfile=None
 
@@ -149,6 +168,23 @@ def download(url, file_name=None):
     newconfig["kernelfile"]=fname
 else: print("no kernel defined!")
 
+
+if config and config.get("replacehostapd"):
+    newconfig["replacehostapd"]=config.get("replacehostapd")
+
+    if bfiles:
+        hostapdfile=bfiles.get("hostapd_arm64.tar.gz")
+        a = urlparse(hostapdfile)
+        fname=os.path.basename(a.path)
+        print(f"hostapdfile: {hostapdfile} filename: {fname}")
+        if not os.path.isfile(fname):
+            download(hostapdfile,fname)
+        else: print(fname,"already exists")
+        newconfig["hostapdfile"]=fname
+    else: print("no bfiles defined!")
+
+
+
 with open(conffile, 'w') as f:
     for d in newconfig:
         s=d+'='+newconfig[d]