Merge pull request #341 from alienatedsec/pre-release-0.4.1x

Pre release 0.4.1x

Author: alienatedsec

.gitmodules

@@ -6,10 +6,6 @@
 	path = src/uClibc/uClibc
 	url = https://github.com/kraj/uClibc.git
 	ignore = dirty
-[submodule "src/busybox/busybox"]
-	path = src/busybox/busybox
-	url = https://github.com/mirror/busybox.git
-	ignore = dirty
 [submodule "src/proxychains-ng/proxychains-ng"]
 	path = src/proxychains-ng/proxychains-ng
 	url = https://github.com/rofl0r/proxychains-ng.git
@@ -26,10 +22,6 @@
 	path = src/mosquitto/mosquitto
 	url = https://github.com/eclipse/mosquitto.git
 	ignore = dirty
-[submodule "src/wsdd/wsdd"]
-	path = src/wsdd/wsdd
-	url = https://github.com/KoynovStas/wsdd.git
-	ignore = dirty
 [submodule "src/libfuse/libfuse"]
 	path = src/libfuse/libfuse
 	url = https://github.com/libfuse/libfuse.git
@@ -42,3 +34,6 @@
 	path = src/curl/curl
 	url = https://github.com/curl/curl
 	ignore = dirty
+[submodule "src/onvif_simple_server/onvif_simple_server"]
+	path = src/onvif_simple_server/onvif_simple_server
+	url = https://github.com/roleoroleo/onvif_simple_server

README.md

@@ -15,7 +15,7 @@
 The answer is simple: missing updates, RTSP, and not based on the latest stock firmware (which features improvements and new cool stuff).
 Besides, there were no updates to `yi-hack-v4`, and I am against that RTSP licensing model. I have contributed enough and will continue my work separately.
 
-I am slowly releasing beta versions, and I can see lots of downloads, testing and contributions. A big thank you to the community.
+I am slowly working on pre-release versions, and I can see lots of downloads, testing and contributions. A big thank you to the community.
 
 ## Table of Contents
 
@@ -109,7 +109,7 @@ Alternative way:
 
 </p></details>
 
-3. Get the correct firmware files for your camera from the latest baseline release link: https://github.com/alienatedsec/yi-hack-v5/releases/tag/0.3.8
+3. Get the correct firmware files for your camera from the latest baseline release link: https://github.com/alienatedsec/yi-hack-v5/releases/tag/0.4.1
 
 | Camera | rootfs partition | home partition | Remarks |
 | --- | --- | --- | --- |
@@ -138,7 +138,7 @@ Depending upon your network setup, accessing the web interface with the hostname
 
 This can be done from the App. Please open the app, and go to the Camera Settings --> Network Info --> IP Address.
 
-Access the web interface by entering the IP address of the camera in a web browser. e.g. `http://192.168.1.5:8080`
+Access the web interface by entering the IP address of the camera in a web browser. e.g. `http://192.168.1.5`
 
 **_IMPORTANT: If you have multiple cameras. It is important to configure each camera with a unique hostname. Otherwise, the web interface will only be accessible by IP address._**
 

VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1g

scripts/compile.sh

@@ -39,6 +39,7 @@ compile_module()
     printf "MOD_COMPILE:    %s\n" "$MOD_COMPILE"
     printf "MOD_INSTALL:    %s\n" "$MOD_INSTALL"
 
+    echo "Compile $MOD_NAME"
     cd "$MOD_DIR"
 
     if [ ! -f $MOD_INIT ]; then
@@ -89,10 +90,22 @@ mkdir -p "$(get_script_dir)/../build/home"
 mkdir -p "$(get_script_dir)/../build/rootfs"
 
 SRC_DIR=$(get_script_dir)/../src
+SELECTED_MODULE=$1
+if [ -n ${SELECTED_MODULE} ]; then
+    echo "SELECTED_MODULE: $SELECTED_MODULE"
+fi
 
 for SUB_DIR in $SRC_DIR/* ; do
     if [ -d ${SUB_DIR} ]; then # Will not run if no directories are available
-        compile_module $(normalize_path "$SUB_DIR") || exit 1
+        if [ -n ${SELECTED_MODULE} ]; then
+            if [[ $SUB_DIR == *"$SELECTED_MODULE"* ]]; then
+                compile_module $(normalize_path "$SUB_DIR") || exit 1
+            else
+                echo "Skip $SUB_DIR"
+            fi
+        else
+            compile_module $(normalize_path "$SUB_DIR") || exit 1
+        fi
     fi
 done
 

scripts/pack_fw.sh

@@ -3,7 +3,7 @@
 #
 #  This file is part of yi-hack-v5 (https://github.com/alienatedsec/yi-hack-v5).
 #  Copyright (c) 2018-2019 Davide Maggioni - v4 specific
-#  Copyright (c) 2021-2023 alienatedsec - v5 specific
+#  Copyright (c) 2021-2024 alienatedsec - v5 specific
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -206,6 +206,10 @@ compress_file "$TMP_DIR/home/app" cloudAPI
 compress_file "$TMP_DIR/home/app" oss
 compress_file "$TMP_DIR/home/app" p2p_tnp
 compress_file "$TMP_DIR/home/app" rmm
+compress_file "$TMP_DIR/home/base/tools" wpa_supplicant
+compress_file "$TMP_DIR/home/base/tools" wpa_passphrase
+compress_file "$TMP_DIR/home/base/tools" wpa_cli
+compress_file "$TMP_DIR/home/lib" libcrypto.so.1.1
 
 # Compress the yi-hack-v5 folder
 printf "Compressing yi-hack-v5... "
@@ -223,18 +227,24 @@ rm $TMP_DIR/home/yi-hack-v5/yi-hack-v5.7z
 echo "Deleteing of yi-hack-v5.7z - done!"
 
 # Delete all the compressed files except system_init.sh and yi-hack-v5.7z
+#find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
 find $TMP_DIR/home/yi-hack-v5/script/ -maxdepth 0 ! -name 'system_init.sh' -type f -exec rm -f {} +
-find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! -name 'script' -exec rm -rf {} +
+find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type d ! \( -name 'script' -o -name 'etc' -o -name 'lib' \) -exec rm -rf {} \;
+find $TMP_DIR/home/yi-hack-v5/lib/ -type f ! -name 'ipc_multiplex.so' -exec rm -f {} \;
 find $TMP_DIR/home/yi-hack-v5/* -maxdepth 0 -type f ! -name 'version' -exec rm {} +
+
+# Delete the old wpa_supplicant upgrade file from the image so it wont override the release version
+find $TMP_DIR/home/app/ -type f -name 'wpa_supplicant' -exec rm -f {} \;
+
 printf "done!\n\n"
 
 # home
 # Disabled after 0.3.8
-#pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
+pack_image "home" $CAMERA_ID $TMP_DIR $OUT_DIR
 
 # rootfs
 # Disabled after 0.3.8
-#pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
+pack_image "rootfs" $CAMERA_ID $TMP_DIR $OUT_DIR
 
 # pack files for release
 pack_files $WORK_DIR $CAMERA_NAME $VERSION_ID
@@ -247,4 +257,3 @@ printf "done!\n\n"
 echo "------------------------------------------------------------------------"
 echo " Finished!"
 echo "------------------------------------------------------------------------"
-