fixup build

Author: daniel-noland

Dockerfile

@@ -1,4 +1,9 @@
 ARG IMAGE=scratch
+FROM ${IMAGE} AS frr
+# size reduction hack
+RUN for frr in /nix/store/*-frr-*; do \
+  ln -s "${frr}" "$(sed 's|/nix/store/.*-\(.*-frr-.*\)|/nix/store/\1|' <<<"${frr}")"; \
+done
 FROM ${IMAGE} as doc-env
 FROM ${IMAGE} as compile-env
 

default.nix

@@ -164,9 +164,6 @@
       rtrlib = (optimizedBuild super.rtrlib).overrideAttrs(orig: {
         cmakeFlags = (orig.cmakeFlags or []) ++ [ "-DENABLE_STATIC=1" ];
       });
-      c-ares = (optimizedBuild super.c-ares).overrideAttrs(orig: {
-        cmakeFlags = (orig.cmakeFlags or []) ++ [ "-DCARES_STATIC=ON" ];
-      });
       abseil-cpp = (optimizedBuild super.abseil-cpp);
       protobuf_25 = (optimizedBuild super.protobuf_25).overrideAttrs(orig: {
         cmakeFlags = (orig.cmakeFlags or []) ++ [ "-Dprotobuf_BUILD_SHARED_LIBS=OFF" ];
@@ -422,13 +419,14 @@
         contents = (map clearDeps (with pkgs.release.gnu64; [
           bash
           coreutils
+          frr
           glibc.bin
           glibc.out
           gnugrep
+          gnused
           libxcrypt
           ncurses
           readline
-          frr
         ])) ++ [ initfrr ];
         config = {
           Env = [

justfile

@@ -70,6 +70,8 @@ _doc_env_container_name := container_repo + "/doc-env"
 
 _compile_env_container_name := container_repo + "/compile-env"
 
+_frr_container_name := container_repo + "/frr"
+
 # This is a unique identifier for the build.
 # We temporarily tag our containers with this id so that we can be certain that we are
 # not retagging or pushing some other container.
@@ -117,6 +119,11 @@ _nix_build attribute:
 build-sysroot: (_nix_build "sysroots") (_nix_build "env.sysroot.gnu64.dev") (_nix_build "env.sysroot.gnu64.release") (_nix_build "env.sysroot.musl64.dev") (_nix_build "env.sysroot.musl64.release") (_nix_build "sysroot")
     {{ _just_debug_ }}
 
+# Build FRR
+[script]
+build-frr: (_nix_build "pkgs.release.gnu64.frr")
+    {{ _just_debug_ }}
+
 # Builds and post processes a container from the nix build
 [private]
 [script]
@@ -180,8 +187,11 @@ build-doc-env-container: (_build-container "doc-env" _doc_env_container_name)
 # Build and tag the compile-env container
 build-compile-env-container: (_build-container "compile-env" _compile_env_container_name)
 
+# Build and tag the frr container
+build-frr-container: build-frr (_build-container "frr" _frr_container_name)
+
 # Build the sysroot, and compile-env containers
-build: build-sysroot build-compile-env-container build-doc-env-container
+build: build-sysroot build-frr-container build-compile-env-container build-doc-env-container
 
 # Push the compile-env and doc-env containers to the container registry
 [script]
@@ -191,6 +201,8 @@ push: build
     docker push "{{ _compile_env_container_name }}:{{ _commit }}.rust-{{ rust }}"
     docker push "{{ _doc_env_container_name }}:{{ _slug }}.rust-{{ rust }}"
     docker push "{{ _doc_env_container_name }}:{{ _commit }}.rust-{{ rust }}"
+    docker push "{{ _frr_container_name }}:{{ _slug }}.rust-{{ rust }}"
+    docker push "{{ _frr_container_name }}:{{ _commit }}.rust-{{ rust }}"
 
 # Delete all the old generations of the nix store and run the garbage collector
 [script]

nix/dpdk-wrapper/default.nix

@@ -15,8 +15,6 @@
     bintools
   ];
 
-  CFLAGS=""; # in case no override is provided
-
   buildPhase = ''
     set euxo pipefail
     mkdir -p $out/{lib,include}

nix/frr/default.nix

@@ -43,7 +43,7 @@
 # other general options besides snmp support
 , rpkiSupport ? false
 , numMultipath ? 8
-, watchfrrSupport ? false
+, watchfrrSupport ? true
 , cumulusSupport ? false
 , rtadvSupport ? true
 , irdpSupport ? false
@@ -211,7 +211,14 @@ stdenv.mkDerivation (finalAttrs: {
     make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" -j32
     cd zebra
     ls -lah
-    $CC $CFLAGS $LDFLAGS -I /build/source -I /build/source/lib -I /build/source/lib/zebra -o sample_plugin.so -shared -fPIC sample_plugin.c
+    $CC $CFLAGS $LDFLAGS \
+      -I /build/source \
+      -I /build/source/lib \
+      -I /build/source/lib/zebra \
+      -o sample_plugin.so \
+      -shared \
+      -fPIC \
+      sample_plugin.c
     mkdir -p $out/lib/frr/modules
     cp sample_plugin.so $out/lib/frr/modules
     cd ..