Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging onto pre-release #330

Merged
merged 25 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
38c0cf6
[~] Update to the Readme page to address #303 and #297
alienatedsec Oct 9, 2023
405862e
Add ptz functions to ipc_cmd
roleoroleo Jan 24, 2024
599e224
Move preset.sh code to ptz_presets.sh
roleoroleo Jan 25, 2024
516bd32
Add add/delete ptz presets
roleoroleo Jan 25, 2024
fe3cb7d
Add ipc2file: create a tmp file when an event is triggered
roleoroleo Jan 25, 2024
39f67ce
Add configuration file editing
roleoroleo Jan 25, 2024
6a15142
Add new parameters
roleoroleo Jan 25, 2024
2fb0fbe
Use generic command for ipc_cmd
roleoroleo Jan 25, 2024
677e5e3
Add onvif_simple_server submodule
roleoroleo Jan 25, 2024
f42d514
Patch httpd to run onvif as a cgi
roleoroleo Jan 25, 2024
e258274
Remove onvif_srvd and add onvif_simple_server sharing port 80 with httpd
roleoroleo Jan 26, 2024
053e47f
Update .gitignore
roleoroleo Jan 26, 2024
e5062db
Remove wsdd submodule
roleoroleo Jan 26, 2024
06e5c1f
Fix installation path
roleoroleo Jan 26, 2024
7021fa0
Replace symlinks with .sh
roleoroleo Jan 26, 2024
867371a
Add -t parameter to imggrabber
roleoroleo Jan 26, 2024
afb3f0c
Update onvif_simple_server to the last commit
roleoroleo Jan 27, 2024
40b9ace
Enable packing of rootfs and home
roleoroleo Jan 31, 2024
b96d835
Remove busybox submodule
roleoroleo Jan 31, 2024
4ae48df
Add busybox 1.36.1
roleoroleo Jan 31, 2024
1ecf7be
Minor fixes
roleoroleo Jan 31, 2024
7b2a9ba
Fix syntax error in system_init.sh
roleoroleo Jan 31, 2024
bd032dd
[+] Merge conflicts resolved
alienatedsec Jan 31, 2024
da803b6
[+] Merge conflict commits part 2
alienatedsec Jan 31, 2024
b8eab19
[~] Update to init.busybox
alienatedsec Jan 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Minor fixes
  • Loading branch information
roleoroleo committed Jan 31, 2024
commit 1ecf7beeff1f896022c85ee760c0e560be25c3bd
4 changes: 2 additions & 2 deletions src/libfuse/compile.libfuse
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ ninja || exit 1

rsync -av lib/libfuse3.so* ../../_install/lib/ || exit 1

arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/* || exit 1

arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2 || exit 1
arm-hisiv300-linux-uclibcgnueabi-strip ../../_install/lib/libfuse3.so.3.4.2.p/*.o || exit 1
1 change: 0 additions & 1 deletion src/onvif_simple_server/compile.onvif_simple_server
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ mkdir -p ../_install/bin || exit 1
mkdir -p ../_install/etc/onvif_notify_server || exit 1
mkdir -p ../_install/etc/wsd_simple_server || exit 1

cp ./onvif_simple_server ../_install/www/onvif || exit 1
cp ./onvif_simple_server ../_install/www/onvif || exit 1
echo "#!/tmp/sd/yi-hack-v5/www/onvif/onvif_simple_server" > ../_install/www/onvif/device_service
chmod 0755 ../_install/www/onvif/device_service
Expand Down
2 changes: 1 addition & 1 deletion src/rRTSPServer/init.rRTSPServer
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ fi
tar zxvf $ARCHIVE

patch -p0 < rRTSPServer.patch
patch -p0 < rRTSPServer2.patch
#patch -p0 < rRTSPServer2.patch

cd live || exit 1

Expand Down
2 changes: 0 additions & 2 deletions src/static/static/home/yi-hack-v5/script/system.sh
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,6 @@ mkdir -p $YI_HACK_PREFIX/etc/dropbear
dropbear -R -B
fi

ipc_multiplexer &

mqttv4 &
if [[ $(get_config MQTT) == "yes" ]] ; then
mqtt-config &
Expand Down