[Pkg-virtualbox-commits] r279 - in trunk/debian: . virtualbox-ose-guest-source.files virtualbox-ose-source.files

[meskes at alioth.debian.org]

Author: meskes
Date: 2008-05-10 08:02:19 +0000 (Sat, 10 May 2008)
New Revision: 279

Modified:
   trunk/debian/changelog
   trunk/debian/virtualbox-ose-guest-source.files/rules
   trunk/debian/virtualbox-ose-source.files/rules
Log:
Fixed module rules file to use make instead of kmk.



Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-05-09 13:11:38 UTC (rev 278)
+++ trunk/debian/changelog	2008-05-10 08:02:19 UTC (rev 279)
@@ -1,22 +1,21 @@
 virtualbox-ose (1.6.0-dfsg-1) unstable; urgency=low
 
   [ Michael Meskes ]
-  * New upstream version, closes: #478373, #478333, #479744
+  * New upstream version, closes: #475193, #478373, #478333, #479744
   * Made virtualbox-ose-modules recommend virtualbox-ose-guest-utils.
-  * Added patch by Pascal Volk <user at localhost.localdomain.org> to prevent
-    init script from overwriting values, closes: #475193
   * Added recommendation on up-to-date xserver-xorg-core and conflict on
     older versions to guest-utils, closes: #476526
   * Provide xserver-xorg-input-2 and xserver-xorg-video-2 with guest-utils.
   * Removed watch file, I couldn't find a way to get the orig tarball without
     first accepting a license.
-  * Rewrote debian/rules for virtualbox-ose-source partially, hopefully this
+  * Rewrote debian/rules for both source packages, hopefully this
     finally closes: #469882
   * Patched module Makefile to allow amd64 build in linux-modules-extra-2.6.
   * Removed unneeded xalan build dependency.
   * Added build dependency on libxslt and libxml.
   * Fixed LocalConfig.kmk to list new variables.
   * Use upstream provided X session file, put patch our changes in there.
+  * Do not use kmk to build modules, closes: #480012
 
   [ Daniel Baumann ]
   * Correcting wrong module-assistant manpage section in

Modified: trunk/debian/virtualbox-ose-guest-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-guest-source.files/rules	2008-05-09 13:11:38 UTC (rev 278)
+++ trunk/debian/virtualbox-ose-guest-source.files/rules	2008-05-10 08:02:19 UTC (rev 279)
@@ -42,8 +42,6 @@
 #
 ### end  KERNEL SETUP
 
-MAKE:=kmk
-
 clean:
 	(cd vboxadd; $(MAKE) clean)
 	(cd vboxvfs; $(MAKE) clean)
@@ -54,8 +52,8 @@
 	dh_clean -k
 
 	# Build the modules
-	(cd vboxadd; $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC))
-	(cd vboxvfs; $(MAKE) all KSRC=$(KSRC) KVER=$(KVERS) KERN_DIR=$(KSRC))
+	$(MAKE) -C $(KSRC) M=$(CURDIR)/vboxadd
+	$(MAKE) -C $(KSRC) M=$(CURDIR)/vboxvfs
 
 	# Install the modules
 	dh_install vboxadd/vboxadd.ko /lib/modules/$(KVERS)/misc/

Modified: trunk/debian/virtualbox-ose-source.files/rules
===================================================================
--- trunk/debian/virtualbox-ose-source.files/rules	2008-05-09 13:11:38 UTC (rev 278)
+++ trunk/debian/virtualbox-ose-source.files/rules	2008-05-10 08:02:19 UTC (rev 279)
@@ -49,8 +49,6 @@
 #
 ### end  KERNEL SETUP
 
-MAKE:=kmk
-
 binary-modules: prep-deb-files
 	dh_testroot
 	dh_clean -k