Новое название для второго слоя diff

git-svn-id: http://svn.calculate.ru/overlay@2057 c91db197-33c1-4113-bf15-f8a5c547ca64

profiles/package.mask

@@ -6,4 +6,3 @@
 =sys-apps/calculate-server-9999
 =sys-apps/calculate-client-2.0.13
 >=app-cdr/k3b-1.6.1
->=sys-kernel/calckernel-3.4.10.903-r3

sys-kernel/calckernel/Manifest

@@ -1,5 +1,5 @@
 AUX calckernel-3.4.10.903-r2.patch 3217 RMD160 2af53fea69a8c4bb7295326c8dcca874186163eb SHA1 6988125ac5ec2788aeb24b39b9648edec2fcc09d SHA256 787528254f20544155f00fd36626d11eee681350a4217edfac22e6e21d68eee1
-AUX calckernel-3.4.10.903-r4.patch 4897 RMD160 8d25cb53505ca75b6e26e4d9656053df7b1e12ff SHA1 83bde36a3ad0e6b9c50ade85558bbf8d7f36b046 SHA256 2f3a26d298e62f3d65be9ba03ec2ef69d9de95cee60a9636568b14d9d56d15ec
+AUX calckernel-3.4.10.903-r5.patch 4900 RMD160 c06016481281a2a056f31cd1c2796ed783627997 SHA1 96bc1c4466598c33117b2a018a66631f9e5132a8 SHA256 c5ad1a6f4bc16ed3971bed3179a629445bb88cd2267facb261502454b3ab2d94
 AUX calckernel-3.4.10.903.patch 1920 RMD160 9c52f4b43e3aec644308bf4e21df90dd64796aed SHA1 ac0ad37424cf13ee886645bb7df4c77d1bb765b3 SHA256 35799327095fa44febb7fcbdbec5e061d6b670e4aba7d901a24909df220f88ec
 AUX calckernel-3.4.9.patch 4652 RMD160 6f8253b8422a1b8c3eef45a0119fabf710018d0b SHA1 a25aa7f0e146cf07bfa2426007c84785ea1f6d20 SHA256 669104f1d2ac7819222c2543688a69474a2add9b1bc4162ba4f420bd31779273
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
@@ -17,5 +17,5 @@ DIST unionfs-1.5pre-cvs200701042308.tar.gz 163418 RMD160 6d54be6db26a562dd943df2
 DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f6488 SHA1 e95799923ee3938e1fb44c6fd9aa7154d720063e SHA256 fa0c494a8ce63f235601fcc35e3a96527831169d6d5921ee49faccf3b25feb78
 EBUILD calckernel-3.4.10.903-r1.ebuild 4721 RMD160 0ad6351496f60f77f5cdb47f91e8887ad2b67111 SHA1 a7f6d9be941333647a4dbc578316792fdd942fc5 SHA256 2f5327f3b368a25cda0dcce60f287c38cd6a2a74e03b6e3280fdd846c1aaeaf8
 EBUILD calckernel-3.4.10.903-r2.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
-EBUILD calckernel-3.4.10.903-r4.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
+EBUILD calckernel-3.4.10.903-r5.ebuild 4722 RMD160 86a8fd0be899be5fe4db799269f0eae5063a30ac SHA1 2d52f4ff1805734cb0ffe572786015a9c0fe0311 SHA256 7ebc44592700cbfc4759508ddc147fe9cafe7c54116b731bfa42dfc7baa19206
 EBUILD calckernel-3.4.9.ebuild 3905 RMD160 86bc088b4a639478f63a6fdab2178da244b2050c SHA1 516ae1c03ad80a2d3b99b29cb602012e7fb71191 SHA256 92aaa6af4097d46db892e3443fa505b7764b7252207c3a5b6319b494e0eed5cc

sys-kernel/calckernel/files/calckernel-3.4.10.903-r5.patch

@@ -87,7 +87,7 @@ diff -ruN genkernel.orig/defaults/linuxrc genkernel-3.4.10.903/defaults/linuxrc
 -				got_good_root=0
 -				REAL_ROOT=''
 +				# check for scratch
-+				if [ -e ${NEW_ROOT}/livecd.squashfs -a -d ${NEW_ROOT}/diff -a -d ${NEW_ROOT}/workspace ];
++				if [ -e ${NEW_ROOT}/livecd.squashfs -a -d ${NEW_ROOT}/delta -a -d ${NEW_ROOT}/workspace ];
 +				then
 +					good_msg 'Found scratch data...'
 +					modprobe unionfs >/dev/null
@@ -97,9 +97,9 @@ diff -ruN genkernel.orig/defaults/linuxrc genkernel-3.4.10.903/defaults/linuxrc
 +						mkdir -p ${NEW_ROOT}/scratch && mkdir -p /union && mkdir -p ${NEW_ROOT}/workspace/mnt/builder && mkdir -p ${NEW_ROOT}/workspace/mnt/calculate
 +						if mount -o loop,ro -t squashfs ${NEW_ROOT}/livecd.squashfs ${NEW_ROOT}/scratch;
 +						then
-+							if mount -t unionfs -o ro,dirs=${NEW_ROOT}/workspace:${NEW_ROOT}/diff=ro:${NEW_ROOT}/scratch=ro unionfs /union;
++							if mount -t unionfs -o ro,dirs=${NEW_ROOT}/workspace:${NEW_ROOT}/delta=ro:${NEW_ROOT}/scratch=ro unionfs /union;
 +							then
-+								mount -t unionfs -o ro,dirs=${NEW_ROOT}/diff:${NEW_ROOT}/scratch=ro unionfs /union/mnt/builder
++								mount -t unionfs -o ro,dirs=${NEW_ROOT}/delta:${NEW_ROOT}/scratch=ro unionfs /union/mnt/builder
 +								CHROOT=/union
 +								break;
 +							else