Add yaml-cli package and some cosmetic changes

2021-06-17 23:22:05 +03:00 · 2021-06-17 23:22:05 +03:00 · 4a1e0803fd
parent 04bd127564
commit 4a1e0803fd
18 changed files with 79 additions and 43 deletions
--- a/br-ext-chip-hisilicon/Config.in
+++ b/br-ext-chip-hisilicon/Config.in
@ -9,3 +9,4 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/libevent-mini/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/node-exporter/Config.in"
 source "$BR2_EXTERNAL_HISILICON_PATH/package/vtund-lite/Config.in"
+source "$BR2_EXTERNAL_HISILICON_PATH/package/yaml-cli/Config.in"
--- a/br-ext-chip-hisilicon/external.mk
+++ b/br-ext-chip-hisilicon/external.mk
@ -9,3 +9,4 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/libevent-mini/libevent-mini.mk
 include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic/majestic.mk
 include $(BR2_EXTERNAL_HISILICON_PATH)/package/node-exporter/node-exporter.mk
 include $(BR2_EXTERNAL_HISILICON_PATH)/package/vtund-lite/vtund-lite.mk
+include $(BR2_EXTERNAL_HISILICON_PATH)/package/yaml-cli/yaml-cli.mk
--- a/br-ext-chip-hisilicon/package/yaml-cli
+++ b/br-ext-chip-hisilicon/package/yaml-cli
@ -0,0 +1 @@
+../../general/package/yaml-cli
--- a/br-ext-chip-sigmastar/Config.in
+++ b/br-ext-chip-sigmastar/Config.in
@ -6,3 +6,4 @@ source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/ipctool/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libevent-mini/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/node-exporter/Config.in"
 source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/vtund-lite/Config.in"
+source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/yaml-cli/Config.in"
--- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig
+++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig
@ -49,16 +49,17 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 # BR2_PACKAGE_LAME is not set
 # BR2_PACKAGE_LIBEVENT_MINI is not set
-# BR2_PACKAGE_MAJESTIC is not set
-BR2_PACKAGE_HASERL=y
-BR2_PACKAGE_MINI_SNMPD=y
-BR2_PACKAGE_VTUND_LITE=y
 BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MINI_SNMPD=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_VTUND_LITE=y
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
--- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_dev_defconfig
+++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_dev_defconfig
@ -57,16 +57,17 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME=y
 BR2_PACKAGE_LIBEVENT_MINI=y
-# BR2_PACKAGE_MAJESTIC is not set
-BR2_PACKAGE_HASERL=y
-BR2_PACKAGE_MINI_SNMPD=y
-BR2_PACKAGE_VTUND_LITE=y
 BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MINI_SNMPD=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_VTUND_LITE=y
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
--- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_goodcam_defconfig
+++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_goodcam_defconfig
@ -50,16 +50,17 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME=y
 BR2_PACKAGE_LIBEVENT_MINI=y
-# BR2_PACKAGE_MAJESTIC is not set
-BR2_PACKAGE_HASERL=y
-BR2_PACKAGE_MINI_SNMPD=y
-BR2_PACKAGE_VTUND_LITE=y
 BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MINI_SNMPD=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_VTUND_LITE=y
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
--- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig
+++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig
@ -48,16 +48,17 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME=y
 BR2_PACKAGE_LIBEVENT_MINI=y
-# BR2_PACKAGE_MAJESTIC is not set
-BR2_PACKAGE_HASERL=y
-BR2_PACKAGE_MINI_SNMPD=y
-BR2_PACKAGE_VTUND_LITE=y
 BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MINI_SNMPD=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_VTUND_LITE=y
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
--- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_rotek_defconfig
+++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_rotek_defconfig
@ -49,16 +49,17 @@ BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME=y
 BR2_PACKAGE_LIBEVENT_MINI=y
-# BR2_PACKAGE_MAJESTIC is not set
-BR2_PACKAGE_HASERL=y
-BR2_PACKAGE_MINI_SNMPD=y
-BR2_PACKAGE_VTUND_LITE=y
 BR2_PACKAGE_LIBYAML=y
+# BR2_PACKAGE_MAJESTIC is not set
+BR2_PACKAGE_MINI_SNMPD=y
+BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y
+BR2_PACKAGE_VTUND_LITE=y
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
--- a/br-ext-chip-sigmastar/external.mk
+++ b/br-ext-chip-sigmastar/external.mk
@ -6,4 +6,4 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/ipctool/ipctool.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libevent-mini/libevent-mini.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/node-exporter/node-exporter.mk
 include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/vtund-lite/vtund-lite.mk
-
+include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/yaml-cli/yaml-cli.mk
--- a/br-ext-chip-sigmastar/package/yaml-cli
+++ b/br-ext-chip-sigmastar/package/yaml-cli
@ -0,0 +1 @@
+../../general/package/yaml-cli
--- a/br-ext-chip-xiongmai/Config.in
+++ b/br-ext-chip-xiongmai/Config.in
@ -8,3 +8,4 @@ source "$BR2_EXTERNAL_XIONGMAI_PATH/package/libevent-mini/Config.in"
 source "$BR2_EXTERNAL_XIONGMAI_PATH/package/majestic/Config.in"
 source "$BR2_EXTERNAL_XIONGMAI_PATH/package/node-exporter/Config.in"
 source "$BR2_EXTERNAL_XIONGMAI_PATH/package/vtund-lite/Config.in"
+source "$BR2_EXTERNAL_XIONGMAI_PATH/package/yaml-cli/Config.in"
--- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig
+++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig
@ -7,6 +7,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.0.101"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y

 # Toolchain
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_GCC_VERSION_7_X=y
 # BR2_TOOLCHAIN_USES_UCLIBC is not set
 # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
