summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Jones <carpaski@gentoo.org>2002-09-02 05:27:15 +0000
committerNicholas Jones <carpaski@gentoo.org>2002-09-02 05:27:15 +0000
commitee12e33218b1e7162cd396b44b45097991b994cd (patch)
tree4ea172b24edd4b53216ba43c0c6a1b734ea97eba /sys-kernel
parentadded sparc/sparc64 keywords (diff)
downloadgentoo-2-ee12e33218b1e7162cd396b44b45097991b994cd.tar.gz
gentoo-2-ee12e33218b1e7162cd396b44b45097991b994cd.tar.bz2
gentoo-2-ee12e33218b1e7162cd396b44b45097991b994cd.zip
Fixed the
---mv: cannot move `linux-2.4.19' to a subdirectory of itself--- error. Added die comments.
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/linux-headers/ChangeLog13
-rw-r--r--sys-kernel/linux-headers/linux-headers-2.4.19.ebuild12
2 files changed, 18 insertions, 7 deletions
diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 0e3128a008ae..795d4034ffd9 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,5 +1,14 @@
# ChangeLog for sys-kernel/linux-headers
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.2 2002/02/14 05:08:40 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.3 2002/09/02 05:27:15 carpaski Exp $
-See the sys-kernel/linux-sources ChangeLog for changes.
+See the sys-kernel/linux-sources ChangeLog for general changes.
+
+*linux-headers-2.4.19 (02 Sept 2002)
+
+ 02 Sept 2002; Nicholas Jones <carpaski@gentoo.org :
+
+ Fixed the
+ mv: cannot move `linux-2.4.19' to a subdirectory of itself
+ error with a $OKV!=$KV check.
+ Added comments to the die statements. \ No newline at end of file
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.19.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.19.ebuild
index e3c96c702b81..9798a590527c 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.19.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2002 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.19.ebuild,v 1.3 2002/09/01 21:23:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.19.ebuild,v 1.4 2002/09/02 05:27:15 carpaski Exp $
#OKV=original kernel version, KV=patched kernel version. They can be the same.
#we use this next variable to avoid duplicating stuff on cvs
@@ -41,14 +41,16 @@ src_unpack() {
cd ${WORKDIR}
unpack linux-${OKV}.tar.bz2
#the main source dir for linux-2.4.19 (and higher?) has the version attached
- mv linux-${OKV} linux-${KV} || die
+ if [ $OKV != $KV ]; then
+ mv linux-${OKV} linux-${KV} || die "moving kernel"
+ fi
cd ${S}
#sometimes we have icky kernel symbols; this seems to get rid of them
- make mrproper || die
+ make mrproper || die "making proper"
#this file is required for other things to build properly, so we autogenerate it
- make include/linux/version.h || die
+ make include/linux/version.h || die "making headers"
#fix silly permissions in tarball
cd ${WORKDIR}
@@ -59,7 +61,7 @@ src_unpack() {
cd ${S}
mv Makefile Makefile.orig
sed -e 's:#export\tINSTALL_PATH:export\tINSTALL_PATH:' \
- Makefile.orig >Makefile || die # test, remove me if Makefile ok
+ Makefile.orig >Makefile || die "sed makefile" # test, remove me if Makefile ok
rm Makefile.orig
}