M7350v7_en_gpl

oe-core/build/conf/bblayers.conf

@@ -7,4 +7,4 @@ export WORKSPACE := "${@os.path.abspath(os.path.join(os.path.dirname(bb.data.get
 
 BBPATH = "${TOPDIR}"
 BBFILES ?= ""
-BBLAYERS = "/home/mobile/Work/mifi/M7350v5_en_gpl/M7350v5_en_gpl/oe-core/meta-tp /home/mobile/Work/mifi/M7350v5_en_gpl/M7350v5_en_gpl/oe-core/meta-msm /home/mobile/Work/mifi/M7350v5_en_gpl/M7350v5_en_gpl/oe-core/meta"
+BBLAYERS = "/home/bba/projects/dev/M7350v7/M7350v7_en_gpl/oe-core/meta-tp /home/bba/projects/dev/M7350v7/M7350v7_en_gpl/oe-core/meta-msm /home/bba/projects/dev/M7350v7/M7350v7_en_gpl/oe-core/meta"

oe-core/build/conf/sanity_info

@@ -0,0 +1,3 @@
+SANITY_VERSION 1
+TMPDIR /home/bba/projects/dev/M7350v7/M7350v7_en_gpl/oe-core/build/tmp-glibc
+SSTATE_DIR /home/bba/projects/dev/M7350v7/M7350v7_en_gpl/oe-core/build/sstate-cache

oe-core/build/conf/tp_set_bb_env.sh

@@ -1,4 +1,4 @@
-PRODUCT_CHOICES=(m7350v5)
+PRODUCT_CHOICES=(m7350v6)
 BUILD_TYPE_CHOICES=(release debug)
 
 export TARGET_BOARD=mdm9607
@@ -200,6 +200,8 @@ function copy_kernel_dts_and_defconfig()
   local PRODUCT_KERNEL_DEFCONFIG_FILE=tp-product/${TARGET_PRODUCT}/kernel/mdm9607_defconfig
   local PRODUCT_KERNEL_PATCH_FILE=tp-product/${TARGET_PRODUCT}/kernel/kernel_diff.patch
   local DEBUG_DEFCONFIG_FILE=${WS}/kernel/arch/arm/configs/mdm9607_debug_defconfig
+  local PRODUCT_QCN_FILE=${WS}/tp-proprietary/qcn/factory.xqcn
+  local PRODUCT_QCN_DIR=${WS}/tp-proprietary/qcn/${TARGET_PRODUCT}
 
 :<<mark
   if [ -d ${WS}/${PRODUCT_KERNEL_DTS_DIR} ] ; then
@@ -221,6 +223,22 @@ mark
   if [ "${TARGET_BUILD_TYPE}" = "debug" ] ; then
     cat ${DEBUG_DEFCONFIG_FILE} >> ${WS}/kernel/arch/arm/configs/mdm9607_defconfig
   fi
