[Pkg-uml-commit] [SCM] Debian packaging for the Usermode Linux kernel branch, master, updated. 2.6.32-1um-3-12-g29f5b05

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 45c08b908502febe5ee56998cdaf68b23d9f2829
Merge: f910b30447bbe3300fc965f1c1fea33684c1a4c4 1f6db0a10a5d34e70b4c01f6ebd5ae5a02f95546
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Mon Mar 19 19:22:12 2012 +0530

    Merge branch 'master' into build
    
    * master:
      Use the kernel stripping options rather than our own

diff --combined debian/rules
index fc918a3,039050f..8bac86c
--- a/debian/rules
+++ b/debian/rules
@@@ -6,7 -6,7 +6,7 @@@
  #export DH_VERBOSE=1
  
  config_target:=oldconfig
 -kernel_version:=2.6.32
 +kernel_version:=3.2
  kernel_dir:=linux-source-$(kernel_version)
  debian:=$(CURDIR)/debian
  tmp:=$(debian)/user-mode-linux
@@@ -88,13 -88,17 +88,17 @@@ install: buil
  	dh_installdirs usr/bin usr/lib/uml usr/share/doc/user-mode-linux
  	install -D -m 0644 debian/user-mode-linux.lintian debian/user-mode-linux/usr/share/lintian/overrides/user-mode-linux
  
- 	install $(kernel_dir)/linux $(tmp)/usr/bin/linux.uml
- 	$(MAKE) -C $(kernel_dir) modules_install ARCH=um \
- 		INSTALL_MOD_PATH=$(tmpmodules)
+ 	MODSTIP=1
  ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- 	find $(tmpmodules) -name '*.ko' \
- 		| xargs --no-run-if-empty strip --strip-debug
+ 	MODSTIP=0
  endif
+ 	install $(kernel_dir)/linux $(tmp)/usr/bin/linux.uml
+ 
+ 	$(MAKE) -C $(kernel_dir) modules_install \
+ 		ARCH=um \
+ 		INSTALL_MOD_PATH=$(tmpmodules) \
+ 		INSTALL_MOD_STRIP=$(MODSTIP)
+ 
  	-rm $(tmpmodules)/lib/modules/*/build
  	-rm $(tmpmodules)/lib/modules/*/source
  	mv $(tmpmodules)/lib/modules \

-- 
Debian packaging for the Usermode Linux kernel