* debian/changelog: Update.
* debian/patches: Add patch. * debian/rules: Remove now unneeded autoconf.h handling. svn path=/dists/trunk/linux-tools/; revision=17877
This commit is contained in:
parent
d5a4f432ac
commit
37b7f2a85b
|
@ -2,6 +2,7 @@ linux-tools (3.0.0-3) UNRELEASED; urgency=low
|
|||
|
||||
* Rename to linux-tools.
|
||||
* Use 3.0 (quilt) source format.
|
||||
* Properly patch modpost symbol prefix setting.
|
||||
|
||||
-- Bastian Blank <waldi@debian.org> Sun, 31 Jul 2011 12:36:15 +0200
|
||||
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
--- a/scripts/mod/modpost.c
|
||||
+++ b/scripts/mod/modpost.c
|
||||
@@ -16,15 +16,11 @@
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
#include "modpost.h"
|
||||
-#include "../../include/generated/autoconf.h"
|
||||
#include "../../include/linux/license.h"
|
||||
|
||||
/* Some toolchains use a `_' prefix for all user symbols. */
|
||||
-#ifdef CONFIG_SYMBOL_PREFIX
|
||||
-#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
|
||||
-#else
|
||||
+/* No Debian architecture currently does this. */
|
||||
#define MODULE_SYMBOL_PREFIX ""
|
||||
-#endif
|
||||
|
||||
|
||||
/* Are we using CONFIG_MODVERSIONS? */
|
|
@ -0,0 +1 @@
|
|||
modpost-symbol-prefix.patch
|
|
@ -11,7 +11,7 @@ VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.*
|
|||
include debian/rules.defs
|
||||
|
||||
build: debian/control $(STAMPS_DIR)/build-base
|
||||
$(STAMPS_DIR)/build-base: $(STAMPS_DIR) include/generated/autoconf.h
|
||||
$(STAMPS_DIR)/build-base: $(STAMPS_DIR)
|
||||
dh_testdir
|
||||
$(MAKE) -f debian/rules.gen build
|
||||
touch $@
|
||||
|
@ -19,12 +19,6 @@ $(STAMPS_DIR)/build-base: $(STAMPS_DIR) include/generated/autoconf.h
|
|||
$(STAMPS_DIR):
|
||||
@[ -d $@ ] || mkdir $@
|
||||
|
||||
# modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined
|
||||
# for all Debian architectures.
|
||||
include/generated/autoconf.h:
|
||||
@mkdir -p $(@D)
|
||||
@[ -f $@ ] || touch $@
|
||||
|
||||
DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
|
||||
TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz
|
||||
TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
|
||||
|
@ -47,7 +41,7 @@ maintainerclean:
|
|||
clean: debian/control
|
||||
dh_testdir
|
||||
make -C $(BUILD_DIR) clean top_srcdir=$(CURDIR)
|
||||
rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc include/generated
|
||||
rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc
|
||||
dh_clean
|
||||
|
||||
binary-indep:
|
||||
|
|
Loading…
Reference in New Issue