[DRBD-cvs] svn commit by lars - r2228 - branches/drbd-0.7/drbd - since 2.6.16, KERNELRELEASE may be empty,

[drbd-cvs at lists.linbit.com]

e.g. when bui
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: lars
Date: 2006-06-09 14:05:34 +0200 (Fri, 09 Jun 2006)
New Revision: 2228

Modified:
   branches/drbd-0.7/drbd/Makefile
Log:
since 2.6.16, KERNELRELEASE may be empty,
e.g. when building agains some (broken?) linux-header package.
Lets test on PATCHLEVEL, that won't change too soon...



Modified: branches/drbd-0.7/drbd/Makefile
===================================================================
--- branches/drbd-0.7/drbd/Makefile	2006-06-08 10:29:00 UTC (rev 2227)
+++ branches/drbd-0.7/drbd/Makefile	2006-06-09 12:05:34 UTC (rev 2228)
@@ -27,7 +27,11 @@
 # note: if you get strange make errors when ARCH=um, you
 # probably need to "make mrproper" in the KDIR first... 
 
-ifneq ($(KERNELRELEASE),)
+# since 2.6.16, KERNELRELEASE may be empty,
+# e.g. when building agains some (broken?) linux-header package.
+# Lets test on PATCHLEVEL, that won't change too soon...
+
+ifneq ($(PATCHLEVEL),)
   ifneq ($(VERSION),2)
     $(error "won't compile with this kernel version")
   endif
@@ -45,8 +49,10 @@
                   "PATCHLEVEL=$(PATCHLEVEL)\n"       \
                   "SUBLEVEL=$(SUBLEVEL)\n"           \
                   "EXTRAVERSION=$(EXTRAVERSION)\n"   \
-                  "KERNELRELEASE=$(KERNELRELEASE)" \
-          > $(DRBDSRC)/.kernelrelease.new \
+                  "LOCALVERSION=$(LOCALVERSION)\n"   \
+                  "KERNELRELEASE=$(KERNELRELEASE)\n" \
+                  "KERNELVERSION=$(KERNELVERSION)"   \
+          > $(DRBDSRC)/.drbd_kernelrelease.new       \
    )
 else
   # called from command line in current directory
@@ -103,7 +109,7 @@
        	mv $@{.new,}
 
   kbuild: drbd_buildtag.c
-	@rm -f .kernelrelease*
+	@rm -f .drbd_kernelrelease*
 	-test -f ../scripts/adjust_drbd_config_h.sh && \
 	 KDIR=$(KDIR) $(SHELL) ../scripts/adjust_drbd_config_h.sh
   ifeq ($(KDIR_Makefile_PATCHLEVEL),4)
@@ -113,17 +119,17 @@
     # $(MAKE) -C $(KDIR) M=$(DRBDSRC) $(ARCH_UM) modules
 	$(MAKE) -C $(KDIR) SUBDIRS=$(DRBDSRC) $(ARCH_UM) modules
   endif
-	@mv .kernelrelease.new .kernelrelease
+	-mv .drbd_kernelrelease.new .drbd_kernelrelease
 	@echo -n "Memorizing module configuration ... "
 	@{ echo -e "#\n# drbd.o was compiled with"          ; \
 	  echo "#  `gcc -v 2>&1 | tail -1`"                 ; \
 	  echo "# against this kernelrelease:"              ; \
-	  sed 's/^/#  /' .kernelrelease                     ; \
-          echo    "# kernel .config from"                   ; \
+	  sed 's/^/#  /' .drbd_kernelrelease                ; \
+	  echo    "# kernel .config from"                   ; \
 	  echo -n "#  $(KDIR)/.config"                      ; \
-          test -L "$(KDIR)" && echo "	alias"   &&           \
+	  test -L "$(KDIR)" && echo "	alias"   &&           \
 	  echo "#  $$(readlink $(KDIR))/.config" || echo "" ; \
-	  echo -e "# follows\n#\n"                             ; \
+	  echo -e "# follows\n#\n"                          ; \
 	  cat $(KDIR)/.config ; } | gzip > .kernel.config.gz
 	@echo "done."
 
@@ -143,9 +149,9 @@
 
   distclean: clean
 
-  ifneq ($(wildcard .kernelrelease),)
+  ifneq ($(wildcard .drbd_kernelrelease),)
     # for VERSION, PATCHLEVEL, SUBLEVEL, EXTRAVERSION, KERNELRELEASE
-    include .kernelrelease
+    include .drbd_kernelrelease
     MODOBJ-4 := drbd.o
     MODOBJ-6 := drbd.ko
     MODOBJ   := $(MODOBJ-$(PATCHLEVEL))
@@ -172,7 +178,7 @@
     endif
   else
     install:
-	@echo "No .kernelrelease found. Do you need to 'make' the module first?"
+	@echo "No .drbd_kernelrelease found. Do you need to 'make' the module first?"
 	@false
   endif