diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-04-04 11:24:24 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-04-11 09:30:39 +0200 |
| commit | 6997e461fdb39985957d24d81e612113cf39e35c (patch) | |
| tree | 096947e214caf457ffdb005522698f3e747ad08a /support/kconfig/patches/06-br-build-system-integration.patch | |
| parent | cfe70c5e13fcf6d99394c646c758236a79041653 (diff) | |
| download | buildroot-6997e461fdb39985957d24d81e612113cf39e35c.tar.gz buildroot-6997e461fdb39985957d24d81e612113cf39e35c.zip | |
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 <thomas.petazzoni@free-electrons.com>
Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'support/kconfig/patches/06-br-build-system-integration.patch')
| -rw-r--r-- | support/kconfig/patches/06-br-build-system-integration.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/support/kconfig/patches/06-br-build-system-integration.patch b/support/kconfig/patches/06-br-build-system-integration.patch index feb166d36c..3faa39ed63 100644 --- a/support/kconfig/patches/06-br-build-system-integration.patch +++ b/support/kconfig/patches/06-br-build-system-integration.patch @@ -2,11 +2,11 @@ Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: kconfig/Makefile +Index: b/Makefile =================================================================== ---- kconfig.orig/Makefile -+++ kconfig/Makefile -@@ -175,11 +175,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -159,11 +159,11 @@ hostprogs-y := conf @@ -20,7 +20,7 @@ Index: kconfig/Makefile hostprogs-y += mconf endif -@@ -187,10 +187,10 @@ +@@ -171,10 +171,10 @@ hostprogs-y += kxgettext endif |
