new genkernel synced with upstream

git-svn-id: http://svn.sabayonlinux.org/overlay@1136 d7aec97c-591d-0410-af39-a8856400b30a
2007-04-04 17:47:00 +00:00
parent bc538159b1
commit 2b2cb71bc1
7 changed files with 341 additions and 6 deletions
@@ -14,10 +14,10 @@ AUX genkernel-3.4.5-unionfs.patch 3217 RMD160 bb023df81dc885633118713b23a3e2b8b6
 MD5 aae20efd1bbee8956ead2cf62766c2fb files/genkernel-3.4.5-unionfs.patch 3217
 RMD160 bb023df81dc885633118713b23a3e2b8b611135a files/genkernel-3.4.5-unionfs.patch 3217
 SHA256 2eb5fb59595b835660c31f0732280467e129eecbd0a88c8b144cdec5de00561d files/genkernel-3.4.5-unionfs.patch 3217
-AUX genkernel-3.4.6-accel_init-support.patch 1091 RMD160 813ba34ab4311cca1f229d78fd376f99619cad35 SHA1 b7aca16c8986d19f35dd4a1ba1bd3a2f5f1d2cd4 SHA256 3748b9aba3dd290f442c692a69315ff505a8c1f8c8c2e7c2e6c00fc07e1eca62
-MD5 268715f05936f5f9a95bf0723948fee8 files/genkernel-3.4.6-accel_init-support.patch 1091
-RMD160 813ba34ab4311cca1f229d78fd376f99619cad35 files/genkernel-3.4.6-accel_init-support.patch 1091
-SHA256 3748b9aba3dd290f442c692a69315ff505a8c1f8c8c2e7c2e6c00fc07e1eca62 files/genkernel-3.4.6-accel_init-support.patch 1091
+AUX genkernel-3.4.6-accel_init-support.patch 1019 RMD160 e4d2b12f1929c5e82b595b557ef0def4bfaa25f7 SHA1 536dac943c8803d23031c29ae18f639d0cca777d SHA256 05b222a7b3b1b349aa284092846db2aef8873ee7ae55c12c0250e2e8e07060f4
+MD5 97e999b524ac0cefff3adecc3c7b7cc9 files/genkernel-3.4.6-accel_init-support.patch 1019
+RMD160 e4d2b12f1929c5e82b595b557ef0def4bfaa25f7 files/genkernel-3.4.6-accel_init-support.patch 1019
+SHA256 05b222a7b3b1b349aa284092846db2aef8873ee7ae55c12c0250e2e8e07060f4 files/genkernel-3.4.6-accel_init-support.patch 1019
 AUX genkernel-3.4.6-sabayon-linux.patch 1181 RMD160 5a3e7d2403531873405d925bb085e5dc669b8c62 SHA1 bdb8e6d84543b31e7bc9d73dabab174a70b99cb6 SHA256 94255520f771b3903c9bc8d76b43db9d0a2c50e8d3c03d639ffba724fc35ca4d
 MD5 be94512bda087a5169a227c3b3ed878d files/genkernel-3.4.6-sabayon-linux.patch 1181
 RMD160 5a3e7d2403531873405d925bb085e5dc669b8c62 files/genkernel-3.4.6-sabayon-linux.patch 1181
@@ -34,6 +34,14 @@ AUX genkernel-3.4.6-unionfs.patch 3217 RMD160 bb023df81dc885633118713b23a3e2b8b6
 MD5 aae20efd1bbee8956ead2cf62766c2fb files/genkernel-3.4.6-unionfs.patch 3217
 RMD160 bb023df81dc885633118713b23a3e2b8b611135a files/genkernel-3.4.6-unionfs.patch 3217
 SHA256 2eb5fb59595b835660c31f0732280467e129eecbd0a88c8b144cdec5de00561d files/genkernel-3.4.6-unionfs.patch 3217
