From d47bd2de38a6a7efb5e104c37af5761b530629a8 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 7 Mar 2008 10:00:04 +0000 Subject: [PATCH] buildroot: move editors under package/editors and merge menus Based on patch by Arnar Mar Sig. --- package/Config.in | 15 ++------------- package/editors/Config.in | 13 ++++++++++--- package/{ => editors}/ed/Config.in | 0 package/{ => editors}/ed/ed.mk | 0 package/{ => editors}/nano/Config.in | 0 package/{ => editors}/nano/nano.mk | 0 package/{ => editors}/uemacs/Config.in | 0 .../uemacs/uemacs-4.0.15-lt.01.patch | 0 .../uemacs/uemacs-4.0.15-lt.02.patch | 0 package/{ => editors}/uemacs/uemacs.mk | 0 10 files changed, 12 insertions(+), 16 deletions(-) rename package/{ => editors}/ed/Config.in (100%) rename package/{ => editors}/ed/ed.mk (100%) rename package/{ => editors}/nano/Config.in (100%) rename package/{ => editors}/nano/nano.mk (100%) rename package/{ => editors}/uemacs/Config.in (100%) rename package/{ => editors}/uemacs/uemacs-4.0.15-lt.01.patch (100%) rename package/{ => editors}/uemacs/uemacs-4.0.15-lt.02.patch (100%) rename package/{ => editors}/uemacs/uemacs.mk (100%) diff --git a/package/Config.in b/package/Config.in index fe7265e2e8..951fd064f7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -11,7 +11,6 @@ source "package/coreutils/Config.in" endif source "package/diffutils/Config.in" if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS -source "package/ed/Config.in" source "package/findutils/Config.in" endif source "package/flex/Config.in" @@ -119,16 +118,8 @@ endif if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS # busybox has an editor -menuconfig BR2_TEXTEDIT_SUPPORT - bool "Text editors" - default y - help - Support for text editors - -if BR2_TEXTEDIT_SUPPORT -source "package/nano/Config.in" -source "package/uemacs/Config.in" -endif +# text editors +source "package/editors/Config.in" endif @@ -490,6 +481,4 @@ source "package/magiccube4d/Config.in" source "package/vice/Config.in" endif -source "package/editors/Config.in" - endmenu diff --git a/package/editors/Config.in b/package/editors/Config.in index b979df85aa..b4e7e40236 100644 --- a/package/editors/Config.in +++ b/package/editors/Config.in @@ -1,5 +1,12 @@ -menu "Editors" +menuconfig BR2_TEXTEDIT_SUPPORT + bool "Text editors" + default y + help + Support for text editors +if BR2_TEXTEDIT_SUPPORT +source "package/editors/ed/Config.in" +source "package/editors/nano/Config.in" +source "package/editors/uemacs/Config.in" source "package/editors/vim/Config.in" - -endmenu +endif diff --git a/package/ed/Config.in b/package/editors/ed/Config.in similarity index 100% rename from package/ed/Config.in rename to package/editors/ed/Config.in diff --git a/package/ed/ed.mk b/package/editors/ed/ed.mk similarity index 100% rename from package/ed/ed.mk rename to package/editors/ed/ed.mk diff --git a/package/nano/Config.in b/package/editors/nano/Config.in similarity index 100% rename from package/nano/Config.in rename to package/editors/nano/Config.in diff --git a/package/nano/nano.mk b/package/editors/nano/nano.mk similarity index 100% rename from package/nano/nano.mk rename to package/editors/nano/nano.mk diff --git a/package/uemacs/Config.in b/package/editors/uemacs/Config.in similarity index 100% rename from package/uemacs/Config.in rename to package/editors/uemacs/Config.in diff --git a/package/uemacs/uemacs-4.0.15-lt.01.patch b/package/editors/uemacs/uemacs-4.0.15-lt.01.patch similarity index 100% rename from package/uemacs/uemacs-4.0.15-lt.01.patch rename to package/editors/uemacs/uemacs-4.0.15-lt.01.patch diff --git a/package/uemacs/uemacs-4.0.15-lt.02.patch b/package/editors/uemacs/uemacs-4.0.15-lt.02.patch similarity index 100% rename from package/uemacs/uemacs-4.0.15-lt.02.patch rename to package/editors/uemacs/uemacs-4.0.15-lt.02.patch diff --git a/package/uemacs/uemacs.mk b/package/editors/uemacs/uemacs.mk similarity index 100% rename from package/uemacs/uemacs.mk rename to package/editors/uemacs/uemacs.mk