mt-apps, buildroot compiler (4.9 headers but no difference, might go back to linaro...

diff --git a/configs/merica-terminal_defconfig b/configs/merica-terminal_defconfig
index 268fa8a8995498ce5b7002646ddf78a15bff3311..1244417c8a0141c69b003d191a6749bccae8931f 100644 (file)
--- a/configs/merica-terminal_defconfig
+++ b/configs/merica-terminal_defconfig
@@ -4,9 +4,11 @@ BR2_ARM_ENABLE_NEON=y
 BR2_ARM_ENABLE_VFP=y
 BR2_ARM_FPU_VFPV3=y
 BR2_CCACHE=y
-BR2_TOOLCHAIN_EXTERNAL=y
-BR2_TOOLCHAIN_EXTERNAL_PREINSTALLED=y
-BR2_TOOLCHAIN_EXTERNAL_PATH="${HOME}/merica/gcc-linaro-7.2.1-2017.11-x86_64_arm-linux-gnueabihf"
+BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y
+BR2_BINUTILS_VERSION_2_30_X=y
+BR2_GCC_VERSION_7_X=y
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_ROOTFS_MERGED_USR=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
@@ -18,7 +20,6 @@ BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
 BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/ADVANTECH-Corp/linux-imx6.git"
 BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="imx_4.9.11_1.0.0_ga"
-BR2_LINUX_KERNEL_PATCH="board/advantech/imx6q-rsb4411-a1/patches/linux-imx"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/advantech/imx6q-rsb4411-a1/imx_v7_adv_defconfig"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
@@ -208,6 +209,8 @@ BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES=y
 BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBIMXVPUAPI=y
+BR2_PACKAGE_LIBWEBSOCKETS=y
+BR2_PACKAGE_LIBEV=y
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_IW=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
@@ -224,7 +227,7 @@ BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y
 BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
 BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
 BR2_PACKAGE_QTWEBBROWSER=y
-BR2_PACKAGE_MT_RFID=y
+BR2_PACKAGE_MT_APPS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="500M"

diff --git a/package/merica/Config.in b/package/merica/Config.in
index 762d6496e589d1731eca842145fa05f683b098f3..c2341d3a0a5f0571dab21d5a9b300dd62a915c4f 100644 (file)
--- a/package/merica/Config.in
+++ b/package/merica/Config.in
@@ -1,3 +1,3 @@
 source "package/merica/qtwebbrowser/Config.in"
 source "package/merica/ufr-lib/Config.in"
-source "package/merica/mt-rfid/Config.in"
+source "package/merica/mt-apps/Config.in"

diff --git a/package/merica/mt-apps/Config.in b/package/merica/mt-apps/Config.in
new file mode 100644 (file)
index 0000000..311a7ef
--- /dev/null
+++ b/package/merica/mt-apps/Config.in
@@ -0,0 +1,11 @@
+config BR2_PACKAGE_MT_APPS
+       bool "mt-apps"
+       select BR2_PACKAGE_UFR_LIB
+       depends on BR2_PACKAGE_LIBEV
+       depends on BR2_PACKAGE_LIBWEBSOCKETS
+
+comment "mt-apps need libev"
+       depends on !BR2_PACKAGE_LIBEV
+
+comment "mt-apps need libwebsockets"
+       depends on !BR2_PACKAGE_LIBWEBSOCKETS

diff --git a/package/merica/mt-apps/mt-apps.mk b/package/merica/mt-apps/mt-apps.mk
new file mode 100644 (file)
index 0000000..ecf4fef
--- /dev/null
+++ b/package/merica/mt-apps/mt-apps.mk
@@ -0,0 +1,23 @@
+################################################################################
+#
+# mt-apps
+#
+################################################################################
+
+MT_APPS_VERSION = master
+MT_APPS_SITE = ${HOME}/merica/mt-apps
+MT_APPS_SITE_METHOD = git
+MT_APPS_LICENSE = Unclear
+MT_APPS_DEPENDENCIES = ufr-lib libev libwebsockets
+
+define MT_APPS_BUILD_CMDS
+       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
+endef
+
+define MT_APPS_INSTALL_TARGET_CMDS
+       $(INSTALL) -D -m 0755 $(@D)/build/* $(TARGET_DIR)/usr/bin/.
+       mkdir -p $(TARGET_DIR)/usr/share/mtserver
+       $(INSTALL) -D -m 0755 $(@D)/html/* $(TARGET_DIR)/usr/share/mtserver/.
+endef
+
+$(eval $(generic-package))

diff --git a/package/merica/mt-rfid/Config.in b/package/merica/mt-rfid/Config.in
deleted file mode 100644 (file)
index 44f3777..0000000
--- a/package/merica/mt-rfid/Config.in
+++ /dev/null
@@ -1,3 +0,0 @@
-config BR2_PACKAGE_MT_RFID
-       bool "mt-rfid"
-       select BR2_PACKAGE_UFR_LIB

diff --git a/package/merica/mt-rfid/mt-rfid.mk b/package/merica/mt-rfid/mt-rfid.mk
deleted file mode 100644 (file)
index 9162884..0000000
--- a/package/merica/mt-rfid/mt-rfid.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# mt-rfid
-#
-################################################################################
-
-MT_RFID_VERSION = master
-MT_RFID_SITE = ${HOME}/merica/mt-rfid
-MT_RFID_SITE_METHOD = git
-MT_RFID_LICENSE = Unclear
-MT_RFID_DEPENDENCIES = ufr-lib
-
-define MT_RFID_BUILD_CMDS
-       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS)
-endef
-
-define MT_RFID_INSTALL_TARGET_CMDS
-       $(INSTALL) -D -m 0755 $(@D)/mt-rfid $(TARGET_DIR)/usr/bin/mt-rfid
-endef
-
-$(eval $(generic-package))

diff --git a/package/merica/qtwebbrowser/Config.in b/package/merica/qtwebbrowser/Config.in
index 5d37904413802241c73fbda3cc660dbf02b3c831..b26bf6fcf3c4bdaed6274f0667e460a7d7335fb2 100644 (file)
--- a/package/merica/qtwebbrowser/Config.in
+++ b/package/merica/qtwebbrowser/Config.in
@@ -1,12 +1,12 @@
 config BR2_PACKAGE_QTWEBBROWSER
        bool "qtwebbrowser"
        depends on BR2_PACKAGE_QT5WEBENGINE
-    depends on BR2_PACKAGE_QT5VIRTUALKEYBOARD
+       depends on BR2_PACKAGE_QT5VIRTUALKEYBOARD
        help
          Touch enabled Qt5 Web Browser
 
 comment "qtwebbrowser needs qt5webengine"
-        depends on !BR2_PACKAGE_QT5WEBENGINE
+       depends on !BR2_PACKAGE_QT5WEBENGINE
 
 comment "qtwebbrowser needs qt5virtualkeyboard"
-        depends on !BR2_PACKAGE_QT5VIRTUALKEYBOARD
+       depends on !BR2_PACKAGE_QT5VIRTUALKEYBOARD