r3197 - trunk/kernel/amd64/kernel-image-2.6.11-amd64-2.6.11/debian

[Frederik Schüler]

Author: fschueler-guest
Date: 2005-05-19 21:42:59 +0000 (Thu, 19 May 2005)
New Revision: 3197

Modified:
   trunk/kernel/amd64/kernel-image-2.6.11-amd64-2.6.11/debian/rules
Log:
Added kernel-headers-version-abi-amd64 handling to the rules file, and removed obsolete cross-build part.


Modified: trunk/kernel/amd64/kernel-image-2.6.11-amd64-2.6.11/debian/rules
===================================================================
--- trunk/kernel/amd64/kernel-image-2.6.11-amd64-2.6.11/debian/rules	2005-05-19 21:00:58 UTC (rev 3196)
+++ trunk/kernel/amd64/kernel-image-2.6.11-amd64-2.6.11/debian/rules	2005-05-19 21:42:59 UTC (rev 3197)
@@ -21,8 +21,6 @@
 export KPKG_ARCH=amd64
 endif
 
-
-
 # Remember real tocuh binary for later use
 TOUCH := $(shell sh -c "command -v touch")
 # Set PATH for bin/touch always and for amd64-linux-* wrapers for i386
@@ -110,7 +108,17 @@
 
 # Build architecture-independent files here.
 binary-indep:
+	dh_testdir
+	dh_installdocs --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_installchangelogs --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_compress --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_fixperms --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_installdeb --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_gencontrol --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_md5sums --package=kernel-headers-$(version)$(debnum)-amd64
+	dh_builddeb --package=kernel-headers-$(version)$(debnum)-amd64
 
+
 # Build architecture-dependent files here.
 binary-arch: install
 	dh_testdir
@@ -129,23 +137,6 @@
 		cat install-$$i/debian/files >> debian/files; \
 		rm -rf install-$$i; \
 	done
-ifeq ($(debarch),i386)
-# Rebuild amd64 debs for i386
-	set -e; \
-	for DEB in *_amd64.deb; do \
-	  DIR=`echo $$DEB | cut -d"_" -f1`; \
-	  mkdir -p debian/$$DIR/DEBIAN; \
-	  dpkg -x $$DEB debian/$$DIR/; \
-	  dpkg -e $$DEB debian/$$DIR/DEBIAN/; \
-	  sed 's/Architecture: amd64/Architecture: i386/' < debian/$$DIR/DEBIAN/control > debian/$$DIR/DEBIAN/control2; \
-	  mv debian/$$DIR/DEBIAN/control2 debian/$$DIR/DEBIAN/control; \
-	  dpkg-deb -b debian/$$DIR ..; \
-	  rm $$DEB; \
-	done
-	sed -e 's/_amd64\.deb/_i386.deb/' debian/files > debian/files.tmp
-	mv debian/files.tmp debian/files
-endif
-	mv *.deb ..
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install unpack