public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix more problems with aufs2

Browse Source 
svn path=/nixpkgs/trunk/; revision=17110
This commit is contained in:
Michael Raskin 2009-09-14 13:30:33 +00:00
parent 1557cfd0c6
commit 5ea58c412e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/os-specific/linux/aufs2/default.nix
View File

@ -19,6 +19,14 @@ stdenv.mkDerivation {
kernelSource=$(echo $(pwd)/linux-*) kernelSource=$(echo $(pwd)/linux-*)
cp -prd $kernelBuild/* $kernelSource 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" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$PWD/include"
make KDIR=$kernelSource aufs.ko make KDIR=$kernelSource aufs.ko

8
pkgs/os-specific/linux/aufs2/src-for-default.nix
View File

@ -1,8 +1,8 @@
rec { rec {
version="4c023a5ec2703cfea465b7ecd6f16b3ef156e5d5"; version="a5883982f82ce927b3cbd8fc9c8d05865fc43bd9";
name="aufs2-4c023a5ec2703cfea465b7ecd6f16b3ef156e5d5"; name="aufs2-a5883982f82ce927b3cbd8fc9c8d05865fc43bd9";
hash="8858eb487db24e9cf524d9428a3fdf8861ee366ddf22f41b446f52490a92da2b"; hash="7ea6f267b2b622b85112624ecc98b1c5a6486172efc355b475ad0ff23ce277a5";
rev="4c023a5ec2703cfea465b7ecd6f16b3ef156e5d5"; rev="a5883982f82ce927b3cbd8fc9c8d05865fc43bd9";
url="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"; url="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git";