+AUX genkernel-3.4.7-accel_init-support.patch 1047 RMD160 6419421a029912abee77975d58a7f7e9aad26f1c SHA1 4d65117f7c18f427fed435a8c2676416721ad621 SHA256 0612de46d41eb6f1bb5dfd5397c02fcf4a7742446b54f550d1719ccf7a56db93
+MD5 626ebcc5de45e3d9d5148e848bd6ece2 files/genkernel-3.4.7-accel_init-support.patch 1047
+RMD160 6419421a029912abee77975d58a7f7e9aad26f1c files/genkernel-3.4.7-accel_init-support.patch 1047
+SHA256 0612de46d41eb6f1bb5dfd5397c02fcf4a7742446b54f550d1719ccf7a56db93 files/genkernel-3.4.7-accel_init-support.patch 1047
+AUX genkernel-3.4.7-unionfs-inkernel-support.patch 5695 RMD160 9b461693cb8b99ab1ea4013181e360e0d5804437 SHA1 f8e7409f73dde813f7df38300189f92b3a4a92e0 SHA256 be249c5508476a5d8aa5bdb654c741be087720fa44f83deaa4be8380a1ab5c42
+MD5 ac9e53d6c84ef726add6d4dba3596f65 files/genkernel-3.4.7-unionfs-inkernel-support.patch 5695
+RMD160 9b461693cb8b99ab1ea4013181e360e0d5804437 files/genkernel-3.4.7-unionfs-inkernel-support.patch 5695
+SHA256 be249c5508476a5d8aa5bdb654c741be087720fa44f83deaa4be8380a1ab5c42 files/genkernel-3.4.7-unionfs-inkernel-support.patch 5695
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
 MD5 a86c191115d517b3cd4dc09a857ccaa2 files/genkernel.bash 2438
 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 files/genkernel.bash 2438
@@ -48,6 +56,8 @@ DIST dmraid-1.0.0.rc13.tar.bz2 170497 RMD160 9b95d68c2177c3bb7c74227c375780d3b49
 DIST e2fsprogs-1.38.tar.gz 3621193 RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c SHA1 aa8915fe43bc7cf5fba633df7041009ce9981551 SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7
 DIST genkernel-3.4.5.tar.bz2 164968 RMD160 0d0bbb4a6aea100d526c86f5fe3db80d8eb5c4e7 SHA1 9e3a42b7e3550101316e8eaf90e190b04ddb32d6 SHA256 8d0e10a07e8edd143f35a40e73a594061d5d67761ac0fa9c46c21943a8b50108
 DIST genkernel-3.4.6.tar.bz2 169270 RMD160 5d38aeebaab78e55cb49a8dbd63504fae5b8d5be SHA1 829710e7c348fafce59159390ac8dd3bbb1356cb SHA256 e1d56d8d16e67181777281d479ed2d323586cc971226f2c7d716a409ac5da0bf
+DIST genkernel-3.4.7_pre5.tar.bz2 176579 RMD160 782e44c544504313c9ecae32effd877c6167eac8 SHA1 1d3885e5ad9d71026eb6f8d8760fe9e86bc160f2 SHA256 55fa19aede5ece7a2ec2d196e99a087b457c77a14a2673bbaf876521c14e3091
+DIST genkernel-pkg-3.4-r1.tar.bz2 1865353 RMD160 56e85293937122aa2e42d70d02f15e2f5a99d62b SHA1 2e7e6541858a45b7cc7a48c59417ec01cef03868 SHA256 e3ed36492a76c95ddc928fe3d871117707eb0625c50448596939f5b761ce6bcc
 DIST genkernel-pkg-3.4.tar.bz2 1848904 RMD160 09e1baed7e3703b2f6c304656a81a12ba4594083 SHA1 f4baa463d0a7595b1a32b8d7a5fec12caa77736a SHA256 2345a16a3b377e3ffde2f0cca7e82cf3566e03e8bb2098db69210f505a989af3
 DIST suspend-0.5.tar.gz 163148 RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a SHA1 6fbcb41ec5bcae277cc6fd6a95d85709e3bfc5a6 SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1
 DIST unionfs-1.4.tar.gz 164696 RMD160 5a19ccfd6edf25f55c48ba1b820347572353c7ba SHA1 746fe5b9d6348e6530a85b38cdb8a8e08f513264 SHA256 3ff105782aba722b1f263e408fac638245d302a9c8d0f37ac09e5a80caf0126b
