[kernel] r12903 - in dists/trunk/linux-kbuild-2.6: debian debian/bin src src/basic src/genksyms src/kconfig src/mod
Bastian Blank
waldi at alioth.debian.org
Sun Feb 22 13:34:56 UTC 2009
Author: waldi
Date: Sun Feb 22 13:31:45 2009
New Revision: 12903
Log:
* debian/bin/genorig.py
- Install upstream files in kbuild directory.
- Add top-level Makefile and Kbuild.
* debian/rules: Fix maintainerclean.
* src/Makefile, src/basic/Makefile,
src/genksyms/Makefile, src/kconfig/Makefile,
src/mod/Makefile src/mod/Makefile.real: Fix paths.
Modified:
dists/trunk/linux-kbuild-2.6/debian/bin/genorig.py
dists/trunk/linux-kbuild-2.6/debian/rules
dists/trunk/linux-kbuild-2.6/src/Makefile
dists/trunk/linux-kbuild-2.6/src/basic/Makefile
dists/trunk/linux-kbuild-2.6/src/genksyms/Makefile
dists/trunk/linux-kbuild-2.6/src/kconfig/Makefile
dists/trunk/linux-kbuild-2.6/src/mod/Makefile
dists/trunk/linux-kbuild-2.6/src/mod/Makefile.real
Modified: dists/trunk/linux-kbuild-2.6/debian/bin/genorig.py
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/bin/genorig.py (original)
+++ dists/trunk/linux-kbuild-2.6/debian/bin/genorig.py Sun Feb 22 13:31:45 2009
@@ -71,11 +71,12 @@
def generate(self):
self.log("Generate orig\n")
- orig = os.path.join(self.dir, self.orig)
+ orig = os.path.join(self.dir, self.orig, 'kbuild')
temp = os.path.join(self.dir, 'temp')
os.makedirs(os.path.join(orig, 'include', 'linux'))
- shutil.copyfile(os.path.join(temp, 'COPYING'), os.path.join(orig, 'COPYING'))
- for i in ('input.h', 'license.h', 'mod_devicetable.h'):
+ for i in 'COPYING', 'Kbuild', 'Makefile':
+ shutil.copyfile(os.path.join(temp, i), os.path.join(orig, i))
+ for i in 'input.h', 'license.h', 'mod_devicetable.h':
shutil.copyfile(os.path.join(temp, 'include', 'linux', i), os.path.join(orig, 'include', 'linux', i))
shutil.copytree(os.path.join(temp, 'scripts'), os.path.join(orig, 'scripts'))
Modified: dists/trunk/linux-kbuild-2.6/debian/rules
==============================================================================
--- dists/trunk/linux-kbuild-2.6/debian/rules (original)
+++ dists/trunk/linux-kbuild-2.6/debian/rules Sun Feb 22 13:31:45 2009
@@ -36,7 +36,7 @@
maintainerclean:
-rm debian/control debian/control.md5sum debian/rules.gen
- -rm -rf COPYING include scripts
+ -rm -rf kbuild
clean: debian/control
dh_testdir
Modified: dists/trunk/linux-kbuild-2.6/src/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/src/Makefile (original)
+++ dists/trunk/linux-kbuild-2.6/src/Makefile Sun Feb 22 13:31:45 2009
@@ -37,6 +37,6 @@
kconfig \
mod
-VPATH = $(top_srcdir)/scripts
+VPATH = $(top_srcdir)/kbuild/scripts
include Makefile.inc
Modified: dists/trunk/linux-kbuild-2.6/src/basic/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/src/basic/Makefile (original)
+++ dists/trunk/linux-kbuild-2.6/src/basic/Makefile Sun Feb 22 13:31:45 2009
@@ -3,6 +3,6 @@
fixdep
OUTDIR = basic
-VPATH = $(top_srcdir)/scripts/basic
+VPATH = $(top_srcdir)/kbuild/scripts/basic
include ../Makefile.inc
Modified: dists/trunk/linux-kbuild-2.6/src/genksyms/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/src/genksyms/Makefile (original)
+++ dists/trunk/linux-kbuild-2.6/src/genksyms/Makefile Sun Feb 22 13:31:45 2009
@@ -1,9 +1,9 @@
PROGS = genksyms
OUTDIR = genksyms
-VPATH = $(top_srcdir)/scripts/genksyms
+VPATH = $(top_srcdir)/kbuild/scripts/genksyms
-CFLAGS += -I$(top_srcdir)/scripts/genksyms
+CFLAGS += -I$(top_srcdir)/kbuild/scripts/genksyms
genksyms: genksyms.o parse.o lex.o
Modified: dists/trunk/linux-kbuild-2.6/src/kconfig/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/src/kconfig/Makefile (original)
+++ dists/trunk/linux-kbuild-2.6/src/kconfig/Makefile Sun Feb 22 13:31:45 2009
@@ -1,18 +1,18 @@
PROGS = conf
OUTDIR = kconfig
-VPATH = $(top_srcdir)/scripts/kconfig
+VPATH = $(top_srcdir)/kbuild/scripts/kconfig
-CFLAGS += -I$(top_srcdir)/scripts/kconfig
+CFLAGS += -I$(top_srcdir)/kbuild/scripts/kconfig
conf: conf.o zconf.tab.o
zconf.tab.c: zconf.hash.c lex.zconf.c
%.c: %.c_shipped
- ln -s $< $@
+ ln -sf $< $@
%.h: %.h_shipped
- ln -s $< $@
+ ln -sf $< $@
include ../Makefile.inc
Modified: dists/trunk/linux-kbuild-2.6/src/mod/Makefile
==============================================================================
--- dists/trunk/linux-kbuild-2.6/src/mod/Makefile (original)
+++ dists/trunk/linux-kbuild-2.6/src/mod/Makefile Sun Feb 22 13:31:45 2009
@@ -8,7 +8,7 @@
OUTDIR = mod
modpost.real-%:
- $(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/scripts/mod
+ $(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod
%: %.o
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
Modified: dists/trunk/linux-kbuild-2.6/src/mod/Makefile.real
==============================================================================
--- dists/trunk/linux-kbuild-2.6/src/mod/Makefile.real (original)
+++ dists/trunk/linux-kbuild-2.6/src/mod/Makefile.real Sun Feb 22 13:31:45 2009
@@ -1,6 +1,6 @@
PROGS = modpost.real-$(TYPE)
-CFLAGS += -I$(top_srcdir)/include
+CFLAGS += -I$(top_srcdir)/kbuild/include
include ../Makefile.inc
More information about the Kernel-svn-changes
mailing list