for new module-tag.py

[nozomi.git] / nozomi.spec

diff --git a/nozomi.spec b/nozomi.spec
index c2026b2..93575ad 100644 (file)
--- a/nozomi.spec
+++ b/nozomi.spec
@@ -10,11 +10,18 @@
 # $Id$
 #
 
+# kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g.
+# kernel_release : vs2.3.0.29.1.planetlab
+# kernel_version : 2.6.22.14
+
 %define name nozomi
 %define version 2.21
 %define subversion alpha_060917
+%define taglevel 1
 
 %define release %{subversion}%{kernel_release}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
+%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch}
+%define kernel_id %{kernel_version}-%{kernel_release}
 
 Summary: nozomi UMTS driver
 Name: %{name}
@@ -39,28 +46,21 @@ nozomi is a UMTS card driver
 %build
 rm -rf $RPM_BUILD_ROOT
 
-# bootstrap to avoid BuildRequires of kernel-source
-for linux in $RPM_BUILD_DIR/linux-* ; do
-   isuml=$(echo $linux | grep uml$ | wc -l)
-   isxen=$(echo $linux | grep xenU$ | wc -l)
-   # don't build for uml platform
-   if [ $isuml -eq 0 -a $isxen -eq 0 ] ; then  
-        %__make KDIR=$linux default
-       # the makefile is broken for installation
-       #%__make KDIR=$linux INSTALLDIR=$linux/kernel/drivers/hotplug install
-       # xxx temporary - needs to be fixed
-       # needs to somehow get the linux version from $linux cleanly
-       linux_version=$(grep UTS_RELEASE $linux/include/linux/version.h | \
-                       sed -e 's,^#.*UTS_RELEASE ",,' -e 's,"$,,')
-       # xxx end temporary
-       mkdir -p $RPM_BUILD_ROOT/lib/modules/${linux_version}/kernel/drivers/hotplug
-       cp -f nozomi.ko $RPM_BUILD_ROOT/lib/modules/${linux_version}/kernel/drivers/hotplug 
-   fi
-done
+# with the new build, we use the kernel-devel rpm for building
+%define kernelpath /usr/src/kernels/%{kernel_id_arch}
+
+%__make KDIR=%kernelpath default
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
+# the makefile is broken for installation
+#%__make KDIR=$linux INSTALLDIR=$linux/kernel/drivers/hotplug install
+mkdir -p $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/kernel/drivers/hotplug
+cp -f nozomi.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/kernel/drivers/hotplug 
+
 # Remove depmod files, will be regenerated in %post
-rm -f $RPM_BUILD_ROOT/lib/modules/*/modules.*
+rm -f $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/modules.*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,9 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-for version in /lib/modules/* ; do
-    depmod -a $(basename $version) >/dev/null 2>&1 || :
-done
+depmod -a %{kernel_id} >/dev/null 2>&1 || :
 
 # ask for a reboot
 
@@ -83,17 +81,18 @@ done
 %postun
 # 0 = erase, 1 = upgrade
 if [ $1 -eq 0 ] ; then
-    for dir in /lib/modules/* ; do
-       version=$(basename $dir)
-        # If we were the only module installed, remove the module dependencies
-       if [ ! -d $dir/kernel ] ; then
-           [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove $version
-       else
-           depmod -a $version >/dev/null 2>&1 || :
-       fi
-    done
+    dir=/lib/modules/%{kernel_id}
+    # If we were the only module installed, remove the module dependencies
+    if [ ! -d $dir/kernel ] ; then
+       [ -x /sbin/new-kernel-pkg ] && /sbin/new-kernel-pkg --rmmoddep --remove %{kernel_id}
+    else
+       depmod -a %{kernel_id} >/dev/null 2>&1 || :
+    fi
 fi
 
 %changelog
+* Fri Dec 05 2007 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
+- updated for 4.2 and new build
+
 * Mon May 04 2007 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
 - Initial release