Skip to content

GitLab

E
easycwmp
Commit 5456532a authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated easycwmp to 1.8.6

parent 25312e52
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
Makefile
View file @ 5456532a
all: easycwmp-service device-info easycwmp-config all: easycwmp-service device-info easycwmp-config
tar xf EasyCwmp-1.8.1.tar.gz tar xf easycwmp-1.8.6.tar.gz
patch -Np1 -d easycwmp-EasyCwmp-1.8.1 < easycwmp-1.8.1-blank_device.patch patch -Np1 -d easycwmp-1.8.6 < easycwmp-1.8.6-blank_device.patch
cd easycwmp-EasyCwmp-1.8.1 && autoreconf -i cd easycwmp-1.8.6 && autoreconf -i
cd easycwmp-EasyCwmp-1.8.1 && ./configure --prefix=/usr --enable-jsonc=1 cd easycwmp-1.8.6 && ./configure --prefix=/usr --enable-jsonc=1
$(MAKE) -C easycwmp-EasyCwmp-1.8.1 $(MAKE) -C easycwmp-1.8.6
$(MAKE) -C easycwmp-EasyCwmp-1.8.1 install $(MAKE) -C easycwmp-1.8.6 install
install -v -Dm755 -d /usr/share/easycwmp/functions install -v -Dm755 -d /usr/share/easycwmp/functions
install -v -Dm755 -d /etc/easycwmp install -v -Dm755 -d /etc/easycwmp
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh /usr/sbin/easycwmp install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh /usr/sbin/easycwmp
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/defaults /usr/share/easycwmp/defaults install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/defaults /usr/share/easycwmp/defaults
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/common/common /usr/share/easycwmp/functions/common install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/common/common /usr/share/easycwmp/functions/common
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/common/device_info /usr/share/easycwmp/functions/device_info install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info /usr/share/easycwmp/functions/device_info
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/common/management_server /usr/share/easycwmp/functions/management_server install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/common/management_server /usr/share/easycwmp/functions/management_server
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/common/ipping_launch /usr/share/easycwmp/functions/ipping_launch install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/common/ipping_launch /usr/share/easycwmp/functions/ipping_launch
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/tr181/root /usr/share/easycwmp/functions/root install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/tr181/root /usr/share/easycwmp/functions/root
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/tr181/ip /usr/share/easycwmp/functions/ip install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/tr181/ip /usr/share/easycwmp/functions/ip
install -v -Dm755 easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/tr181/ipping_diagnostic /usr/share/easycwmp/functions/ipping_diagnostic install -v -Dm755 easycwmp-1.8.6/ext/openwrt/scripts/functions/tr181/ipping_diagnostic /usr/share/easycwmp/functions/ipping_diagnostic
install -v -Dm755 ip /usr/share/easycwmp/functions/ip install -v -Dm755 ip /usr/share/easycwmp/functions/ip
install -v -Dm755 ssh /usr/share/easycwmp/functions/ssh install -v -Dm755 ssh /usr/share/easycwmp/functions/ssh
install -v -Dm755 easycwmp-init-device-info /usr/sbin/easycwmp-init-device-info install -v -Dm755 easycwmp-init-device-info /usr/sbin/easycwmp-init-device-info
...@@ -25,7 +25,7 @@ all: easycwmp-service device-info easycwmp-config ...@@ -25,7 +25,7 @@ all: easycwmp-service device-info easycwmp-config
tar xf ../openwrt/openwrt.tar.xz -C / tar xf ../openwrt/openwrt.tar.xz -C /
@echo "$$EASYCWMP_SERVICE" > /lib/systemd/system/easycwmpd.service @echo "$$EASYCWMP_SERVICE" > /lib/systemd/system/easycwmpd.service
ln -s /lib/systemd/system/easycwmpd.service /etc/systemd/system/multi-user.target.wants/easycwmpd.service ln -s /lib/systemd/system/easycwmpd.service /etc/systemd/system/multi-user.target.wants/easycwmpd.service
rm -rf easycwmp-EasyCwmp-1.8.1 rm -rf easycwmp-1.8.6
easycwmp-service: easycwmp-service:
define EASYCWMP_SERVICE define EASYCWMP_SERVICE
......
easycwmp-1.8.1-blank_device.patch → easycwmp-1.8.6-blank_device.patch
View file @ 5456532a
diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh easycwmp-EasyCwmp-1.8.1-blank_device/ext/openwrt/scripts/easycwmp.sh diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh
--- easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh 2019-06-24 19:29:07.000000000 +0930 --- easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh 2019-12-17 21:33:19.000000000 +1030
+++ easycwmp-EasyCwmp-1.8.1-blank_device/ext/openwrt/scripts/easycwmp.sh 2019-09-15 22:50:09.046556997 +0930 +++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh 2021-06-20 12:38:28.222312349 +0930
@@ -399,11 +399,7 @@ @@ -399,11 +399,7 @@
return return
fi fi
...@@ -14,9 +14,9 @@ diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh easycwmp-EasyC ...@@ -14,9 +14,9 @@ diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh easycwmp-EasyC
sync sync
reboot reboot
fi fi
diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-EasyCwmp-1.8.1-blank_device/ext/openwrt/scripts/easycwmp.sh.orig diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh.orig
--- easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh.orig 1970-01-01 09:30:00.000000000 +0930 --- easycwmp-1.8.6/ext/openwrt/scripts/easycwmp.sh.orig 1970-01-01 09:30:00.000000000 +0930
+++ easycwmp-EasyCwmp-1.8.1-blank_device/ext/openwrt/scripts/easycwmp.sh.orig 2019-06-24 19:29:07.000000000 +0930 +++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/easycwmp.sh.orig 2021-06-20 12:38:28.223312352 +0930
@@ -0,0 +1,540 @@ @@ -0,0 +1,540 @@
+#!/bin/sh +#!/bin/sh
+# Copyright (C) 2012-2014 PIVA Software <www.pivasoftware.com> +# Copyright (C) 2012-2014 PIVA Software <www.pivasoftware.com>
...@@ -558,9 +558,9 @@ diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh.orig easycwmp- ...@@ -558,9 +558,9 @@ diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/easycwmp.sh.orig easycwmp-
+ fi + fi
+} +}
+handle_action 2>/dev/null +handle_action 2>/dev/null
diff -uNr easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/common/device_info easycwmp-EasyCwmp-1.8.1-blank_device/ext/openwrt/scripts/functions/common/device_info diff -uNr easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info easycwmp-1.8.6-blank_device/ext/openwrt/scripts/functions/common/device_info
--- easycwmp-EasyCwmp-1.8.1/ext/openwrt/scripts/functions/common/device_info 2019-06-24 19:29:07.000000000 +0930 --- easycwmp-1.8.6/ext/openwrt/scripts/functions/common/device_info 2019-12-17 21:33:19.000000000 +1030
+++ easycwmp-EasyCwmp-1.8.1-blank_device/ext/openwrt/scripts/functions/common/device_info 2019-09-15 22:50:09.046556997 +0930 +++ easycwmp-1.8.6-blank_device/ext/openwrt/scripts/functions/common/device_info 2021-06-20 12:38:28.223312352 +0930
@@ -25,11 +25,12 @@ @@ -25,11 +25,12 @@
common_execute_method_param "$DMROOT.DeviceInfo.SerialNumber" "0" "$UCI_GET easycwmp.@device[0].serial_number" "" "" "1" common_execute_method_param "$DMROOT.DeviceInfo.SerialNumber" "0" "$UCI_GET easycwmp.@device[0].serial_number" "" "" "1"
common_execute_method_param "$DMROOT.DeviceInfo.HardwareVersion" "0" "$UCI_GET easycwmp.@device[0].hardware_version" "" "" "1" common_execute_method_param "$DMROOT.DeviceInfo.HardwareVersion" "0" "$UCI_GET easycwmp.@device[0].hardware_version" "" "" "1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment