From 4d9ae0e4a0bdae275aad84c210302551125062d8 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Wed, 9 Nov 2022 23:08:48 +0300
Subject: [PATCH] Sync project

---
 .../board/t31/kernel/t31.vixand.config        |   8 +-
 .../configs/t31_vixand_defconfig              | 125 ++++++++++++++++++
 stapler                                       |  14 +-
 3 files changed, 137 insertions(+), 10 deletions(-)
 create mode 100644 projects/t31_vixand/br-ext-chip-ingenic/configs/t31_vixand_defconfig

diff --git a/projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config b/projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config
index 1fccb2c..7e580e4 100644
--- a/projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config
+++ b/projects/t31_vixand/br-ext-chip-ingenic/board/t31/kernel/t31.vixand.config
@@ -1253,13 +1253,17 @@ CONFIG_T10_INTERNAL_CODEC=y
 #
 # HID support
 #
-# CONFIG_HID is not set
+CONFIG_HID=y
+# CONFIG_HIDRAW is not set
+# CONFIG_UHID is not set
+CONFIG_HID_GENERIC=y
 
 #
 # USB HID support
 #
-# CONFIG_USB_HID is not set
+CONFIG_USB_HID=y
 # CONFIG_HID_PID is not set
+CONFIG_USB_HIDDEV=y
 
 #
 # USB HID Boot Protocol drivers
