summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--backport/Makefile.real8
-rw-r--r--backport/kconfig/Makefile (renamed from backport/kconf/Makefile)0
-rw-r--r--backport/kconfig/conf.c (renamed from backport/kconf/conf.c)0
-rw-r--r--backport/kconfig/confdata.c (renamed from backport/kconf/confdata.c)0
-rw-r--r--backport/kconfig/expr.c (renamed from backport/kconf/expr.c)0
-rw-r--r--backport/kconfig/expr.h (renamed from backport/kconf/expr.h)0
-rw-r--r--backport/kconfig/list.h (renamed from backport/kconf/list.h)0
-rw-r--r--backport/kconfig/lkc.h (renamed from backport/kconf/lkc.h)0
-rw-r--r--backport/kconfig/lkc_proto.h (renamed from backport/kconf/lkc_proto.h)0
-rwxr-xr-xbackport/kconfig/lxdialog/check-lxdialog.sh (renamed from backport/kconf/lxdialog/check-lxdialog.sh)0
-rw-r--r--backport/kconfig/lxdialog/checklist.c (renamed from backport/kconf/lxdialog/checklist.c)0
-rw-r--r--backport/kconfig/lxdialog/dialog.h (renamed from backport/kconf/lxdialog/dialog.h)0
-rw-r--r--backport/kconfig/lxdialog/inputbox.c (renamed from backport/kconf/lxdialog/inputbox.c)0
-rw-r--r--backport/kconfig/lxdialog/menubox.c (renamed from backport/kconf/lxdialog/menubox.c)0
-rw-r--r--backport/kconfig/lxdialog/textbox.c (renamed from backport/kconf/lxdialog/textbox.c)0
-rw-r--r--backport/kconfig/lxdialog/util.c (renamed from backport/kconf/lxdialog/util.c)0
-rw-r--r--backport/kconfig/lxdialog/yesno.c (renamed from backport/kconf/lxdialog/yesno.c)0
-rw-r--r--backport/kconfig/mconf.c (renamed from backport/kconf/mconf.c)0
-rw-r--r--backport/kconfig/menu.c (renamed from backport/kconf/menu.c)0
-rw-r--r--backport/kconfig/symbol.c (renamed from backport/kconf/symbol.c)0
-rw-r--r--backport/kconfig/util.c (renamed from backport/kconf/util.c)0
-rw-r--r--backport/kconfig/zconf.hash.c (renamed from backport/kconf/zconf.hash.c)0
-rw-r--r--backport/kconfig/zconf.lex.c (renamed from backport/kconf/zconf.lex.c)0
-rw-r--r--backport/kconfig/zconf.tab.c (renamed from backport/kconf/zconf.tab.c)0
-rwxr-xr-xgentree.py2
25 files changed, 5 insertions, 5 deletions
diff --git a/backport/Makefile.real b/backport/Makefile.real
index 5b36e39a..22a13738 100644
--- a/backport/Makefile.real
+++ b/backport/Makefile.real
@@ -14,7 +14,7 @@ export CONFIG_=CPTCFG_
.PHONY: menuconfig
menuconfig:
@$(MAKE) -C kconfig mconf
- @./kconf/mconf Kconfig
+ @./kconfig/mconf Kconfig
.PHONY: listnewconfig oldaskconfig oldconfig \
silentoldconfig olddefconfig oldnoconfig \
@@ -25,16 +25,16 @@ silentoldconfig olddefconfig oldnoconfig \
allnoconfig allyesconfig allmodconfig \
alldefconfig randconfig:
@$(MAKE) -C kconfig conf
- @./kconf/conf --$@ Kconfig
+ @./kconfig/conf --$@ Kconfig
.PHONY: usedefconfig
usedefconfig:
@$(MAKE) -C kconfig conf
- @./kconf/conf --defconfig=defconfig Kconfig
+ @./kconfig/conf --defconfig=defconfig Kconfig
defconfig-%::
@$(MAKE) -C kconfig conf
- @./kconf/conf --defconfig=defconfigs/$(@:defconfig-%=%) Kconfig
+ @./kconfig/conf --defconfig=defconfigs/$(@:defconfig-%=%) Kconfig
.config:
@test -f defconfig && $(MAKE) usedefconfig || ( \
diff --git a/backport/kconf/Makefile b/backport/kconfig/Makefile
index ff5c2701..ff5c2701 100644
--- a/backport/kconf/Makefile
+++ b/backport/kconfig/Makefile
diff --git a/backport/kconf/conf.c b/backport/kconfig/conf.c
index e39fcd81..e39fcd81 100644
--- a/backport/kconf/conf.c
+++ b/backport/kconfig/conf.c
diff --git a/backport/kconf/confdata.c b/backport/kconfig/confdata.c
index 13ddf112..13ddf112 100644
--- a/backport/kconf/confdata.c
+++ b/backport/kconfig/confdata.c
diff --git a/backport/kconf/expr.c b/backport/kconfig/expr.c
index d6626521..d6626521 100644
--- a/backport/kconf/expr.c
+++ b/backport/kconfig/expr.c
diff --git a/backport/kconf/expr.h b/backport/kconfig/expr.h
index cdd48600..cdd48600 100644
--- a/backport/kconf/expr.h
+++ b/backport/kconfig/expr.h
diff --git a/backport/kconf/list.h b/backport/kconfig/list.h
index 0ae730be..0ae730be 100644
--- a/backport/kconf/list.h
+++ b/backport/kconfig/list.h
diff --git a/backport/kconf/lkc.h b/backport/kconfig/lkc.h
index f8aee5fc..f8aee5fc 100644
--- a/backport/kconf/lkc.h
+++ b/backport/kconfig/lkc.h
diff --git a/backport/kconf/lkc_proto.h b/backport/kconfig/lkc_proto.h
index ef1a7381..ef1a7381 100644
--- a/backport/kconf/lkc_proto.h
+++ b/backport/kconfig/lkc_proto.h
diff --git a/backport/kconf/lxdialog/check-lxdialog.sh b/backport/kconfig/lxdialog/check-lxdialog.sh
index 80788137..80788137 100755
--- a/backport/kconf/lxdialog/check-lxdialog.sh
+++ b/backport/kconfig/lxdialog/check-lxdialog.sh
diff --git a/backport/kconf/lxdialog/checklist.c b/backport/kconfig/lxdialog/checklist.c
index a2eb80fb..a2eb80fb 100644
--- a/backport/kconf/lxdialog/checklist.c
+++ b/backport/kconfig/lxdialog/checklist.c
diff --git a/backport/kconf/lxdialog/dialog.h b/backport/kconfig/lxdialog/dialog.h
index aa3d6d9a..aa3d6d9a 100644
--- a/backport/kconf/lxdialog/dialog.h
+++ b/backport/kconfig/lxdialog/dialog.h
diff --git a/backport/kconf/lxdialog/inputbox.c b/backport/kconfig/lxdialog/inputbox.c
index 21404a04..21404a04 100644
--- a/backport/kconf/lxdialog/inputbox.c
+++ b/backport/kconfig/lxdialog/inputbox.c
diff --git a/backport/kconf/lxdialog/menubox.c b/backport/kconfig/lxdialog/menubox.c
index 48d382e7..48d382e7 100644
--- a/backport/kconf/lxdialog/menubox.c
+++ b/backport/kconfig/lxdialog/menubox.c
diff --git a/backport/kconf/lxdialog/textbox.c b/backport/kconfig/lxdialog/textbox.c
index a48bb93e..a48bb93e 100644
--- a/backport/kconf/lxdialog/textbox.c
+++ b/backport/kconfig/lxdialog/textbox.c
diff --git a/backport/kconf/lxdialog/util.c b/backport/kconfig/lxdialog/util.c
index 109d5311..109d5311 100644
--- a/backport/kconf/lxdialog/util.c
+++ b/backport/kconfig/lxdialog/util.c
diff --git a/backport/kconf/lxdialog/yesno.c b/backport/kconfig/lxdialog/yesno.c
index 4e6e8090..4e6e8090 100644
--- a/backport/kconf/lxdialog/yesno.c
+++ b/backport/kconfig/lxdialog/yesno.c
diff --git a/backport/kconf/mconf.c b/backport/kconfig/mconf.c
index 566288a7..566288a7 100644
--- a/backport/kconf/mconf.c
+++ b/backport/kconfig/mconf.c
diff --git a/backport/kconf/menu.c b/backport/kconfig/menu.c
index f3bffa30..f3bffa30 100644
--- a/backport/kconf/menu.c
+++ b/backport/kconfig/menu.c
diff --git a/backport/kconf/symbol.c b/backport/kconfig/symbol.c
index ecc5aa5f..ecc5aa5f 100644
--- a/backport/kconf/symbol.c
+++ b/backport/kconfig/symbol.c
diff --git a/backport/kconf/util.c b/backport/kconfig/util.c
index 6e7fbf19..6e7fbf19 100644
--- a/backport/kconf/util.c
+++ b/backport/kconfig/util.c
diff --git a/backport/kconf/zconf.hash.c b/backport/kconfig/zconf.hash.c
index 40df0005..40df0005 100644
--- a/backport/kconf/zconf.hash.c
+++ b/backport/kconfig/zconf.hash.c
diff --git a/backport/kconf/zconf.lex.c b/backport/kconfig/zconf.lex.c
index a0521aa5..a0521aa5 100644
--- a/backport/kconf/zconf.lex.c
+++ b/backport/kconfig/zconf.lex.c
diff --git a/backport/kconf/zconf.tab.c b/backport/kconfig/zconf.tab.c
index f636141e..f636141e 100644
--- a/backport/kconf/zconf.tab.c
+++ b/backport/kconfig/zconf.tab.c
diff --git a/gentree.py b/gentree.py
index fef2faf6..86b3f3c1 100755
--- a/gentree.py
+++ b/gentree.py
@@ -323,7 +323,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
# do the copy
backport_files = [(x, x) for x in [
'Kconfig', 'Makefile', 'Makefile.build', 'Makefile.kernel', '.gitignore',
- 'Makefile.real', 'compat/', 'backport-include/', 'kconf/', 'defconfigs/',
+ 'Makefile.real', 'compat/', 'backport-include/', 'kconfig/', 'defconfigs/',
'scripts/', '.blacklist.map', 'udev/',
]]
if not args.git_revision: