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.

Sign up for GitHub

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

OPENOLT_PROTO_VER updated to 5.4.6, applying debian stretch mirror patch #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OPENOLT_PROTO_VER updated to 5.4.6, applying debian stretch mirror patch #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ tag/branch corresponding to that specific version:
make OPENOLTDEVICE=asfvolt16 OPENOLT_PROTO_VER=master
```

By default, the `OPENOLT_PROTO_VER` defaults to git tag *v5.2.1* of the
By default, the `OPENOLT_PROTO_VER` defaults to git tag *v5.4.6* of the
[voltha-protos](https://gerrit.opencord.org/gitweb?p=voltha-protos.git;a=summary)
repo.

Expand Down Expand Up @@ -333,7 +333,7 @@ tag/branch corresponding to that specific version:
make OPENOLTDEVICE=rlt-3200g-w OPENOLT_PROTO_VER=master
```

By default, the `OPENOLT_PROTO_VER` defaults to git tag *v5.2.1* of the
By default, the `OPENOLT_PROTO_VER` defaults to git tag *v5.4.6* of the
[voltha-protos](https://gerrit.opencord.org/gitweb?p=voltha-protos.git;a=summary)
repo.

Expand Down Expand Up @@ -431,7 +431,7 @@ tag/branch corresponding to that specific version:
make OPENOLTDEVICE=sda3016ss OPENOLT_PROTO_VER=master
```

By default, the `OPENOLT_PROTO_VER` defaults to git tag *v5.2.1* of the
By default, the `OPENOLT_PROTO_VER` defaults to git tag *v5.4.6* of the
[voltha-protos](https://gerrit.opencord.org/gitweb?p=voltha-protos.git;a=summary)
repo.

Expand Down
3 changes: 2 additions & 1 deletion agent/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SDK_VER = 6.5.21
# This specifies the GIT tag in https://github.com/opencord/voltha-protos
# repo that we need to refer to, to pick the right version of
# openolt.proto and tech_profile.proto
OPENOLT_PROTO_VER ?= v5.2.1
OPENOLT_PROTO_VER ?= v5.4.6

# Variables used for Inband build
INBAND = "n"
Expand Down Expand Up @@ -159,6 +159,7 @@ onl:
cp download/Makefile.onl $(ONL_DIR)/Makefile; \
install -m 755 download/build-onl.sh $(ONL_DIR)/OpenNetworkLinux; \
cp download/disable-certificate-validation*.patch $(ONL_DIR)/OpenNetworkLinux; \
cp download/debian_stretch_mirror.patch $(ONL_DIR)/OpenNetworkLinux; \
if [ "$(OPENOLTDEVICE)" = "rlt-3200g-w" ] || [ "$(OPENOLTDEVICE)" = "rlt-1600g-w" ] || [ "$(OPENOLTDEVICE)" = "rlt-1600x-w" ]; \
then \
cp $(TOP_DIR)/device/$(OPENOLTDEVICE)/update_kernel_options.sh $(ONL_DIR)/OpenNetworkLinux/.; \
Expand Down
5 changes: 3 additions & 2 deletions agent/download/Makefile.onl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RLT_COMMIT_ID = 72b95a7
INBAND = "n"
BOARD = ""


onl-4.14:
if [ $(INBAND) = y ]; then \
cd OpenNetworkLinux && git checkout -B $@ $(COMMIT_ID) && git pull origin pull/822/head -ff -q --no-edit && git apply disable-certificate-validation-v$(COMMIT_ID).patch && git apply inband-$(COMMIT_ID).patch && docker/tools/onlbuilder --non-interactive -8 -c ./build-onl.sh; \
Expand All @@ -25,7 +26,7 @@ onl-4.14:
fi;
onl-4.19:
if [ "$(BOARD)" = "rlt-3200g-w" ] || [ "$(BOARD)" = "rlt-1600g-w" ] || [ "$(BOARD)" = "rlt-1600x-w" ]; then \
cd OpenNetworkLinux && git stash && git checkout -B $@ $(RLT_COMMIT_ID) && git apply disable-certificate-validation-v$(RLT_COMMIT_ID).patch && bash update_kernel_options.sh && docker/tools/onlbuilder --non-interactive -9 -c ./build-onl.sh; \
cd OpenNetworkLinux && git stash && git checkout -B $@ $(RLT_COMMIT_ID) && git apply disable-certificate-validation-v$(RLT_COMMIT_ID).patch && bash update_kernel_options.sh && git apply debian_stretch_mirror.patch && docker/tools/onlbuilder --non-interactive -9 -c ./build-onl.sh; \
else \
cd OpenNetworkLinux && git stash && git checkout -B $@ $(COMMIT_ID) && git pull origin pull/822/head -ff -q --no-edit && git apply disable-certificate-validation-v$(COMMIT_ID).patch && docker/tools/onlbuilder --non-interactive -9 -c ./build-onl.sh; \
cd OpenNetworkLinux && git stash && git checkout -B $@ $(COMMIT_ID) && git pull origin pull/822/head -ff -q --no-edit && git apply disable-certificate-validation-v$(COMMIT_ID).patch && git apply debian_stretch_mirror.patch && docker/tools/onlbuilder --non-interactive -9 -c ./build-onl.sh; \
fi;
13 changes: 13 additions & 0 deletions agent/download/debian_stretch_mirror.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/tools/onlrfs.py b/tools/onlrfs.py
index a9a4cb5d..051259d0 100755
--- a/tools/onlrfs.py
+++ b/tools/onlrfs.py
@@ -302,7 +302,7 @@ class OnlRfsBuilder(object):

DEFAULTS = dict(
DEBIAN_SUITE='wheezy',
- DEBIAN_MIRROR='mirrors.kernel.org/debian/',
+ DEBIAN_MIRROR='archive.debian.org/debian/',
APT_CACHE='127.0.0.1:3142/'
)