Reinhard Russinger 3 年 前
コミット
cfc54d482f

+ 2 - 1
Make-bb-kernel.sh

@@ -6,7 +6,8 @@ git clone https://gogs.reru.org/PUBLIC_REPOS/buildroot.git ./buildroot
 cd buildroot
 cd buildroot
 ##git checkout fa3267bd460095eb9e1478b27d9cb8fa80f96163
 ##git checkout fa3267bd460095eb9e1478b27d9cb8fa80f96163
 ##git checkout 2020.05
 ##git checkout 2020.05
-git checkout 0bec4c8a4a90cde57ccd46dcad4b9a860c71ffde
+git checkout 2021.08.1
+##git checkout 0bec4c8a4a90cde57ccd46dcad4b9a860c71ffde
 #
 #
 for i in ../GfA/patches/*.patch
 for i in ../GfA/patches/*.patch
 do
 do

+ 6 - 10
configs/SOPINEA64_L50_Qt5.15_defconfig

@@ -1,10 +1,10 @@
 BR2_aarch64=y
 BR2_aarch64=y
 BR2_ARM_FPU_VFPV4=y
 BR2_ARM_FPU_VFPV4=y
 BR2_DL_DIR="~/buildroot_dl_A64"
 BR2_DL_DIR="~/buildroot_dl_A64"
-BR2_HOST_DIR="/opt/GfA/TC_A64_L50_C930_QT515"
+BR2_HOST_DIR="/opt/GfA/TC_A64_L50_C1030_QT515"
 # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
 # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
-BR2_GCC_VERSION_8_X=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
 BR2_PACKAGE_HOST_GDB_TUI=y
@@ -24,6 +24,8 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="../GfA/board/GfA/Display001/post-build_4.4.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c ../GfA/board/GfA/Display001/sopine/genimage.cfg"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c ../GfA/board/GfA/Display001/sopine/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.7"
 BR2_LINUX_KERNEL_PATCH="../GfA/board/GfA/Display001/Linux-5.8"
 BR2_LINUX_KERNEL_PATCH="../GfA/board/GfA/Display001/Linux-5.8"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../GfA/board/GfA/Display001/SOPINEA64_defconfig"
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="../GfA/board/GfA/Display001/SOPINEA64_defconfig"
@@ -109,7 +111,6 @@ BR2_PACKAGE_FB_TEST_APP=y
 BR2_PACKAGE_FBTERM=y
 BR2_PACKAGE_FBTERM=y
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_FBV=y
 BR2_PACKAGE_MESA3D=y
 BR2_PACKAGE_MESA3D=y
-BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_KMSRO=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_LIMA=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
@@ -278,7 +279,6 @@ BR2_PACKAGE_JANSSON=y
 BR2_PACKAGE_LIBXSLT=y
 BR2_PACKAGE_LIBXSLT=y
 BR2_PACKAGE_RAPIDJSON=y
 BR2_PACKAGE_RAPIDJSON=y
 BR2_PACKAGE_TINYXML=y
 BR2_PACKAGE_TINYXML=y
-BR2_PACKAGE_LIBASS=y
 BR2_PACKAGE_LIBMPEG2=y
 BR2_PACKAGE_LIBMPEG2=y
 BR2_PACKAGE_LIBYUV=y
 BR2_PACKAGE_LIBYUV=y
 BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCURL_CURL=y
@@ -334,7 +334,6 @@ BR2_PACKAGE_POCO_DATA_SQLITE=y
 BR2_PACKAGE_POCO_DATA_MYSQL=y
 BR2_PACKAGE_POCO_DATA_MYSQL=y
 BR2_PACKAGE_PROTOBUF=y
 BR2_PACKAGE_PROTOBUF=y
 BR2_PACKAGE_PROTOBUF_C=y
 BR2_PACKAGE_PROTOBUF_C=y
-BR2_PACKAGE_FMT=y
 BR2_PACKAGE_FSTRCMP=y
 BR2_PACKAGE_FSTRCMP=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
@@ -366,8 +365,6 @@ BR2_PACKAGE_HTTPING_TFO=y
 BR2_PACKAGE_IFTOP=y
 BR2_PACKAGE_IFTOP=y
 BR2_PACKAGE_IFUPDOWN=y
 BR2_PACKAGE_IFUPDOWN=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPROUTE2=y
-BR2_PACKAGE_IPSEC_TOOLS=y
-BR2_PACKAGE_IPSEC_TOOLS_READLINE=y
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
 BR2_PACKAGE_IW=y
 BR2_PACKAGE_LRZSZ=y
 BR2_PACKAGE_LRZSZ=y
@@ -396,7 +393,6 @@ BR2_PACKAGE_WPA_SUPPLICANT=y
 BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
 BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
 BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
 BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
 BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
 BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
 BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
 BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
@@ -438,12 +434,12 @@ BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
 BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
-BR2_TARGET_UBOOT_BOOT_SCRIPT=y
-BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="../GfA/board/GfA/Display001/sopine/boot.cmd"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_PACKAGE_HOST_UBOOT_TOOLS=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
+BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="../GfA/board/GfA/Display001/sopine/boot.cmd"
 BR2_PACKAGE_APPLICATIONLAUNCHER=y
 BR2_PACKAGE_APPLICATIONLAUNCHER=y
 BR2_PACKAGE_GFASQLPLUGIN=y
 BR2_PACKAGE_GFASQLPLUGIN=y
 BR2_PACKAGE_QTFREEVIRTUALKEYBOARD=y
 BR2_PACKAGE_QTFREEVIRTUALKEYBOARD=y

+ 19 - 0
patches/0109-qt5webengine_add_dependencies.patch

@@ -0,0 +1,19 @@
+diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
+index 64c9c96..cd6c2d9 100644
+--- a/package/qt5/qt5webengine/qt5webengine.mk
++++ b/package/qt5/qt5webengine/qt5webengine.mk
+@@ -29,6 +29,14 @@ endif
+ 
+ QT5WEBENGINE_DEPENDENCIES += host-libpng host-libnss libnss
+ 
++ifeq ($(BR2_PACKAGE_QT5BASE_FONTCONFIG),y)
++       QT5WEBENGINE_DEPENDENCIES += host-freetype
++endif
++
++ifeq ($(BR2_PACKAGE_QT5BASE_JPEG),y)
++       QT5WEBENGINE_DEPENDENCIES += host-libjpeg
++endif
++
+ QT5WEBENGINE_CONF_OPTS += WEBENGINE_CONFIG+=use_system_ffmpeg
+ 
+ ifeq ($(BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS),y)