From 8a6ee3997116e64bf3e781501d61b1cbe3ffe485 Mon Sep 17 00:00:00 2001 From: cronyx Date: Tue, 6 Sep 2022 11:01:28 +0300 Subject: [PATCH] resolve conflicts --- br-ext-chip-goke/Config.in | 1 - br-ext-chip-goke/external.mk | 1 - br-ext-chip-goke/package/ax-agent | 1 - br-ext-chip-ingenic/Config.in | 1 - .../unknown_unknown_t31_vixand_defconfig | 120 ------------------ br-ext-chip-ingenic/external.mk | 1 - br-ext-chip-ingenic/package/ax-agent | 1 - building.sh | 2 +- general/package/ax-agent/Config.in | 7 - general/package/ax-agent/ax-agent.mk | 22 ---- general/package/ax-agent/src/ax-agent.c | 7 - 11 files changed, 1 insertion(+), 163 deletions(-) delete mode 120000 br-ext-chip-goke/package/ax-agent delete mode 100644 br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig delete mode 120000 br-ext-chip-ingenic/package/ax-agent delete mode 100644 general/package/ax-agent/Config.in delete mode 100644 general/package/ax-agent/ax-agent.mk delete mode 100644 general/package/ax-agent/src/ax-agent.c diff --git a/br-ext-chip-goke/Config.in b/br-ext-chip-goke/Config.in index bc2a1b83..e5bc9743 100644 --- a/br-ext-chip-goke/Config.in +++ b/br-ext-chip-goke/Config.in @@ -1,7 +1,6 @@ source "$BR2_EXTERNAL_GOKE_PATH/linux/Config.ext.in" source "$BR2_EXTERNAL_GOKE_PATH/package/goke_patcher/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/aura-httpd/Config.in" -source "$BR2_EXTERNAL_GOKE_PATH/package/ax-agent/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/baresip-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/dropbear-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/fdk-aac-openipc/Config.in" diff --git a/br-ext-chip-goke/external.mk b/br-ext-chip-goke/external.mk index 37e239be..5e4acba2 100644 --- a/br-ext-chip-goke/external.mk +++ b/br-ext-chip-goke/external.mk @@ -1,7 +1,6 @@ include $(BR2_EXTERNAL_GOKE_PATH)/linux/linux-ext-goke_patcher.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/goke_patcher/goke_patcher.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/aura-httpd/aura-httpd.mk -include $(BR2_EXTERNAL_GOKE_PATH)/package/ax-agent/ax-agent.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/baresip-openipc/baresip-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/dropbear-openipc/dropbear-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk diff --git a/br-ext-chip-goke/package/ax-agent b/br-ext-chip-goke/package/ax-agent deleted file mode 120000 index ed6ab54a..00000000 --- a/br-ext-chip-goke/package/ax-agent +++ /dev/null @@ -1 +0,0 @@ -../../general/package/ax-agent \ No newline at end of file diff --git a/br-ext-chip-ingenic/Config.in b/br-ext-chip-ingenic/Config.in index 89d54e9b..ff7de542 100644 --- a/br-ext-chip-ingenic/Config.in +++ b/br-ext-chip-ingenic/Config.in @@ -4,7 +4,6 @@ source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic-osdrv-t21/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic-osdrv-t31/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/ingenic_patcher/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/aura-httpd/Config.in" -source "$BR2_EXTERNAL_INGENIC_PATH/package/ax-agent/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/dropbear-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/fdk-aac-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/ffmpeg-openipc/Config.in" diff --git a/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig b/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig deleted file mode 100644 index 1b0bb094..00000000 --- a/br-ext-chip-ingenic/configs/unknown_unknown_t31_vixand_defconfig +++ /dev/null @@ -1,120 +0,0 @@ -# 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 -BR2_PACKAGE_QUIRC_OPENIPC=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 - -# DEBUG -BR2_PACKAGE_HOST_GDB=y -BR2_PACKAGE_GDB=y diff --git a/br-ext-chip-ingenic/external.mk b/br-ext-chip-ingenic/external.mk index 780f2912..13d94aa8 100644 --- a/br-ext-chip-ingenic/external.mk +++ b/br-ext-chip-ingenic/external.mk @@ -4,7 +4,6 @@ include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t21/ingenic-osdrv-t21 include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic-osdrv-t31/ingenic-osdrv-t31.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/ingenic_patcher/ingenic_patcher.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/aura-httpd/aura-httpd.mk -include $(BR2_EXTERNAL_INGENIC_PATH)/package/ax-agent/ax-agent.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/dropbear-openipc/dropbear-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/fdk-aac-openipc/fdk-aac-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/ffmpeg-openipc/ffmpeg-openipc.mk diff --git a/br-ext-chip-ingenic/package/ax-agent b/br-ext-chip-ingenic/package/ax-agent deleted file mode 120000 index ed6ab54a..00000000 --- a/br-ext-chip-ingenic/package/ax-agent +++ /dev/null @@ -1 +0,0 @@ -../../general/package/ax-agent \ No newline at end of file diff --git a/building.sh b/building.sh index 4d4f7b21..1d3f2869 100755 --- a/building.sh +++ b/building.sh @@ -236,7 +236,7 @@ FUNCS=( t10 t20 t30 - t31 t31_vixand t31_ultimate + t31 t31_ultimate xm510 xm530 diff --git a/general/package/ax-agent/Config.in b/general/package/ax-agent/Config.in deleted file mode 100644 index 32a435a3..00000000 --- a/general/package/ax-agent/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_AX_AGENT - bool "ax-agent" - default n - help - Simple daemon - - https://openipc.org diff --git a/general/package/ax-agent/ax-agent.mk b/general/package/ax-agent/ax-agent.mk deleted file mode 100644 index b6eb3c3d..00000000 --- a/general/package/ax-agent/ax-agent.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# ax-agent | updated 2022.08.10 -# -################################################################################ - -AX_AGENT_LICENSE = MIT -AX_AGENT_LICENSE_FILES = LICENSE - -define AX_AGENT_EXTRACT_CMDS - cp ../general/package/ax-agent/src/ax-agent.c $(@D)/ -endef - -define AX_AGENT_BUILD_CMDS - (cd $(@D); $(TARGET_CC) -s ax-agent.c -o ax-agent) -endef - -define AX_AGENT_INSTALL_TARGET_CMDS - install -m 0755 -D $(@D)/ax-agent $(TARGET_DIR)/usr/sbin/ax-agent -endef - -$(eval $(generic-package)) diff --git a/general/package/ax-agent/src/ax-agent.c b/general/package/ax-agent/src/ax-agent.c deleted file mode 100644 index aec22620..00000000 --- a/general/package/ax-agent/src/ax-agent.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main (void) -{ - puts ("Hello, World!"); - return 0; -} \ No newline at end of file