netease
/
SmartAudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clockFrame code pull from gitLab instead of donwload tar when compile

This commit is contained in:
lupeng 2019-01-21 20:13:06 +08:00
parent 8e7ab60cee
commit 4627b875ab
6 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -25,3 +25,4 @@ prebuilt/r311/fw_bcm43436b0.bin
prebuilt/r311/wl prebuilt/r311/wl
*.code-workspace *.code-workspace
*.si4project *.si4project
package/netease/clockFrame/C1-windows

36
package/netease/clockFrame/Makefile
View File

@ -3,19 +3,21 @@ include $(BUILD_DIR)/kernel.mk
PKG_NAME:=democlock PKG_NAME:=democlock
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=$(PKG_SOURCE_VERSION) #PKG_RELEASE:=$(PKG_SOURCE_VERSION)
#PKG_SOURCE_PROTO:=git
PKG_SOURCE_PROTO:=git #PKG_SOURCE_URL:=ssh://git@g.hz.netease.com:22222/IoT/PV2/C1-windows.git
PKG_SOURCE_URL:=ssh://git@g.hz.netease.com:22222/IoT/PV2/C1-windows.git #PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) #PKG_SOURCE_VERSION:=0a133512b7d7748b6365c1577adb11c1f326e952
PKG_SOURCE_VERSION:=0a133512b7d7748b6365c1577adb11c1f326e952 #PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_SOURCE_VERSION).tar.gz
QMAKE_R311 := $(STAGING_DIR)/host/bin/qmake QMAKE_R311 := $(STAGING_DIR)/host/bin/qmake
QMAKE_SPECFILE:=$(STAGING_DIR)/usr/mkspecs/linux-openwrt-g++ QMAKE_SPECFILE:=$(STAGING_DIR)/usr/mkspecs/linux-openwrt-g++
TARGET_INCDIRS += $(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include TARGET_INCDIRS += $(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include
TARGET_LIBDIRS += $(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/qt5/qml TARGET_LIBDIRS += $(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/qt5/qml
#git compile do not need this line
PKG_BUILD_DIR := $(COMPILE_DIR)/$(PKG_NAME)
include $(BUILD_DIR)/package.mk include $(BUILD_DIR)/package.mk
define Package/$(PKG_NAME) define Package/$(PKG_NAME)
@ -23,16 +25,21 @@ define Package/$(PKG_NAME)
CATEGORY:=Netease CATEGORY:=Netease
TITLE:=$(PKG_NAME) app TITLE:=$(PKG_NAME) app
DEPENDS:=+qt5-gui +qt5-core +qt5-widgets +qt5-network +qt5-qml +qt5-quick +qt5-graphicaleffects +qt5-quick-2 +qt5-quick-controls +qt5-quick-layouts +qt5-quick-controls-2 +qt5-virtual-keyboard DEPENDS:=+qt5-gui +qt5-core +qt5-widgets +qt5-network +qt5-qml +qt5-quick +qt5-graphicaleffects +qt5-quick-2 +qt5-quick-controls +qt5-quick-layouts +qt5-quick-controls-2 +qt5-virtual-keyboard
MAINTAINER:=lupeng01 <lupeng01@corp.netease.com>
URL:=https://g.hz.netease.com/IoT/PV2/C1-windows
endef endef
define Package/$(PKG_NAME)/description define Package/$(PKG_NAME)/description
$(PKG_NAME) app $(PKG_NAME) app
endef endef
#git compile do not need Build/Prepare
define Build/Prepare
sh ./clockFrameCodePull.sh
mkdir -p $(PKG_BUILD_DIR)
$(CP) -r ./C1-windows/Frames/* $(PKG_BUILD_DIR)/
$(CP) clockFrameQt.sh $(PKG_BUILD_DIR)/clockFrame
endef
define Build/Configure define Build/Configure
ls -l $(PKG_BUILD_DIR)
TARGET_CC="$(TARGET_CROSS)gcc" \ TARGET_CC="$(TARGET_CROSS)gcc" \
TARGET_CXX="$(TARGET_CROSS)g++" \ TARGET_CXX="$(TARGET_CROSS)g++" \
TARGET_AR="$(TARGET_CROSS)ar cqs" \ TARGET_AR="$(TARGET_CROSS)ar cqs" \
@ -48,9 +55,9 @@ define Build/Configure
STAGING_DIR="$(STAGING_DIR)" \ STAGING_DIR="$(STAGING_DIR)" \
$(QMAKE_R311) \ $(QMAKE_R311) \
-spec $(QMAKE_SPECFILE) \ -spec $(QMAKE_SPECFILE) \
-o $(PKG_BUILD_DIR)/Frames/Makefile \ -o $(PKG_BUILD_DIR)/Makefile \
$(2) \ $(2) \
$(PKG_BUILD_DIR)/Frames/$(1).pro $(PKG_BUILD_DIR)/$(1).pro
endef endef
define Build/Compile define Build/Compile
@ -67,7 +74,7 @@ define Build/Compile
TARGET_LIBS="$(TARGET_LIBS)" \ TARGET_LIBS="$(TARGET_LIBS)" \
STAGING_DIR_HOST="$(STAGING_DIR_HOST)" \ STAGING_DIR_HOST="$(STAGING_DIR_HOST)" \
STAGING_DIR="$(STAGING_DIR)" \ STAGING_DIR="$(STAGING_DIR)" \
$(MAKE) -C $(PKG_BUILD_DIR)/Frames/ \ $(MAKE) -C $(PKG_BUILD_DIR)/ \
ARCH="$(TARGET_ARCH)" \ ARCH="$(TARGET_ARCH)" \
AR="$(TARGET_AR)" \ AR="$(TARGET_AR)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
@ -79,7 +86,8 @@ endef
define Package/$(PKG_NAME)/install define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/Frames/$(PKG_NAME) $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/clockFrame $(1)/usr/bin/
endef endef
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME)))

7
package/netease/clockFrame/clockFrameCodePull.sh Executable file
View File

@ -0,0 +1,7 @@
#!/bin/sh
if [[ ! -d ./C1-windows || ! -d ./C1-windows/Frames ]]; then
rm -rf ./C1-windows
mkdir -p C1-windows
git clone ssh://git@g.hz.netease.com:22222/IoT/PV2/C1-windows.git
fi

5
package/netease/clockFrame/clockFrameQt.sh Executable file
View File

@ -0,0 +1,5 @@
#!/bin/sh
source /etc/qt-env.sh
democlock -platform linuxfb
#democlock -platform eglfs

4
target/allwinner/mandolin-c1evb/configs/sys_config.fex
View File

@ -501,8 +501,8 @@ screen1_output_type = 1
screen1_output_mode = 4 screen1_output_mode = 4
fb0_format = 8 fb0_format = 8
fb0_width = 1024 fb0_width = 480
fb0_height = 768 fb0_height = 854
fb1_format = 0 fb1_format = 0
fb1_width = 0 fb1_width = 0

18
target/allwinner/mandolin-c1evb/defconfig
View File

@ -2695,28 +2695,28 @@ CONFIG_PACKAGE_zlib=y
# #
# Translations # Translations
# #
# CONFIG_LUCI_LANG_uk is not set
# CONFIG_LUCI_LANG_hu is not set # CONFIG_LUCI_LANG_hu is not set
# CONFIG_LUCI_LANG_pt is not set # CONFIG_LUCI_LANG_pt is not set
# CONFIG_LUCI_LANG_ro is not set # CONFIG_LUCI_LANG_sk is not set
# CONFIG_LUCI_LANG_no is not set
# CONFIG_LUCI_LANG_en is not set # CONFIG_LUCI_LANG_en is not set
# CONFIG_LUCI_LANG_pl is not set # CONFIG_LUCI_LANG_pl is not set
# CONFIG_LUCI_LANG_sk is not set # CONFIG_LUCI_LANG_uk is not set
# CONFIG_LUCI_LANG_ja is not set # CONFIG_LUCI_LANG_ru is not set
# CONFIG_LUCI_LANG_vi is not set # CONFIG_LUCI_LANG_vi is not set
# CONFIG_LUCI_LANG_he is not set # CONFIG_LUCI_LANG_he is not set
# CONFIG_LUCI_LANG_no is not set # CONFIG_LUCI_LANG_ro is not set
# CONFIG_LUCI_LANG_ms is not set # CONFIG_LUCI_LANG_ms is not set
# CONFIG_LUCI_LANG_zh-cn is not set # CONFIG_LUCI_LANG_zh-cn is not set
# CONFIG_LUCI_LANG_de is not set # CONFIG_LUCI_LANG_de is not set
# CONFIG_LUCI_LANG_zh-tw is not set # CONFIG_LUCI_LANG_zh-tw is not set
# CONFIG_LUCI_LANG_tr is not set # CONFIG_LUCI_LANG_tr is not set
# CONFIG_LUCI_LANG_sv is not set # CONFIG_LUCI_LANG_sv is not set
# CONFIG_LUCI_LANG_ru is not set # CONFIG_LUCI_LANG_ja is not set
# CONFIG_LUCI_LANG_pt-br is not set
# CONFIG_LUCI_LANG_el is not set # CONFIG_LUCI_LANG_el is not set
# CONFIG_LUCI_LANG_ca is not set # CONFIG_LUCI_LANG_ca is not set
# CONFIG_LUCI_LANG_es is not set # CONFIG_LUCI_LANG_es is not set
# CONFIG_LUCI_LANG_pt-br is not set
# CONFIG_LUCI_LANG_cs is not set # CONFIG_LUCI_LANG_cs is not set
# CONFIG_LUCI_LANG_fr is not set # CONFIG_LUCI_LANG_fr is not set
# CONFIG_LUCI_LANG_it is not set # CONFIG_LUCI_LANG_it is not set
@ -2910,7 +2910,7 @@ CONFIG_PACKAGE_libyunxin=y
CONFIG_PACKAGE_KPlatinum=y CONFIG_PACKAGE_KPlatinum=y
CONFIG_PACKAGE_KPlayer=y CONFIG_PACKAGE_KPlayer=y
CONFIG_PACKAGE_KPlayerTest=y CONFIG_PACKAGE_KPlayerTest=y
CONFIG_PACKAGE_NeteaseInitScript=y # CONFIG_PACKAGE_NeteaseInitScript is not set
CONFIG_PACKAGE_SPlayer=y CONFIG_PACKAGE_SPlayer=y
CONFIG_PACKAGE_SPlayer-demo=y CONFIG_PACKAGE_SPlayer-demo=y
CONFIG_PACKAGE_alarmer=y CONFIG_PACKAGE_alarmer=y
@ -2918,7 +2918,7 @@ CONFIG_PACKAGE_baidu_oases=y
# CONFIG_PACKAGE_blueKC is not set # CONFIG_PACKAGE_blueKC is not set
# CONFIG_PACKAGE_blueKC-demo is not set # CONFIG_PACKAGE_blueKC-demo is not set
# CONFIG_PACKAGE_config_server is not set # CONFIG_PACKAGE_config_server is not set
# CONFIG_PACKAGE_democlock is not set CONFIG_PACKAGE_democlock=y
# CONFIG_PACKAGE_factoryTest is not set # CONFIG_PACKAGE_factoryTest is not set
# CONFIG_PACKAGE_golangtest is not set # CONFIG_PACKAGE_golangtest is not set
CONFIG_PACKAGE_ihwplayer=y CONFIG_PACKAGE_ihwplayer=y