* 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.

svn path=/dists/trunk/linux-kbuild-2.6/; revision=12903

debian/bin/genorig.py

@@ -71,11 +71,12 @@ class Main(object):
 
     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'))
 

debian/rules

@@ -36,7 +36,7 @@ endif
 
 maintainerclean:
 	-rm debian/control debian/control.md5sum debian/rules.gen
-	-rm -rf COPYING include scripts
+	-rm -rf kbuild
 
 clean: debian/control
 	dh_testdir

src/Makefile

@@ -37,6 +37,6 @@ SUBDIRS = \
 	kconfig \
 	mod
 
-VPATH = $(top_srcdir)/scripts
+VPATH = $(top_srcdir)/kbuild/scripts
 
 include Makefile.inc

src/basic/Makefile

@@ -3,6 +3,6 @@ PROGS = \
 	fixdep
 
 OUTDIR = basic
-VPATH = $(top_srcdir)/scripts/basic
+VPATH = $(top_srcdir)/kbuild/scripts/basic
 
 include ../Makefile.inc

src/genksyms/Makefile

@@ -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
 

src/kconfig/Makefile

@@ -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

src/mod/Makefile

@@ -8,7 +8,7 @@ PROGS = \
 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 $@ $^

src/mod/Makefile.real

@@ -1,6 +1,6 @@
 PROGS = modpost.real-$(TYPE)
 
-CFLAGS += -I$(top_srcdir)/include
+CFLAGS += -I$(top_srcdir)/kbuild/include
 
 include ../Makefile.inc