diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2009-09-14 13:30:33 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2009-09-14 13:30:33 +0000 |
| commit | 5ea58c412eea0c0a4368a0b435a114ccf663edba (patch) | |
| tree | 75b8f88680fc3be0661528defb06117ff7d63a92 /pkgs/os-specific/linux | |
| parent | 1557cfd0c60061971325d3c944c332b3af96e8c3 (diff) | |
| download | nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.tar nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.tar.gz nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.tar.bz2 nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.tar.lz nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.tar.xz nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.tar.zst nixlib-5ea58c412eea0c0a4368a0b435a114ccf663edba.zip | |
Fix more problems with aufs2
svn path=/nixpkgs/trunk/; revision=17110
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/aufs2/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/aufs2/src-for-default.nix | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/aufs2/default.nix b/pkgs/os-specific/linux/aufs2/default.nix index 4b0b05039c48..6e87546c6a95 100644 --- a/pkgs/os-specific/linux/aufs2/default.nix +++ b/pkgs/os-specific/linux/aufs2/default.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation { kernelSource=$(echo $(pwd)/linux-*) cp -prd $kernelBuild/* $kernelSource + # Looks like GCC3 and GCC4 protect stack differently + # We do have the protection with recent GCC3 and GCC4, so override + # the check + chmod u+w $kernelSource/scripts/gcc-x86_32-has-stack-protector.sh + chmod u+w $kernelSource/scripts/gcc-x86_64-has-stack-protector.sh + echo echo y > $kernelSource/scripts/gcc-x86_32-has-stack-protector.sh + echo echo y > $kernelSource/scripts/gcc-x86_64-has-stack-protector.sh + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PWD/include" make KDIR=$kernelSource aufs.ko diff --git a/pkgs/os-specific/linux/aufs2/src-for-default.nix b/pkgs/os-specific/linux/aufs2/src-for-default.nix index 3744d6f2e892..ba44a60f58cd 100644 --- a/pkgs/os-specific/linux/aufs2/src-for-default.nix +++ b/pkgs/os-specific/linux/aufs2/src-for-default.nix @@ -1,8 +1,8 @@ rec { - version="4c023a5ec2703cfea465b7ecd6f16b3ef156e5d5"; - name="aufs2-4c023a5ec2703cfea465b7ecd6f16b3ef156e5d5"; - hash="8858eb487db24e9cf524d9428a3fdf8861ee366ddf22f41b446f52490a92da2b"; - rev="4c023a5ec2703cfea465b7ecd6f16b3ef156e5d5"; + version="a5883982f82ce927b3cbd8fc9c8d05865fc43bd9"; + name="aufs2-a5883982f82ce927b3cbd8fc9c8d05865fc43bd9"; + hash="7ea6f267b2b622b85112624ecc98b1c5a6486172efc355b475ad0ff23ce277a5"; + rev="a5883982f82ce927b3cbd8fc9c8d05865fc43bd9"; url="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"; |