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

Remove clear deps as a test to fix dataplane CI #77

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Remove clear deps as a test to fix dataplane CI #77

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
17 changes: 9 additions & 8 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,12 @@ rec {
cacert
cargo-nextest
coreutils
glibc.dev
glibc.out
just
libgcc.libgcc
libgccjit
libz
llvmPackages.clang
llvmPackages.libclang.lib
llvmPackages.lld
Expand Down Expand Up @@ -511,6 +516,8 @@ rec {
)
+ (
if libc == "gnu64" then
# libm.a file contains a GROUP instruction which contains absolute paths to /nix
# and those paths are not preserved by the rsync commands.
''
export lib="$out/sysroot/x86_64-unknown-linux-${libcShortName}/${profile}/lib"
cd $lib
Expand Down Expand Up @@ -544,9 +551,6 @@ rec {
musl64.release
];

clearDeps =
obj: with builtins; (/. + "${unsafeDiscardStringContext (unsafeDiscardOutputDependency (obj))}");

maxLayers = 120;

initfrr = toolchainPkgs.stdenv.mkDerivation {
Expand Down Expand Up @@ -582,7 +586,7 @@ rec {
frr = toolchainPkgs.dockerTools.buildLayeredImage {
name = "${contianer-repo}/frr";
tag = "${image-tag}";
contents = map clearDeps frrContainerContents;
contents = frrContainerContents;
config = {
Env = [
"LD_LIBRARY_PATH=/lib"
Expand All @@ -595,9 +599,6 @@ rec {
compile-env = toolchainPkgs.dockerTools.buildLayeredImage {
name = "${contianer-repo}/compile-env";
tag = "${image-tag}";
# glibc is needed as an explicit dependency due to the use of linker script in the libm.a file.
# Specifically, the libm.a file contains a GROUP instruction which contains absolute paths to /nix
# and those paths are not preserved by the rsync and clearDeps commands.
contents = [
env.compile
pkgs.dev.gnu64.glibc.static
Expand All @@ -606,7 +607,7 @@ rec {
pkgs.release.gnu64.glibc.dev
pkgs.dev.gnu64.glibc.out
pkgs.release.gnu64.glibc.out
] ++ (map clearDeps sysroots);
] ++ (sysroots);
inherit maxLayers;
};
doc-env = toolchainPkgs.dockerTools.buildLayeredImage {
Expand Down
Loading