+
+  cp ${PRODUCT_QCN_DIR}/*.xqcn ${PRODUCT_QCN_FILE}
+  cp ${WS}/tp-product/${TARGET_PRODUCT}/config/product ${WS}/tp-product/product
+}
+
+function create_firmware_id()
+{
+  local PRODUCT_FILE=${WS}/tp-product/${TARGET_PRODUCT}/config/product
+  local PRODUCT_FILE_TMP=${WS}/tp-product/product_tmp
+
+  echo "---------------------------------------------------------"
+  echo " generate firmware_id"
+  echo "---------------------------------------------------------"
+
+  ${WS}/oe-core/build/conf/gen_firmware_id.sh ${PRODUCT_FILE} ${PRODUCT_FILE_TMP}
+  cat ${PRODUCT_FILE}
 }
 
 function choosecombo()
@@ -270,6 +288,8 @@ function rpp () {
 
 function build()
 {
+	create_firmware_id
+
 	if check_config
 	then
 		echo "Your environment is set, please check if it is right."

oe-core/meta-msm/recipes/lighttpd/files/lighttpd.conf

@@ -12,6 +12,7 @@
 # - saves some time
 # - saves memory
 server.modules              = (
+                                "mod_expire",
 #                               "mod_rewrite",
                                 "mod_redirect",
 #                               "mod_alias",
@@ -20,7 +21,7 @@ server.modules              = (
 #                               "mod_trigger_b4_dl",
 #                               "mod_auth",
 #                               "mod_status",
-#                               "mod_setenv",
+                                "mod_setenv",
 #                               "mod_fastcgi",
 #                               "mod_proxy",
 #                               "mod_simple_vhost",
@@ -30,7 +31,6 @@ server.modules              = (
 #                               "mod_compress",
 #                               "mod_ssi",
 #                               "mod_usertrack",
-#                               "mod_expire",
 #                               "mod_secdownload",
 #                               "mod_rrdtool",
 #                               "mod_webdav",
@@ -119,6 +119,9 @@ mimetype.assign             = (
 #accesslog.filename          = "/www/access.log"
 #debug.log-request-handling = "enable"
 
+###[pudongfang] add ipv6 support
+$SERVER["socket"] == "[::]:80" {}
+
 $HTTP["url"] =~ "/" {
                 server.document-root        = "/WEBSERVER/www/"
                 #server.errorlog             = "/www/lighttpd.error.log"
@@ -154,6 +157,16 @@ $HTTP["url"] == "/" {
         }
     }
 }
+$HTTP["url"] =~ "/*.html" {
+  setenv.add-response-header = ( "Cache-Control" => "no-cache" )
+}
+$HTTP["url"] =~ "/*.css" {
+  expire.url = ( "" => "access 1 hours")
+}
+$HTTP["url"] =~ "/*.js" {
+  setenv.add-response-header = ( "Cache-Control" => "no-cache" )
+}
+expire.url = (  "/images/" => "access 1 hours")
 
 ##
 # which extensions should not be handle via static-file transfer

oe-core/meta-msm/recipes/lighttpd/lighttpd_1.4.35.bbappend

@@ -15,6 +15,8 @@ RDEPENDS_${PN} += " \
                lighttpd-module-auth \
                lighttpd-module-redirect \
                lighttpd-module-evasive \
+               lighttpd-module-expire \
+               lighttpd-module-setenv \
 "
 EXTRA_OECONF += " \
              --with-openssl \

oe-core/meta-msm/recipes/sfe/sfe_git.bb

@@ -11,6 +11,8 @@ S = "${WORKDIR}/shortcut-fe/shortcut-fe"
 
 FILES_${PN}="/etc/init.d/start_shortcut_fe_le"
 
+EXTRA_OEMAKE += "${@base_conditional('TP_FEATURE_CLOUD', 'y', 'EXTRA_CFLAGS+=-DTP_FEATURE_CLOUD', '', d)}"
+
 do_install() {
     module_do_install
     install -d ${D}${sysconfdir}/init.d

oe-core/meta-msm/recipes/sigma-dut/sigma-dut_git.bb

@@ -1,16 +0,0 @@
-inherit autotools qcommon
-
-DESCRIPTION = "WFA certification testing tool for QCA devices"
-HOMEPAGE = "https://github.com/qca/sigma-dut"
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/${LICENSE};md5=550794465ba0ec5312d6919e203a55f9"
-
-PR = "r0"
-
-SRC_DIR = "${WORKSPACE}/wlan/utils/sigma-dut/"
-
-S = "${WORKDIR}/wlan/utils/sigma-dut"
-
-do_install() {
-    make install DESTDIR=${D} BINDIR=${sbindir}/
-}

oe-core/meta-tp/classes/tp-link-common.bbclass

@@ -10,8 +10,8 @@ FILESPATH        =+ "${WORKSPACE}:"
 SRC_URI          = "file://${@d.getVar('SRC_DIR', True).replace('${WORKSPACE}/', '')}"
 PV               = "git-${GITSHA}"
 
-LICENSE          = "TPLink-Technologies-Inc.-Proprietary"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta-tp/files/tp-licenses/${LICENSE};md5=abd123e5a2e897447f2c177f6053913c"
+LICENSE          = "TPLink-Corporation-Limited.-Proprietary"
+LIC_FILES_CHKSUM = "file://${COREBASE}/meta-tp/files/tp-licenses/${LICENSE};md5=414f2f16c6966d51db8a805b26f9a907"
 
 TP-PROPRIETARY   = "${WORKSPACE}/tp-proprietary"
 TP-OPENSOURCE    = "${WORKSPACE}/tp-opensource"

oe-core/meta-tp/conf/layer.conf

@@ -5,4 +5,4 @@ BBFILE_PRIORITY_tp = "20"
 BBFILE_PATTERN_tp := "^${LAYERDIR}/"
 #LICENSE_PATH += "${LAYERDIR}/files/tp-licenses"
 LICENSE_DIR .= "${LAYERDIR}/files/tp-licenses"
-SPDXLICENSEMAP[TPLink-Technologies-Inc.-Proprietary] = "TPLink-Technologies-Inc.-Proprietary"
+SPDXLICENSEMAP[TPLink-Corporation-Limited.-Proprietary] = "TPLink-Corporation-Limited.-Proprietary"

oe-core/meta-tp/files/tp-licenses/TPLink-Corporation-Limited.-Proprietary

@@ -0,0 +1,2 @@
+Copyright (c) 2020 TPLINK CORPORATION LIMITED. All Rights Reserved.
+TP-Link Corporation Limited Proprietary and Confidential.

oe-core/meta-tp/files/tp-licenses/TPLink-Technologies-Inc.-Proprietary

@@ -1,2 +0,0 @@
-Copyright (c) 2015 TPLINK TECHNOLOGIES CO., LTD. All Rights Reserved.
-TP-Link Technologies Proprietary and Confidential.

oe-core/meta-tp/recipes/uci/uci.bb

@@ -8,7 +8,8 @@ SRCREV="393bc2b908ef44cb8b417126a35d4915c4cdfbc9"
 SRC_URI = "git://nbd.name/uci.git;protocol=git \
 	   file://hack_uci_save.patch \
 	   file://unspport_lua.patch \
-        file://change_default_confdir.patch"
+	   file://change_default_confdir.patch\
+        file://gdpr.patch"
 
 S="${WORKDIR}/git"
 
@@ -17,6 +18,13 @@ INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 PACKAGES = "${PN}"
 
 DEPENDS = "libubox"
+DEPENDS += "${@base_conditional('TP_FEATURE_GDPR', 'y', 'openssl', '', d)}"
+DEPENDS += "${@base_conditional('TP_FEATURE_GDPR', 'y', 'system-core', '', d)}"
+
 #RDEPENDS += "libubox"
 
 inherit cmake
+
+OECMAKE_C_FLAGS += "${@base_conditional('TP_FEATURE_GDPR', 'y', '-DTP_FEATURE_GDPR', '', d)}"
+
+

oe-core/meta/files/common-licenses/TPLink-Corporation-Limited.-Proprietary

@@ -0,0 +1,2 @@
+Copyright (c) 2020 TPLINK CORPORATION LIMITED. All Rights Reserved.
+TP-Link Corporation Limited Proprietary and Confidential.

oe-core/meta/files/common-licenses/TPLink-Technologies-Inc.-Proprietary

@@ -1,2 +0,0 @@
-Copyright (c) 2015 TPLINK TECHNOLOGIES CO., LTD. All Rights Reserved.
-TP-Link Technologies Proprietary and Confidential.

oe-core/meta/recipes-support/curl/curl/configure_ac.patch

@@ -1,5 +1,3 @@
-Upstream-Status:  Pending
-
 --- a/configure.ac
 +++ b/configure.ac
 @@ -281,7 +281,7 @@ dnl ************************************

oe-core/meta/recipes-support/curl/curl_7.30.0.bb

@@ -0,0 +1,62 @@
+DESCRIPTION = "Command line tool and library for client-side URL transfers."
+HOMEPAGE = "http://curl.haxx.se/"
+BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker"
+SECTION = "console/network"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
+
+DEPENDS = "zlib gnutls"
+DEPENDS_class-native = "zlib-native openssl-native"
+DEPENDS_class-nativesdk = "nativesdk-zlib"
+PR = "r0"
+
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+           file://pkgconfig_fix.patch \
+"
+
+# curl likes to set -g0 in CFLAGS, so we stop it
+# from mucking around with debug options
+#
+SRC_URI += " file://configure_ac.patch"
+
+SRC_URI[md5sum] = "0db5ec03a5001b42a2edc03bf63b5ceb"
+SRC_URI[sha256sum] = "6b1c410387bea82601baec85d6aa61955794672e36766407e99ade8d55aaaf11"
+
+inherit autotools pkgconfig binconfig
+
+EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
+                --without-libssh2 \
+                --with-random=/dev/urandom \
+                --without-libidn \
+                --enable-crypto-auth \
+                --disable-ldap \
+                --disable-ldaps \
+                ${CURLGNUTLS} \
+                "
+
+CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
+CURLGNUTLS_class-native = "--without-gnutls --with-ssl"
+CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl"
+
+do_configure_prepend() {
+	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac
+}
+
+PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc"
+
+FILES_${PN}-certs = "${datadir}/curl/curl-*"
+PACKAGE_ARCH_${PN}-certs = "all"
+
+FILES_lib${BPN} = "${libdir}/lib*.so.*"
+RRECOMMENDS_lib${BPN} += "${PN}-certs"
+FILES_lib${BPN}-dev = "${includedir} \
+                      ${libdir}/lib*.so \
+                      ${libdir}/lib*.la \
+                      ${libdir}/pkgconfig \
+                      ${datadir}/aclocal \
+                      ${bindir}/*-config"
+FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
+FILES_lib${BPN}-doc = "${mandir}/man3 \
+                      ${mandir}/man1/curl-config.1"
+
+BBCLASSEXTEND = "native nativesdk"

oe-core/meta/recipes-support/curl/curl_7.40.0.bb

@@ -1,59 +0,0 @@
-SUMMARY = "Command line tool and library for client-side URL transfers"
-HOMEPAGE = "http://curl.haxx.se/"
-BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker"
-SECTION = "console/network"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
-           file://pkgconfig_fix.patch \
-          "
-
-# curl likes to set -g0 in CFLAGS, so we stop it
-# from mucking around with debug options
-#
-SRC_URI += " file://configure_ac.patch"
-
-SRC_URI[md5sum] = "8d30594212e65657a5c32030f0998fa9"
-SRC_URI[sha256sum] = "899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f883fba"
-
-inherit autotools pkgconfig binconfig multilib_header
-
-PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib"
-PACKAGECONFIG_class-native = "ipv6 ssl zlib"
-PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib"
-
-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openssl"
-PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
-PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
-PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
-PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
-PACKAGECONFIG[smb] = "--enable-smb,--disable-smb,samba"
-
-EXTRA_OECONF = "--without-libidn \
-                --enable-crypto-auth \
-                --disable-ldap \
-                --disable-ldaps \
-                --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
-"
-
-do_install_append() {
-	oe_multilib_header curl/curlbuild.h
-}
-
-PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-staticdev lib${BPN}-doc"
-
-FILES_lib${BPN} = "${libdir}/lib*.so.*"
-RRECOMMENDS_lib${BPN} += "ca-certificates"
-FILES_lib${BPN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.la \
-                      ${libdir}/pkgconfig \
-                      ${datadir}/aclocal \
-                      ${bindir}/*-config"
-FILES_lib${BPN}-staticdev = "${libdir}/lib*.a"
-FILES_lib${BPN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
-
-BBCLASSEXTEND = "native nativesdk"