From e422e5cb73311fd0807b40d8a1fcac53cac7d6eb Mon Sep 17 00:00:00 2001 From: zheng_wenlong Date: Thu, 9 Nov 2017 09:38:31 +0900 Subject: Add PROVIDES into libhomescreen bb files Restore libhomescreen-old.inc to libhomescreen_git.bb, but use fix SRCREV. Change libhomescreen-2017.inc to libhomescreen-2017_git.bb. Add PROVIDES into bb files for switch libhomescreen. These is another commit in meta-agl-devel set PREFERRED_PROVIDER. Related commit: https://gerrit.automotivelinux.org/gerrit/#/c/11761/ Change-Id: I2eadc3c703f220f286e8ffa6b52276b792fc0729 Signed-off-by: zheng_wenlong --- .../libhomescreen/libhomescreen-2017.inc | 11 ---- .../libhomescreen/libhomescreen-2017_git.bb | 20 ++++++++ .../libhomescreen/libhomescreen-old.inc | 58 --------------------- .../libhomescreen/libhomescreen_git.bb | 59 +++++++++++++++++++++- 4 files changed, 78 insertions(+), 70 deletions(-) delete mode 100644 recipes-demo-hmi/libhomescreen/libhomescreen-2017.inc create mode 100644 recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb delete mode 100644 recipes-demo-hmi/libhomescreen/libhomescreen-old.inc diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen-2017.inc b/recipes-demo-hmi/libhomescreen/libhomescreen-2017.inc deleted file mode 100644 index f8432bd0d..000000000 --- a/recipes-demo-hmi/libhomescreen/libhomescreen-2017.inc +++ /dev/null @@ -1,11 +0,0 @@ -LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" - -DEPENDS = "af-binder json-c" - -inherit cmake - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "390902a6b002c6af183c939749fdebfcc4b3e839" -S = "${WORKDIR}/git" - -RDEPENDS_${PN} = "agl-service-homescreen-2017" diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb b/recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb new file mode 100644 index 000000000..918d2ec09 --- /dev/null +++ b/recipes-demo-hmi/libhomescreen/libhomescreen-2017_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "AGL Home Screen Library" +DESCRIPTION = "libhomescreen" +HOMEPAGE = "http://docs.automotivelinux.org" +LICENSE = "Apache-2.0" +SECTION = "libs" + +BBCLASSEXTEND = " nativesdk" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +DEPENDS = "af-binder json-c" + +inherit cmake + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH}" +SRCREV = "390902a6b002c6af183c939749fdebfcc4b3e839" +S = "${WORKDIR}/git" + +RDEPENDS_${PN} = "agl-service-homescreen-2017" +PROVIDES += "virtual/libhomescreen" diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen-old.inc b/recipes-demo-hmi/libhomescreen/libhomescreen-old.inc deleted file mode 100644 index 4ec2860e5..000000000 --- a/recipes-demo-hmi/libhomescreen/libhomescreen-old.inc +++ /dev/null @@ -1,58 +0,0 @@ -LIC_FILES_CHKSUM = "file://libhomescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" - -DEPENDS += " glib-2.0 " - -inherit qmake5 pkgconfig - -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH} \ - file://homescreen.pc.in" -SRCREV = "f5c14333d2170ae9babed53ea530828569a830ff" -S = "${WORKDIR}/git/" - -# PV needs to be modified with SRCPV to work AUTOREV correctly -PV = "0.0+git${SRCPV}" - -do_install() { - install -d ${D}/usr/AGL/${PN} - install -m 0755 ${B}/samplehomescreeninterfaceapp/SampleHomeScreenInterfaceApp ${D}/usr/AGL/${PN}/ - - install -d ${D}${libdir} - install -m 0644 ${B}/libhomescreen/libhomescreen.so.1.0.0 ${D}${libdir}/ - ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so - ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1 - ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1.0 - -# kooltux: still some problem with paths inside .pc file -# error at build time: -# ERROR: homescreen-git-r0 do_populate_sysroot: QA Issue: homescreen.pc failed sanity test (tmpdir) in path /xdt/build/tmp/work/cortexa15hf-neon-agl-linux-gnueabi/libhomescreen/git-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig] -# - install -d ${D}${libdir}/pkgconfig - install -m 0644 ${WORKDIR}/homescreen.pc.in ${D}${libdir}/pkgconfig/homescreen.pc - sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/homescreen.pc - sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/homescreen.pc - sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/homescreen.pc - - install -d ${D}${includedir} - install -m 0644 ${S}/libhomescreen/include/libhomescreen.hpp ${D}${includedir}/ -} - -PACKAGES =+ "libhomescreensampleapp libhomescreensampleapp-dbg" - -FILES_${PN} = "\ - ${libdir}/libhomescreen.so.* \ -" -FILES_${PN}-dev = "\ - ${includedir}/libhomescreen.hpp \ - ${libdir}/libhomescreen.so \ - ${libdir}/pkgconfig/homescreen.pc \ -" -FILES_${PN}-dbg += "\ - ${libdir}/.debug/libhomescreen.so.* \ -" - -FILES_libhomescreensampleapp += "/usr/AGL/${PN}/SampleHomeScreenInterfaceApp" -FILES_libhomescreensampleapp-dbg += "/usr/AGL/${PN}/.debug" - - -RDEPENDS_libhomescreensampleapp-dbg += "${PN}-dbg ${PN}-dev" - diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb index b39becf40..b71b5b410 100644 --- a/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb +++ b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb @@ -6,4 +6,61 @@ SECTION = "libs" BBCLASSEXTEND = " nativesdk" -require ${@bb.utils.contains('DISTRO_FEATURES', 'agl-hmi-framework', 'libhomescreen-2017.inc', 'libhomescreen-old.inc', d)} +LIC_FILES_CHKSUM = "file://libhomescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" + +DEPENDS += " glib-2.0 " + +inherit qmake5 pkgconfig + +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=${AGL_BRANCH} \ + file://homescreen.pc.in" +SRCREV = "f5c14333d2170ae9babed53ea530828569a830ff" +S = "${WORKDIR}/git/" + +# PV needs to be modified with SRCPV to work AUTOREV correctly +PV = "0.0+git${SRCPV}" + +do_install() { + install -d ${D}/usr/AGL/${PN} + install -m 0755 ${B}/samplehomescreeninterfaceapp/SampleHomeScreenInterfaceApp ${D}/usr/AGL/${PN}/ + + install -d ${D}${libdir} + install -m 0644 ${B}/libhomescreen/libhomescreen.so.1.0.0 ${D}${libdir}/ + ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so + ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1 + ln -sf libhomescreen.so.1.0.0 ${D}${libdir}/libhomescreen.so.1.0 + +# kooltux: still some problem with paths inside .pc file +# error at build time: +# ERROR: homescreen-git-r0 do_populate_sysroot: QA Issue: homescreen.pc failed sanity test (tmpdir) in path /xdt/build/tmp/work/cortexa15hf-neon-agl-linux-gnueabi/libhomescreen/git-r0/sysroot-destdir/usr/lib/pkgconfig [pkgconfig] +# + install -d ${D}${libdir}/pkgconfig + install -m 0644 ${WORKDIR}/homescreen.pc.in ${D}${libdir}/pkgconfig/homescreen.pc + sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/homescreen.pc + sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/homescreen.pc + sed -i s:OEINCDIR:${includedir}:g ${D}${libdir}/pkgconfig/homescreen.pc + + install -d ${D}${includedir} + install -m 0644 ${S}/libhomescreen/include/libhomescreen.hpp ${D}${includedir}/ +} + +PACKAGES =+ "libhomescreensampleapp libhomescreensampleapp-dbg" + +FILES_${PN} = "\ + ${libdir}/libhomescreen.so.* \ +" +FILES_${PN}-dev = "\ + ${includedir}/libhomescreen.hpp \ + ${libdir}/libhomescreen.so \ + ${libdir}/pkgconfig/homescreen.pc \ +" +FILES_${PN}-dbg += "\ + ${libdir}/.debug/libhomescreen.so.* \ +" + +FILES_libhomescreensampleapp += "/usr/AGL/${PN}/SampleHomeScreenInterfaceApp" +FILES_libhomescreensampleapp-dbg += "/usr/AGL/${PN}/.debug" + + +RDEPENDS_libhomescreensampleapp-dbg += "${PN}-dbg ${PN}-dev" +PROVIDES += "virtual/libhomescreen" -- cgit 1.2.3-korg