Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (e99f25e740d6dc48c3f218e260cbd5df5cd457a0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Juuso Alasuutari <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (e99f25e740d6dc48c3f218e260cbd5df5cd457a0)
  • Date: Sun, 17 Dec 2006 12:18:41 -0600

GIT changes to master z-rejected grimoire by Juuso Alasuutari
<iuso AT sourcemage.org>:

z-java/j2sdk/HISTORY | 4 ++++
z-java/j2sdk/PRE_BUILD | 2 +-
z-kernels/ieee80211/HISTORY | 2 +-
z-kernels/ipw2200/HISTORY | 2 +-
z-kernels/nvidia_nforce/BUILD | 14 +-------------
z-kernels/nvidia_nforce/HISTORY | 4 ++++
6 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit e99f25e740d6dc48c3f218e260cbd5df5cd457a0
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

ipw2200: Corrected error in last HISTORY entry

commit e51e4942a6ea7c88742a4adefde7f23bdb7c742a
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

ieee80211: Corrected error in last HISTORY entry

commit 8d0c34a3e80d539ada7278b91560729cb7d0646c
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

nvidia_nforce: Use get_kernel_version instead of ugly hack (although I
suspect this whole spell is borked), bug #10940

commit 46be247549bbe99ef7e23d8cf3e7d4f086cad5c6
Author: Juuso Alasuutari <iuso AT sourcemage.org>
Commit: Juuso Alasuutari <iuso AT sourcemage.org>

j2sdk: 'uname -r' -> get_running_kernel_version, bug #10940

diff --git a/z-java/j2sdk/HISTORY b/z-java/j2sdk/HISTORY
index ca79442..f3d6290 100644
--- a/z-java/j2sdk/HISTORY
+++ b/z-java/j2sdk/HISTORY
@@ -1,3 +1,7 @@
+2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
+ * PRE_BUILD: Replaced 'uname -r' with get_running_kernel_version
+ (bug #10940).
+
2006-10-26 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* INSTALL: use TRACK_ROOT when linking #9163

diff --git a/z-java/j2sdk/PRE_BUILD b/z-java/j2sdk/PRE_BUILD
index 51d8007..af2dc2b 100755
--- a/z-java/j2sdk/PRE_BUILD
+++ b/z-java/j2sdk/PRE_BUILD
@@ -1,4 +1,4 @@
-if [[ $(uname -r) == 2.6.* ]]; then
+if [[ $(get_running_kernel_version) == 2.6.* ]]; then
if [ $(cat /proc/meminfo | grep SwapFree |awk '$1=="SwapFree:"{print $2;}')
-gt "1300000000" ] ;
then mk_source_dir $SOURCE_DIRECTORY 2g
else export TMPFS=off &&
diff --git a/z-kernels/ieee80211/HISTORY b/z-kernels/ieee80211/HISTORY
index 29f3830..64f9a15 100644
--- a/z-kernels/ieee80211/HISTORY
+++ b/z-kernels/ieee80211/HISTORY
@@ -1,6 +1,6 @@
2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Changed all get_sorcery_kernel_config to
- get_kernel_config (bug #10940).
+ get_kernel_config (bug #13071).

2006-10-27 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.2.15.
diff --git a/z-kernels/ipw2200/HISTORY b/z-kernels/ipw2200/HISTORY
index 54935ce..e1a9254 100644
--- a/z-kernels/ipw2200/HISTORY
+++ b/z-kernels/ipw2200/HISTORY
@@ -1,6 +1,6 @@
2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_BUILD: Changed all get_sorcery_kernel_config to
- get_kernel_config (bug #10940).
+ get_kernel_config (bug #13071).

2006-10-27 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Updated to 1.2.0.
diff --git a/z-kernels/nvidia_nforce/BUILD b/z-kernels/nvidia_nforce/BUILD
index f6da4d5..7fe3fb6 100755
--- a/z-kernels/nvidia_nforce/BUILD
+++ b/z-kernels/nvidia_nforce/BUILD
@@ -1,17 +1,5 @@
(
-
- # A surprising number of module makefiles attempt to figure out the kernel
- # version in every way but the correct one - which is to actually look at
- # the sources being compiled against!
- KVERSION=` head -1 /lib/modules/$(uname -r)/build/Makefile |
sed 's/.*=//'`
- KPATCHLEVEL=` head -2 /lib/modules/$(uname -r)/build/Makefile | tail -1
| sed 's/.*=//'`
- KSUBLEVEL=` head -3 /lib/modules/$(uname -r)/build/Makefile | tail -1
| sed 's/.*=//'`
- KEXTRAVERSION=` head -4 /lib/modules/$(uname -r)/build/Makefile | tail -1
| sed 's/.*=//'`
-
- KERNEL=`echo "${KVERSION}.${KPATCHLEVEL}.${KSUBLEVEL}${KEXTRAVERSION}" |
- sed 's/ //g'`
-
- sedit "s/\$(shell uname -r)/$KERNEL/" Makefile
+ sedit "s/\$(shell uname -r)/$(get_kernel_version)/" Makefile

sedit "s/: gcc-check/:/" Makefile

diff --git a/z-kernels/nvidia_nforce/HISTORY b/z-kernels/nvidia_nforce/HISTORY
index dabc9b9..19c2697 100644
--- a/z-kernels/nvidia_nforce/HISTORY
+++ b/z-kernels/nvidia_nforce/HISTORY
@@ -1,3 +1,7 @@
+2006-12-17 Juuso Alasuutari <iuso AT sourcemage.org>
+ * BUILD: Replaced kernel version retriever hack with
+ get_kernel_version (bug #10940).
+
2005-12-01 Seth Woolley <seth AT tautology.org>
* DETAILS: MD5 -> SHA512




  • [SM-Commit] GIT changes to master z-rejected grimoire by Juuso Alasuutari (e99f25e740d6dc48c3f218e260cbd5df5cd457a0), Juuso Alasuutari, 12/17/2006

Archive powered by MHonArc 2.6.24.

Top of Page