From 6f2c8964b64d77d4ce36c98e6c8157415da9c9b9 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 24 Jan 2025 09:27:51 +0100 Subject: [PATCH] Skip a few files and dirs in the meson dist tarball --- pdns/recursordist/.gitattributes | 7 +++++++ pdns/recursordist/meson-dist-script.sh | 9 +++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 pdns/recursordist/.gitattributes diff --git a/pdns/recursordist/.gitattributes b/pdns/recursordist/.gitattributes new file mode 100644 index 0000000000..3f006fb339 --- /dev/null +++ b/pdns/recursordist/.gitattributes @@ -0,0 +1,7 @@ +Caddyfile export-ignore +/README.md export-ignore +docs export-ignore +examples export-ignore +make-ext-symlinks.py export-ignore +recursor-lsan.supp export-ignore +recursor-tsan.supp export-ignore diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh index 4ce83e3442..a8699d94dd 100755 --- a/pdns/recursordist/meson-dist-script.sh +++ b/pdns/recursordist/meson-dist-script.sh @@ -24,9 +24,14 @@ cd "$MESON_PROJECT_BUILD_ROOT" ninja man-pages cp -vp rec-man-pages/*.1 "$MESON_PROJECT_DIST_ROOT" +rm -rf "$MESON_PROJECT_DIST_ROOT"/autom4te.cache + + # Generate a few files to reduce build dependencies -ninja librec-dnslabeltext.a.p/dnslabeltext.cc +echo 'If the below command generates an error, remove dnslabeltext.cc from source dir (remains of an autotools build?) and start again with a clean meson setup' +ninja librec-dnslabeltext.a.p/dnslabeltext.cc cp -vp librec-dnslabeltext.a.p/dnslabeltext.cc "$MESON_PROJECT_DIST_ROOT" -ninja effective_tld_names.dat +echo 'If the below command generates an error, remove effective_tld_names.dat and pubsuffix.cc from source dir (remains of an autotools build?) and start again with a clean meson setup' +ninja effective_tld_names.dat cp -vp effective_tld_names.dat "$MESON_PROJECT_DIST_ROOT" -- 2.47.2