From 6997e461fdb39985957d24d81e612113cf39e35c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 4 Apr 2013 11:24:24 +0000 Subject: support/kconfig: upgrade to 3.9-rc2 Our kconfig code is updated to the version of kernel 3.9-rc2. No major issues during the migration, except: * Some conflicts when applying 03-change-config-option-prefix.patch due to upstream kernel changes. * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix the make rule that generates the moc file for the Qt-based interface. Signed-off-by: Thomas Petazzoni Acked-by: Gustavo Zacarias Tested-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- support/kconfig/patches/12-fix-glade-file-path.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'support/kconfig/patches/12-fix-glade-file-path.patch') diff --git a/support/kconfig/patches/12-fix-glade-file-path.patch b/support/kconfig/patches/12-fix-glade-file-path.patch index badfc91d8..a5777da3e 100644 --- a/support/kconfig/patches/12-fix-glade-file-path.patch +++ b/support/kconfig/patches/12-fix-glade-file-path.patch @@ -2,11 +2,11 @@ gconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: kconfig/gconf.c +Index: b/gconf.c =================================================================== ---- kconfig.orig/gconf.c -+++ kconfig/gconf.c -@@ -1525,7 +1525,7 @@ +--- a/gconf.c ++++ b/gconf.c +@@ -1486,7 +1486,7 @@ /* Determine GUI path */ env = getenv(SRCTREE); if (env) -- cgit v1.2.3