diff --git a/meta/base/conf/mt8516/aud8516p1v2-consys-slc-128/local.conf.sample b/meta/base/conf/mt8516/aud8516p1v2-consys-slc-128/local.conf.sample index 63156de40..03996e73c 100644 --- a/meta/base/conf/mt8516/aud8516p1v2-consys-slc-128/local.conf.sample +++ b/meta/base/conf/mt8516/aud8516p1v2-consys-slc-128/local.conf.sample @@ -18,7 +18,8 @@ INHERIT += "buildhistory" BUILDHISTORY_COMMIT = "1" INCOMPATIBLE_LICENSE ?= "GPL-3.0 LGPL-3.0 AGPL-3.0" QEMU_TARGETS = "arm aarch64 i386 x86_64" -BB_NO_NETWORK = "${@int(os.path.isdir('${DL_DIR}/.git') == True)}" +# BB_NO_NETWORK = "${@int(os.path.isdir('${DL_DIR}/.git') == True)}" +BB_NO_NETWORK = "0" LICENSE_FLAGS_WHITELIST = "commercial" LICENSE_FLAGS_FFMPEG="yes" LICENSE_FLAGS_GMRENDER="yes" diff --git a/meta/base/conf/mt8516/aud8516p1v2-consys-slc/local.conf.sample b/meta/base/conf/mt8516/aud8516p1v2-consys-slc/local.conf.sample index 6658eae18..db9bc544e 100755 --- a/meta/base/conf/mt8516/aud8516p1v2-consys-slc/local.conf.sample +++ b/meta/base/conf/mt8516/aud8516p1v2-consys-slc/local.conf.sample @@ -18,6 +18,7 @@ INHERIT += "buildhistory" BUILDHISTORY_COMMIT = "1" INCOMPATIBLE_LICENSE ?= "GPL-3.0 LGPL-3.0 AGPL-3.0" QEMU_TARGETS = "arm aarch64 i386 x86_64" -BB_NO_NETWORK = "${@int(os.path.isdir('${DL_DIR}/.git') == True)}" +#BB_NO_NETWORK = "${@int(os.path.isdir('${DL_DIR}/.git') == True)}" +BB_NO_NETWORK = "0" LICENSE_FLAGS_WHITELIST = "commercial" LICENSE_FLAGS_FFMPEG="yes" diff --git a/meta/meta-mediatek-aud/recipes-apps/config-app/config-app.bb b/meta/meta-mediatek-aud/recipes-apps/config-app/config-app.bb index 22d173073..66c1cdc65 100644 --- a/meta/meta-mediatek-aud/recipes-apps/config-app/config-app.bb +++ b/meta/meta-mediatek-aud/recipes-apps/config-app/config-app.bb @@ -1,6 +1,6 @@ DESCRIPTION = "config-app" LICENSE = "MediaTekProprietary" -DEPENDS+="bluetooth openssl libev json-c alsa-lib" +DEPENDS+="curl bluetooth openssl libev json-c alsa-lib" APPS_SRC = "${TOPDIR}/../src/apps/aud-base/config_app" inherit workonsrc systemd diff --git a/meta/meta-mediatek-aud/recipes-support/libnvram_custom/libnvramcustom_1.0.0.bb b/meta/meta-mediatek-aud/recipes-support/libnvram_custom/libnvramcustom_1.0.0.bb index be55008f9..8181ae65a 100755 --- a/meta/meta-mediatek-aud/recipes-support/libnvram_custom/libnvramcustom_1.0.0.bb +++ b/meta/meta-mediatek-aud/recipes-support/libnvram_custom/libnvramcustom_1.0.0.bb @@ -1,5 +1,6 @@ #Basic Configuration DESCRIPTION = "Customization." +TOOLCHAIN = "gcc" SECTION = "base" LICENSE = "MediaTekProprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=e1696b147d49d491bcb4da1a57173fff" diff --git a/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb b/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb index f259e6206..c948f2001 100755 --- a/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb +++ b/meta/meta-mediatek-mt8516/recipes-audio/images/mtk-image-aud-8516.bb @@ -31,8 +31,7 @@ IMAGE_INSTALL_append = " \ curl \ prog \ ntpdate \ - appmainprog \ - config-app \ + appmainprog \ mic-asp \ ppc \ ppccli \ @@ -43,8 +42,6 @@ IMAGE_INSTALL_append = " \ android-tools-adbd \ mtd-utils-ubifs \ custom \ - nvram \ - libnvramcustom \ upgrade_app \ buildinfo \ tzapp \ diff --git a/meta/meta-mediatek/recipes-connectivity/packagegroups/packagegroup-mtk-6630.bb b/meta/meta-mediatek/recipes-connectivity/packagegroups/packagegroup-mtk-6630.bb index 44c07d6b6..e8896223f 100644 --- a/meta/meta-mediatek/recipes-connectivity/packagegroups/packagegroup-mtk-6630.bb +++ b/meta/meta-mediatek/recipes-connectivity/packagegroups/packagegroup-mtk-6630.bb @@ -10,8 +10,7 @@ RDEPENDS_packagegroup-mtk-6630 = "\ mtkcombo \ mtkwifitesttool \ connman-client \ - gnsshal \ - ${@base_contains("TARGET_PLATFORM", "mt2712", "lib32-mnld", "mnld", d)} \ + gnsshal \ gnsstest \ hostapd \ dhcp-server \ diff --git a/meta/meta-mediatek/recipes-multimedia/images/mtk-multimedia-image-minimal.bb b/meta/meta-mediatek/recipes-multimedia/images/mtk-multimedia-image-minimal.bb index c99b5f853..0d2d5c62f 100644 --- a/meta/meta-mediatek/recipes-multimedia/images/mtk-multimedia-image-minimal.bb +++ b/meta/meta-mediatek/recipes-multimedia/images/mtk-multimedia-image-minimal.bb @@ -31,8 +31,7 @@ IMAGE_INSTALL_append = " \ udev-extraconf \ usbutils \ util-linux \ - ${@base_contains("TARGET_PLATFORM", "mt2701", "vpud", "", d)} \ - ${@base_contains("TARGET_PLATFORM", "mt2712", "lib32-vpud", "", d)} \ + ${@base_contains("TARGET_PLATFORM", "mt2701", "vpud", "", d)} \ mdpd \ mtk-ovl-adapter \ tzapp \ diff --git a/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb b/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb index 9b2ace9c4..e724034d1 100644 --- a/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb +++ b/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb @@ -20,7 +20,6 @@ LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse- EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " do_install_append() { diff --git a/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb b/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb index 1d8b0dbd4..2b30c527e 100644 --- a/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb +++ b/meta/meta-openembedded/meta-oe/recipes-extended/konkretcmpi/konkretcmpi_0.9.2.bb @@ -20,7 +20,6 @@ inherit cmake EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " do_install_append() { diff --git a/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb b/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb index 7cfcbe246..91ee34487 100644 --- a/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb +++ b/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-networking_0.3.1.bb @@ -17,7 +17,6 @@ SRC_URI[sha256sum] = "578eaa5c65fe924b5d7aeb635509dd46443166cd6a88b019bc42646e35 inherit cmake EXTRA_OECMAKE = "${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " diff --git a/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb b/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb index 604888874..0be34801f 100644 --- a/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb +++ b/meta/meta-openembedded/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb @@ -34,7 +34,6 @@ EXTRA_OECMAKE = " \ -DWITH-SELINUX=OFF \ -DWITH-SOFTWARE-DBUS=ON \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " do_configure_prepend() { diff --git a/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_2.4.bb b/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_2.4.bb index ced066f56..c850a4a24 100644 --- a/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_2.4.bb +++ b/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_2.4.bb @@ -31,7 +31,6 @@ EXTRA_OECMAKE = "-DPYTHON_NUMPY_INCLUDE_DIR:PATH=${STAGING_LIBDIR}/${PYTHON_DIR} ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " PACKAGECONFIG ??= "eigen jpeg png tiff v4l libv4l \ diff --git a/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.1.bb index 1bbb965c8..434555f43 100644 --- a/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -45,7 +45,6 @@ EXTRA_OECMAKE = "-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DI ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@base_conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" diff --git a/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libfile_op.so b/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libfile_op.so new file mode 100755 index 000000000..a5008a0be Binary files /dev/null and b/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libfile_op.so differ diff --git a/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libnvram.so b/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libnvram.so new file mode 100755 index 000000000..0fa27a6dc Binary files /dev/null and b/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libnvram.so differ diff --git a/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libnvram_custom.so b/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libnvram_custom.so new file mode 100755 index 000000000..5ce2a324b Binary files /dev/null and b/src/connectivity/bt_others/vendor_lib/mt66xx/mtk/bluedroid/external/platform/libnvram_custom.so differ diff --git a/src/support/libnvram_custom/CFG/Makefile b/src/support/libnvram_custom/CFG/Makefile index 2d3544aeb..3e5933701 100644 --- a/src/support/libnvram_custom/CFG/Makefile +++ b/src/support/libnvram_custom/CFG/Makefile @@ -1,5 +1,5 @@ PREFIX = ../../../install -CROSS = arm-linux- +CROSS = aarch64-poky-linux- ROOT = $(PREFIX)/$(CROSS:%-=%) DEFAULT=$(shell if [ -e DEFAULT ]; then ls DEFAULT; fi) diff --git a/src/support/libnvram_custom/Makefile b/src/support/libnvram_custom/Makefile index f98f95978..33602fa2a 100755 --- a/src/support/libnvram_custom/Makefile +++ b/src/support/libnvram_custom/Makefile @@ -1,5 +1,5 @@ PREFIX = ../install -CROSS = arm-linux- +CROSS = aarch64-poky-linux- CROSS_COMPILER = $(CROSS:%-=%) ROOT = ../install/$(CROSS_COMPILER) DEP_LIBS =