[Glibc-bsd-commits] r4941 - trunk/kfreebsd-10/debian

[Robert Millan]

Author: rmh
Date: 2013-09-14 12:34:17 +0000 (Sat, 14 Sep 2013)
New Revision: 4941

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Remove one gratuitous round of src copying.

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-09-14 11:31:49 UTC (rev 4940)
+++ trunk/kfreebsd-10/debian/changelog	2013-09-14 12:34:17 UTC (rev 4941)
@@ -1,3 +1,9 @@
+kfreebsd-10 (10.0~svn255412-2) UNRELEASED; urgency=low
+
+  * Remove one gratuitous round of src copying.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 14 Sep 2013 14:34:07 +0200
+
 kfreebsd-10 (10.0~svn255412-1) experimental; urgency=low
 
   * New upstream snapshot.

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-09-14 11:31:49 UTC (rev 4940)
+++ trunk/kfreebsd-10/debian/rules	2013-09-14 12:34:17 UTC (rev 4941)
@@ -107,7 +107,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	rm -rf src kfreebsd-source-* flavor-*
+	rm -rf kfreebsd-source-* flavor-*
 	rm -f debian/kfreebsd-image-*.preinst
 	rm -f debian/kfreebsd-image-*.prerm
 	rm -f debian/kfreebsd-image-*.postinst
@@ -116,18 +116,12 @@
 	rm -f *-stamp
 	dh_clean
 
-src: src-stamp
-src-stamp:
-	mkdir $(CURDIR)/src
-	cp -af $(CURDIR)/sys $(CURDIR)/src
-
-	touch src-stamp
-
 build-indep: build-indep-stamp
-build-indep-stamp: src
+build-indep-stamp:
 	dh_testdir
 
-	cp -af src $(SRC_DIR)
+	mkdir -p $(SRC_DIR)
+	cp -af sys $(SRC_DIR)/
 
 	touch build-indep-stamp
 
@@ -147,8 +141,9 @@
 	touch install-indep-stamp
 
 build-arch: $(foreach flavor,$(flavours),build-flavor-$(flavor)-stamp)
-src-flavor-%-stamp: src
-	cp -af src $(FLAVOR_DIR)-$*
+src-flavor-%-stamp:
+	mkdir -p $(FLAVOR_DIR)-$*
+	cp -af sys $(FLAVOR_DIR)-$*/
 	touch $@
 build-flavor-%-stamp: src-flavor-%-stamp
 	# Add the abiname and the flavor to the kernel version
@@ -181,15 +176,14 @@
 
 	touch build-flavor-$*-stamp
 
-install-common-stamp: src
+install-common-stamp:
 	dh_testdir
 	dh_testroot
 	mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)
-	cd src \
-		&& find . -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(kfreebsd_cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
+	find sys -type f -name "*.h" -not -regex ".*modules.*" -not -regex ".*sys/$(kfreebsd_cpu)/.*" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR) \;
 
 	mkdir -p $(HEADERS_PACKAGE)/usr/src/$(HEADERS_DIR)/conf
-	cd src && cp --parents \
+	cp --parents \
 		sys/conf/kern.mk \
 		sys/conf/kmod.mk \
 		sys/conf/kmod_syms.awk \