Added a note to pkg_postinst() and tweaked $ARCH's assignment. Closes Bugs #25836 & #26647.

4 files changed, 31 insertions, 10 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 5cd104bce34c..135a7316045b 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.26 2003/10/29 23:38:22 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.27 2003/10/30 23:17:54 kumba Exp $
+
+
+*linux-headers-2.4.22 (21 Sep 2003)
+
+  30 Oct 2003; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.21.ebuild,
+  linux-headers-2.4.22.ebuild:
+  Added a minor note in pkg_postinst() to advise users to upgrade their glibc
+  after emerging newer kernel headers.  Closes Bug #25836
+  Tweaked the ARCH= line in the same ebuilds to get assigned the value of
+  "uname -m".  This prevents any nasty surprises incase someone re-defines
+  $ARCH from the commandline (or in a script).  Closes Bug #26647.
 
   29 Oct 2003; <plasmaroo@gentoo.org> linux-headers-2.2.20.ebuild,
   linux-headers-2.2.21_pre3.ebuild, linux-headers-2.4.16-r1.ebuild,
@@ -12,8 +23,6 @@
   All linux-headers ebuilds have been re-slotted to slot zero.
   Bug #32197, et al.
 
-*linux-headers-2.4.22 (21 Sep 2003)
-
   23 Oct 2003; Joshua Kinard <kumba@gentoo.org> linux-headers-2.4.21.ebuild,
   linux-headers-2.4.22.ebuild:
   Changed SLOT to 0 from ${OKV}
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 0ec1d6bf8931..3d32c3c02bf1 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,4 +1,4 @@
-MD5 200ecae8f4956db78f60b901445aca18 ChangeLog 5560
+MD5 3dde755878644df7510bdd1f016df53d ChangeLog 5556
 MD5 90a3df79392bb9607250e45e608472b3 linux-headers-2.2.20.ebuild 3924
 MD5 7289ac3b900fe7136758fdae230e74fb linux-headers-2.2.21_pre3.ebuild 4095
 MD5 b970d40b6384eb86cbeb120e6e0a5f0c linux-headers-2.4.16-r1.ebuild 5052
@@ -12,8 +12,8 @@ MD5 b854072fd0ae0ea776038247474d5fe5 linux-headers-2.4.18-r2.ebuild 4555
 MD5 ebb37a4bbba2124565be7130173a6f34 linux-headers-2.4.18.ebuild 3176
 MD5 db99dd305dd1be1b71632047b4e6f80c linux-headers-2.4.19-r1.ebuild 4794
 MD5 d0a25ca6955eb14a8baa4fee38cfc0f0 linux-headers-2.4.19.ebuild 4625
-MD5 7ded05ace4510818cd991bac295a7f39 linux-headers-2.4.21.ebuild 3570
-MD5 90252804663bea76afbf9c8262f8fa01 linux-headers-2.4.22.ebuild 3545
+MD5 b4601d645487253604cbbed2f575fbbc linux-headers-2.4.21.ebuild 3570
+MD5 09cea568bd3dedfd398d9735ddb223de linux-headers-2.4.22.ebuild 3545
 MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 07aeae7e5036a3ec3e06d29fd68e9cce files/digest-linux-headers-2.2.20 216
 MD5 167e790d7861e0ed3a31577b31a92968 files/digest-linux-headers-2.2.21_pre3 281
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
index 4686bf7b2bb6..b8403574202b 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.21.ebuild,v 1.11 2003/10/23 04:30:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.21.ebuild,v 1.12 2003/10/30 23:17:54 kumba Exp $
 
 
 ETYPE="headers"
@@ -25,7 +25,7 @@ KEYWORDS="-* amd64 ~sparc ~x86 -mips"
 
 
 # Figure out what architecture we are, and set ARCH appropriately
-ARCH="${ARCH:-`uname -m`}"
+ARCH="$(uname -m)"
 ARCH=`echo $ARCH | sed -e s/[i].86/i386/ -e s/x86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/amd64/x86_64/`
 [ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
 
@@ -114,4 +114,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	kernel_pkg_postinst
+
+	einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation"
+	einfo "of newer headers, it is advised that you re-merge glibc as follows:"
+	einfo "emerge glibc"
+	einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel"
+	einfo "headers."
 }
diff --git a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
index e3f898076047..436da6dd83e7 100644
--- a/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.22.ebuild,v 1.4 2003/10/23 04:30:09 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.4.22.ebuild,v 1.5 2003/10/30 23:17:54 kumba Exp $
 
 
 ETYPE="headers"
@@ -25,7 +25,7 @@ KEYWORDS="-*"
 
 
 # Figure out what architecture we are, and set ARCH appropriately
-ARCH="${ARCH:-`uname -m`}"
+ARCH="$(uname -m)"
 ARCH=`echo $ARCH | sed -e s/[i].86/i386/ -e s/x86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/amd64/x86_64/`
 [ "$ARCH" == "sparc" -a "$PROFILE_ARCH" == "sparc64" ] && ARCH=sparc64
 
@@ -114,4 +114,10 @@ pkg_preinst() {
 
 pkg_postinst() {
 	kernel_pkg_postinst
+
+	einfo "Kernel headers are usually only used when recompiling glibc, as such, following the installation"
+	einfo "of newer headers, it is advised that you re-merge glibc as follows:"
+	einfo "emerge glibc"
+	einfo "Failure to do so will cause glibc to not make use of newer features present in the updated kernel"
+	einfo "headers."
 }