Updated BAL3.4.9.6 ACCTON patch file name
Updated openolt agent version to 3.2.1
Change-Id: I81fdf2508fc6ebfacd1b7832f18742fab10d7bfe
diff --git a/BUILDING.md b/BUILDING.md
index 8a9283e..fa766e4 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -16,7 +16,7 @@
* `SW-BCM686OLT_3_4_9_6.tgz`
* `sdk-all-6.5.13.tar.gz`
-* `ACCTON_BAL_3.4.9.6-V202008310101.patch`. This is downloadable from the common CSP CS00003233745.
+* `ACCTON_BAL_3.4.9.6-V202012040101.patch`. This is downloadable from the common CSP CS00003233745.
> NOTE: the repository does not contain the above three source packages. These
> are needed to build the OpenOLT agent executable. Contact [Dave Baron at
@@ -120,7 +120,7 @@
```shell
cd <dir containing Broadcom source and patch files>
-cp ACCTON_BAL_3.4.9.6-V202008310101.patch SW-BCM686OLT_3_4_9_6.tgz sdk-all-6.5.13.tar.gz <cloned openolt repo path>/agent/download
+cp ACCTON_BAL_3.4.9.6-V202012040101.patch SW-BCM686OLT_3_4_9_6.tgz sdk-all-6.5.13.tar.gz <cloned openolt repo path>/agent/download
```
Run the configure script to generate the appropriate Makefile scaffolding for
diff --git a/VERSION b/VERSION
index 8ee49b2..e4604e3 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.2.1-dev
+3.2.1
diff --git a/agent/Makefile.in b/agent/Makefile.in
index b8000d3..7866c44 100644
--- a/agent/Makefile.in
+++ b/agent/Makefile.in
@@ -33,7 +33,7 @@
BAL_API_VER = $(BAL_MAJOR_VER).$(BAL_MINOR_VER).$(BAL_REV_A_VER).$(BAL_REV_B_VER)
BAL_VER = $(BAL_MAJOR_VER).$(BAL_MINOR_VER).$(BAL_REV_A_VER).$(BAL_REV_B_VER)
SDK_VER = 6.5.13
-DEV_VER ?= 202008310101
+DEV_VER ?= 202012040101
#
# Version of Open Network Linux (ONL).
ONL_KERN_VER_MAJOR = 4.14
diff --git a/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst b/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst
index 7f2928d..b7ae471 100644
--- a/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst
+++ b/agent/device/asfvolt16/mkdebian/debian/asfvolt16.postinst
@@ -17,7 +17,7 @@
rm -rf /opt/bcm68620
rm -rf /broadcom
-tar zxf /tmp/release_asfvolt16_V3.4.9.6.202008310101.tar.gz -C / 2>&1 > /dev/null
+tar zxf /tmp/release_asfvolt16_V3.4.9.6.202012040101.tar.gz -C / 2>&1 > /dev/null
grep -q '\/opt\/bcm68620\/svk_init.sh' /etc/rc.local || sed -i -e '$i \/opt\/bcm68620\/svk_init.sh' /etc/rc.local
rm -f /run/bcm68620
mkdir -p /opt/openolt && cp /tmp/watchdog/openolt_dev_mgmt_daemon_process_watchdog /opt/openolt && cp /tmp/watchdog/watchdog.config /opt/openolt
diff --git a/agent/device/asfvolt16/mkdebian/debian/changelog b/agent/device/asfvolt16/mkdebian/debian/changelog
index cf594d3..988f58d 100644
--- a/agent/device/asfvolt16/mkdebian/debian/changelog
+++ b/agent/device/asfvolt16/mkdebian/debian/changelog
@@ -1,6 +1,6 @@
-asfvolt16 (3.4.9.6+edgecore-V202008310101) stable; urgency=high
+asfvolt16 (3.4.9.6+edgecore-V202012040101) stable; urgency=high
* Based on code from SW-BCM686OLT_3_4_9_6.tgz.
- * Merged the Accton's fixed to ACCTON_BAL_3.4.9.6-V202008310101.patch.
+ * Merged the Accton's fixed to ACCTON_BAL_3.4.9.6-V202012040101.patch.
-- Jason Huang <jasonsc_huang@edge-core.com> Mon, 30 NOV 2020 01:01:03 +0800
diff --git a/agent/device/asfvolt16/mkdebian/debian/files b/agent/device/asfvolt16/mkdebian/debian/files
index 6c6932a..728e1ce 100644
--- a/agent/device/asfvolt16/mkdebian/debian/files
+++ b/agent/device/asfvolt16/mkdebian/debian/files
@@ -1 +1 @@
-asfvolt16_3.4.9.6+edgecore-V202008310101_amd64.deb misc optional
+asfvolt16_3.4.9.6+edgecore-V202012040101_amd64.deb misc optional
diff --git a/agent/device/asfvolt16/mkdebian/debian/rules b/agent/device/asfvolt16/mkdebian/debian/rules
index 61726b9..c952f58 100755
--- a/agent/device/asfvolt16/mkdebian/debian/rules
+++ b/agent/device/asfvolt16/mkdebian/debian/rules
@@ -26,7 +26,7 @@
override_dh_auto_install:
mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/tmp
- cp -a $(CURDIR)/debian/release_asfvolt16_V3.4.9.6.202008310101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
+ cp -a $(CURDIR)/debian/release_asfvolt16_V3.4.9.6.202012040101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libz.so.1 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libstdc++.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libbal_host_api.so $(DEB_DH_INSTALL_SOURCEDIR)/tmp
diff --git a/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst b/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst
index ca5f4c9..c930f7b 100644
--- a/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst
+++ b/agent/device/asgvolt64/mkdebian/debian/asgvolt64.postinst
@@ -17,7 +17,7 @@
rm -rf /opt/bcm68620
rm -rf /broadcom
-tar zxf /tmp/release_asgvolt64_V3.4.9.6.202008310101.tar.gz -C / 2>&1 > /dev/null
+tar zxf /tmp/release_asgvolt64_V3.4.9.6.202012040101.tar.gz -C / 2>&1 > /dev/null
grep -q '\/opt\/bcm68620\/svk_init.sh' /etc/rc.local || sed -i -e '$i \/opt\/bcm68620\/svk_init.sh' /etc/rc.local
rm -f /run/bcm68620
mkdir -p /opt/openolt && cp /tmp/watchdog/openolt_dev_mgmt_daemon_process_watchdog /opt/openolt && cp /tmp/watchdog/watchdog.config /opt/openolt
diff --git a/agent/device/asgvolt64/mkdebian/debian/changelog b/agent/device/asgvolt64/mkdebian/debian/changelog
index 317e3ee..5282661 100644
--- a/agent/device/asgvolt64/mkdebian/debian/changelog
+++ b/agent/device/asgvolt64/mkdebian/debian/changelog
@@ -1,6 +1,6 @@
-asgvolt64 (3.4.9.6+edgecore-V202008310101) stable; urgency=high
+asgvolt64 (3.4.9.6+edgecore-V202012040101) stable; urgency=high
* Based on code from SW-BCM686OLT_3_4_9_6.tgz.
- * Merged the Accton's fixed to ACCTON_BAL_3.4.9.6-V202008310101.patch.
+ * Merged the Accton's fixed to ACCTON_BAL_3.4.9.6-V202012040101.patch.
-- Jason Huang <jasonsc_huang@edge-core.com> Mon, 30 NOV 2020 01:01:03 +0800
diff --git a/agent/device/asgvolt64/mkdebian/debian/files b/agent/device/asgvolt64/mkdebian/debian/files
index 365a521..3617d2b 100644
--- a/agent/device/asgvolt64/mkdebian/debian/files
+++ b/agent/device/asgvolt64/mkdebian/debian/files
@@ -1 +1 @@
-asgvolt64_3.4.9.6+edgecore-V202008310101_amd64.deb misc optional
+asgvolt64_3.4.9.6+edgecore-V202012040101_amd64.deb misc optional
diff --git a/agent/device/asgvolt64/mkdebian/debian/rules b/agent/device/asgvolt64/mkdebian/debian/rules
index 58f1ecf..772857a 100755
--- a/agent/device/asgvolt64/mkdebian/debian/rules
+++ b/agent/device/asgvolt64/mkdebian/debian/rules
@@ -26,7 +26,7 @@
override_dh_auto_install:
mkdir -p $(DEB_DH_INSTALL_SOURCEDIR)/tmp
- cp -a $(CURDIR)/debian/release_asgvolt64_V3.4.9.6.202008310101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
+ cp -a $(CURDIR)/debian/release_asgvolt64_V3.4.9.6.202012040101.tar.gz $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libz.so.1 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libstdc++.so.6 $(DEB_DH_INSTALL_SOURCEDIR)/tmp
cp -a $(CURDIR)/debian/libbal_host_api.so $(DEB_DH_INSTALL_SOURCEDIR)/tmp