From bedcde05df261504ee9ed85091272bff8e932bdb Mon Sep 17 00:00:00 2001
From: Michel-FK <michel.stempin@funkey-project.com>
Date: Wed, 10 Mar 2021 22:12:20 +0100
Subject: [PATCH] add commander package, increased image size

Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>
---
 FunKey/Config.in                      |  1 +
 FunKey/configs/funkey_defconfig       |  3 +-
 FunKey/package/commander/Config.in    | 13 +++++++++
 FunKey/package/commander/commander.mk | 42 +++++++++++++++++++++++++++
 genimage-prod.cfg                     |  2 +-
 genimage.cfg                          |  2 +-
 6 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 FunKey/package/commander/Config.in
 create mode 100644 FunKey/package/commander/commander.mk

diff --git a/FunKey/Config.in b/FunKey/Config.in
index 8b1004a..7ff1400 100644
--- a/FunKey/Config.in
+++ b/FunKey/Config.in
@@ -17,3 +17,4 @@ source "$BR2_EXTERNAL_FUNKEY_PATH/package/gmenu2x/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/agg/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/fluidlite/Config.in"
 source "$BR2_EXTERNAL_FUNKEY_PATH/package/libmikmod/Config.in"
+source "$BR2_EXTERNAL_FUNKEY_PATH/package/commander/Config.in"
diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig
index 0a1f32b..6bf6d83 100644
--- a/FunKey/configs/funkey_defconfig
+++ b/FunKey/configs/funkey_defconfig
@@ -104,7 +104,7 @@ BR2_PACKAGE_UTIL_LINUX_BINARIES=y
 BR2_PACKAGE_NANO=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
-BR2_TARGET_ROOTFS_EXT2_SIZE="160M"
+BR2_TARGET_ROOTFS_EXT2_SIZE="200M"
 # BR2_TARGET_ROOTFS_TAR is not set
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_DTC=y
@@ -117,3 +117,4 @@ BR2_PACKAGE_GMENU2X=y
 BR2_PACKAGE_AGG=y
 BR2_PACKAGE_FLUIDLITE=y
 BR2_PACKAGE_LIBMIKMOD=y
+BR2_PACKAGE_COMMANDER=y
diff --git a/FunKey/package/commander/Config.in b/FunKey/package/commander/Config.in
new file mode 100644
index 0000000..2d07de9
--- /dev/null
+++ b/FunKey/package/commander/Config.in
@@ -0,0 +1,13 @@
+config BR2_PACKAGE_COMMANDER
+	bool "commander"
+	select BR2_PACKAGE_LIBPNG
+	select BR2_PACKAGE_SDL
+	select BR2_PACKAGE_SDL_TTF
+	select BR2_PACKAGE_SDL_GFX
+	help
+
+	  DinguxCommander is a file manager for RetroFW. It uses two
+	  vertical panels side by side, one being the source and the
+	  other the destination, like many 'commander-style' file
+	  managers such as Norton Commander or Midnight
+	  Commander.
\ No newline at end of file
diff --git a/FunKey/package/commander/commander.mk b/FunKey/package/commander/commander.mk
new file mode 100644
index 0000000..0da510b
--- /dev/null
+++ b/FunKey/package/commander/commander.mk
@@ -0,0 +1,42 @@
+#############################################################
+#
+# commander
+#
+#############################################################
+COMMANDER_VERSION = commander-FunKey-1.0.0
+COMMANDER_SITE_METHOD = git
+COMMANDER_SITE = https://github.com/FunKey-Project/commander.git
+COMMANDER_LICENSE = GPL-2.0
+
+COMMANDER_DEPENDENCIES = sdl sdl_ttf sdl_gfx
+
+COMMANDER_CONF_OPTS = -DCMAKE_BUILD_TYPE=Release -DTARGET_PLATFORM="funkey-s" -DRES_DIR=""
+#COMMANDER_CONF_OPTS += -DWITH_SYSTEM_SDL_GFX=ON -DWITH_SYSTEM_SDL_TTF=ON
+
+define COMMANDER_INSTALL_CMDS
+endef
+
+define COMMANDER_CREATE_OPK
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/games/opk
+	cd $(@D); \
+	$(HOST_DIR)/usr/bin/mksquashfs \
+		opkg/default.funkey-s.desktop \
+		opkg/readme.funkey-s.txt \
+		opkg/commander.png \
+		res/file-image.png \
+		res/file-ipk.png \
+		res/file-is-symlink.png \
+		res/file-opk.png \
+		res/file-text.png \
+		res/folder.png res/up.png \
+		res/DroidSansFallback.ttf \
+		res/Fiery_Turk.ttf \
+		res/FreeSans.ttf \
+		$(TARGET_DIR)/usr/bin/commander \
+		$(TARGET_DIR)/usr/games/opk/commander-funkey-s.opk \
+		-all-root -noappend -no-exports -no-xattrs -noappend; \
+	rm -rf $(TARGET_DIR)/usr/bin/commander
+endef
+COMMANDER_POST_INSTALL_TARGET_HOOKS += COMMANDER_CREATE_OPK
+
+$(eval $(cmake-package))
diff --git a/genimage-prod.cfg b/genimage-prod.cfg
index 1d5db58..2fbe19a 100644
--- a/genimage-prod.cfg
+++ b/genimage-prod.cfg
@@ -31,7 +31,7 @@ image sdcard-prod.img {
 		partition-type = 0x83
 		bootable = "yes"
 		image = "FunKey/output/images/rootfs.ext4"
-		size = 160M # This will be resized to 1G during first boot
+		size = 200M # This will be resized to 1G during first boot
 	}
 
 # These partitions will be created during first boot
diff --git a/genimage.cfg b/genimage.cfg
index b91bcac..2cac992 100644
--- a/genimage.cfg
+++ b/genimage.cfg
@@ -31,7 +31,7 @@ image sdcard.img {
 		partition-type = 0x83
 		bootable = "yes"
 		image = "FunKey/output/images/rootfs.ext4"
-		size = 160M # This will be resized to 1G during first boot
+		size = 200M # This will be resized to 1G during first boot
 	}
 
 # These partitions will be created during first boot