[Feature][ZXW-76]merged P48U04 base code

Change-Id: Ia14632a24eb4e8ddf720d8f53f2fe3a1b52a0a8e
diff --git a/cap/zx297520v3/sources/meta-zxic/recipes-app/libupi-ab/libupi-ab.bb b/cap/zx297520v3/sources/meta-zxic/recipes-app/libupi-ab/libupi-ab.bb
index cecb662..b54d5e7 100755
--- a/cap/zx297520v3/sources/meta-zxic/recipes-app/libupi-ab/libupi-ab.bb
+++ b/cap/zx297520v3/sources/meta-zxic/recipes-app/libupi-ab/libupi-ab.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "libupi_ab"
-DEPENDS     = "libnvram libsoftap libsofttimer libatutils zlib openssl libmtd"
+DEPENDS     = "libnvram libsoftap libsofttimer libatutils zlib openssl"
 SECTION     = "lib"
 LICENSE     = "zte"
 PV          = "1.0.0"
@@ -7,7 +7,7 @@
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/zte;md5=c075689d1d1e06d4ab5bbe53623a6808"
 
 #配置code路径信息。
-FILESEXTRAPATHS_prepend :="${APP-OPEN-PATH}/sdk:"
+FILESEXTRAPATHS_prepend :="${APP-PATH}:"
 SRC_URI = " \          
 		  ${@bb.utils.contains("MK_SDK_VERSION", "yes", "", "file://libupi_ab", d)} \
           "
@@ -22,7 +22,7 @@
 do_compile () {
 	if [ ${MK_SDK_VERSION} = "no" ];	then
 		make -C libupi_ab
-	fi	
+	fi
 }
 
 do_install () {
@@ -32,18 +32,19 @@
 		
 		install -m 0755 ${S}/libupi_ab/libupi_ab.so 	${RELEASE-PATH}/lib				
 		install -m 0755 ${S}/libupi_ab/libupi_ab.a 	${RELEASE-PATH}/lib
-		install -m 0644 ${S}/libupi_ab/inc/*.h     	${RELEASE-PATH}/include/upi_ab
+		install -m 0644 ${S}/libupi_ab/inc/zxic_fota_ab_upgrade.h     	${RELEASE-PATH}/include/upi_ab
 		
 		#install elfs
 		install -d ${ELFS-PATH}/
 		install -m 0755 ${S}/libupi_ab/libupi_ab.so ${ELFS-PATH}/		
-	fi
+	fi	
+	
 	install -d ${D}${libdir}/
 	install -d ${D}/usr/include
 
 	install -m 0755 ${RELEASE-PATH}/lib/libupi_ab.so      	${D}${libdir}/
 	install -m 0755 ${RELEASE-PATH}/lib/libupi_ab.a      	${D}${libdir}/
-	install -m 0644 ${RELEASE-PATH}/include/upi_ab/*.h 	${D}/usr/include/	
+	install -m 0644 ${RELEASE-PATH}/include/upi_ab/*.h 	${D}/usr/include/
 }
 
 #清库
@@ -63,4 +64,4 @@
 FILES_SOLIBSDEV   = ""
 INSANE_SKIP_${PN} = "dev-so"
 
-RDEPENDS_${PN} = "libnvram libsoftap libsofttimer libatutils zlib libmtd"
+RDEPENDS_${PN} = "libnvram libsoftap libsofttimer libatutils zlib"