From 7b89a827458ea3ac5b60a0845f52457545830ddb Mon Sep 17 00:00:00 2001
From: Paul Holzinger <pholzing@redhat.com>
Date: Thu, 24 Feb 2022 15:21:49 +0100
Subject: [PATCH] use local cargo dependencies

We should not try to build with deps from the vendor directory locally.
This will force me to run make vendor manually if I pull in new deps.

When distros want to build with bundlwd deps they should a) download
the linked vendor tarball which we should provide for the releases and
b) create the cargo config since to let cargo use the vendor dir.
```
tar xvf %{SOURCE1}
mkdir -p .cargo

cat >.cargo/config << EOF
[source.crates-io]
replace-with = "vendored-sources"

[source.vendored-sources]
directory = "vendor"
EOF
```

see https://src.fedoraproject.org/rpms/rust-coreos-installer/blob/rawhide/f/rust-coreos-installer.spec#_86

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
---
 .cargo/config.toml       |  6 ------
 .gitignore               |  3 +--
 DISTRO_PACKAGE.md        | 16 ++++++++++++++++
 contrib/cirrus/runner.sh |  4 ----
 4 files changed, 17 insertions(+), 12 deletions(-)
 delete mode 100644 .cargo/config.toml

diff --git a/.cargo/config.toml b/.cargo/config.toml
deleted file mode 100644
index dc522c0..0000000
--- a/.cargo/config.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use vendor for everything
-[source.crates-io]
-replace-with = "vendored-sources"
-
-[source.vendored-sources]
-directory = "vendor"
diff --git a/.gitignore b/.gitignore
index b1e6198..ed9de6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ target/
 targets/
 *.swp
 netavark.1
-vendor/winapi*gnu*/lib/*.a
-vendor/**/*.dll
+vendor/
diff --git a/DISTRO_PACKAGE.md b/DISTRO_PACKAGE.md
index 34f475b..f46738f 100644
--- a/DISTRO_PACKAGE.md
+++ b/DISTRO_PACKAGE.md
@@ -39,6 +39,22 @@ dist-git](https://src.fedoraproject.org/rpms/aardvark-dns).
 
 The Fedora package builds Aardvark-dns using a compressed tarball of the vendored
 libraries that is attached to each upstream release.
+You can download them with the following:
+
+`https://github.com/containers/netavark/releases/download/v{version}/aardvark-dns-v{version}.tar.gz`
+
+And then create a cargo config file to point it to the vendor dir:
+```
+tar xvf %{SOURCE}
+mkdir -p .cargo
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
+```
 
 The `aardvark-dns` binary is installed to `/usr/libexec/podman/aardvark-dns`.
 
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh
index f17700d..b4c554a 100755
--- a/contrib/cirrus/runner.sh
+++ b/contrib/cirrus/runner.sh
@@ -19,7 +19,6 @@ _run_noarg() {
 _run_build() {
     # Assume we're on a fast VM, compile everything needed by the
     # rest of CI since subsequent tasks may have limited resources.
-	make vendor
     make all debug=1
     make build_unit  # reuses some debug binaries
     make all  # optimized/non-debug binaries
@@ -37,7 +36,6 @@ EOF
 }
 
 _run_validate() {
-	make vendor
     make validate
 }
 
@@ -49,12 +47,10 @@ _run_verify_vendor() {
 }
 
 _run_unit() {
-	make vendor
     make unit
 }
 
 _run_integration() {
-	make vendor
     make integration
 }