Merge pull request #14 from tiopex/master

add build fatresize from source

board/miyoo/boot/firstboot

@@ -3,26 +3,18 @@
 MOUNTDIR=/boot
 # expect to be run from /boot, where the boot partition is mounted (readonly)
 
-# also expect CONSOLE_VARIANT to be passed in = already set from /etc/main
-# also expect the screen driver to be loaded in /etc/main
-
 # create swap
 mkswap /dev/mmcblk0p3 | tee -a ${LOG}
 swapon /dev/mmcblk0p3 | tee -a ${LOG}
 
 LOG=/dev/null
 
-BINDIR="${MOUNTDIR}/misc/bin"
-FATFSCK="fsck.fat"
-
 # high brightness
 echo '10' > /sys/devices/platform/backlight/backlight/backlight/brightness
 
 #echo -e "\e[?3c"
 echo -e "\e[32m" # green
 
-# action time - copy over the kernel and the config files
-
 echo "firstboot script running..." | tee -a ${LOG}
 echo
 
@@ -68,9 +60,9 @@ if test -e "${MOUNTDIR}/resize"; then
     echo "Going to resize the MAIN partition." | tee -a ${LOG}
     echo "This can take A LONG TIME, so be patient." | tee -a ${LOG}
     umount /dev/mmcblk0p4 | tee -a ${LOG}
-    "${FATFSCK}" -y /dev/mmcblk0p4 | tee -a ${LOG}
+    fsck.fat -y /dev/mmcblk0p4 | tee -a ${LOG}
-    "${BINDIR}/fatresize_hc" | tee -a ${LOG}
+    fatresize_hc | tee -a ${LOG}
-    "${FATFSCK}" -y /dev/mmcblk0p4 | tee -a ${LOG}
+    fsck.fat -y /dev/mmcblk0p4 | tee -a ${LOG}
     echo -n -e \\xEB\\x58\\x90 > /dev/mmcblk0p4
     sync
     mount -t vfat -o rw,sync,utf8 /dev/mmcblk0p4 /mnt | tee -a ${LOG}

board/miyoo/boot/misc/bin/README.md

@@ -1,2 +0,0 @@
-# some statically compiled binaries
-* `fatresize_hc` is a "minimal fat resize example" using `libparted`; the source code is [here](https://github.com/flabbergast/fatresize/tree/hardcoded); compiling requires static(musl) toolchain from the above buildroot

board/miyoo/genimage-sdcard.cfg

@@ -12,9 +12,6 @@ image bootfs.vfat {
 			"boot/firstboot.custom.sh-OFF",
 			"boot/normalboot.custom.sh"
 		}
-		file misc/bin/fatresize_hc {
-			image = "boot/misc/bin/fatresize_hc"
-		}
 		file configs/manifest {
 			image = "boot/configs/manifest"
 		}

configs/miyoo_musl_defconfig

@@ -51,6 +51,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_FATRESIZE=y
 BR2_PACKAGE_FBGRAB=y
 BR2_PACKAGE_SDL_GFX=y
 BR2_PACKAGE_SDL_IMAGE_GIF=y
@@ -71,6 +72,7 @@ BR2_PACKAGE_SDL_NET=y
 BR2_PACKAGE_SDL_SOUND=y
 BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
 BR2_PACKAGE_DBUS=y
+BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_UMTPRD=y
 BR2_PACKAGE_LUA=y
 BR2_PACKAGE_LUA_5_1=y

configs/miyoo_uclibc_defconfig

@@ -5,7 +5,7 @@ BR2_CPAN_MIRROR="http://cpan.metacpan.org"
 BR2_RELRO_NONE=y
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="miyoo"
 BR2_KERNEL_HEADERS_4_9=y
-BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_PTHREAD_DEBUG=y
 BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
@@ -49,6 +49,7 @@ BR2_PACKAGE_DOSFSTOOLS=y
 BR2_PACKAGE_DOSFSTOOLS_FATLABEL=y
 BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
+BR2_PACKAGE_FATRESIZE=y
 BR2_PACKAGE_FBGRAB=y
 BR2_PACKAGE_SDL_GFX=y
 BR2_PACKAGE_SDL_IMAGE_GIF=y
@@ -69,6 +70,7 @@ BR2_PACKAGE_SDL_NET=y
 BR2_PACKAGE_SDL_SOUND=y
 BR2_PACKAGE_SDL_SOUND_PLAYSOUND=y
 BR2_PACKAGE_DBUS=y
+BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_UMTPRD=y
 BR2_PACKAGE_LUA=y
 BR2_PACKAGE_LUA_5_1=y

package/Config.in

@@ -241,6 +241,7 @@ menu "Filesystem and flash utilities"
 	source "package/unionfs/Config.in"
 	source "package/xfsprogs/Config.in"
 	source "package/zfs/Config.in"
+	source "package/fatresize/Config.in"
 endmenu
 
 menu "Fonts, cursors, icons, sounds and themes"

package/fatresize/Config.in

@@ -0,0 +1,5 @@
+config BR2_PACKAGE_FATRESIZE
+	depends on BR2_PACKAGE_PARTED
+	bool "fatresize"
+	help
+	  Resize fat partitions

package/fatresize/fatresize.mk

@@ -0,0 +1,14 @@
+FATRESIZE_VERSION = origin/hardcoded
+FATRESIZE_SITE_METHOD = git
+FATRESIZE_SITE = https://github.com/flabbergast/fatresize.git
+FATRESIZE_DEPENDENCIES = parted
+
+define FATRESIZE_BUILD_CMDS
+	$(MAKE) CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" LD="$(TARGET_LD)" -C $(@D)
+endef
+
+define FATRESIZE_INSTALL_TARGET_CMDS
+        $(INSTALL) -D -m 0755 $(@D)/fatresize_hc $(TARGET_DIR)/usr/bin
+endef
+
+$(eval $(generic-package))