diff options
author | Daniel Robbins <drobbins@gentoo.org> | 2000-12-08 06:42:08 +0000 |
---|---|---|
committer | Daniel Robbins <drobbins@gentoo.org> | 2000-12-08 06:42:08 +0000 |
commit | 49412a91b7c70cffefea08157b393dbc2e61d1b5 (patch) | |
tree | 459257f76919d24734251ea69d868412f1ed191a /sys-kernel | |
parent | Update to bugfix release 2.0.1 (diff) | |
download | gentoo-2-49412a91b7c70cffefea08157b393dbc2e61d1b5.tar.gz gentoo-2-49412a91b7c70cffefea08157b393dbc2e61d1b5.tar.bz2 gentoo-2-49412a91b7c70cffefea08157b393dbc2e61d1b5.zip |
kernel updates
Diffstat (limited to 'sys-kernel')
5 files changed, 339 insertions, 54 deletions
diff --git a/sys-kernel/linux-sources/files/2.4.0_rc10/super.c.patch b/sys-kernel/linux-sources/files/2.4.0_rc10/super.c.patch new file mode 100644 index 000000000000..77b1e03e8c3e --- /dev/null +++ b/sys-kernel/linux-sources/files/2.4.0_rc10/super.c.patch @@ -0,0 +1,37 @@ +*** super.c~ Thu Dec 7 12:14:03 2000 +--- super.c Thu Dec 7 12:18:14 2000 +*************** +*** 759,773 **** + if (is_read_only(s->s_dev) && !(s->s_flags & MS_RDONLY)) { + printk("clm-7000: Detected readonly device, marking FS readonly\n") ; + s->s_flags |= MS_RDONLY ; + } +- args.objectid = REISERFS_ROOT_PARENT_OBJECTID ; +- root_inode = iget4 (s, REISERFS_ROOT_OBJECTID, 0, (void *)(&args)); + if (!root_inode) { + printk ("reiserfs_read_super: get root inode failed\n"); + goto error; + } + + s->s_root = d_alloc_root(root_inode); + if (!s->s_root) { + iput(root_inode); + goto error; +--- 759,775 ---- + if (is_read_only(s->s_dev) && !(s->s_flags & MS_RDONLY)) { + printk("clm-7000: Detected readonly device, marking FS readonly\n") ; + s->s_flags |= MS_RDONLY ; + } + if (!root_inode) { + printk ("reiserfs_read_super: get root inode failed\n"); + goto error; + } + ++ ilabel.ino = REISERFS_ROOT_OBJECTID; ++ ilabel.i_key.reiserfs_ikey.k_dir_id = REISERFS_ROOT_PARENT_OBJECTID; ++ ilabel.i_key.reiserfs_ikey.k_objectid = REISERFS_ROOT_OBJECTID; ++ root_inode = iget4 (s, & ilabel, 0, 0); + s->s_root = d_alloc_root(root_inode); + if (!s->s_root) { + iput(root_inode); + goto error; diff --git a/sys-kernel/linux-sources/files/digest-linux-sources-2.4.0_rc10-r5 b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.0_rc10-r5 new file mode 100644 index 000000000000..c94cf510c444 --- /dev/null +++ b/sys-kernel/linux-sources/files/digest-linux-sources-2.4.0_rc10-r5 @@ -0,0 +1,9 @@ +MD5 8f300d9f53974a1f7b135f4d6085d6db linux-2.4.0-test10.tar.bz2 +MD5 a8b358cb185390da6a24beded276eddf linux-2.4.0-test10-reiserfs-3.6.22-patch.gz +MD5 c16f3df6b5f9e56b146071edfa5ec5d4 lm_sensors-2.5.4.tar.gz +MD5 039fb223e361d343e8d40c54f0a317e6 i2c-2.5.4.tar.gz +MD5 b2cf95e1189e63b44e6f7ae7fc27ae19 jfs-0.0.18-patch.tar.gz +MD5 5d4983ad745464954aa770196167ad06 alsa-driver-0.5.9d.tar.bz2 +MD5 130d1e7bf56eda1a93a831189b4c6420 NVIDIA_kernel-0.9-5.tar.gz +MD5 3e20d89a759dac0c43f3a39570116e49 lvm_0.9.tar.gz +MD5 123eaa322a26d143b51d1f2a3f5a0357 linux-2.4.0-test6-reiserfs-3.6.13-nfs.diff.gz diff --git a/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r5.ebuild b/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r5.ebuild new file mode 100644 index 000000000000..c1cb350b674e --- /dev/null +++ b/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r5.ebuild @@ -0,0 +1,223 @@ +# Copyright 1999-2000 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +# Author Daniel Robbins <drobbins@gentoo.org> +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-sources/linux-sources-2.4.0_rc10-r5.ebuild,v 1.1 2000/12/08 06:42:08 drobbins Exp $ + +S=${WORKDIR}/linux +KV=2.4.0-test10 +if [ "$PN" = "linux" ] +then + DESCRIPTION="Linux kernel, including modules, binary tools, libraries and includes" +else + DESCRIPTION="Kernel source package, including full sources, binary tools and libraries" +fi +SRC_URI=" +http://www.kernel.org/pub/linux/kernel/v2.4/linux-2.4.0-test10.tar.bz2 +ftp://ftp.reiserfs.org/pub/2.4/linux-2.4.0-test10-reiserfs-3.6.22-patch.gz +http://www.netroedge.com/~lm78/archive/lm_sensors-2.5.4.tar.gz +http://www.netroedge.com/~lm78/archive/i2c-2.5.4.tar.gz +http://oss.software.ibm.com/developerworks/opensource/jfs/project/pub/jfs-0.0.18-patch.tar.gz +ftp://ftp.alsa-project.org/pub/driver/alsa-driver-0.5.9d.tar.bz2 +ftp://ftp1.detonator.nvidia.com/pub/drivers/english/XFree86_40/0.9-5/NVIDIA_kernel-0.9-5.tar.gz +ftp://ftp.sistina.com/pub/LVM/0.9/lvm_0.9.tar.gz +http://www.namesys.com/lexa/linux-2.4.0-test6-reiserfs-3.6.13-nfs.diff.gz" + +HOMEPAGE="http://www.kernel.org/ + http://www.netroedge.com/~lm78/ + http://www.namesys.com + http://www.sistina.com/lvm/ + http://www.alsa-project.org + http://www.nvidia.com" + +src_compile() { + cd ${S} + try make symlinks + try make dep + #time to do the special symlink tweak + if [ -e /usr/src/linux ] + then + readlink /usr/src/linux > ${T}/linuxlink + fi + rm /usr/src/linux + ( cd /usr/src; ln -s ${S} linux ) + #symlink tweak in place + cd ${S}/fs/reiserfs/utils + try make +# cd ${S}/lm_sensors-2.5.2 +# try make +# cd ${S}/fs/jfs/utils +# try make + if [ "$PN" = "linux" ] + then + cd ${S} + try make bzImage + try make modules + cd ${S}/extras/NVIDIA_kernel-0.9-5 + make NVdriver + cd ${S}/extras/alsa-driver-0.5.9d + try ./configure --with-kernel=${S} --with-isapnp=yes --with-sequencer=yes --with-oss=yes --with-cards=all + try make + fi + cd ${S}/extras/LVM/0.9 + try ./configure --prefix=/ + try make + #untweak the symlink + if [ -e ${T}/linuxlink ] + then + ( cd /usr/src; rm linux; ln -s `cat ${T}/linuxlink` linux ) + fi +} + +src_unpack() { + if [ -e /usr/src/linux ] + then + if [ ! -L /usr/src/linux ] + then + echo '!!!' /usr/src/linux is not a symbolic link. + echo '!!!' For ${PF} to compile correctly, /usr/src/linux + echo '!!!' needs to be temporarily modified to point to + echo '!!!' a temporary build directory. Please rename your + echo '!!!' current directory and restart this build process. + exit 1 + fi + fi + cd ${WORKDIR} + unpack linux-2.4.0-test10.tar.bz2 + cd ${S} + echo "Applying ReiserFS patch..." + gzip -dc ${DISTDIR}/linux-2.4.0-test10-reiserfs-3.6.22-patch.gz | patch -p1 + + cd ${S} + echo "Applying reiser-nfs patch..." + gzip -dc ${DISTDIR}/linux-2.4.0-test6-reiserfs-3.6.13-nfs.diff.gz | patch -p1 + echo "Fixing failed super.c" + cd ${S}/fs/reiserfs + patch -p0 < ${FILESDIR}/${PV}/super.c.patch + cd ${S} + mkdir extras +# echo "Applying IBM JFS patch..." +# cd extras +# mkdir jfs +# cd jfs +# unpack jfs-0.0.18-patch.tar.gz +# cd ${S} +# patch -p1 < extras/jfs/jfs-common-v0.0.18-patch +# patch -p1 < extras/jfs/jfs-2.4.0-test10-v0.0.18-patch + + cd ${S}/extras + echo "Unpacking ALSA drivers..." + unpack alsa-driver-0.5.9d.tar.bz2 + echo "Unpacking NVidia drivers..." + unpack NVIDIA_kernel-0.9-5.tar.gz + cd NVIDIA_kernel-0.9-5 + # this is a little fix to make the NVidia drivers compile right with test10 + mv nv.c nv.c.orig + echo '#define mem_map_inc_count(p) atomic_inc(&(p->count))' > nv.c + echo '#define mem_map_dec_count(p) atomic_dec(&(p->count))' >> nv.c + cat nv.c.orig >> nv.c + cd ${S}/extras +# for x in lm_sensors i2c +# do +# echo "Unpacking and applying $x patch..." +# cd ${S}/extras +# unpack ${x}-2.5.4.tar.gz +# cd ${x}-2.5.4 +# mkpatch/mkpatch.pl . /usr/src/linux > /usr/src/linux/${x}-patch +# cd ${S} +# patch -p1 < ${x}-patch +# done + cd ${S}/extras + echo "Applying LVM 0.9 patch..." +# one patch will fail, this is OK (it was applied earlier probably by the JFS patch) +# we pass the -f argument to patch to get around and already-applied patch + unpack lvm_0.9.tar.gz + cd LVM/0.9/PATCHES + cat linux-2.4.0-test10-VFS-lock.patch | ( cd ${S}; patch -p1 -f) + cat lvm-0.9-2.4.0-test10.patch | ( cd ${S}; patch -p1 -f) + echo "Preparing for compilation..." + cd ${S} + #this is the configuration for the bootdisk/cd + cp ${FILESDIR}/${PV}/${P}.config .config + cp ${FILESDIR}/${PV}/${P}.autoconf include/linux/autoconf.h + try make include/linux/version.h + #fix silly permissions in tarball + cd ${WORKDIR} + chown -R root.root linux +} + +src_install() { + cd ${S}/fs/reiserfs/utils + dodir /usr/man/man8 /sbin + try make install SBIN=${D}/sbin MANDIR=${D}/usr/man/man8 + +# cd ${S}/fs/jfs/utils +# cp output/* ${D}/sbin +# local x +# for x in `find -iname *.1` +# do +# doman $x +# done +# for x in `find -iname *.8` +# do +# doman $x +# done + cd ${S}/extras/LVM/0.9 + make install prefix=${D} MAN8DIR=${D}/usr/man/man8 LIBDIR=${D}/lib + dodir /usr/src + if [ "$PN" = "linux" ] + then + dodir /usr/src/linux-${KV} + cd ${D}/usr/src + ln -sf linux-${KV} linux + #grab includes and documentation only + dodir /usr/src/linux-${KV}/include/linux + dodir /usr/src/linux-${KV}/include/asm-i386 + cp -ax ${S}/include ${D}/usr/src/linux-${KV} + cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV} + dodir /usr/include + dosym /usr/src/linux/include/linux /usr/include/linux + dosym /usr/src/linux/include/asm-i386 /usr/include/asm + #grab compiled kernel + dodir /boot/boot + insinto /boot/boot + cd ${S} + doins arch/i386/boot/bzImage + #grab modules + try make INSTALL_MOD_PATH=${D} modules_install + #install ALSA modules + cd ${S}/extras/alsa-driver-0.5.9d + dodir /lib/modules/${KV}/misc + cp modules/*.o ${D}/lib/modules/${KV}/misc + dodir /usr/include/linux + insinto /usr/include/linux + cd include + doins asound.h asoundid.h asequencer.h ainstr_*.h + #install nvidia driver + cd ${S}/extras/NVIDIA_kernel-0.9-5 + insinto /lib/modules/${KV}/video + doins NVdriver + #fix symlink + cd ${D}/lib/modules/${KV} + rm build + ln -sf /usr/src/linux-${KV} build + else + #grab all the sources + cd ${WORKDIR} + mv linux ${D}/usr/src/linux-${KV} + cd ${D}/usr/src + ln -sf linux-${KV} linux + #remove workdir since our install was dirty and modified ${S} + #this will cause an unpack to be done next time + rm -rf ${WORKDIR} + fi +} + + + + + + + + + + diff --git a/sys-kernel/linux/linux-2.4.0_rc10-r5.ebuild b/sys-kernel/linux/linux-2.4.0_rc10-r5.ebuild index 9528505e48a8..56593003d2c5 100644 --- a/sys-kernel/linux/linux-2.4.0_rc10-r5.ebuild +++ b/sys-kernel/linux/linux-2.4.0_rc10-r5.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc10-r5.ebuild,v 1.1 2000/12/07 16:14:08 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc10-r5.ebuild,v 1.2 2000/12/08 06:42:08 drobbins Exp $ S=${WORKDIR}/linux +KV=2.4.0-test10 if [ "$PN" = "linux" ] then DESCRIPTION="Linux kernel, including modules, binary tools, libraries and includes" @@ -29,12 +30,14 @@ HOMEPAGE="http://www.kernel.org/ http://www.nvidia.com" src_compile() { - cd ${S} try make symlinks try make dep #time to do the special symlink tweak - readlink /usr/src/linux > ${T}/linuxlink + if [ -e /usr/src/linux ] + then + readlink /usr/src/linux > ${T}/linuxlink + fi rm /usr/src/linux ( cd /usr/src; ln -s ${S} linux ) #symlink tweak in place @@ -59,18 +62,24 @@ src_compile() { try ./configure --prefix=/ try make #untweak the symlink - ( cd /usr/src; rm linux; ln -s `cat ${T}/linuxlink` linux ) + if [ -e ${T}/linuxlink ] + then + ( cd /usr/src; rm linux; ln -s `cat ${T}/linuxlink` linux ) + fi } src_unpack() { - if [ ! -L /usr/src/linux ] + if [ -e /usr/src/linux ] then - echo '!!!' /usr/src/linux is not a symbolic link. - echo '!!!' For ${PF} to compile correctly, /usr/src/linux - echo '!!!' needs to be temporarily modified to point to - echo '!!!' a temporary build directory. Please rename your - echo '!!!' current directory and restart this build process. - exit 1 + if [ ! -L /usr/src/linux ] + then + echo '!!!' /usr/src/linux is not a symbolic link. + echo '!!!' For ${PF} to compile correctly, /usr/src/linux + echo '!!!' needs to be temporarily modified to point to + echo '!!!' a temporary build directory. Please rename your + echo '!!!' current directory and restart this build process. + exit 1 + fi fi cd ${WORKDIR} unpack linux-2.4.0-test10.tar.bz2 @@ -131,10 +140,9 @@ src_unpack() { cp ${FILESDIR}/${PV}/${P}.config .config cp ${FILESDIR}/${PV}/${P}.autoconf include/linux/autoconf.h try make include/linux/version.h - - cd ${S} #fix silly permissions in tarball - chown -R root.root * + cd ${WORKDIR} + chown -R root.root linux } src_install() { @@ -158,14 +166,14 @@ src_install() { dodir /usr/src if [ "$PN" = "linux" ] then - dodir /usr/src/linux-${PV} + dodir /usr/src/linux-${KV} cd ${D}/usr/src - ln -sf linux-${PV} linux + ln -sf linux-${KV} linux #grab includes and documentation only - dodir /usr/src/linux-${PV}/include/linux - dodir /usr/src/linux-${PV}/include/asm-i386 - cp -ax ${S}/include ${D}/usr/src/linux-${PV} - cp -ax ${S}/Documentation ${D}/usr/src/linux-${PV} + dodir /usr/src/linux-${KV}/include/linux + dodir /usr/src/linux-${KV}/include/asm-i386 + cp -ax ${S}/include ${D}/usr/src/linux-${KV} + cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV} dodir /usr/include dosym /usr/src/linux/include/linux /usr/include/linux dosym /usr/src/linux/include/asm-i386 /usr/include/asm @@ -178,26 +186,26 @@ src_install() { try make INSTALL_MOD_PATH=${D} modules_install #install ALSA modules cd ${S}/extras/alsa-driver-0.5.9d - dodir /lib/modules/2.4.0-test10/misc - cp modules/*.o ${D}/lib/modules/2.4.0-test10/misc + dodir /lib/modules/${KV}/misc + cp modules/*.o ${D}/lib/modules/${KV}/misc dodir /usr/include/linux insinto /usr/include/linux cd include doins asound.h asoundid.h asequencer.h ainstr_*.h #install nvidia driver cd ${S}/extras/NVIDIA_kernel-0.9-5 - insinto /lib/modules/2.4.0-test10/video + insinto /lib/modules/${KV}/video doins NVdriver #fix symlink - cd ${D}/lib/modules/2.4.0-test10 + cd ${D}/lib/modules/${KV} rm build - ln -sf /usr/src/linux-2.4.0-test10 build + ln -sf /usr/src/linux-${KV} build else #grab all the sources cd ${WORKDIR} - mv linux ${D}/usr/src/linux-${PV} + mv linux ${D}/usr/src/linux-${KV} cd ${D}/usr/src - ln -sf linux-${PV} linux + ln -sf linux-${KV} linux #remove workdir since our install was dirty and modified ${S} #this will cause an unpack to be done next time rm -rf ${WORKDIR} diff --git a/sys-kernel/linux/linux-2.4.0_rc10-r6.ebuild b/sys-kernel/linux/linux-2.4.0_rc10-r6.ebuild index 2325c621148a..7c2628c78a21 100644 --- a/sys-kernel/linux/linux-2.4.0_rc10-r6.ebuild +++ b/sys-kernel/linux/linux-2.4.0_rc10-r6.ebuild @@ -1,9 +1,10 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later # Author Daniel Robbins <drobbins@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc10-r6.ebuild,v 1.1 2000/12/07 16:14:08 achim Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux/linux-2.4.0_rc10-r6.ebuild,v 1.2 2000/12/08 06:42:08 drobbins Exp $ S=${WORKDIR}/linux +KV=2.4.0-test10 if [ "$PN" = "linux" ] then DESCRIPTION="Linux kernel, including modules, binary tools, libraries and includes" @@ -29,12 +30,14 @@ HOMEPAGE="http://www.kernel.org/ http://www.nvidia.com" src_compile() { - cd ${S} try make symlinks try make dep #time to do the special symlink tweak - readlink /usr/src/linux > ${T}/linuxlink + if [ -e /usr/src/linux ] + then + readlink /usr/src/linux > ${T}/linuxlink + fi rm /usr/src/linux ( cd /usr/src; ln -s ${S} linux ) #symlink tweak in place @@ -59,18 +62,24 @@ src_compile() { try ./configure --prefix=/ try make #untweak the symlink - ( cd /usr/src; rm linux; ln -s `cat ${T}/linuxlink` linux ) + if [ -e ${T}/linuxlink ] + then + ( cd /usr/src; rm linux; ln -s `cat ${T}/linuxlink` linux ) + fi } src_unpack() { - if [ ! -L /usr/src/linux ] + if [ -e /usr/src/linux ] then - echo '!!!' /usr/src/linux is not a symbolic link. - echo '!!!' For ${PF} to compile correctly, /usr/src/linux - echo '!!!' needs to be temporarily modified to point to - echo '!!!' a temporary build directory. Please rename your - echo '!!!' current directory and restart this build process. - exit 1 + if [ ! -L /usr/src/linux ] + then + echo '!!!' /usr/src/linux is not a symbolic link. + echo '!!!' For ${PF} to compile correctly, /usr/src/linux + echo '!!!' needs to be temporarily modified to point to + echo '!!!' a temporary build directory. Please rename your + echo '!!!' current directory and restart this build process. + exit 1 + fi fi cd ${WORKDIR} unpack linux-2.4.0-test10.tar.bz2 @@ -131,10 +140,9 @@ src_unpack() { cp ${FILESDIR}/${PV}/${PF}.config .config cp ${FILESDIR}/${PV}/${PF}.autoconf include/linux/autoconf.h try make include/linux/version.h - - cd ${S} #fix silly permissions in tarball - chown -R root.root * + cd ${WORKDIR} + chown -R root.root linux } src_install() { @@ -158,14 +166,14 @@ src_install() { dodir /usr/src if [ "$PN" = "linux" ] then - dodir /usr/src/linux-${PV} + dodir /usr/src/linux-${KV} cd ${D}/usr/src - ln -sf linux-${PV} linux + ln -sf linux-${KV} linux #grab includes and documentation only - dodir /usr/src/linux-${PV}/include/linux - dodir /usr/src/linux-${PV}/include/asm-i386 - cp -ax ${S}/include ${D}/usr/src/linux-${PV} - cp -ax ${S}/Documentation ${D}/usr/src/linux-${PV} + dodir /usr/src/linux-${KV}/include/linux + dodir /usr/src/linux-${KV}/include/asm-i386 + cp -ax ${S}/include ${D}/usr/src/linux-${KV} + cp -ax ${S}/Documentation ${D}/usr/src/linux-${KV} dodir /usr/include dosym /usr/src/linux/include/linux /usr/include/linux dosym /usr/src/linux/include/asm-i386 /usr/include/asm @@ -178,26 +186,26 @@ src_install() { try make INSTALL_MOD_PATH=${D} modules_install #install ALSA modules cd ${S}/extras/alsa-driver-0.5.9d - dodir /lib/modules/2.4.0-test10/misc - cp modules/*.o ${D}/lib/modules/2.4.0-test10/misc + dodir /lib/modules/${KV}/misc + cp modules/*.o ${D}/lib/modules/${KV}/misc dodir /usr/include/linux insinto /usr/include/linux cd include doins asound.h asoundid.h asequencer.h ainstr_*.h #install nvidia driver cd ${S}/extras/NVIDIA_kernel-0.9-5 - insinto /lib/modules/2.4.0-test10/video + insinto /lib/modules/${KV}/video doins NVdriver #fix symlink - cd ${D}/lib/modules/2.4.0-test10 + cd ${D}/lib/modules/${KV} rm build - ln -sf /usr/src/linux-2.4.0-test10 build + ln -sf /usr/src/linux-${KV} build else #grab all the sources cd ${WORKDIR} - mv linux ${D}/usr/src/linux-${PV} + mv linux ${D}/usr/src/linux-${KV} cd ${D}/usr/src - ln -sf linux-${PV} linux + ln -sf linux-${KV} linux #remove workdir since our install was dirty and modified ${S} #this will cause an unpack to be done next time rm -rf ${WORKDIR} |