From: Russ Allbery <rra@debian.org>
Date: Fri, 13 Feb 2009 17:42:23 +0000 (-0800)
Subject: Use make libafs_tree to create the kernel source
X-Git-Tag: debian/1.4.8.dfsg1-1~8
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=1f7158675f36178402b32ebdf31407b758595fa7;p=packages%2Fo%2Fopenafs.git

Use make libafs_tree to create the kernel source

* Use make libafs_tree to generate the tree for the kernel module
  compile rather than copying the entire source tree.
---

diff --git a/debian/changelog b/debian/changelog
index 4c22fd007..dcdcfdede 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ openafs (1.4.8.dfsg1-1) UNRELEASED; urgency=low
       could result in reuse of freed memory.
     - STABLE14-rx-do-not-race-current-packet-20090105: fix rx race
       condition.
+  * Use make libafs_tree to generate the tree for the kernel module
+    compile rather than copying the entire source tree.
   * Add initial DKMS support via an openafs-modules-dkms package, based on
     work by Robert Gerlach.  (LP: #288743)
   * Compress the source in openafs-modules-source with bzip2 instead of
diff --git a/debian/rules b/debian/rules
index b1bdc868d..f52672303 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,6 +99,7 @@ build-stamp:
 	    $(DEBIAN_OPT_FLAGS) $(SYSTEM)
 	chmod a+x src/libafs/make_kbuild_makefile.pl
 	dh build --after configure
+	$(MAKE) libafs_tree
 	touch $@
 
 clean:
@@ -119,19 +120,12 @@ install-stamp: build-stamp
 	dh_installinit -popenafs-fileserver -r
 
 	install -d debian/$(srcpkg)/usr/src/modules/$(package)
-	find . \( -name \*.o -o -path ./debian -o -path \*/.svn \
-	    -o -path ./src/WINNT -o -path ./doc -o -path ./obj \
-	    -o -path ./$(SYS_NAME) -o -path ./.pc \) -prune -o -print | \
-	        cpio -admp debian/$(srcpkg)/usr/src/modules/$(package)
+	cd libafs_tree && find . -print | \
+	    cpio -admp $(CURDIR)/debian/$(srcpkg)/usr/src/modules/$(package)
 	mkdir -p debian/$(srcpkg)/usr/src/modules/$(package)/debian
 	cp debian/changelog debian/copyright debian/module/* \
 	    debian/$(srcpkg)/usr/src/modules/$(package)/debian/
 	chmod 755 debian/$(srcpkg)/usr/src/modules/$(package)/debian/rules
-	rm -f debian/$(srcpkg)/usr/src/modules/$(package)/*-stamp
-	cd debian/$(srcpkg)/usr/src/modules/$(package) && \
-	    $(MAKE) distclean
-	-cd debian/$(srcpkg)/usr/src/modules/$(package) && \
-	    rm -rf src/libafs/rx src/libafs/afs src/libafs/afsint
 	chown -R root.src debian/$(srcpkg)
 	find debian/$(srcpkg) -type d | xargs chmod 755
 	find debian/$(srcpkg) -type f -perm -100 | xargs chmod 755
@@ -143,6 +137,7 @@ install-stamp: build-stamp
 	install -d debian/$(dkmspkg)/usr/src
 	mv debian/$(srcpkg)/usr/src/modules/$(package) \
 	    debian/$(dkmspkg)/usr/src/openafs-$(VERSION)
+	rmdir debian/$(srcpkg)/usr/src/modules
 	sed -e 's/[@]VERSION[@]/$(VERSION)/' debian/dkms.conf.in \
 	    > debian/$(dkmspkg)/usr/src/openafs-$(VERSION)/dkms.conf