summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-04-26 20:03:37 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-04-26 20:03:37 (GMT)
commite0db53202c306634005fa2f6068ea7f06d68d5ab (patch)
treecfd6434173bd329ac08b90e6e305262a50b385b7
parent187f0a55323437e33f5a66ef670fe0e49f52bc45 (diff)
downloadbuildroot-e0db53202c306634005fa2f6068ea7f06d68d5ab.tar.gz
buildroot-e0db53202c306634005fa2f6068ea7f06d68d5ab.tar.bz2
package: get rid of editors subdir
Not much point in a seperate subdir for only four packages. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/Config.in8
-rw-r--r--package/ed/Config.in (renamed from package/editors/ed/Config.in)0
-rw-r--r--package/ed/ed.mk (renamed from package/editors/ed/ed.mk)2
-rw-r--r--package/editors/Config.in9
-rw-r--r--package/editors/editors.mk1
-rw-r--r--package/nano/Config.in (renamed from package/editors/nano/Config.in)0
-rw-r--r--package/nano/nano.mk (renamed from package/editors/nano/nano.mk)0
-rw-r--r--package/uemacs/Config.in (renamed from package/editors/uemacs/Config.in)0
-rw-r--r--package/uemacs/uemacs-4.0.15-lt.01.patch (renamed from package/editors/uemacs/uemacs-4.0.15-lt.01.patch)0
-rw-r--r--package/uemacs/uemacs-4.0.15-lt.02.patch (renamed from package/editors/uemacs/uemacs-4.0.15-lt.02.patch)0
-rw-r--r--package/uemacs/uemacs.mk (renamed from package/editors/uemacs/uemacs.mk)2
-rw-r--r--package/vim/Config.in (renamed from package/editors/vim/Config.in)0
-rw-r--r--package/vim/configure.patch (renamed from package/editors/vim/configure.patch)0
-rw-r--r--package/vim/patches (renamed from package/editors/vim/patches)0
-rw-r--r--package/vim/vim.mk (renamed from package/editors/vim/vim.mk)4
15 files changed, 8 insertions, 18 deletions
diff --git a/package/Config.in b/package/Config.in
index 15f6c3e..6848f9f 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -465,14 +465,14 @@ endif
endmenu
menu "Text editors and viewers"
-source "package/editors/ed/Config.in"
+source "package/ed/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
source "package/less/Config.in"
endif
-source "package/editors/nano/Config.in"
-source "package/editors/uemacs/Config.in"
+source "package/nano/Config.in"
+source "package/uemacs/Config.in"
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-source "package/editors/vim/Config.in"
+source "package/vim/Config.in"
endif
endmenu
diff --git a/package/editors/ed/Config.in b/package/ed/Config.in
index 63dc21e..63dc21e 100644
--- a/package/editors/ed/Config.in
+++ b/package/ed/Config.in
diff --git a/package/editors/ed/ed.mk b/package/ed/ed.mk
index d9960db..158667b 100644
--- a/package/editors/ed/ed.mk
+++ b/package/ed/ed.mk
@@ -7,4 +7,4 @@ ED_VERSION:=1.1
ED_SOURCE:=ed-$(ED_VERSION).tar.bz2
ED_SITE:=$(BR2_GNU_MIRROR)/ed/
-$(eval $(call AUTOTARGETS,package/editors,ed))
+$(eval $(call AUTOTARGETS,package,ed))
diff --git a/package/editors/Config.in b/package/editors/Config.in
deleted file mode 100644
index f58f96b..0000000
--- a/package/editors/Config.in
+++ /dev/null
@@ -1,9 +0,0 @@
-menu "Text editors"
-source "package/editors/ed/Config.in"
-source "package/editors/nano/Config.in"
-source "package/editors/uemacs/Config.in"
-if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
-# busybox has vi
-source "package/editors/vim/Config.in"
-endif
-endmenu
diff --git a/package/editors/editors.mk b/package/editors/editors.mk
deleted file mode 100644
index 6aa9d76..0000000
--- a/package/editors/editors.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/editors/*/*.mk
diff --git a/package/editors/nano/Config.in b/package/nano/Config.in
index 8c78096..8c78096 100644
--- a/package/editors/nano/Config.in
+++ b/package/nano/Config.in
diff --git a/package/editors/nano/nano.mk b/package/nano/nano.mk
index 3e8ba50..3e8ba50 100644
--- a/package/editors/nano/nano.mk
+++ b/package/nano/nano.mk
diff --git a/package/editors/uemacs/Config.in b/package/uemacs/Config.in
index f093218..f093218 100644
--- a/package/editors/uemacs/Config.in
+++ b/package/uemacs/Config.in
diff --git a/package/editors/uemacs/uemacs-4.0.15-lt.01.patch b/package/uemacs/uemacs-4.0.15-lt.01.patch
index 855dd35..855dd35 100644
--- a/package/editors/uemacs/uemacs-4.0.15-lt.01.patch
+++ b/package/uemacs/uemacs-4.0.15-lt.01.patch
diff --git a/package/editors/uemacs/uemacs-4.0.15-lt.02.patch b/package/uemacs/uemacs-4.0.15-lt.02.patch
index 946b3d5..946b3d5 100644
--- a/package/editors/uemacs/uemacs-4.0.15-lt.02.patch
+++ b/package/uemacs/uemacs-4.0.15-lt.02.patch
diff --git a/package/editors/uemacs/uemacs.mk b/package/uemacs/uemacs.mk
index 0fd51f5..6e2f4c4 100644
--- a/package/editors/uemacs/uemacs.mk
+++ b/package/uemacs/uemacs.mk
@@ -18,7 +18,7 @@ uemacs-source: $(DL_DIR)/$(UEMACS_SOURCE)
$(UEMACS_DIR)/.unpacked: $(DL_DIR)/$(UEMACS_SOURCE)
$(UEMACS_CAT) $(DL_DIR)/$(UEMACS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(UEMACS_DIR) package/editors/uemacs/ uemacs\*.patch
+ toolchain/patch-kernel.sh $(UEMACS_DIR) package/uemacs/ uemacs\*.patch
touch $(UEMACS_DIR)/.unpacked
$(UEMACS_DIR)/$(UEMACS_BINARY): $(UEMACS_DIR)/.unpacked
diff --git a/package/editors/vim/Config.in b/package/vim/Config.in
index 30b73d3..30b73d3 100644
--- a/package/editors/vim/Config.in
+++ b/package/vim/Config.in
diff --git a/package/editors/vim/configure.patch b/package/vim/configure.patch
index f884095..f884095 100644
--- a/package/editors/vim/configure.patch
+++ b/package/vim/configure.patch
diff --git a/package/editors/vim/patches b/package/vim/patches
index 2d5f457..2d5f457 100644
--- a/package/editors/vim/patches
+++ b/package/vim/patches
diff --git a/package/editors/vim/vim.mk b/package/vim/vim.mk
index fea7f18..399cb0e 100644
--- a/package/editors/vim/vim.mk
+++ b/package/vim/vim.mk
@@ -9,7 +9,7 @@ VIM_SITE:=http://ftp.vim.org/pub/vim
VIM_SOURCE_SITE:=$(VIM_SITE)/unix
VIM_PATCH_SITE:=$(VIM_SITE)/patches/7.1
VIM_DIR:=$(BUILD_DIR)/vim71
-VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/$(VIM_VERSION).:' package/editors/vim/patches)
+VIM_PATCHES:=$(shell sed -e 's:^:$(DL_DIR)/$(VIM_VERSION).:' package/vim/patches)
VIM_CONFIG_H:=$(VIM_DIR)/src/auto/config.h
VIM_CONFIG_MK:=$(VIM_DIR)/src/auto/config.mk
@@ -31,7 +31,7 @@ $(VIM_DIR)/.patched: $(VIM_DIR)/.unpacked
cd $(VIM_DIR); \
patch -p0 < $$i) \
done
- toolchain/patch-kernel.sh $(VIM_DIR) package/editors/vim/ \*.patch
+ toolchain/patch-kernel.sh $(VIM_DIR) package/vim/ \*.patch
touch $@
$(VIM_DIR)/.configured: $(VIM_DIR)/.patched