@@ -89,6 +99,10 @@ EBUILD genkernel-3.4.6-r4.ebuild 3719 RMD160 678d771f009858778660e46ae7a0bc90bf4
 MD5 aa49208c3d96b91c903541b26e4a0299 genkernel-3.4.6-r4.ebuild 3719
 RMD160 678d771f009858778660e46ae7a0bc90bf4da38e genkernel-3.4.6-r4.ebuild 3719
 SHA256 e4f71497beacc6539373cb92b8af5939e1aef9950dd1190dd63bffad2bf38007 genkernel-3.4.6-r4.ebuild 3719
+EBUILD genkernel-3.4.7_pre5-r1.ebuild 3898 RMD160 1e505308b4540c438360e9787b67dc8f1399a2c1 SHA1 e8697eda38cd0e2e03658219362d490304f8e05f SHA256 bdaa4d130062c5b8c27343c883f801285ba8513b35e5852579cef182ef48c2d3
+MD5 883f18bcc6e8e1c3f8402722043c1a5c genkernel-3.4.7_pre5-r1.ebuild 3898
+RMD160 1e505308b4540c438360e9787b67dc8f1399a2c1 genkernel-3.4.7_pre5-r1.ebuild 3898
+SHA256 bdaa4d130062c5b8c27343c883f801285ba8513b35e5852579cef182ef48c2d3 genkernel-3.4.7_pre5-r1.ebuild 3898
 MD5 ccb9fec2a148ec67a44b66643d5f3d7a files/digest-genkernel-3.4.5-r1 1732
 RMD160 6ce8bfdc09977cb81d3a50277c9a8821da29da9b files/digest-genkernel-3.4.5-r1 1732
 SHA256 98a891eb2b6737e431e5ffed1c8e901034b189bad423777c0bbfe1a855cd1498 files/digest-genkernel-3.4.5-r1 1732
@@ -116,3 +130,6 @@ SHA256 ee25d73adf0d452c2d9f9689147a55ad0eaaddd851b08dfd0238af4b4dc21e34 files/di
 MD5 221c3b97b61ea78601e5ed59d9ee6390 files/digest-genkernel-3.4.6-r4 1982
 RMD160 741449ce59fd3e2bdfc6155e76f93661bc9d267a files/digest-genkernel-3.4.6-r4 1982
 SHA256 ee25d73adf0d452c2d9f9689147a55ad0eaaddd851b08dfd0238af4b4dc21e34 files/digest-genkernel-3.4.6-r4 1982
