[SM-Commit] GIT changes to master grimoire by Eric Sandall (8f723b726e3d99fa2b61affe03f2ee847ae52c84)

Eric Sandall scm at mail.sourcemage.org
Fri Sep 22 18:26:44 EDT 2006


GIT changes to master grimoire by Eric Sandall <sandalle at moby.(none)>:

 kernels/drm/HISTORY     |    4 +++-
 kernels/drm/INSTALL     |    8 ++++----
 kernels/drm/PRE_INSTALL |   11 -----------
 3 files changed, 7 insertions(+), 16 deletions(-)

New commits:
commit 8f723b726e3d99fa2b61affe03f2ee847ae52c84
Author: Eric Sandall <sandalle at moby.(none)>
Commit: Eric Sandall <sandalle at moby.(none)>

    drm set to use get_kernel_version instead of uname, removed backup code for binaries

diff --git a/kernels/drm/HISTORY b/kernels/drm/HISTORY
index 4fe8fea..ecad013 100644
--- a/kernels/drm/HISTORY
+++ b/kernels/drm/HISTORY
@@ -1,5 +1,7 @@
 2006-09-22 Eric Sandall <eric at sandall.us>
-	* PRE_INSTALL: Only backup drm modules if they're installed
+	* PRE_INSTALL: Remove backup of kernel modules
+	* INSTALL: No need to be verbose when calling mkdir
+	  Use get_kernel_version rather than uname
 
 2006-09-13 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* BUILD, CONFIGURE, DEPENDS, DETAILS, HISTORY: created spell
diff --git a/kernels/drm/INSTALL b/kernels/drm/INSTALL
index 884f435..7f47aa6 100755
--- a/kernels/drm/INSTALL
+++ b/kernels/drm/INSTALL
@@ -1,10 +1,10 @@
 cd $SOURCE_DIRECTORY                                                     &&
-mkdir -vp $INSTALL_ROOT/lib/modules/$(uname -r)/kernel/drivers/char/drm  &&
+mkdir -p $INSTALL_ROOT/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm  &&
 
-if [[ "`uname -r | cut -c-3`" == "2.6" ]]; then
+if [[ "`get_kernel_version | cut -c-3`" == "2.6" ]]; then
   cp -v $SOURCE_DIRECTORY/linux-core/*.ko                                \
-  $INSTALL_ROOT/lib/modules/$(uname -r)/kernel/drivers/char/drm/
+  $INSTALL_ROOT/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm/
 else
   cp -v $SOURCE_DIRECTORY/linux-core/*.o                                 \
-  $INSTALL_ROOT/lib/modules/$(uname -r)/kernel/drivers/char/drm/
+  $INSTALL_ROOT/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm/
 fi
diff --git a/kernels/drm/PRE_INSTALL b/kernels/drm/PRE_INSTALL
deleted file mode 100755
index 53598db..0000000
--- a/kernels/drm/PRE_INSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-if [[ -d $INSTALL_ROOT/lib/modules/$(uname -r)/kernel/drivers/char/drm/ ]]
-then
-  cd $INSTALL_ROOT/lib/modules/$(uname -r)/kernel/drivers/char/drm/  &&
-  local i                                                            &&
-  for i in *.ko
-  do
-    mv -fv $i $i.bak
-  done
-fi  &&
-
-default_pre_install



More information about the SM-Commit mailing list