[Pkg-uml-commit] r104 - trunk/src/user-mode-linux/debian

[Mattia Dongili]

Author: malattia
Date: 2006-05-27 18:26:25 +0000 (Sat, 27 May 2006)
New Revision: 104

Modified:
   trunk/src/user-mode-linux/debian/changelog
   trunk/src/user-mode-linux/debian/rules
Log:
implement update-alternatives to cohexist with kernel-package
self-built kernels


Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog	2006-05-27 16:16:04 UTC (rev 103)
+++ trunk/src/user-mode-linux/debian/changelog	2006-05-27 18:26:25 UTC (rev 104)
@@ -2,8 +2,10 @@
 
   [Mattia Dongili]:
   * add 03_uml_switch patch (Closes: #367132)
+  * use the alternatives system to avoid conflicting with kernel-package
+    self-build UML kernels.
 
- -- Mattia Dongili <malattia at debian.org>  Sun, 21 May 2006 19:44:44 +0200
+ -- Mattia Dongili <malattia at debian.org>  Sat, 27 May 2006 19:32:08 +0200
 
 user-mode-linux (2.6.16-1um-2) unstable; urgency=low
 

Modified: trunk/src/user-mode-linux/debian/rules
===================================================================
--- trunk/src/user-mode-linux/debian/rules	2006-05-27 16:16:04 UTC (rev 103)
+++ trunk/src/user-mode-linux/debian/rules	2006-05-27 18:26:25 UTC (rev 104)
@@ -45,7 +45,7 @@
 	dh_testdir
 
 	$(MAKE) -C $(kernel_dir) $(KBUILDVARS) linux modules ARCH=um
-	docbook-to-man linux.sgml > linux.1
+	docbook-to-man linux.sgml > linux.uml.1
 
 	touch $@
 
@@ -69,7 +69,7 @@
 	dh_clean -k
 	dh_installdirs usr/bin usr/lib/uml usr/share/doc/user-mode-linux
 
-	install $(kernel_dir)/linux $(tmp)/usr/bin
+	install $(kernel_dir)/linux $(tmp)/usr/bin/linux.uml
 	$(MAKE) -C $(kernel_dir) modules_install ARCH=um \
 		INSTALL_MOD_PATH=$(tmpmodules)
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
@@ -77,6 +77,7 @@
 		| xargs --no-run-if-empty strip --strip-debug
 endif
 	-rm $(tmpmodules)/lib/modules/*/build
+	-rm $(tmpmodules)/lib/modules/*/source
 	mv $(tmpmodules)/lib/modules \
 		$(tmp)/usr/lib/uml/modules
 	rm -rf $(tmpmodules)
@@ -86,6 +87,7 @@
 
 	install -m 644 umldefconfig \
 		$(tmp)/usr/share/doc/user-mode-linux/defconfig
+	
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -105,7 +107,7 @@
 #	dh_installmime
 #	dh_installinit
 	dh_installcron
-	dh_installman linux.1
+	dh_installman linux.uml.1
 	dh_installinfo
 #	dh_undocumented
 	dh_installchangelogs $(CURDIR)/debian/changelog