diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-07-19 19:00:24 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-07-19 19:00:24 +0000 |
| commit | be527a2943e64b2e2f78a8cbac2e9b5c9abf4ca7 (patch) | |
| tree | 93e0f2e0f0478671bd9465246bddfbaa15ecf153 /sys-kernel | |
| parent | Version bump (development version). (Manifest recommit) (diff) | |
| download | gentoo-2-be527a2943e64b2e2f78a8cbac2e9b5c9abf4ca7.tar.gz gentoo-2-be527a2943e64b2e2f78a8cbac2e9b5c9abf4ca7.tar.bz2 gentoo-2-be527a2943e64b2e2f78a8cbac2e9b5c9abf4ca7.zip | |
handle portage ARCH vs kernel ARCH properly
Diffstat (limited to 'sys-kernel')
| -rw-r--r-- | sys-kernel/linux26-headers/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild | 13 |
2 files changed, 11 insertions, 9 deletions
diff --git a/sys-kernel/linux26-headers/ChangeLog b/sys-kernel/linux26-headers/ChangeLog index 7a2415be4d2e..f40857078336 100644 --- a/sys-kernel/linux26-headers/ChangeLog +++ b/sys-kernel/linux26-headers/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/linux26-headers # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.9 2004/07/18 12:27:51 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/ChangeLog,v 1.10 2004/07/19 19:00:24 vapier Exp $ + + 19 Jul 2004; Mike Frysinger <vapier@gentoo.org> + linux26-headers-2.6.7-r3.ebuild: + Stop running $(uname -m) to figure out what to set ARCH to. Use the functions + from kernel.eclass to translate portage ARCH to kernel ARCH. 18 Jul 2004; <plasmaroo@gentoo.org> files/linux26-headers-2.6.7-appCompat.patch: diff --git a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild index fdee4eca2fc2..36eed0660181 100644 --- a/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild +++ b/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.1 2004/07/15 19:42:15 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux26-headers/linux26-headers-2.6.7-r3.ebuild,v 1.2 2004/07/19 19:00:24 vapier Exp $ ETYPE="headers" inherit kernel eutils @@ -27,17 +27,12 @@ IUSE="" DEPEND="!virtual/os-headers" pkg_setup() { - # Figure out what architecture we are, and set ARCH appropriately - ARCH="$(uname -m)" - ARCH="$(echo ${ARCH} | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)" - [ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64 - # Archs which have their own separate header packages, add a check here # and redirect the user to them case "${ARCH}" in - mips|mips64) + mips) eerror "These headers are not appropriate for your architecture." - eerror "Please use sys-kernel/${ARCH/64/}-headers instead." + eerror "Please use sys-kernel/mips-headers instead." die ;; esac @@ -65,8 +60,10 @@ src_compile() { touch ${S}/include/linux/autoconf.h # if there arent any installed headers, then there also isnt an asm # symlink in /usr/include/, and make defconfig will fail. + set_arch_to_kernel ln -sf ${S}/include/asm-${ARCH} ${S}/include/asm make defconfig HOSTCFLAGS="-Wall -Wstrict-prototypes -O2 -fomit-frame-pointer -I${S}/include/" + set_arch_to_portage } src_install() { |