+MD5 3554dfc4f50131bb58435c4f5b91d11f files/digest-genkernel-3.4.7_pre5-r1 2006
+RMD160 a4702bb9230f92d5825b4cd8f6434c4bf8f36daf files/digest-genkernel-3.4.7_pre5-r1 2006
+SHA256 df80ae41ae2f98fa339bc7d4417245a94893db1556c116e99eaf8281334d5a51 files/digest-genkernel-3.4.7_pre5-r1 2006
@@ -0,0 +1,24 @@
+MD5 87d8615a655b9a6c1a0e234eab2485bf LVM2.2.02.05.tgz 473621
+RMD160 7295f14e64dc25035d46e3512db6cae1b2be5f9b LVM2.2.02.05.tgz 473621
+SHA256 707c596c7a2f11cc08d3b1099995be2a4a3859a5454ed5af1a6c5361a821a402 LVM2.2.02.05.tgz 473621
+MD5 460cc211b03af4048ec90c0de2ecd8f7 device-mapper.1.02.07.tgz 923923
+RMD160 517dd7bde6935235f8c22149ef6e0cb80e6c925b device-mapper.1.02.07.tgz 923923
+SHA256 1e9c16e8f7bcf87bec03103dda63c0d11cdc739f432488b026b4614fd3cabf40 device-mapper.1.02.07.tgz 923923
+MD5 a2a8948de7717e2e76a1291fc1daf9d1 dmraid-1.0.0.rc13.tar.bz2 170497
+RMD160 9b95d68c2177c3bb7c74227c375780d3b4936ef7 dmraid-1.0.0.rc13.tar.bz2 170497
+SHA256 8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9 dmraid-1.0.0.rc13.tar.bz2 170497
+MD5 d774d4412bfb80d12cf3a4fdfd59de5a e2fsprogs-1.38.tar.gz 3621193
+RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c e2fsprogs-1.38.tar.gz 3621193
+SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7 e2fsprogs-1.38.tar.gz 3621193
+MD5 e13d5b1d732ddc8541cea0f84f82e265 genkernel-3.4.6.tar.bz2 169270
+RMD160 5d38aeebaab78e55cb49a8dbd63504fae5b8d5be genkernel-3.4.6.tar.bz2 169270
+SHA256 e1d56d8d16e67181777281d479ed2d323586cc971226f2c7d716a409ac5da0bf genkernel-3.4.6.tar.bz2 169270
+MD5 2fa8384b099d53f878a1f8ef49214493 genkernel-pkg-3.4.tar.bz2 1848904
+RMD160 09e1baed7e3703b2f6c304656a81a12ba4594083 genkernel-pkg-3.4.tar.bz2 1848904
+SHA256 2345a16a3b377e3ffde2f0cca7e82cf3566e03e8bb2098db69210f505a989af3 genkernel-pkg-3.4.tar.bz2 1848904
+MD5 c0a89e47eeaf14ec68f9114f74b16d09 suspend-0.5.tar.gz 163148
+RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a suspend-0.5.tar.gz 163148
+SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1 suspend-0.5.tar.gz 163148
+MD5 adbe18f19d1d45e80697fbccdf38d8df unionfs-utils-0.1.tar.gz 37049
+RMD160 058ce9c27dd36a90e338aa9f0314fd6d65c4f55d unionfs-utils-0.1.tar.gz 37049
+SHA256 345e213a0b6c95bbdcfc67ce1bddcff626664cb186559bb8c5ffcfa58c12aac2 unionfs-utils-0.1.tar.gz 37049
@@ -0,0 +1,24 @@
+MD5 87d8615a655b9a6c1a0e234eab2485bf LVM2.2.02.05.tgz 473621
+RMD160 7295f14e64dc25035d46e3512db6cae1b2be5f9b LVM2.2.02.05.tgz 473621
+SHA256 707c596c7a2f11cc08d3b1099995be2a4a3859a5454ed5af1a6c5361a821a402 LVM2.2.02.05.tgz 473621
+MD5 460cc211b03af4048ec90c0de2ecd8f7 device-mapper.1.02.07.tgz 923923
+RMD160 517dd7bde6935235f8c22149ef6e0cb80e6c925b device-mapper.1.02.07.tgz 923923
+SHA256 1e9c16e8f7bcf87bec03103dda63c0d11cdc739f432488b026b4614fd3cabf40 device-mapper.1.02.07.tgz 923923
+MD5 a2a8948de7717e2e76a1291fc1daf9d1 dmraid-1.0.0.rc13.tar.bz2 170497
+RMD160 9b95d68c2177c3bb7c74227c375780d3b4936ef7 dmraid-1.0.0.rc13.tar.bz2 170497
+SHA256 8497196528d50203053de0f733917b1d85aae416d2136c695a07aee5632b12b9 dmraid-1.0.0.rc13.tar.bz2 170497
+MD5 d774d4412bfb80d12cf3a4fdfd59de5a e2fsprogs-1.38.tar.gz 3621193
+RMD160 492071c29e9a0adc1bed0762e795efb6b29a692c e2fsprogs-1.38.tar.gz 3621193
+SHA256 c4e482687d0cff240d02a70fcf423cc14296b6a7869cd8dd42d5404d098e0bb7 e2fsprogs-1.38.tar.gz 3621193
+MD5 497d16d3b1d94c0fd3f24ee5b8a55613 genkernel-3.4.7_pre5.tar.bz2 176579
+RMD160 782e44c544504313c9ecae32effd877c6167eac8 genkernel-3.4.7_pre5.tar.bz2 176579
+SHA256 55fa19aede5ece7a2ec2d196e99a087b457c77a14a2673bbaf876521c14e3091 genkernel-3.4.7_pre5.tar.bz2 176579
+MD5 b100c516c1f17cfe68eb88e0840cf6d7 genkernel-pkg-3.4-r1.tar.bz2 1865353
+RMD160 56e85293937122aa2e42d70d02f15e2f5a99d62b genkernel-pkg-3.4-r1.tar.bz2 1865353
+SHA256 e3ed36492a76c95ddc928fe3d871117707eb0625c50448596939f5b761ce6bcc genkernel-pkg-3.4-r1.tar.bz2 1865353
+MD5 c0a89e47eeaf14ec68f9114f74b16d09 suspend-0.5.tar.gz 163148
+RMD160 8b38fcb18c7f860b4c292a4329f268bce6dc177a suspend-0.5.tar.gz 163148
+SHA256 ab87f1ee097dab98b4d56f98c95779a47a859de81512292743213e6bd5a352f1 suspend-0.5.tar.gz 163148
+MD5 adbe18f19d1d45e80697fbccdf38d8df unionfs-utils-0.1.tar.gz 37049
+RMD160 058ce9c27dd36a90e338aa9f0314fd6d65c4f55d unionfs-utils-0.1.tar.gz 37049
+SHA256 345e213a0b6c95bbdcfc67ce1bddcff626664cb186559bb8c5ffcfa58c12aac2 unionfs-utils-0.1.tar.gz 37049
@@ -1,5 +1,5 @@
--- genkernel-3.4.6.orig/generic/linuxrc	2007-01-17 16:31:39.000000000 +0100
-+++ genkernel-3.4.6/generic/linuxrc	2007-01-17 16:37:52.000000000 +0100
+--- genkernel-3.4.6.orig/generic/linuxrc
+++ genkernel-3.4.6/generic/linuxrc
@@ -46,6 +46,7 @@ CMDLINE="`cat /proc/cmdline`"
 REAL_ROOT=''
 FAKE_ROOT=''
