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

[Mattia Dongili]

Author: malattia
Date: 2006-04-02 13:27:51 +0000 (Sun, 02 Apr 2006)
New Revision: 33

Modified:
   trunk/src/user-mode-linux/debian/changelog
   trunk/src/user-mode-linux/debian/rules
Log:
reverted stupid and useless ack, fixed make target deps

Modified: trunk/src/user-mode-linux/debian/changelog
===================================================================
--- trunk/src/user-mode-linux/debian/changelog	2006-04-02 13:13:15 UTC (rev 32)
+++ trunk/src/user-mode-linux/debian/changelog	2006-04-02 13:27:51 UTC (rev 33)
@@ -4,10 +4,6 @@
   [Mattia Dongili]:
     * added myself to the uploaders
     * fixed dependency on module-init-tools for kernel 2.6
-    * added some small acks to avoid removing and unpacking kernel sources
-      again and again when testing builds, use with:
-      UML_MAINT_MODE=1 dpkg-buildpackage -uc -us -Ilinux-source-2.6.16
-      UML_MAINT_MODE=1 ./debian/rules clean
     * using dpatch to apply patches, currently only a patch to fix uml_net
       path usage as we install to /usr/lib/uml/
     * updated config for 2.6.16

Modified: trunk/src/user-mode-linux/debian/rules
===================================================================
--- trunk/src/user-mode-linux/debian/rules	2006-04-02 13:13:15 UTC (rev 32)
+++ trunk/src/user-mode-linux/debian/rules	2006-04-02 13:27:51 UTC (rev 33)
@@ -19,15 +19,9 @@
 KBUILDVARS := CFLAGS_KERNEL=-O1
 endif
 
-unpack_clean_sources:=$(shell if [ -d $(kernel_dir) ] && [ -n "$(UML_MAINT_MODE)" ] ; then echo 1 ; fi)
-
 unpack: unpack-stamp
 unpack-stamp:
-ifeq (,$(unpack_clean_sources))
 	tar -x --bzip2 -f /usr/src/linux-source-$(kernel_version).tar.bz2
-else
-	@echo "UML Maintainer mode and kernel sources already unpacked"
-endif
 	touch $@
 
 patch: patch-stamp
@@ -55,26 +49,19 @@
 
 	touch $@
 
-clean: clean-patched unpatch
-clean-patched:
+clean: clean-unpatched
+clean-unpatched: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f unpack-stamp build-stamp configure-stamp
 
-ifeq (,$(unpack_clean_sources))
-	rm -rf $(kernel_dir)
-else
-	@echo "UML Maintainer mode, not just cleaning kernel directory tree."
-	cd $(kernel_dir) && make clean mrproper && cd ..
-	rm -rf $(kernel_dir)/linux
-endif
-	rm -rf linux.1 $(tmpmodules) changelog
+	rm -rf $(kernel_dir) linux.1 $(tmpmodules) changelog
 
 	dh_clean
 
 unpatch:
 	dpatch --workdir $(kernel_dir) deapply-all
-	rm -rf patch-stamp $(kernel_dir)/debian/patched
+	rm -rf patch-stamp $(kernel_dir)/debian
 
 install: build
 	dh_testdir