Author: ludo
Date: Tue Apr 5 11:44:13 2011
New Revision: 26691
URL: https://svn.nixos.org/websvn/nix/?rev=26691&sc=1
Log:
hurd: Remove `make dist' fixes that were applied upstream.
Deleted:
hydra-config/gnu/trunk/hurd/dist-mach-defpager.patch
hydra-config/gnu/trunk/hurd/dist-pfinet.patch
Modified:
hydra-config/gnu/trunk/hurd/release.nix
Modified: hydra-config/gnu/trunk/hurd/release.nix
==============================================================================
--- hydra-config/gnu/trunk/hurd/release.nix Tue Apr 5 11:24:36 2011
(r26690)
+++ hydra-config/gnu/trunk/hurd/release.nix Tue Apr 5 11:44:13 2011
(r26691)
@@ -53,37 +53,13 @@
name = "hurd-tarball";
src = hurdSrc;
configureFlags = "--build=i586-pc-gnu"; # cheat
- patches =
- [ ./dist-pfinet.patch
- ./dist-mach-defpager.patch
- ];
postPatch =
- '' # `mach-defpager' depends on code from `serverboot', but the
- # latter is no longer included in "make dist" and no longer
- # built. Thus copy useful code from there. See also
- # `dist-mach-defpager.patch'.
- ( cd serverboot && \
- mv -v default_pager.c kalloc.c wiring.[ch] queue.h \
- ../mach-defpager )
-
- echo "removing \`-o root' from makefiles..."
+ '' echo "removing \`-o root' from makefiles..."
for mf in {utils,daemons}/Makefile
do
sed -i "$mf" -e's/-o root//g'
done
'';
- preDist =
- '' echo "adding missing \`ChangeLog' files (due to commit
f91f5eb5)..."
- for i in *
- do
- if [ -d "$i" ] && [ ! -f "$i/ChangeLog" ]
- then
- : > "$i/ChangeLog"
- fi
- done
-
- : > "fatfs/EXTENSIONS"
- '';
buildNativeInputs = [ pkgs.machHeaders pkgs.mig pkgs.texinfo ];
buildInputs = [ pkgs.parted /* not the cross-GNU one */ pkgs.libuuid ];
inherit meta succeedOnFailure keepBuildDirectory;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
