r3853 - people/waldi/kernel/source/linux-2.6/debian

[Bastian Blank]

Author: waldi
Date: 2005-08-14 10:01:06 +0000 (Sun, 14 Aug 2005)
New Revision: 3853

Modified:
   people/waldi/kernel/source/linux-2.6/debian/rules.real
Log:
debian/rules.real
- Fix cross compile options for make-kpkg.
- Fix architecture patches.
- Remove asm-offsets.s workaround, pending real fix.


Modified: people/waldi/kernel/source/linux-2.6/debian/rules.real
===================================================================
--- people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-13 19:00:03 UTC (rev 3852)
+++ people/waldi/kernel/source/linux-2.6/debian/rules.real	2005-08-14 10:01:06 UTC (rev 3853)
@@ -55,7 +55,7 @@
   kpkg_header += --subarch $(headers_subarch)
 endif
 ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-  kpkg_image := --cross-compile=-$(DEB_HOST_GNU_TYPE)
+  kpkg_image += --cross-compile=$(DEB_HOST_GNU_TYPE)
 endif
 setup_env := env -i HOME=$(HOME) LOGNAME=$(LOGNAME) PATH=$(PATH)
 ifdef build_makeflags
@@ -162,7 +162,7 @@
 	touch $(DIR)/debian/official
 	if [ -n '$(patches)' ]; then			\
 	  cd $(DIR);					\
-	  cat $(addprefix ../,$(patches)) | patch -p1;	\
+	  cat $(addprefix $(CURDIR)/,$(patches)) | patch -p1;	\
 	fi
 	install $< $(DIR)/debian/post-install
 	touch $@
@@ -171,27 +171,13 @@
 # that in this file it should be always placed *before* the
 # build-$(subarch)-% target, which creates the build directory.
 #
-# Some arches have extra arch/${ARCH}/kernel/asm-offsets.s files
-# which have to be included in linux-headers. The problem is that
-# they are only generated during build and we never performed a
-# full build in the directory $(kdir) where linux-headers are
-# built. So, after build we check whether current build arch has
-# such a file and symlink it into the $(kdir) if necessary. It will
-# then be picked up and included into the linux-headers package
-# by the headers-install script.
-#
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 $(STAMPS_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR): $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 	ln -fs $$(command -v touch) debian/build/touch.orig
 	cd $(DIR); $(setup_env) PATH=$(CURDIR)/build:$(CURDIR)/bin:$(PATH) $(kpkg_image) build
-	cd $(DIR); $(if $(image_postproc),$(image_postproc),true)
-	arch=$$(basename $$(readlink $(DIR)/include/asm));		\
-	arch="$${arch#asm-}";					\
-	src="arch/$${arch}/kernel/asm-offsets.s";		\
-	dst="../$(DIR)/$${src}";				\
-	if [ -f "$${src}" ] && [ ! -e "$${dst}" ]; then		\
-	  cp -a "$$(pwd)/$${src}" "$${dst}";			\
-	fi
+ifdef image_postproc
+	cd $(DIR); $(image_postproc)
+endif
 	touch $@
 
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR): SOURCE_DIR=$(BUILD_DIR)/source-$(ARCH)-$(SUBARCH)