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 ed9afdc66..caaf2c842 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 @@ -19,7 +19,6 @@ BUILDHISTORY_COMMIT = "1" INCOMPATIBLE_LICENSE ?= "GPL-3.0 LGPL-3.0 AGPL-3.0" #QEMU_TARGETS = "arm aarch64 i386 x86_64" QEMU_TARGETS = "arm aarch64 i386 x86_64" -# 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-core/systemd/systemd_300.bb b/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb index a69328224..7617aaccd 100644 --- a/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb +++ b/meta/meta-mediatek-aud/recipes-core/systemd/systemd_300.bb @@ -19,7 +19,7 @@ PROVIDES = "udev" PE = "1" #DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline libcap libcgroup qemu-native util-linux" -DEPENDS = "libcgroup libcap intltool-native util-linux" +DEPENDS = "libcgroup libcap acl curl gnutls intltool-native util-linux" SECTION = "base/shell" diff --git a/meta/meta-mediatek-aud/recipes-support/faad2/faad2_2.0.0.bb b/meta/meta-mediatek-aud/recipes-support/faad2/faad2_2.0.0.bb index 6f8c75808..f73fcafb8 100644 --- a/meta/meta-mediatek-aud/recipes-support/faad2/faad2_2.0.0.bb +++ b/meta/meta-mediatek-aud/recipes-support/faad2/faad2_2.0.0.bb @@ -25,4 +25,4 @@ do_install() { cd ${S} && oe_runmake 'DESTDIR=${D}' install } -INSANE_SKIP_${PN} += "already-stripped installed-vs-shipped dev-deps ldflags" \ No newline at end of file +INSANE_SKIP_${PN} += "already-stripped installed-vs-shipped dev-deps ldflags" diff --git a/meta/meta-mediatek-aud/recipes-support/nghttp2/nghttp2_1.47.0.bb b/meta/meta-mediatek-aud/recipes-support/nghttp2/nghttp2_1.47.0.bb index cdfd28744..288c3d1ac 100644 --- a/meta/meta-mediatek-aud/recipes-support/nghttp2/nghttp2_1.47.0.bb +++ b/meta/meta-mediatek-aud/recipes-support/nghttp2/nghttp2_1.47.0.bb @@ -4,9 +4,9 @@ SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=764abdf30b2eadd37ce47dcbce0ea1ec" -SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.bz2" -SRC_URI[md5sum] = "2bca98caef4b5c27d5bdc4732f36a5d6" -SRC_URI[sha256sum] = "07c89947438f0254c2f4300a884813431d678cfb2e699d9aacddc28c23e2a685" +SRC_URI = "https://github.com/nghttp2/nghttp2/releases/download/v${PV}/nghttp2-${PV}.tar.xz" +SRC_URI[md5sum] = "6c8c35dd14a36673a9b86a7892b800f8" +SRC_URI[sha256sum] = "68271951324554c34501b85190f22f2221056db69f493afc3bbac8e7be21e7cc" DEPENDS = "libxml2 openssl zlib jansson cunit c-ares jemalloc" @@ -15,4 +15,4 @@ inherit cmake pythonnative python-dir do_install_append() { install -d ${D}${libdir}/pkgconfig install -m 0755 ${B}/lib/libnghttp2.pc ${D}${libdir}/pkgconfig/libnghttp2.pc -} \ No newline at end of file +} diff --git a/meta/meta-mediatek-mt8516/conf/machine/aud8516p1v2-consys-slc-128.conf b/meta/meta-mediatek-mt8516/conf/machine/aud8516p1v2-consys-slc-128.conf index efe78091b..cc50704ae 100755 --- a/meta/meta-mediatek-mt8516/conf/machine/aud8516p1v2-consys-slc-128.conf +++ b/meta/meta-mediatek-mt8516/conf/machine/aud8516p1v2-consys-slc-128.conf @@ -27,7 +27,7 @@ require arch-arm64-tune-cortexa7-multilib.inc # For building codes to sync with other projects. require conf/multilib.conf -DEFAULTTUNE_virtclass-multilib-lib32 = "cortexa7hf-neon-vfpv4" +#DEFAULTTUNE_virtclass-multilib-lib32 = "cortexa7hf-neon-vfpv4" # project MTK_PROJECT = "aud8516p1v2-consys-slc-128" 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 8eda6beee..7e76146c2 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 @@ -33,8 +33,6 @@ IMAGE_INSTALL_append = " \ mtkwlan \ mtkcombo \ curl \ - prog \ - ntpdate \ appmainprog \ mic-asp \ ppc \ @@ -76,8 +74,7 @@ IMAGE_INSTALL_append = " \ gstreamer1.0-libav \ gstreamer1.0-plugins-ugly \ libopus \ - libarchive \ - faad2 \ + libarchive \ nfs-utils \ softhsm2 \ libgcrypt \ diff --git a/meta/poky/meta/conf/bitbake.conf b/meta/poky/meta/conf/bitbake.conf index 0f27e92e9..412b9290d 100644 --- a/meta/poky/meta/conf/bitbake.conf +++ b/meta/poky/meta/conf/bitbake.conf @@ -352,6 +352,9 @@ S = "${WORKDIR}/${BP}" B = "${S}" STAGING_DIR = "${TMPDIR}/sysroots" +COMPONENTS_DIR = "${STAGING_DIR}-components" +RECIPE_SYSROOT = "${WORKDIR}/recipe-sysroot" +RECIPE_SYSROOT_NATIVE = "${WORKDIR}/recipe-sysroot-native" STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}" STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}" diff --git a/meta/poky/meta/conf/multilib.conf b/meta/poky/meta/conf/multilib.conf index 1403a034a..26578aad7 100644 --- a/meta/poky/meta/conf/multilib.conf +++ b/meta/poky/meta/conf/multilib.conf @@ -1,10 +1,10 @@ baselib = "${@d.getVar('BASE_LIB_tune-' + (d.getVar('DEFAULTTUNE', True) or 'INVALID'), True) or d.getVar('BASELIB', True)}" -MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" +# MULTILIB_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" MULTILIB_SAVE_VARNAME = "DEFAULTTUNE TARGET_ARCH TARGET_SYS TARGET_VENDOR" -MULTILIBS ??= "multilib:lib32" +# MULTILIBS ??= "multilib:lib32" STAGING_DIR_HOST = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" @@ -12,7 +12,7 @@ PKGDATA_DIR = "${STAGING_DIR}/${MACHINE}/pkgdata" INHERIT += "multilib_global" -BBCLASSEXTEND_append = " ${MULTILIBS}" +# BBCLASSEXTEND_append = " ${MULTILIBS}" MULTILIB_GLOBAL_VARIANTS ?= "lib32 lib64 libx32" diff --git a/prebuilt/connectivity/wlan_smartconnection/Makefile b/prebuilt/connectivity/wlan_smartconnection/Makefile index 811dec3dc..8a418154f 100644 --- a/prebuilt/connectivity/wlan_smartconnection/Makefile +++ b/prebuilt/connectivity/wlan_smartconnection/Makefile @@ -6,4 +6,7 @@ install: install -d ${DESTDIR}${libdir} install -m 755 ./${libdir}/libsmtcn.so ${DESTDIR}/${libdir}/ install -d ${DESTDIR}${bindir} - install -m 755 ./${bindir}/smtcn_demo ${DESTDIR}/${bindir}/ \ No newline at end of file + install -m 755 ./${bindir}/smtcn_demo ${DESTDIR}/${bindir}/ + +clean : + find . -name "*.o" diff --git a/prebuilt/multimedia/audio-misc/ppccli/Makefile b/prebuilt/multimedia/audio-misc/ppccli/Makefile index 9e09fc444..102df1042 100755 --- a/prebuilt/multimedia/audio-misc/ppccli/Makefile +++ b/prebuilt/multimedia/audio-misc/ppccli/Makefile @@ -5,3 +5,7 @@ install: find -name "*${ppccli_package_arch}*.rpm" | while read i; do ${bindir}/rpm2cpio $${i} | cpio -idmv ; done install -d ${DESTDIR}${bindir} install -m 755 ./usr/bin/ppccli ${DESTDIR}/${bindir} + + +clean : + find . -name "*.o"