[kernel] r11759 - in people/waldi/s390/s390-tools/debian: . patches

[Bastian Blank]

Author: waldi
Date: Fri Jul  4 09:29:49 2008
New Revision: 11759

Log:
* debian/patches/common-cflags.patch: Don't override CFLAGS.
* debian/rules: Use quilt.


Added:
   people/waldi/s390/s390-tools/debian/patches/
   people/waldi/s390/s390-tools/debian/patches/common-cflags.patch
   people/waldi/s390/s390-tools/debian/patches/series
Modified:
   people/waldi/s390/s390-tools/debian/rules

Added: people/waldi/s390/s390-tools/debian/patches/common-cflags.patch
==============================================================================
--- (empty file)
+++ people/waldi/s390/s390-tools/debian/patches/common-cflags.patch	Fri Jul  4 09:29:49 2008
@@ -0,0 +1,11 @@
+--- s390-tools.orig/common.mak
++++ s390-tools/common.mak
+@@ -22,7 +22,7 @@
+ OBJCOPY         = $(CROSS_COMPILE)objcopy
+ OBJDUMP         = $(CROSS_COMPILE)objdump
+ INSTALL         = install # FIXME: We need s390-install (strip)
+-CFLAGS		= $(OPT_FLAGS) -Wall -O3 -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
++CFLAGS		+= $(OPT_FLAGS) -Wall -DS390_TOOLS_RELEASE=$(S390_TOOLS_RELEASE)
+ export AS LD CC CPP AR NM STRIP OBJCOPY OBJDUMP INSTALL CFLAGS
+ 
+ # Support alternate install root

Added: people/waldi/s390/s390-tools/debian/patches/series
==============================================================================
--- (empty file)
+++ people/waldi/s390/s390-tools/debian/patches/series	Fri Jul  4 09:29:49 2008
@@ -0,0 +1 @@
+common-cflags.patch

Modified: people/waldi/s390/s390-tools/debian/rules
==============================================================================
--- people/waldi/s390/s390-tools/debian/rules	(original)
+++ people/waldi/s390/s390-tools/debian/rules	Fri Jul  4 09:29:49 2008
@@ -20,6 +20,7 @@
 	@rm -rf $(DIR)
 	mkdir $(DIR)
 	cp -a $(SOURCE_FILES) $(DIR)
+	cd $(DIR); QUILT_PATCHES=$(CURDIR)/debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	touch $@
 
 build: $(STAMPS_DIR)/build
@@ -35,6 +36,9 @@
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
+maintainerclean:
+	rm -rf $(filter-out .svn debian, $(wildcard * .[^.]*))
+
 install: DIR = $(BUILD_DIR)/build
 install: $(STAMPS_DIR)/build
 	dh_testdir