diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 2dd49d78..2b54a45f 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -16,6 +16,7 @@ source "$BR2_EXTERNAL_HISILICON_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516cv300/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516cv500/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/majestic-hi3516ev300/Config.in" source "$BR2_EXTERNAL_HISILICON_PATH/package/mbedtls-openipc/Config.in" diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 42389226..7a23780b 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -16,6 +16,7 @@ include $(BR2_EXTERNAL_HISILICON_PATH)/package/libevent-openipc/libevent-openipc include $(BR2_EXTERNAL_HISILICON_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516cv300/majestic-hi3516cv300.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516cv500/majestic-hi3516cv500.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/majestic-hi3516ev300/majestic-hi3516ev300.mk include $(BR2_EXTERNAL_HISILICON_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk diff --git a/br-ext-chip-hisilicon/package/majestic-hi3516cv300 b/br-ext-chip-hisilicon/package/majestic-hi3516cv300 new file mode 120000 index 00000000..94d6c229 --- /dev/null +++ b/br-ext-chip-hisilicon/package/majestic-hi3516cv300 @@ -0,0 +1 @@ +../../general/package/majestic-hi3516cv300 \ No newline at end of file diff --git a/building.sh b/building.sh index 998635fa..6a0be8fe 100755 --- a/building.sh +++ b/building.sh @@ -93,7 +93,9 @@ hi3518ev200() { hi3516cv300() { soc="hi3516cv300" fresh && make PLATFORM=hisilicon BOARD=unknown_unknown_${soc}_openipc all && rename - #PLATFORM=hisilicon make br-linux-{dirclean,rebuild} + #PLATFORM=hisilicon make br-linux-{dirclean,rebuild} + #PLATFORM=hisilicon make br-hisilicon-osdrv-hi3516cv300-{dirclean,rebuild} + #PLATFORM=hisilicon make br-majestic-hi3516cv300-{dirclean,rebuild} } hi3516cv500() { diff --git a/general/package/hisilicon-osdrv-hi3516cv300/files/script/load_hisilicon b/general/package/hisilicon-osdrv-hi3516cv300/files/script/load_hisilicon index 7907e0cc..344737cc 100755 --- a/general/package/hisilicon-osdrv-hi3516cv300/files/script/load_hisilicon +++ b/general/package/hisilicon-osdrv-hi3516cv300/files/script/load_hisilicon @@ -463,16 +463,6 @@ calc_mmz_info() echo "mmz_start: $mmz_start, mmz_size: $mmz_size" } -start_majestic() -{ - # Use it for stopping service: killall -sigint majestic - sleep 1 - export SENSOR=$SNS_TYPE - sleep 30 - ntpd -n -q -p 0.openwrt.pool.ntp.org -p 1.openwrt.pool.ntp.org -p 2.openwrt.pool.ntp.org -p 3.openwrt.pool.ntp.org - majestic 2>&1 | logger -p daemon.info -t majestic & -} - ######################parse arg################################### b_arg_os_mem=0 @@ -558,13 +548,12 @@ if [ $# -lt 1 ]; then fi if [ $b_arg_remove -eq 1 ]; then - killall -sigint majestic remove_ko; fi if [ $b_arg_insmod -eq 1 ]; then + cd /lib/modules/3.18.20/hisilicon insert_ko; - start_majestic; fi if [ $b_arg_restore -eq 1 ]; then diff --git a/general/package/majestic-hi3516cv300/Config.in b/general/package/majestic-hi3516cv300/Config.in new file mode 100644 index 00000000..d1ddc440 --- /dev/null +++ b/general/package/majestic-hi3516cv300/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_MAJESTIC_HI3516CV300 + bool "Tiny but powerful IPC streaming software" + default n + help + Tiny but powerful IPC streaming software + + https://openipc.org diff --git a/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk new file mode 100644 index 00000000..72569bc7 --- /dev/null +++ b/general/package/majestic-hi3516cv300/majestic-hi3516cv300.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# majestic-hi3516cv300 +# +################################################################################ + +MAJESTIC_HI3516CV300_VERSION = current +MAJESTIC_HI3516CV300_SOURCE = majestic.hi3516cv300.master.tar.bz2 +MAJESTIC_HI3516CV300_SITE = http://openipc.s3-eu-west-1.amazonaws.com +MAJESTIC_HI3516CV300_LICENSE = MIT +MAJESTIC_HI3516CV300_LICENSE_FILES = LICENSE + +define MAJESTIC_HI3516CV300_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc $(@D)/majestic.yaml + + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin + $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/majestic +endef + + +$(eval $(generic-package))