@ -37,22 +38,25 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_

 # OpenIPC configuration
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1.06.14"
-BR2_TARGET_GENERIC_HOSTNAME="ipcam"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1"
+BR2_TARGET_GENERIC_HOSTNAME="openipc"
 BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"

 # Packages
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-# BR2_PACKAGE_XIONGMAI_OSDRV_XM510 is not set
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME=y
 BR2_PACKAGE_LIBEVENT_MINI=y
+BR2_PACKAGE_LIBYAML=y
 # BR2_PACKAGE_MAJESTIC is not set
 BR2_PACKAGE_MINI_SNMPD=y
 BR2_PACKAGE_VTUND_LITE=y
+# BR2_PACKAGE_XIONGMAI_OSDRV_XM510 is not set
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
@ -62,15 +66,11 @@ BR2_PACKAGE_VTUND_LITE=y
 # BR2_PACKAGE_SSHPASS is not set
 # BR2_PACKAGE_RTL8188EU is not set

-# Experimental
-BR2_PER_PACKAGE_DIRECTORIES=y
+# WiFi
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_HASERL=y
-
-# Firmware
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
--- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig
+++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig
@ -7,6 +7,7 @@ BR2_DEFAULT_KERNEL_VERSION="3.10.103"
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y

 # Toolchain
+BR2_PER_PACKAGE_DIRECTORIES=y
 BR2_GCC_VERSION_7_X=y
 # BR2_TOOLCHAIN_USES_UCLIBC is not set
 # BR2_TOOLCHAIN_BUILDROOT_UCLIBC is not set
@ -37,22 +38,25 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(TOPDIR)/../scripts/executing_commands_for_$(BR2_

 # OpenIPC configuration
 BR2_TOOLCHAIN_BUILDROOT_VENDOR="openipc"
-BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1.06.14"
-BR2_TARGET_GENERIC_HOSTNAME="ipcam"
+BR2_TARGET_GENERIC_ISSUE="Welcome to OpenIPC v2.1"
+BR2_TARGET_GENERIC_HOSTNAME="openipc"
 BR2_GLOBAL_PATCH_DIR="$(TOPDIR)/../general/package/all-patches"

 # Packages
 BR2_PACKAGE_BUSYBOX_CONFIG="$(TOPDIR)/../general/package/busybox/busybox.config"
 BR2_PACKAGE_DROPBEAR=y
 BR2_PACKAGE_FWPRINTENV_NG=y
-BR2_PACKAGE_XIONGMAI_OSDRV_XM530=y
+BR2_PACKAGE_HASERL=y
 BR2_PACKAGE_IPCTOOL=y
 BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LAME=y
 BR2_PACKAGE_LIBEVENT_MINI=y
+BR2_PACKAGE_LIBYAML=y
 # BR2_PACKAGE_MAJESTIC is not set
 BR2_PACKAGE_MINI_SNMPD=y
 BR2_PACKAGE_VTUND_LITE=y
+BR2_PACKAGE_XIONGMAI_OSDRV_XM530=y
+BR2_PACKAGE_YAML_CLI=y

 # Unused
 # BR2_SHARED_STATIC_LIBS is not set
@ -62,15 +66,11 @@ BR2_PACKAGE_VTUND_LITE=y
 # BR2_PACKAGE_SSHPASS is not set
 # BR2_PACKAGE_RTL8188EU is not set

-# Experimental
-BR2_PER_PACKAGE_DIRECTORIES=y
+# WiFi
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_NL80211=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_HASERL=y
-
-# Firmware
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U=y
--- a/br-ext-chip-xiongmai/external.mk
+++ b/br-ext-chip-xiongmai/external.mk
@ -8,4 +8,4 @@ include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/libevent-mini/libevent-mini.mk
 include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/majestic/majestic.mk
 include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/node-exporter/node-exporter.mk
 include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/vtund-lite/vtund-lite.mk
-
+include $(BR2_EXTERNAL_XIONGMAI_PATH)/package/yaml-cli/yaml-cli.mk
--- a/br-ext-chip-xiongmai/package/yaml-cli
+++ b/br-ext-chip-xiongmai/package/yaml-cli
@ -0,0 +1 @@
+../../general/package/yaml-cli
--- a/general/package/yaml-cli/Config.in
+++ b/general/package/yaml-cli/Config.in
@ -0,0 +1,7 @@
+config BR2_PACKAGE_YAML_CLI
+	select BR2_PACKAGE_LIBYAML
+	bool "yaml-cli"
+	help
+	  yaml-cli - console configurator for YAML files
+
+	  https://github.com/openipc/yaml-cli/
--- a/general/package/yaml-cli/yaml-cli.mk
+++ b/general/package/yaml-cli/yaml-cli.mk
@ -0,0 +1,17 @@
+################################################################################
+#
+# yaml-cli | updated 2021.06.17
+#
+################################################################################
+
+YAML_CLI_VERSION = 0.0.1
+YAML_CLI_SITE = $(call github,openipc,yaml-cli,v$(YAML_CLI_VERSION))
+YAML_CLI_LICENSE = MIT
+YAML_CLI_LICENSE_FILES = LICENSE
+
+YAML_CLI_DEPENDENCIES = libyaml
+YAML_CLI_CONF_OPTS += -DCMAKE_BUILD_TYPE=MinSizeRel
+
+YAML_CLI_MAKE_OPTS += VERBOSE=1
+
+$(eval $(cmake-package))