diff --git a/board/miyoo/main/apps/commander/commander b/board/miyoo/main/apps/commander/commander deleted file mode 100644 index a5733897..00000000 Binary files a/board/miyoo/main/apps/commander/commander and /dev/null differ diff --git a/board/miyoo/main/apps/commander/commander.png b/board/miyoo/main/apps/commander/commander.png deleted file mode 100644 index 1f1bc8e5..00000000 Binary files a/board/miyoo/main/apps/commander/commander.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/DejaVuSansCondensed.ttf b/board/miyoo/main/apps/commander/res/DejaVuSansCondensed.ttf deleted file mode 100644 index 3259bc21..00000000 Binary files a/board/miyoo/main/apps/commander/res/DejaVuSansCondensed.ttf and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/DroidSansFallback.ttf b/board/miyoo/main/apps/commander/res/DroidSansFallback.ttf deleted file mode 100644 index 1099b177..00000000 Binary files a/board/miyoo/main/apps/commander/res/DroidSansFallback.ttf and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/Fiery_Turk.ttf b/board/miyoo/main/apps/commander/res/Fiery_Turk.ttf deleted file mode 100644 index c9f4bca6..00000000 Binary files a/board/miyoo/main/apps/commander/res/Fiery_Turk.ttf and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/FreeSans.ttf b/board/miyoo/main/apps/commander/res/FreeSans.ttf deleted file mode 100644 index 8ac9e9a5..00000000 Binary files a/board/miyoo/main/apps/commander/res/FreeSans.ttf and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/README.md b/board/miyoo/main/apps/commander/res/README.md deleted file mode 100644 index 1172f23b..00000000 --- a/board/miyoo/main/apps/commander/res/README.md +++ /dev/null @@ -1,3 +0,0 @@ -These icons are from the "Humanity" Gnome theme. -License: GPL - diff --git a/board/miyoo/main/apps/commander/res/file-image.png b/board/miyoo/main/apps/commander/res/file-image.png deleted file mode 100644 index f621e88e..00000000 Binary files a/board/miyoo/main/apps/commander/res/file-image.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/file-ipk.png b/board/miyoo/main/apps/commander/res/file-ipk.png deleted file mode 100644 index 9de78af2..00000000 Binary files a/board/miyoo/main/apps/commander/res/file-ipk.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/file-is-symlink.png b/board/miyoo/main/apps/commander/res/file-is-symlink.png deleted file mode 100644 index 4800268f..00000000 Binary files a/board/miyoo/main/apps/commander/res/file-is-symlink.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/file-opk.png b/board/miyoo/main/apps/commander/res/file-opk.png deleted file mode 100644 index c3be1c39..00000000 Binary files a/board/miyoo/main/apps/commander/res/file-opk.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/file-text.png b/board/miyoo/main/apps/commander/res/file-text.png deleted file mode 100644 index 3ac8dd79..00000000 Binary files a/board/miyoo/main/apps/commander/res/file-text.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/folder.png b/board/miyoo/main/apps/commander/res/folder.png deleted file mode 100644 index 562474b4..00000000 Binary files a/board/miyoo/main/apps/commander/res/folder.png and /dev/null differ diff --git a/board/miyoo/main/apps/commander/res/up.png b/board/miyoo/main/apps/commander/res/up.png deleted file mode 100644 index 4f82cca4..00000000 Binary files a/board/miyoo/main/apps/commander/res/up.png and /dev/null differ diff --git a/board/miyoo/main/gmenu2x/sections/applications/commander b/board/miyoo/main/gmenu2x/sections/applications/commander index 441dfafc..30f34b44 100644 --- a/board/miyoo/main/gmenu2x/sections/applications/commander +++ b/board/miyoo/main/gmenu2x/sections/applications/commander @@ -1,4 +1,3 @@ -title=Commander -description=file utility -exec=/mnt/apps/commander/commander -selectorbrowser=true +title=Commander +description=File manager utility +exec=/usr/bin/commander diff --git a/configs/miyoo_musl_defconfig b/configs/miyoo_musl_defconfig index 880ee4d4..2ad9ca76 100644 --- a/configs/miyoo_musl_defconfig +++ b/configs/miyoo_musl_defconfig @@ -222,6 +222,7 @@ BR2_PACKAGE_MIYOO_LOGO=y BR2_PACKAGE_MIYOO_CTL=y BR2_PACKAGE_FBCAT=y BR2_PACKAGE_ST_SDL=y +BR2_PACKAGE_COMMANDER=y BR2_PACKAGE_OPKG=y BR2_PACKAGE_OPKG_UTILS=y BR2_PACKAGE_DIALOG=y diff --git a/configs/miyoo_uclibc_defconfig b/configs/miyoo_uclibc_defconfig index 47a2ff01..e47894c5 100644 --- a/configs/miyoo_uclibc_defconfig +++ b/configs/miyoo_uclibc_defconfig @@ -199,6 +199,7 @@ BR2_PACKAGE_MIYOO_LOGO=y BR2_PACKAGE_MIYOO_CTL=y BR2_PACKAGE_FBCAT=y BR2_PACKAGE_ST_SDL=y +BR2_PACKAGE_COMMANDER=y BR2_PACKAGE_OPKG=y BR2_PACKAGE_OPKG_UTILS=y BR2_PACKAGE_DIALOG=y diff --git a/package/Config.in b/package/Config.in index 78c23f85..c19487c9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2213,6 +2213,7 @@ menu "Miscellaneous" source "package/miyoo-ctl/Config.in" source "package/fbcat/Config.in" source "package/st-sdl/Config.in" + source "package/commander/Config.in" endmenu diff --git a/package/commander/Config.in b/package/commander/Config.in new file mode 100644 index 00000000..5628f6ca --- /dev/null +++ b/package/commander/Config.in @@ -0,0 +1,4 @@ +config BR2_PACKAGE_COMMANDER + bool "commander" + help + Dual pane file manager diff --git a/package/commander/commander.mk b/package/commander/commander.mk new file mode 100644 index 00000000..1d947799 --- /dev/null +++ b/package/commander/commander.mk @@ -0,0 +1,17 @@ +COMMANDER_VERSION = 52f9a6a1e06d48471c3f116f37ffad26f7c33262 +COMMANDER_SITE_METHOD = git +COMMANDER_SITE = https://github.com/Apaczer/commander +COMMANDER_DEPENDENCIES = sdl sdl_image sdl_ttf sdl_gfx + +RESDIR = /usr/share/commander + +define COMMANDER_BUILD_CMDS + $(MAKE) CXX="$(TARGET_CXX)" RESDIR="$(RESDIR)" -C $(@D) -f Makefile.miyoo +endef + +define COMMANDER_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 0755 $(@D)/output/commander $(TARGET_DIR)/usr/bin + cp -R $(@D)/res $(TARGET_DIR)/usr/share/commander +endef + +$(eval $(generic-package))