From e0db53202c306634005fa2f6068ea7f06d68d5ab Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 26 Apr 2010 22:03:37 +0200 Subject: [PATCH] package: get rid of editors subdir Not much point in a seperate subdir for only four packages. Signed-off-by: Peter Korsgaard --- package/Config.in | 8 ++++---- package/{editors => }/ed/Config.in | 0 package/{editors => }/ed/ed.mk | 2 +- package/editors/Config.in | 9 --------- package/editors/editors.mk | 1 - package/{editors => }/nano/Config.in | 0 package/{editors => }/nano/nano.mk | 0 package/{editors => }/uemacs/Config.in | 0 package/{editors => }/uemacs/uemacs-4.0.15-lt.01.patch | 0 package/{editors => }/uemacs/uemacs-4.0.15-lt.02.patch | 0 package/{editors => }/uemacs/uemacs.mk | 2 +- package/{editors => }/vim/Config.in | 0 package/{editors => }/vim/configure.patch | 0 package/{editors => }/vim/patches | 0 package/{editors => }/vim/vim.mk | 4 ++-- 15 files changed, 8 insertions(+), 18 deletions(-) rename package/{editors => }/ed/Config.in (100%) rename package/{editors => }/ed/ed.mk (82%) delete mode 100644 package/editors/Config.in delete mode 100644 package/editors/editors.mk 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 (94%) rename package/{editors => }/vim/Config.in (100%) rename package/{editors => }/vim/configure.patch (100%) rename package/{editors => }/vim/patches (100%) rename package/{editors => }/vim/vim.mk (95%) diff --git a/package/Config.in b/package/Config.in index 15f6c3ea0e..6848f9ffe5 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 similarity index 100% rename from package/editors/ed/Config.in rename to package/ed/Config.in diff --git a/package/editors/ed/ed.mk b/package/ed/ed.mk similarity index 82% rename from package/editors/ed/ed.mk rename to package/ed/ed.mk index d9960db820..158667bca4 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 f58f96b110..0000000000 --- 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 6aa9d7694b..0000000000 --- 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 similarity index 100% rename from package/editors/nano/Config.in rename to package/nano/Config.in diff --git a/package/editors/nano/nano.mk b/package/nano/nano.mk similarity index 100% rename from package/editors/nano/nano.mk rename to package/nano/nano.mk diff --git a/package/editors/uemacs/Config.in b/package/uemacs/Config.in similarity index 100% rename from package/editors/uemacs/Config.in rename to 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 similarity index 100% rename from package/editors/uemacs/uemacs-4.0.15-lt.01.patch rename to 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 similarity index 100% rename from package/editors/uemacs/uemacs-4.0.15-lt.02.patch rename to package/uemacs/uemacs-4.0.15-lt.02.patch diff --git a/package/editors/uemacs/uemacs.mk b/package/uemacs/uemacs.mk similarity index 94% rename from package/editors/uemacs/uemacs.mk rename to package/uemacs/uemacs.mk index 0fd51f57a4..6e2f4c4973 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 similarity index 100% rename from package/editors/vim/Config.in rename to package/vim/Config.in diff --git a/package/editors/vim/configure.patch b/package/vim/configure.patch similarity index 100% rename from package/editors/vim/configure.patch rename to package/vim/configure.patch diff --git a/package/editors/vim/patches b/package/vim/patches similarity index 100% rename from package/editors/vim/patches rename to package/vim/patches diff --git a/package/editors/vim/vim.mk b/package/vim/vim.mk similarity index 95% rename from package/editors/vim/vim.mk rename to package/vim/vim.mk index fea7f18d4c..399cb0ece0 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 -- 2.30.2