[Fai-commit] r5056 - trunk

[lange at alioth.debian.org]

Author: lange
Date: 2008-08-29 15:06:39 +0000 (Fri, 29 Aug 2008)
New Revision: 5056

Modified:
   trunk/Makefile
   trunk/VERSION
Log:
remove variable KERNELVERSION, because it's not used any more (since 3.2) (closes: #494699)


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-08-29 15:00:20 UTC (rev 5055)
+++ trunk/Makefile	2008-08-29 15:06:39 UTC (rev 5056)
@@ -12,9 +12,6 @@
 # do not include .svn dir and setup-storage subdir
 libfiles=$(patsubst lib/setup-storage,,$(wildcard lib/[a-z]*))
 
-# files with variable KERNLEVERSION in it; this string will be substituted
-KVERSION_FILES =  $(DESTDIR)/etc/fai/make-fai-nfsroot.conf
-
 all:
 	$(MAKE) -C doc all
 
@@ -46,7 +43,6 @@
 	install -m644 conf/fai_modules_off $(DESTDIR)/etc/modutils
 	install -m755 lib/fai-abort $(DESTDIR)/etc/init.d
 	install -p -m644 pixmaps/*.gif $(DESTDIR)/usr/share/fai/pixmaps
-	perl -pi -e 's/_KERNELVERSION_/$(KERNELVERSION)/' $(KVERSION_FILES)
 	perl -pi -e 's/FAIVERSIONSTRING/$(VERSIONSTRING)/' $(DESTDIR)/usr/sbin/fai
 	cp -a examples $(DOCDIR)
 	cp -a utils $(DOCDIR)/examples

Modified: trunk/VERSION
===================================================================
--- trunk/VERSION	2008-08-29 15:00:20 UTC (rev 5055)
+++ trunk/VERSION	2008-08-29 15:06:39 UTC (rev 5056)
@@ -1,4 +1 @@
 VERSIONSTRING="$(shell perl -e 'while (<>) { /^(\S+).*\((.*)\)/ and print uc($$1) . " $$2, "; if (/ --.*,\s+(.*)\s\d+:/) { print "$$1" ; exit } }' $(SRCDIR)debian/changelog)"
-# in several files the string _KERNELVERSION_ will be replaced by the
-# value of KERNELVERSION 
-KERNELVERSION=2.6.18