[kernel] r17872 - in dists/trunk/linux-tools: . debian debian/bin debian/build debian/build/scripts debian/build/scripts/basic debian/build/scripts/genksyms debian/build/scripts/kconfig debian/build/scripts/mod scripts
Bastian Blank
waldi at alioth.debian.org
Sun Jul 31 11:02:39 UTC 2011
Author: waldi
Date: Sun Jul 31 11:02:37 2011
New Revision: 17872
Log:
* debian/build: Move build infrastructure.
* debian/rules: Clean build dir
* debian/rules.real: Use build dir directly.
Added:
dists/trunk/linux-tools/debian/build/
dists/trunk/linux-tools/debian/build/Makefile
- copied, changed from r17870, dists/trunk/linux-tools/Makefile
dists/trunk/linux-tools/debian/build/Makefile.inc
- copied unchanged from r17870, dists/trunk/linux-tools/Makefile.inc
dists/trunk/linux-tools/debian/build/scripts/
- copied from r17870, dists/trunk/linux-tools/scripts/
Deleted:
dists/trunk/linux-tools/Makefile
dists/trunk/linux-tools/Makefile.inc
dists/trunk/linux-tools/scripts/
Modified:
dists/trunk/linux-tools/debian/bin/genorig.py
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
dists/trunk/linux-tools/debian/rules.real
Modified: dists/trunk/linux-tools/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-tools/debian/bin/genorig.py Sun Jul 31 11:01:09 2011 (r17871)
+++ dists/trunk/linux-tools/debian/bin/genorig.py Sun Jul 31 11:02:37 2011 (r17872)
@@ -98,7 +98,7 @@
def generate(self):
self.log("Generate orig\n")
- orig = os.path.join(self.dir, self.orig, 'kbuild')
+ orig = os.path.join(self.dir, self.orig)
temp = os.path.join(self.dir, 'temp')
os.makedirs(os.path.join(orig, 'include', 'linux'))
for i in 'COPYING', 'Kbuild', 'Makefile':
Copied and modified: dists/trunk/linux-tools/debian/build/Makefile (from r17870, dists/trunk/linux-tools/Makefile)
==============================================================================
--- dists/trunk/linux-tools/Makefile Sun Jul 31 10:37:47 2011 (r17870, copy source)
+++ dists/trunk/linux-tools/debian/build/Makefile Sun Jul 31 11:02:37 2011 (r17872)
@@ -9,4 +9,4 @@
top_srcdir = .
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
Copied: dists/trunk/linux-tools/debian/build/Makefile.inc (from r17870, dists/trunk/linux-tools/Makefile.inc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-tools/debian/build/Makefile.inc Sun Jul 31 11:02:37 2011 (r17872, copy of r17870, dists/trunk/linux-tools/Makefile.inc)
@@ -0,0 +1,48 @@
+SHELL = /bin/sh -e
+
+CC = gcc
+CXX = g++
+CFLAGS ?= -O2 -Wall
+CXXFLAGS = $(CFLAGS)
+
+all: all-local all-recursive
+clean: clean-local clean-recursive
+install: install-local install-recursive
+
+%-recursive:
+ + at list='$(SUBDIRS)'; \
+ for subdir in $$list; do \
+ echo "Making $* in $$subdir"; \
+ $(MAKE) -C $$subdir $* \
+ || exit 1; \
+ done
+
+all-local: $(PROGS)
+
+clean-local::
+ rm -f $(PROGS) *.o
+
+install-local: install-local-progs install-local-scripts install-local-data
+
+install-local-progs: $(PROGS)
+ @for p in $^; do \
+ echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
+ install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+ done
+
+SCRIPTS_REAL = $(addprefix $(top_srcdir)/kbuild/$(OUTDIR)/,$(SCRIPTS))
+
+install-local-scripts: $(SCRIPTS_REAL)
+ @for p in $^; do \
+ echo " install -m755 '$$p' '$(prefix)/$(OUTDIR)'"; \
+ install -D -m755 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+ done
+
+DATA_REAL = $(addprefix $(top_srcdir)/kbuild/$(OUTDIR)/,$(DATA))
+
+install-local-data: $(DATA_REAL)
+ @for p in $^; do \
+ echo " install -m644 '$$p' '$(prefix)/$(OUTDIR)'"; \
+ install -D -m644 "$$p" "$(prefix)/$(OUTDIR)/$$(basename $$p)"; \
+ done
+
Modified: dists/trunk/linux-tools/debian/build/scripts/Makefile
==============================================================================
--- dists/trunk/linux-tools/scripts/Makefile Sun Jul 31 10:37:47 2011 (r17870)
+++ dists/trunk/linux-tools/debian/build/scripts/Makefile Sun Jul 31 11:02:37 2011 (r17872)
@@ -47,4 +47,4 @@
VPATH = $(top_srcdir)/kbuild/scripts
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/basic/Makefile
==============================================================================
--- dists/trunk/linux-tools/scripts/basic/Makefile Sun Jul 31 10:37:47 2011 (r17870)
+++ dists/trunk/linux-tools/debian/build/scripts/basic/Makefile Sun Jul 31 11:02:37 2011 (r17872)
@@ -7,4 +7,4 @@
VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
Modified: dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile
==============================================================================
--- dists/trunk/linux-tools/scripts/genksyms/Makefile Sun Jul 31 10:37:47 2011 (r17870)
+++ dists/trunk/linux-tools/debian/build/scripts/genksyms/Makefile Sun Jul 31 11:02:37 2011 (r17872)
@@ -6,7 +6,7 @@
VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
CFLAGS += -I$(VPATH)
Modified: dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile
==============================================================================
--- dists/trunk/linux-tools/scripts/kconfig/Makefile Sun Jul 31 10:37:47 2011 (r17870)
+++ dists/trunk/linux-tools/debian/build/scripts/kconfig/Makefile Sun Jul 31 11:02:37 2011 (r17872)
@@ -6,7 +6,7 @@
VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
CFLAGS += -I$(VPATH)
Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile
==============================================================================
--- dists/trunk/linux-tools/scripts/mod/Makefile Sun Jul 31 10:37:47 2011 (r17870)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile Sun Jul 31 11:02:37 2011 (r17872)
@@ -9,7 +9,7 @@
top_srcdir = ../..
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
modpost.real-%:
$(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod
Modified: dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real
==============================================================================
--- dists/trunk/linux-tools/scripts/mod/Makefile.real Sun Jul 31 10:37:47 2011 (r17870)
+++ dists/trunk/linux-tools/debian/build/scripts/mod/Makefile.real Sun Jul 31 11:02:37 2011 (r17872)
@@ -4,7 +4,7 @@
CFLAGS += -I$(top_srcdir)/kbuild/include
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
modpost.real-$(TYPE): file2alias.real-$(TYPE).o modpost.real-$(TYPE).o sumversion.real-$(TYPE).o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
Modified: dists/trunk/linux-tools/debian/rules
==============================================================================
--- dists/trunk/linux-tools/debian/rules Sun Jul 31 11:01:09 2011 (r17871)
+++ dists/trunk/linux-tools/debian/rules Sun Jul 31 11:02:37 2011 (r17872)
@@ -11,12 +11,12 @@
include debian/rules.defs
build: debian/control $(STAMPS_DIR)/build-base
-$(STAMPS_DIR)/build-base: $(BUILD_DIR) $(STAMPS_DIR) kbuild/include/generated/autoconf.h
+$(STAMPS_DIR)/build-base: $(STAMPS_DIR) kbuild/include/generated/autoconf.h
dh_testdir
$(MAKE) -f debian/rules.gen build
touch $@
-$(BUILD_DIR) $(STAMPS_DIR):
+$(STAMPS_DIR):
@[ -d $@ ] || mkdir $@
# modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined
@@ -46,7 +46,8 @@
clean: debian/control
dh_testdir
- rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
+ make -C $(BUILD_DIR) clean top_srcdir=$(CURDIR)
+ rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
dh_clean
binary-indep:
Modified: dists/trunk/linux-tools/debian/rules.real
==============================================================================
--- dists/trunk/linux-tools/debian/rules.real Sun Jul 31 11:01:09 2011 (r17871)
+++ dists/trunk/linux-tools/debian/rules.real Sun Jul 31 11:02:37 2011 (r17872)
@@ -6,25 +6,19 @@
build: $(STAMPS_DIR)/build
-$(STAMPS_DIR)/build: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/build: DIR=$(BUILD_DIR)/build
$(STAMPS_DIR)/build:
- rm -rf '$(DIR)'
- mkdir -p '$(DIR)'
- cp -al $(SOURCE_FILES) '$(DIR)'
- $(MAKE) -C $(DIR) top_srcdir=$(CURDIR)
+ $(MAKE) -C $(BUILD_DIR) top_srcdir=$(CURDIR)
touch '$@'
install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME)
install-kbuild: BASE_DIR = /usr/lib/$(PACKAGE_NAME)
-install-kbuild: SOURCE_DIR = $(BUILD_DIR)/build
install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
install-kbuild: $(STAMPS_DIR)/build
dh_testdir
dh_testroot
dh_clean -k -d
- $(MAKE) -C $(SOURCE_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
+ $(MAKE) -C $(BUILD_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
dh_installchangelogs
dh_installdocs
More information about the Kernel-svn-changes
mailing list