[Glibc-bsd-commits] r3307 - trunk/kfreebsd-kernel-headers/debian

[Guillem Jover]

Author: guillem
Date: 2011-05-25 07:45:50 +0000 (Wed, 25 May 2011)
New Revision: 3307

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Unpack the kfreebsd-source tarball directly into the topdir


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2011-05-25 06:30:38 UTC (rev 3306)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2011-05-25 07:45:50 UTC (rev 3307)
@@ -9,6 +9,10 @@
   * Add <sys/kerneldump.h> for savecore (freebsd-utils).
   * start MIPS support.
 
+  [ Guillem Jover ]
+  * Unpack the kfreebsd-source tarball directly into the top package
+    source directory.
+
  -- Robert Millan <rmh at debian.org>  Thu, 27 Jan 2011 16:16:03 +0100
 
 kfreebsd-kernel-headers (0.53) unstable; urgency=low

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2011-05-25 06:30:38 UTC (rev 3306)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2011-05-25 07:45:50 UTC (rev 3307)
@@ -15,7 +15,6 @@
 
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-kernel-headers
 SRC_TAR		:= /usr/src/kfreebsd-source-8.2.tar.xz
-SRC_DIR		:= kfreebsd-source-8.2
 
 clean:
 	dh_testdir
@@ -28,9 +27,9 @@
 build-stamp:
 	dh_testdir
 	
-	tar xfJ $(SRC_TAR)
+	tar xfJ $(SRC_TAR) --strip-components=1
 
-	cd $(SRC_DIR) && QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a
+	QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a
 
 	touch build-stamp
 
@@ -39,17 +38,17 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_install --sourcedir=$(SRC_DIR)
+	dh_install --sourcedir=$(CURDIR)
 
 	# legacy USB stack
 	#mkdir -p $(HEADERS_PACKAGE)/usr/include/legacy/dev/usb
 	#install -p $(CURDIR)/debian/legacy-usb/*.h $(HEADERS_PACKAGE)/usr/include/legacy/dev/usb/
 
 ifneq ($(filter i386 amd64, $(kfreebsd_cpu)),)
-	sh debian/generate-asm.sh $(kfreebsd_cpu) $(SRC_DIR)/sys $(HEADERS_PACKAGE)/usr/include
+	sh debian/generate-asm.sh $(kfreebsd_cpu) $(CURDIR)/sys $(HEADERS_PACKAGE)/usr/include
 else
 	mkdir -p $(HEADERS_PACKAGE)/usr/include/machine
-	cd $(SRC_DIR)/sys/$(kfreebsd_cpu)/include \
+	cd $(CURDIR)/sys/$(kfreebsd_cpu)/include \
 		&& find . -type f -name "*.h" -exec cp --parents {} $(HEADERS_PACKAGE)/usr/include/machine \;
 endif