From 41e8c6da17e038b708ff4edca208241b7514146f Mon Sep 17 00:00:00 2001 From: "Igor Zalatov (from Citadel PC)" Date: Sun, 21 Nov 2021 22:01:55 +0300 Subject: [PATCH] Update majestic-fonts and microbe-web packages --- br-ext-chip-ambarella/Config.in | 1 + .../unknown_unknown_s3l_openipc_defconfig | 1 + br-ext-chip-ambarella/external.mk | 1 + br-ext-chip-anyka/Config.in | 1 + br-ext-chip-anyka/external.mk | 1 + br-ext-chip-fullhan/Config.in | 1 + br-ext-chip-fullhan/external.mk | 1 + br-ext-chip-goke/Config.in | 1 + ...unknown_unknown_gk7202v300_openipc_defconfig | 1 + ...unknown_unknown_gk7205v200_openipc_defconfig | 1 + .../unknown_unknown_gk7205v200_uclibc_defconfig | 1 + ...unknown_unknown_gk7205v300_openipc_defconfig | 1 + ...unknown_unknown_gk7605v100_openipc_defconfig | 1 + br-ext-chip-goke/external.mk | 1 + br-ext-chip-grainmedia/Config.in | 1 + br-ext-chip-grainmedia/external.mk | 1 + br-ext-chip-hisilicon/Config.in | 1 + ...nknown_unknown_hi3516av300_openipc_defconfig | 1 + ...nknown_unknown_hi3516cv200_openipc_defconfig | 1 + ...nknown_unknown_hi3516cv300_openipc_defconfig | 1 + ...nknown_unknown_hi3516cv500_openipc_defconfig | 1 + ...nknown_unknown_hi3516dv200_openipc_defconfig | 1 + ...nknown_unknown_hi3516dv300_openipc_defconfig | 1 + ...nknown_unknown_hi3516ev100_openipc_defconfig | 1 + .../unknown_unknown_hi3516ev200_dozor_defconfig | 1 + .../unknown_unknown_hi3516ev200_eltis_defconfig | 1 + ...nknown_unknown_hi3516ev200_openipc_defconfig | 1 + ...unknown_unknown_hi3516ev200_vixand_defconfig | 1 + .../unknown_unknown_hi3516ev300_glibc_defconfig | 1 + ...nknown_unknown_hi3516ev300_openipc_defconfig | 1 + ...nown_unknown_hi3516ev300_tehshield_defconfig | 1 + ...nknown_unknown_hi3518ev200_openipc_defconfig | 1 + ...nknown_unknown_hi3518ev300_openipc_defconfig | 1 + ...nknown_unknown_hi3520dv200_openipc_defconfig | 1 + ...nknown_unknown_hi3536cv100_openipc_defconfig | 1 + ...nknown_unknown_hi3536dv100_openipc_defconfig | 1 + br-ext-chip-hisilicon/external.mk | 1 + br-ext-chip-ingenic/Config.in | 1 + br-ext-chip-ingenic/external.mk | 1 + br-ext-chip-novatek/Config.in | 1 + .../unknown_unknown_nt98562_openipc_defconfig | 1 + .../unknown_unknown_nt98566_openipc_defconfig | 1 + br-ext-chip-novatek/external.mk | 1 + br-ext-chip-sigmastar/Config.in | 1 + .../unknown_unknown_ssc325_openipc_defconfig | 1 + .../unknown_unknown_ssc333_openipc_defconfig | 1 + .../unknown_unknown_ssc335_blackbird_defconfig | 1 + .../unknown_unknown_ssc335_goodcam_defconfig | 1 + .../unknown_unknown_ssc335_musl_defconfig | 1 + .../unknown_unknown_ssc335_openipc_defconfig | 1 + .../unknown_unknown_ssc335_portal_defconfig | 1 + .../unknown_unknown_ssc335_rotek_defconfig | 1 + .../unknown_unknown_ssc335de_openipc_defconfig | 1 + .../unknown_unknown_ssc337_kama_defconfig | 1 + .../unknown_unknown_ssc337_openipc_defconfig | 1 + .../unknown_unknown_ssc337de_openipc_defconfig | 1 + br-ext-chip-sigmastar/external.mk | 1 + .../unknown_unknown_xm510_openipc_defconfig | 1 + .../unknown_unknown_xm530_openipc_defconfig | 1 + .../unknown_unknown_xm550_openipc_defconfig | 1 + .../majestic-fonts/files/UbuntuMono-Regular.ttf | Bin 0 -> 33492 bytes .../package/majestic-fonts/majestic-fonts.mk | 15 ++++++++------- .../microbe-web/files}/S50httpd | 0 .../microbe-web/files}/httpd.conf | 0 general/package/microbe-web/microbe-web.mk | 9 ++++++++- 65 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 general/package/majestic-fonts/files/UbuntuMono-Regular.ttf rename general/{overlay/etc/init.d => package/microbe-web/files}/S50httpd (100%) rename general/{overlay/etc => package/microbe-web/files}/httpd.conf (100%) diff --git a/br-ext-chip-ambarella/Config.in b/br-ext-chip-ambarella/Config.in index 66baa819..2bc61cbd 100644 --- a/br-ext-chip-ambarella/Config.in +++ b/br-ext-chip-ambarella/Config.in @@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_AMBARELLA_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_AMBARELLA_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_AMBARELLA_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_AMBARELLA_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_AMBARELLA_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_AMBARELLA_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_AMBARELLA_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_AMBARELLA_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-ambarella/configs/unknown_unknown_s3l_openipc_defconfig b/br-ext-chip-ambarella/configs/unknown_unknown_s3l_openipc_defconfig index fed83967..2ee20661 100644 --- a/br-ext-chip-ambarella/configs/unknown_unknown_s3l_openipc_defconfig +++ b/br-ext-chip-ambarella/configs/unknown_unknown_s3l_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y # BR2_PACKAGE_MAJESTIC_S3L is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-ambarella/external.mk b/br-ext-chip-ambarella/external.mk index 566a0150..e6085696 100644 --- a/br-ext-chip-ambarella/external.mk +++ b/br-ext-chip-ambarella/external.mk @@ -10,6 +10,7 @@ include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libevent-openipc/libevent-openipc include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/majestic/majestic.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_AMBARELLA_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-anyka/Config.in b/br-ext-chip-anyka/Config.in index 5fdd76b1..8913745c 100644 --- a/br-ext-chip-anyka/Config.in +++ b/br-ext-chip-anyka/Config.in @@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_ANYKA_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_ANYKA_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_ANYKA_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_ANYKA_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_ANYKA_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_ANYKA_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_ANYKA_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_ANYKA_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-anyka/external.mk b/br-ext-chip-anyka/external.mk index 2446ef35..a6e9ea9f 100644 --- a/br-ext-chip-anyka/external.mk +++ b/br-ext-chip-anyka/external.mk @@ -10,6 +10,7 @@ include $(BR2_EXTERNAL_ANYKA_PATH)/package/libevent-openipc/libevent-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_ANYKA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/majestic/majestic.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_ANYKA_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-fullhan/Config.in b/br-ext-chip-fullhan/Config.in index 8403062a..7150f5b0 100644 --- a/br-ext-chip-fullhan/Config.in +++ b/br-ext-chip-fullhan/Config.in @@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_FULLHAN_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_FULLHAN_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_FULLHAN_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-fullhan/external.mk b/br-ext-chip-fullhan/external.mk index c8d74155..64a49ba6 100644 --- a/br-ext-chip-fullhan/external.mk +++ b/br-ext-chip-fullhan/external.mk @@ -10,6 +10,7 @@ include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libevent-openipc/libevent-openipc.m include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_FULLHAN_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/majestic/majestic.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_FULLHAN_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-goke/Config.in b/br-ext-chip-goke/Config.in index 46c1626f..28a24b0f 100644 --- a/br-ext-chip-goke/Config.in +++ b/br-ext-chip-goke/Config.in @@ -11,6 +11,7 @@ source "$BR2_EXTERNAL_GOKE_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_GOKE_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/majestic-gk7205v200/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_GOKE_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig index c012b352..c91cdb5b 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7202v300_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig index 20514f49..f19b2c66 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_uclibc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_uclibc_defconfig index 1f45c4af..a7e19fda 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_uclibc_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v200_uclibc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig index 9dc765a2..fdf59451 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7205v300_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig b/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig index 57e72435..007448cc 100644 --- a/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig +++ b/br-ext-chip-goke/configs/unknown_unknown_gk7605v100_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_GK7205V200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-goke/external.mk b/br-ext-chip-goke/external.mk index 7d683570..b752e590 100644 --- a/br-ext-chip-goke/external.mk +++ b/br-ext-chip-goke/external.mk @@ -11,6 +11,7 @@ include $(BR2_EXTERNAL_GOKE_PATH)/package/libevent-openipc/libevent-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/majestic-gk7205v200/majestic-gk7205v200.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_GOKE_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-grainmedia/Config.in b/br-ext-chip-grainmedia/Config.in index e1d5c949..0ea9044f 100644 --- a/br-ext-chip-grainmedia/Config.in +++ b/br-ext-chip-grainmedia/Config.in @@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_GRAINMEDIA_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-grainmedia/external.mk b/br-ext-chip-grainmedia/external.mk index f2546acf..827db0b8 100644 --- a/br-ext-chip-grainmedia/external.mk +++ b/br-ext-chip-grainmedia/external.mk @@ -10,6 +10,7 @@ include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libevent-openipc/libevent-openip include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/majestic/majestic.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_GRAINMEDIA_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-hisilicon/Config.in b/br-ext-chip-hisilicon/Config.in index 73236cf8..8759ea9c 100644 --- a/br-ext-chip-hisilicon/Config.in +++ b/br-ext-chip-hisilicon/Config.in @@ -17,6 +17,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-fonts/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" diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig index a210174c..77bc1535 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516av300_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV500=y # BR2_PACKAGE_MAJESTIC_HI3516EV300 is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig index 0ca69869..d69608da 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv200_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig index 3e07d8f9..786270e1 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv300_openipc_defconfig @@ -65,6 +65,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig index df0365cb..95f17938 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516cv500_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV500=y # BR2_PACKAGE_MAJESTIC_HI3516EV300 is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig index e6e12bda..1d139a30 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv200_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig index b83ab007..feedec99 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516dv300_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV500=y # BR2_PACKAGE_MAJESTIC_HI3516EV300 is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_openipc_defconfig index 8855d6c5..654f2091 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev100_openipc_defconfig @@ -65,6 +65,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dozor_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dozor_defconfig index ebb2cf6d..b8f49ed5 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dozor_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_dozor_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_eltis_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_eltis_defconfig index 36a3b659..f1a77395 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_eltis_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_eltis_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y # BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT is not set # BR2_PACKAGE_LIBOGG_OPENIPC is not set BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y # BR2_PACKAGE_MAJESTIC_HI3516EV300 is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig index ebb2cf6d..b8f49ed5 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_vixand_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_vixand_defconfig index 12376b6a..8af100b0 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_vixand_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev200_vixand_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig index b24bc8a1..5c25e4c2 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_glibc_defconfig @@ -71,6 +71,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig index 8e7dbd2f..982dc1d4 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_tehshield_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_tehshield_defconfig index ddb7d131..fe242ebd 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_tehshield_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3516ev300_tehshield_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig index b16e66f6..fbad3b42 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev200_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516CV200=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig index dbe74a1e..5de68b22 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3518ev300_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_HI3516EV300=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3520dv200_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3520dv200_openipc_defconfig index ce342222..891539e1 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3520dv200_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3520dv200_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y # BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT is not set # BR2_PACKAGE_LIBOGG_OPENIPC is not set BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536cv100_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536cv100_openipc_defconfig index c33edef8..91a4069a 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536cv100_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536cv100_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y # BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT is not set # BR2_PACKAGE_LIBOGG_OPENIPC is not set BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536dv100_openipc_defconfig b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536dv100_openipc_defconfig index c0d4475b..7489a963 100644 --- a/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536dv100_openipc_defconfig +++ b/br-ext-chip-hisilicon/configs/unknown_unknown_hi3536dv100_openipc_defconfig @@ -68,6 +68,7 @@ BR2_PACKAGE_LIBCURL_OPENIPC_MBEDTLS=y # BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT is not set # BR2_PACKAGE_LIBOGG_OPENIPC is not set BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set # BR2_PACKAGE_MBEDTLS_OPENIPC_COMPRESSION is not set diff --git a/br-ext-chip-hisilicon/external.mk b/br-ext-chip-hisilicon/external.mk index 09203ccc..8d018405 100644 --- a/br-ext-chip-hisilicon/external.mk +++ b/br-ext-chip-hisilicon/external.mk @@ -17,6 +17,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-fonts/majestic-fonts.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 diff --git a/br-ext-chip-ingenic/Config.in b/br-ext-chip-ingenic/Config.in index 1a09aa0e..13d333a4 100644 --- a/br-ext-chip-ingenic/Config.in +++ b/br-ext-chip-ingenic/Config.in @@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_INGENIC_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/majestic/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_INGENIC_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-ingenic/external.mk b/br-ext-chip-ingenic/external.mk index dfd3a90a..4ea6ffba 100644 --- a/br-ext-chip-ingenic/external.mk +++ b/br-ext-chip-ingenic/external.mk @@ -11,6 +11,7 @@ include $(BR2_EXTERNAL_INGENIC_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/libsrt-openipc/libsrt-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic/majestic.mk +include $(BR2_EXTERNAL_INGENIC_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/microbe-web/microbe-web.mk include $(BR2_EXTERNAL_INGENIC_PATH)/package/motors/motors.mk diff --git a/br-ext-chip-novatek/Config.in b/br-ext-chip-novatek/Config.in index 0cdd941d..50b950b8 100644 --- a/br-ext-chip-novatek/Config.in +++ b/br-ext-chip-novatek/Config.in @@ -10,6 +10,7 @@ source "$BR2_EXTERNAL_NOVATEK_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_NOVATEK_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/majestic-nt9856x/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_NOVATEK_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-novatek/configs/unknown_unknown_nt98562_openipc_defconfig b/br-ext-chip-novatek/configs/unknown_unknown_nt98562_openipc_defconfig index 5b23e161..d2eb19cc 100644 --- a/br-ext-chip-novatek/configs/unknown_unknown_nt98562_openipc_defconfig +++ b/br-ext-chip-novatek/configs/unknown_unknown_nt98562_openipc_defconfig @@ -70,6 +70,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_NT9856X=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-novatek/configs/unknown_unknown_nt98566_openipc_defconfig b/br-ext-chip-novatek/configs/unknown_unknown_nt98566_openipc_defconfig index ddd6a99c..b1776f96 100644 --- a/br-ext-chip-novatek/configs/unknown_unknown_nt98566_openipc_defconfig +++ b/br-ext-chip-novatek/configs/unknown_unknown_nt98566_openipc_defconfig @@ -67,6 +67,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_NT9856X=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-novatek/external.mk b/br-ext-chip-novatek/external.mk index 95733aa0..cc4305e2 100644 --- a/br-ext-chip-novatek/external.mk +++ b/br-ext-chip-novatek/external.mk @@ -10,6 +10,7 @@ include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libevent-openipc/libevent-openipc.m include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_NOVATEK_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/majestic-nt9856x/majestic-nt9856x.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_NOVATEK_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-sigmastar/Config.in b/br-ext-chip-sigmastar/Config.in index c4f07269..d40eb9ef 100644 --- a/br-ext-chip-sigmastar/Config.in +++ b/br-ext-chip-sigmastar/Config.in @@ -11,6 +11,7 @@ source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libevent-openipc/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libhv-openipc/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libogg-openipc/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/libsrt-openipc/Config.in" +source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/majestic-fonts/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/majestic-ssc335/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/mbedtls-openipc/Config.in" source "$BR2_EXTERNAL_SIGMASTAR_PATH/package/microbe-web/Config.in" diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig index c072dcd5..a5c80663 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc325_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig index 6a3052c0..6d10d9bb 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc333_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig index 0cda68bb..c7df88dd 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_blackbird_defconfig @@ -57,6 +57,7 @@ BR2_PACKAGE_JSON_C=y # BR2_PACKAGE_LAME_OPENIPC is not set # BR2_PACKAGE_LIBEVENT_OPENIPC is not set # BR2_PACKAGE_LIBYAML is not set +# BR2_PACKAGE_MAJESTIC_FONTS is not set # BR2_PACKAGE_MAJESTIC_SSC335 is not set BR2_PACKAGE_MICROBE_WEB=y # BR2_PACKAGE_MINI_SNMPD is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_goodcam_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_goodcam_defconfig index ee3c2ee6..1ad57ce1 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_goodcam_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_goodcam_defconfig @@ -56,6 +56,7 @@ BR2_PACKAGE_JSON_C=y # BR2_PACKAGE_LAME_OPENIPC is not set # BR2_PACKAGE_LIBEVENT_OPENIPC is not set BR2_PACKAGE_LIBYAML=y +# BR2_PACKAGE_MAJESTIC_FONTS is not set # BR2_PACKAGE_MAJESTIC_SSC335 is not set # BR2_PACKAGE_MINI_SNMPD is not set BR2_PACKAGE_SIGMASTAR_OSDRV_SSC335=y diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig index 13864445..1636ac94 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_musl_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig index b25476b6..8b22732a 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig index 82e214c1..27cd066c 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_portal_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_rotek_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_rotek_defconfig index bcb2945f..5cf9cecb 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_rotek_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335_rotek_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig index 99a8752e..7d9cf91b 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc335de_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_kama_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_kama_defconfig index 548b23dd..d19ec732 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_kama_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_kama_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_openipc_defconfig index b31ff2ac..1bb61c3d 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig index df683970..393ccf9f 100644 --- a/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig +++ b/br-ext-chip-sigmastar/configs/unknown_unknown_ssc337de_openipc_defconfig @@ -66,6 +66,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_SSC335=y BR2_PACKAGE_MBEDTLS_OPENIPC=y # BR2_PACKAGE_MBEDTLS_OPENIPC_PROGRAMS is not set diff --git a/br-ext-chip-sigmastar/external.mk b/br-ext-chip-sigmastar/external.mk index eb89a8fc..d811a289 100644 --- a/br-ext-chip-sigmastar/external.mk +++ b/br-ext-chip-sigmastar/external.mk @@ -11,6 +11,7 @@ include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libevent-openipc/libevent-openipc include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libhv-openipc/libhv-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libogg-openipc/libogg-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/libsrt-openipc/libsrt-openipc.mk +include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/majestic-fonts/majestic-fonts.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/majestic-ssc335/majestic-ssc335.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/mbedtls-openipc/mbedtls-openipc.mk include $(BR2_EXTERNAL_SIGMASTAR_PATH)/package/microbe-web/microbe-web.mk diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig index adf845e8..51d4dc40 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm510_openipc_defconfig @@ -64,6 +64,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y BR2_PACKAGE_MAJESTIC_XM510=y # BR2_PACKAGE_MAJESTIC_XM530 is not set BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig index f592e7ed..03b498bb 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm530_openipc_defconfig @@ -64,6 +64,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y # BR2_PACKAGE_MAJESTIC_XM510 is not set BR2_PACKAGE_MAJESTIC_XM530=y BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/br-ext-chip-xiongmai/configs/unknown_unknown_xm550_openipc_defconfig b/br-ext-chip-xiongmai/configs/unknown_unknown_xm550_openipc_defconfig index 924cdbd0..a62944ef 100644 --- a/br-ext-chip-xiongmai/configs/unknown_unknown_xm550_openipc_defconfig +++ b/br-ext-chip-xiongmai/configs/unknown_unknown_xm550_openipc_defconfig @@ -64,6 +64,7 @@ BR2_PACKAGE_LIBEVENT_OPENIPC=y BR2_PACKAGE_LIBEVENT_OPENIPC_REMOVE_PYSCRIPT=y BR2_PACKAGE_LIBOGG_OPENIPC=y BR2_PACKAGE_LIBYAML=y +BR2_PACKAGE_MAJESTIC_FONTS=y # BR2_PACKAGE_MAJESTIC_XM510 is not set BR2_PACKAGE_MAJESTIC_XM530=y BR2_PACKAGE_MBEDTLS_OPENIPC=y diff --git a/general/package/majestic-fonts/files/UbuntuMono-Regular.ttf b/general/package/majestic-fonts/files/UbuntuMono-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..20230e802571ac0d58987bb46de9cd1d94608f7b GIT binary patch literal 33492 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 literal 0 HcmV?d00001 diff --git a/general/package/majestic-fonts/majestic-fonts.mk b/general/package/majestic-fonts/majestic-fonts.mk index 1f6b5106..929eacac 100644 --- a/general/package/majestic-fonts/majestic-fonts.mk +++ b/general/package/majestic-fonts/majestic-fonts.mk @@ -1,19 +1,20 @@ ################################################################################ # -# majestic-fonts +# majestic-fonts | updated 2021.11.21 # ################################################################################ -MAJESTIC_FONTS_VERSION = current -MAJESTIC_FONTS_SOURCE = fonts.tar.bz2 -MAJESTIC_FONTS_SITE = http://openipc.s3-eu-west-1.amazonaws.com +#MAJESTIC_FONTS_VERSION = current MAJESTIC_FONTS_LICENSE = MIT MAJESTIC_FONTS_LICENSE_FILES = LICENSE -define MAJESTIC_FONTS_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/fonts - $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/fonts $(@D)/fonts.bin +define MAJESTIC_FONTS_EXTRACT_CMDS + cp ../general/package/majestic-fonts/files/* $(@D)/ endef +define MAJESTIC_FONTS_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/lib/fonts + $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/lib/fonts $(@D)/UbuntuMono-Regular.ttf +endef $(eval $(generic-package)) diff --git a/general/overlay/etc/init.d/S50httpd b/general/package/microbe-web/files/S50httpd similarity index 100% rename from general/overlay/etc/init.d/S50httpd rename to general/package/microbe-web/files/S50httpd diff --git a/general/overlay/etc/httpd.conf b/general/package/microbe-web/files/httpd.conf similarity index 100% rename from general/overlay/etc/httpd.conf rename to general/package/microbe-web/files/httpd.conf diff --git a/general/package/microbe-web/microbe-web.mk b/general/package/microbe-web/microbe-web.mk index 0a108f27..6c927367 100644 --- a/general/package/microbe-web/microbe-web.mk +++ b/general/package/microbe-web/microbe-web.mk @@ -1,6 +1,6 @@ ################################################################################ # -# microbe-web | updated 2021.11.09 +# microbe-web | updated 2021.11.21 # ################################################################################ @@ -10,6 +10,13 @@ MICROBE_WEB_LICENSE = MIT MICROBE_WEB_LICENSE_FILES = LICENSE define MICROBE_WEB_INSTALL_TARGET_CMDS + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc + cp ../general/package/microbe-web/files/httpd.conf $(TARGET_DIR)/etc + + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d + cp ../general/package/microbe-web/files/S50httpd $(TARGET_DIR)/etc/init.d + + $(INSTALL) -m 755 -d $(TARGET_DIR)/var cp -rv $(@D)/files/var/www $(TARGET_DIR)/var endef