Author: ludo Date: Sat Jun 11 21:08:46 2011 New Revision: 27421 URL: https://svn.nixos.org/websvn/nix/?rev=27421&sc=1
Log: glibc: Don't try to add deleted files to the tarball. Modified: hydra-config/gnu/trunk/glibc/add-local-changes-to-tarball.patch Modified: hydra-config/gnu/trunk/glibc/add-local-changes-to-tarball.patch ============================================================================== --- hydra-config/gnu/trunk/glibc/add-local-changes-to-tarball.patch Sat Jun 11 15:04:42 2011 (r27420) +++ hydra-config/gnu/trunk/glibc/add-local-changes-to-tarball.patch Sat Jun 11 21:08:46 2011 (r27421) @@ -1,5 +1,6 @@ This patch forces the addition of local changes (e.g., removal of `/bin/pwd' -from `configure') to the tarball. +from `configure') to the tarball. Use `--diff-filter' to filter out deleted +files. diff --git a/Makefile b/Makefile index 61cfa43..a6e7cee 100644 @@ -12,7 +13,7 @@ + tar -rv --owner=0 --group=0 \ + --transform='s|^\(.*\)$$|$*/\1|g' \ + -f "[email protected]" \ -+ `git diff --name-only` ++ `git diff --name-only --diff-filter=ACMT` mv -f [email protected] $@ # Do `make dist dist-version=X.Y.Z' to make tar files of an older version. _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
