[kernel] r17874 - in dists/trunk/linux-tools/debian: . build build/scripts build/scripts/basic build/scripts/genksyms build/scripts/kconfig build/scripts/mod
Bastian Blank
waldi at alioth.debian.org
Sun Jul 31 11:18:49 UTC 2011
Author: waldi
Date: Sun Jul 31 11:18:48 2011
New Revision: 17874
Log:
Move imported code to root directory.
Modified:
dists/trunk/linux-tools/debian/build/Makefile.inc
dists/trunk/linux-tools/debian/build/scripts/Makefile
dists/trunk/linux-tools/debian/build/scripts/basic/Makefile
dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile
dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile
dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real
dists/trunk/linux-tools/debian/rules
Modified: dists/trunk/linux-tools/debian/build/Makefile.inc
==============================================================================
--- dists/trunk/linux-tools/debian/build/Makefile.inc Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/Makefile.inc Sun Jul 31 11:18:48 2011 (r17874)
@@ -30,7 +30,7 @@
install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
done
-SCRIPTS_REAL = $(addprefix $(top_srcdir)/kbuild/$(OUTDIR)/,$(SCRIPTS))
+SCRIPTS_REAL = $(addprefix $(top_srcdir)/$(OUTDIR)/,$(SCRIPTS))
install-local-scripts: $(SCRIPTS_REAL)
@for p in $^; do \
@@ -38,7 +38,7 @@
install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
done
-DATA_REAL = $(addprefix $(top_srcdir)/kbuild/$(OUTDIR)/,$(DATA))
+DATA_REAL = $(addprefix $(top_srcdir)/$(OUTDIR)/,$(DATA))
install-local-data: $(DATA_REAL)
@for p in $^; do \
Modified: dists/trunk/linux-tools/debian/build/scripts/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/Makefile Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/scripts/Makefile Sun Jul 31 11:18:48 2011 (r17874)
@@ -45,6 +45,6 @@
top_srcdir = ..
-VPATH = $(top_srcdir)/kbuild/scripts
+VPATH = $(top_srcdir)/scripts
include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/basic/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/basic/Makefile Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/scripts/basic/Makefile Sun Jul 31 11:18:48 2011 (r17874)
@@ -5,6 +5,6 @@
top_srcdir = ../..
-VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+VPATH = $(top_srcdir)/$(OUTDIR)
include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile Sun Jul 31 11:18:48 2011 (r17874)
@@ -4,7 +4,7 @@
top_srcdir = ../..
-VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+VPATH = $(top_srcdir)/$(OUTDIR)
include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile Sun Jul 31 11:18:48 2011 (r17874)
@@ -4,7 +4,7 @@
top_srcdir = ../..
-VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
+VPATH = $(top_srcdir)/$(OUTDIR)
include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/Makefile Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile Sun Jul 31 11:18:48 2011 (r17874)
@@ -12,12 +12,12 @@
include $(top_srcdir)/debian/build/Makefile.inc
modpost.real-%:
- $(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod
+ $(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/scripts/mod
%: %.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
-modpost.h: $(top_srcdir)/kbuild/scripts/mod/modpost.c
+modpost.h: $(top_srcdir)/scripts/mod/modpost.c
python ./gendef.py $< > $@
modpost.o: modpost.c modpost.h
Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real
==============================================================================
--- dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real Sun Jul 31 11:18:48 2011 (r17874)
@@ -2,7 +2,7 @@
top_srcdir = ../..
-CFLAGS += -I$(top_srcdir)/kbuild/include
+CFLAGS += -I$(top_srcdir)/include
include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/rules
==============================================================================
--- dists/trunk/linux-tools/debian/rules Sun Jul 31 11:04:53 2011 (r17873)
+++ dists/trunk/linux-tools/debian/rules Sun Jul 31 11:18:48 2011 (r17874)
@@ -11,7 +11,7 @@
include debian/rules.defs
build: debian/control $(STAMPS_DIR)/build-base
-$(STAMPS_DIR)/build-base: $(STAMPS_DIR) kbuild/include/generated/autoconf.h
+$(STAMPS_DIR)/build-base: $(STAMPS_DIR) include/generated/autoconf.h
dh_testdir
$(MAKE) -f debian/rules.gen build
touch $@
@@ -21,7 +21,7 @@
# modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined
# for all Debian architectures.
-kbuild/include/generated/autoconf.h:
+include/generated/autoconf.h:
@mkdir -p $(@D)
@[ -f $@ ] || touch $@
@@ -30,7 +30,7 @@
TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
orig: $(DIR_ORIG)
- rsync --delete --link-dest=$(CURDIR)/$(DIR_ORIG)/kbuild/ -a $(DIR_ORIG)/kbuild/ kbuild
+ rsync --delete --exclude debian --exclude .svk --exclude .svn --link-dest=$(DIR_ORIG)/ -a $(DIR_ORIG)/ .
$(DIR_ORIG):
ifeq ($(TAR_ORIG),)
@@ -41,13 +41,13 @@
endif
maintainerclean:
- -rm debian/control debian/control.md5sum debian/rules.gen
- -rm -rf kbuild
+ rm -f debian/control debian/control.md5sum debian/rules.gen
+ rm -rf $(filter-out debian .svk .svn, $(wildcard * .[^.]*))
clean: debian/control
dh_testdir
make -C $(BUILD_DIR) clean top_srcdir=$(CURDIR)
- rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
+ rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc include/generated
dh_clean
binary-indep:
More information about the Kernel-svn-changes
mailing list