Skip to content

Commit

Permalink
[radvd] No longer build from source; Install vanilla Debian package o…
Browse files Browse the repository at this point in the history
…nce again (sonic-net#5242)

Remove radvd Makefile and patch, change docker-router-advertiser Dockerfile template to simply install the vanilla radvd package using apt-get.

- In PR sonic-net#2795, we started building radvd from source and patching it to prevent it from erroring out when advertising an MTU of 9100 which was greater than the MTU size configured on the bridge interface (1500), which was due to a limitation in the 4.9 Linux kernel.
- Master branch is now using Linux kernel 4.19. As of 4.18, the kernel supports setting a bridge MTU to a value > 1500.
- PR sonic-net/sonic-swss#1393 modified vlanmgrd to take advantage of this and now configures the MTU of bridge interfaces in SONiC to the proper size of 9100. Therefore, we no longer need to patch radvd. Since we no longer need to patch radvd, we no longer need to build it from source, so we can save build time by going back to simply installing the vanilla radvd Debian package in the router-advertiser container.
  • Loading branch information
jleveque authored and santhosh-kt committed Feb 25, 2021
1 parent 95bd4d3 commit 7fa0925
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 99 deletions.
3 changes: 3 additions & 0 deletions dockers/docker-router-advertiser/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ENV DEBIAN_FRONTEND=noninteractive
# Update apt's cache of available packages
RUN apt-get update

# Install radvd Debian package
RUN apt-get -y install radvd=1:2.17-2

{% if docker_router_advertiser_debs.strip() -%}
# Copy built Debian packages
{{ copy_files("debs/", docker_router_advertiser_debs.split(' '), "/debs/") }}
Expand Down
1 change: 0 additions & 1 deletion rules/docker-router-advertiser.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ DOCKER_ROUTER_ADVERTISER_DBG = $(DOCKER_ROUTER_ADVERTISER_STEM)-$(DBG_IMAGE_MARK

$(DOCKER_ROUTER_ADVERTISER)_PATH = $(DOCKERS_PATH)/$(DOCKER_ROUTER_ADVERTISER_STEM)

$(DOCKER_ROUTER_ADVERTISER)_DEPENDS += $(RADVD)
$(DOCKER_ROUTER_ADVERTISER)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
$(DOCKER_ROUTER_ADVERTISER)_DBG_DEPENDS += $(RADVD_DBG)

Expand Down
10 changes: 0 additions & 10 deletions rules/radvd.dep

This file was deleted.

17 changes: 0 additions & 17 deletions rules/radvd.mk

This file was deleted.

4 changes: 0 additions & 4 deletions src/radvd/.gitignore

This file was deleted.

32 changes: 0 additions & 32 deletions src/radvd/Makefile

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions src/radvd/patch/series

This file was deleted.

0 comments on commit 7fa0925

Please sign in to comment.