@@ -0,0 +1,38 @@
+--- genkernel-3.4.6.orig/generic/linuxrc
+++ genkernel-3.4.6/generic/linuxrc
+@@ -46,6 +46,7 @@ CMDLINE="`cat /proc/cmdline`"
+ REAL_ROOT=''
+ FAKE_ROOT=''
+ REAL_ROOTFLAGS=''
+REAL_INITD="/sbin/init"
+ for x in ${CMDLINE}
+ do
+ 	case "${x}" in
+@@ -61,6 +62,9 @@ do
+ 		real_init\=*)
+ 			REAL_INIT=`parse_opt "${x}"`
+ 		;;
+		accel_init\=*)
+			REAL_INITD=`parse_opt "${x}"`
+		;;
+ 		init_opts\=*)
+ 			INIT_OPTS=`parse_opt "${x}"`
+ 		;;
+@@ -719,7 +723,7 @@ then
+ 	exec chroot . /bin/sh <<- EOF
+ 		umount /tmp/.initrd || echo "*: Failed to unmount the initrd!"
+ 		/sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
+-		exec ${REAL_INIT:-/sbin/init} ${INIT_OPTS}
+		exec ${REAL_INIT:-${REAL_INITD}} ${INIT_OPTS}
+ EOF
+ elif [ "$0" = '/init' ]
+ then
+@@ -734,7 +738,7 @@ then
+ 		umount /proc || echo '*: Failed to unmount the initrd /proc!'
+ 	echo -n '.'
+ 
+-	exec switch_root -c "/dev/console" "${CHROOT}" ${REAL_INIT:-/sbin/init} ${INIT_OPTS}
+	exec switch_root -c "/dev/console" "${CHROOT}" ${REAL_INIT:-${REAL_INITD}} ${INIT_OPTS}
+ fi
+ 
+ splash 'verbose'
@@ -0,0 +1,121 @@
+diff -Nurp genkernel-3.4.7_pre5.orig/gen_compile.sh genkernel-3.4.7_pre5/gen_compile.sh
+--- genkernel-3.4.7_pre5.orig/gen_compile.sh	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/gen_compile.sh	2007-04-04 16:54:17.000000000 +0200
+@@ -403,13 +403,10 @@ compile_unionfs_utils() {
+ 			gen_die 'Unionfs directory ${UNIONFS_DIR} is invalid!'
+ 		cd "${UNIONFS_DIR}"
+ 		print_info 1 'unionfs tools: >> Compiling...'
+-		sed -i utils/Makefile -e 's|${CC} -o|${CC} -static -o|g'
+-		sed -i Makefile -e 's|${CC} -o|${CC} -static -o|g'
+-		compile_generic utils utils
+-
+-		if [ ! -e "uniondbg" ]; then
+-			cd utils
+-		fi
+		./bootstrap &> /dev/null
+		./configure >> ${DEBUGFILE} 2>&1 || gen_die 'Configuring unionfs-utils failed!'
+		sed -i Makefile -e 's|LDFLAGS = |LDFLAGS = -all-static|g'
+		compile_generic '' utils
+ 		print_info 1 'unionfs: >> Copying to cache...'
+ 		strip uniondbg unionctl
+ 		cp uniondbg ${TEMP}/unionfs/sbin/ || 
+diff -Nurp genkernel-3.4.7_pre5.orig/generic/linuxrc genkernel-3.4.7_pre5/generic/linuxrc
+--- genkernel-3.4.7_pre5.orig/generic/linuxrc	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/generic/linuxrc	2007-04-04 16:56:31.000000000 +0200
+@@ -557,6 +557,9 @@ then
+ 	if [ "${USE_UNIONFS_NORMAL}" -eq '1' ]
+ 	then
+ 		union_insert_dir ${UNION} ${NEW_ROOT}/${FS_LOCATION}
+
+		mkdir ${UNION}/mnt/livecd
+		mount --bind ${NEW_ROOT}/${FS_LOCATION} ${UNION}/mnt/livecd
+ 		
+ 		# Make sure fstab notes livecd is mounted ro.  Makes system skip remount which fails on unionfs dirs.
+ 		sed -e 's|\(.*\s/\s*tmpfs\s*\)defaults\(.*\)|\1defaults,ro\2|' /${UNION}/etc/fstab > /${UNION}/etc/fstab.new
+diff -Nurp genkernel-3.4.7_pre5.orig/gen_initramfs.sh genkernel-3.4.7_pre5/gen_initramfs.sh
+--- genkernel-3.4.7_pre5.orig/gen_initramfs.sh	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/gen_initramfs.sh	2007-04-04 16:57:38.000000000 +0200
+@@ -137,21 +137,6 @@ append_devfs(){
+ 	rm -rf "${TEMP}/initramfs-devfs-temp" > /dev/null
+ }
+ 
+-append_unionfs_modules(){
+-	if [ -d "${TEMP}/initramfs-unionfs-modules-temp" ]
+-	then
+-		rm -r "${TEMP}/initramfs-unionfs-modules-temp/"
+-	fi
+-	print_info 1 'UNIONFS MODULES: Adding support (compiling)...'
+-	compile_unionfs_modules
+-	mkdir -p "${TEMP}/initramfs-unionfs-modules-temp/"
+-	/bin/tar -jxpf "${UNIONFS_MODULES_BINCACHE}" -C "${TEMP}/initramfs-unionfs-modules-temp" ||
+-		gen_die "Could not extract unionfs modules binary cache!";
+-	cd "${TEMP}/initramfs-unionfs-modules-temp/"
+-	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+-	rm -r "${TEMP}/initramfs-unionfs-modules-temp/"
+-}
+-
+ append_unionfs_tools(){
+ 	if [ -d "${TEMP}/initramfs-unionfs-tools-temp" ]
+ 	then
+@@ -487,7 +472,6 @@ create_initramfs() {
+ 	append_data 'busybox' "${BUSYBOX}"
+ 	append_data 'devfs' "${DEVFS}"
+ #	append_data 'udev' "${UDEV}"
+-	append_data 'unionfs_modules' "${UNIONFS}"
+ 	append_data 'unionfs_tools' "${UNIONFS}"
+ 	append_data 'suspend' "${SUSPEND}"
+ 	append_data 'lvm2' "${LVM2}"
+diff -Nurp genkernel-3.4.7_pre5.orig/gen_initrd.sh genkernel-3.4.7_pre5/gen_initrd.sh
+--- genkernel-3.4.7_pre5.orig/gen_initrd.sh	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/gen_initrd.sh	2007-04-04 16:58:09.000000000 +0200
+@@ -126,15 +126,6 @@ create_base_initrd_sys() {
+ #		fi
+ #	fi
+ 	
+-	#unionfs modules
+-	if [ "${UNIONFS}" -eq '1' ]
+-	then
+-		print_info 1 'UNIONFS MODULES: Adding support (compiling)...'
+-		compile_unionfs_modules
+-		/bin/tar -jxpf "${UNIONFS_MODULES_BINCACHE}" -C "${TEMP}/initrd-temp" ||
+-			gen_die "Could not extract unionfs modules binary cache!";
+-	fi
+-	
+ 	#unionfs utils
+ 	if [ "${UNIONFS}" -eq '1' ]
+ 	then
+diff -Nurp genkernel-3.4.7_pre5.orig/genkernel.conf genkernel-3.4.7_pre5/genkernel.conf
+--- genkernel-3.4.7_pre5.orig/genkernel.conf	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/genkernel.conf	2007-04-04 16:59:02.000000000 +0200
+@@ -136,10 +136,9 @@ DMRAID_BINCACHE="%%CACHE%%/dmraid-${DMRA
+ # 2.6.17			1.3
+ 
+ UNIONFS_VER="VERSION_UNIONFS"
+-UNIONFS_DIR="unionfs-${UNIONFS_VER}"
+-UNIONFS_SRCTAR="${GK_SHARE}/pkg/unionfs-${UNIONFS_VER}.tar.gz"
+-UNIONFS_BINCACHE="%%CACHE%%/unionfs-${UNIONFS_VER}-tools-%%ARCH%%.tar.bz2"
+-UNIONFS_MODULES_BINCACHE="%%CACHE%%/unionfs-${UNIONFS_VER}-modules-%%KV%%-%%ARCH%%.tar.bz2"
+UNIONFS_DIR="unionfs-utils"
+UNIONFS_SRCTAR="${GK_SHARE}/pkg/unionfs-utils-${UNIONFS_VER}.tar.gz"
+UNIONFS_BINCACHE="%%CACHE%%/unionfs-utils-${UNIONFS_VER}-%%ARCH%%.tar.bz2"
+ 
+ E2FSPROGS_VER="VERSION_E2FSPROGS"
+ E2FSPROGS_DIR="e2fsprogs-${E2FSPROGS_VER}"
+diff -Nurp genkernel-3.4.7_pre5.orig/x86/modules_load genkernel-3.4.7_pre5/x86/modules_load
+--- genkernel-3.4.7_pre5.orig/x86/modules_load	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/x86/modules_load	2007-04-04 16:59:14.000000000 +0200
+@@ -25,4 +25,4 @@ MODULES_DMRAID="dm-mod dm-mirror raid0 r
+ MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
+ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \
+ ata_piix sata_mv pdc_adma scsi_wait_scan"
+-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs unionfs"
+diff -Nurp genkernel-3.4.7_pre5.orig/x86_64/modules_load genkernel-3.4.7_pre5/x86_64/modules_load
+--- genkernel-3.4.7_pre5.orig/x86_64/modules_load	2007-03-14 02:20:22.000000000 +0100
+++ genkernel-3.4.7_pre5/x86_64/modules_load	2007-04-04 16:59:22.000000000 +0200
+@@ -25,4 +25,4 @@ MODULES_DMRAID="dm-mod dm-mirror raid0 r
+ MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via \
+ sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata \
+ ata_piix sata_mv pdc_adma scsi_wait_scan"
+-MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs"
+MODULES_FS="ext2 ext3 reiserfs jfs nfs xfs unionfs"
@@ -0,0 +1,111 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.7_pre5.ebuild,v 1.1 2007/03/14 01:27:30 wolf31o2 Exp $
+
+inherit bash-completion eutils
+
+VERSION_DMAP='1.02.07'
+VERSION_DMRAID='1.0.0.rc13'
+VERSION_E2FSPROGS='1.38'
+VERSION_LVM2='2.02.05'
+VERSION_PKG='3.4-r1'
+VERSION_SUSPEND='0.5'
+VERSION_UNIONFS='0.1'
+
+DESCRIPTION="Gentoo autokernel script"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~wolf31o2/sources/genkernel/${P}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/sources/genkernel/genkernel-pkg-${VERSION_PKG}.tar.bz2
+	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM2}.tgz
+	ftp://sources.redhat.com/pub/dm/old/device-mapper.${VERSION_DMAP}.tgz
+	mirror://sourceforge/suspend/suspend-${VERSION_SUSPEND}.tar.gz
+	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-utils-0.x/unionfs-utils-${VERSION_UNIONFS}.tar.gz
+	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
+# Release Engineering, it's easier for us to deal with all arches at once.
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
+	cp ${FILESDIR}/suspend-0.5-Makefile.patch pkg
+	use selinux && sed -i 's/###//g' gen_compile.sh
+
+	# Add UnionFS support
+	epatch ${FILESDIR}/genkernel-3.4.7-unionfs-inkernel-support.patch
+
+	# Add Sabayon Linux text
+	epatch ${FILESDIR}/genkernel-3.4.6-sabayon-linux.patch
+
+	# add init-ng/einit support
+	epatch ${FILESDIR}/genkernel-3.4.7-accel_init-support.patch
+
+}
+
+src_install() {
+	dodir /etc
+	cp "${S}"/genkernel.conf ${D}/etc
+	# This block updates genkernel.conf
+	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
+		-e "s:VERSION_LVM2:$VERSION_LVM2:" \
+		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
+		-e "s:VERSION_SUSPEND:$VERSION_SUSPEND:" \
+		${D}/etc/genkernel.conf || die "Could not adjust versions"
+
+	dodir /usr/share/genkernel
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
+	cp -Rp "${S}"/* ${D}/usr/share/genkernel
+
+	dodir /usr/bin
+	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
+
+	rm ${D}/usr/share/genkernel/genkernel.conf
+	dodoc README
+
+	doman genkernel.8
+	rm genkernel.8
+
+	cp "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+	"${DISTDIR}"/LVM2.${VERSION_LVM2}.tgz \
+	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
+	"${DISTDIR}"/unionfs-utils-${VERSION_UNIONFS}.tar.gz \
+	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
+	"${DISTDIR}"/suspend-${VERSION_SUSPEND}.tar.gz \
+	${D}/usr/share/genkernel/pkg
+
+	dobashcompletion ${FILESDIR}/genkernel.bash
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
+	ewarn "even reiser3."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+
+	bash-completion_pkg_postinst
+}