diff --git a/projects/t31_vixand/br-ext-chip-ingenic/configs/t31_vixand_defconfig b/projects/t31_vixand/br-ext-chip-ingenic/configs/t31_vixand_defconfig
new file mode 100644
index 0000000..4c05c94
--- /dev/null
+++ b/projects/t31_vixand/br-ext-chip-ingenic/configs/t31_vixand_defconfig
@@ -0,0 +1,125 @@
+# Architecture
+BR2_mipsel=y
+BR2_mips_xburst=y
+# BR2_MIPS_SOFT_FLOAT is not set
+BR2_MIPS_FP32_MODE_32=y
+# BR2_MIPS_FP32_MODE_XX is not set
+BR2_MIPS_NAN_LEGACY=y
+BR2_MIPS_OABI32=y
+BR2_KERNEL_HEADERS_VERSION=y
+BR2_DEFAULT_KERNEL_VERSION="3.10.14"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
+
+# Toolchain
+BR2_PER_PACKAGE_DIRECTORIES=y
+BR2_GCC_VERSION_8_X=y
+BR2_TOOLCHAIN_USES_UCLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_UCLIBC=y
+BR2_TOOLCHAIN_BUILDROOT_LIBC="uclibc"
+BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-float=hard"
+# BR2_TOOLCHAIN_USES_MUSL is not set
+# BR2_TOOLCHAIN_BUILDROOT_MUSL is not set
+# BR2_TOOLCHAIN_BUILDROOT_LIBC="musl"
+BR2_TOOLCHAIN_BUILDROOT_CXX=y
+BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
+BR2_TOOLCHAIN_BUILDROOT_USE_SSP=y
+
+# Kernel
+BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.14"
+BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
+BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_INGENIC_PATH)/board/t31/kernel/t31.vixand.config"
+BR2_LINUX_KERNEL_UIMAGE=y
+BR2_LINUX_KERNEL_LZMA=y
+BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER=y
+BR2_LINUX_KERNEL_EXT_INGENIC_PATCHER_LIST="$(BR2_EXTERNAL_INGENIC_PATH)/board/t31/kernel/patches/ $(BR2_EXTERNAL_INGENIC_PATH)/board/t31/kernel/overlay"
+
+# Filesystem
+# BR2_TARGET_TZ_INFO is not set
+BR2_TARGET_ROOTFS_CPIO=y
+BR2_TARGET_ROOTFS_SQUASHFS=y
+BR2_TARGET_ROOTFS_SQUASHFS4_XZ=y
+BR2_ROOTFS_OVERLAY="$(TOPDIR)/../general/overlay"
+BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_TOOLCHAIN_BUILDROOT_LIBC).sh"
+
+# OpenIPC configuration
+BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.2"
+BR2_TARGET_GENERIC_HOSTNAME="vixand-t31"
+BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
+
+# OpenIPC packages
+BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
+BR2_PACKAGE_DROPBEAR_OPENIPC=y
+# BR2_PACKAGE_FDK_AAC_OPENIPC is not set
+BR2_PACKAGE_FWPRINTENV_OPENIPC=y
+# BR2_PACKAGE_INGENIC_OSDRV_T31 is not set
+BR2_PACKAGE_HASERL=y
+# BR2_PACKAGE_HISI_GPIO is not set
+BR2_PACKAGE_IPCTOOL=y
+# BR2_PACKAGE_JSON_C  is not set
+# BR2_PACKAGE_LAME_OPENIPC is not set
+BR2_PACKAGE_LIBCURL_OPENIPC=y
+BR2_PACKAGE_LIBCURL_OPENIPC_CURL=y
+# BR2_PACKAGE_LIBCURL_OPENIPC_VERBOSE is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_PROXY_SUPPORT is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_COOKIES_SUPPORT is not set
+# BR2_PACKAGE_LIBCURL_OPENIPC_EXTRA_PROTOCOLS_FEATURES is not set
+BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y
+# BR2_PACKAGE_LIBEVENT_OPENIPC is not set
+# BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT is not set
+# BR2_PACKAGE_LIBOGG_OPENIPC is not set
+# BR2_PACKAGE_LIBWEBSOCKETS_OPENIPC is not set
+BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC_FONTS is not set
+# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MBEDTLS_OPENIPC=y
+# BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set
+# BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set
+BR2_PACKAGE_MICROBE_WEB=y
+# BR2_PACKAGE_MINI_SNMPD is not set
+# BR2_PACKAGE_MOTORS is not set
+# BR2_PACKAGE_OPUS_OPENIPC is not set
+# BR2_PACKAGE_OPUS_OPENIPC_FIXED_POINT is not set
+# BR2_PACKAGE_SSHPASS is not set
+# BR2_PACKAGE_UACME_OPENIPC is not set
+BR2_PACKAGE_VTUND_OPENIPC=y
+BR2_PACKAGE_YAML_CLI=y
+
+# WiFi
+# BR2_PACKAGE_WIRELESS_TOOLS is not set
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
+# BR2_PACKAGE_WPA_SUPPLICANT_CLI is not set
+# BR2_PACKAGE_WPA_SUPPLICANT_NL80211 is not set
+# BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE is not set
+# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC is not set
+# BR2_PACKAGE_LINUX_FIRMWARE_OPENIPC_MT7601U is not set
+# BR2_PACKAGE_RTL8188EU is not set
+
+# WIREGUARD
+# BR2_PACKAGE_WIREGUARD_LINUX_COMPAT is not set
+# BR2_PACKAGE_WIREGUARD_TOOLS is not set
+
+# MQTT
+BR2_PACKAGE_MOSQUITTO=y
+# BR2_PACKAGE_MOSQUITTO_BROKER is not set
+
+# For Facilitator "Vasiliy" ONLY
+BR2_PACKAGE_PHP=y
+BR2_PACKAGE_PHP_EXT_JSON=y
+BR2_PACKAGE_PHP_EXT_ZIP=y
+BR2_PACKAGE_UHTTPD=y
+
+# Optional packages
+BR2_PACKAGE_PPPD=y
+
+# SMARTHOME
+BR2_PACKAGE_COMGT=y
+BR2_PACKAGE_DEMO_OPENIPC=y
+BR2_PACKAGE_DBELL_INA219=y
+BR2_PACKAGE_JSONFILTER=y
+
+# DEBUG
+BR2_PACKAGE_HOST_GDB=y
+BR2_PACKAGE_GDB=y
diff --git a/stapler b/stapler
index ebafaea..a950f02 100755
--- a/stapler
+++ b/stapler
@@ -13,6 +13,7 @@ RELEASE=""
 PROJECT="$1"
 TFTPSRV="root@172.17.32.17:/mnt/bigger-2tb/Rotator/TFTP"
 OUTTIME=$(date +"%Y%m%d")
+RELEASE="0de21138e0261a5ef100b9980594f15dac94d225"                              # Rollback
 
 
 echo_c() {
@@ -41,13 +42,13 @@ else
     echo_c 31 "\nAttention, let's start working on the ${PROJECT} project ...\n"
     tree -C projects/${PROJECT}; sleep 3
     echo_c 33 "\nSync of Composer repo ...\n"
-    git pull
+#   git pull
     echo_c 33 "\nDownload Firmware repo ...\n"
-    rm -rf openipc
-    git clone --depth=1 https://github.com/OpenIPC/firmware.git openipc
-    cp -afv projects/${PROJECT}/* openipc
-    cp -afv packages/* openipc/general/package
+#    rm -rf openipc
+#    git clone --depth=1 https://github.com/OpenIPC/firmware.git openipc
     cd openipc
+    cp -afv ../projects/${PROJECT}/* .
+    cp -afv ../packages/* ./general/package
     ./building.sh ${PROJECT}
     2archive; 2tftp
     echo_c 35 "\nRollback to home ...\n"
@@ -55,6 +56,3 @@ else
 fi
 
 
-
-
-