From patchwork Sat Mar 9 08:26:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [meta-webserver] apache2:fix PN to BPN to avoid do_package warning Date: Sat, 09 Mar 2013 08:26:12 -0000 From: Song.Li@windriver.com X-Patchwork-Id: 45785 Message-Id: <1362817572-14365-1-git-send-email-Song.Li@windriver.com> To: , Cc: qingtao.cao@windriver.com, Pradeep.Tumati@windriver.com From: Song.Li Some files weren't shipped in package when do a multilib build.This is caused by PN various. change them to BPN. Signed-off-by: Song.Li --- recipes-httpd/apache2/apache2_2.4.2.bb | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/recipes-httpd/apache2/apache2_2.4.2.bb b/recipes-httpd/apache2/apache2_2.4.2.bb index af8c4ca..af285d6 100644 --- a/recipes-httpd/apache2/apache2_2.4.2.bb +++ b/recipes-httpd/apache2/apache2_2.4.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://httpd.apache.org/" DEPENDS = "libtool-native apache2-native openssl expat pcre apr apr-util" SECTION = "net" LICENSE = "Apache-2.0" -PR = "r3" +PR = "r4" SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2 \ file://server-makefile.patch \ @@ -105,40 +105,39 @@ LEAD_SONAME = "libapr-1.so.0" PACKAGES = "${PN}-doc ${PN}-dev ${PN}-dbg ${PN}" -CONFFILES_${PN} = "${sysconfdir}/${PN}/httpd.conf \ - ${sysconfdir}/${PN}/magic \ - ${sysconfdir}/${PN}/mime.types \ - ${sysconfdir}/init.d/${PN} " +CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \ + ${sysconfdir}/${BPN}/magic \ + ${sysconfdir}/${BPN}/mime.types \ + ${sysconfdir}/init.d/${BPN} " # we override here rather than append so that .so links are # included in the runtime package rather than here (-dev) # and to get build, icons, error into the -dev package -FILES_${PN}-dev = "${datadir}/${PN}/build \ - ${datadir}/${PN}/icons \ - ${datadir}/${PN}/error \ +FILES_${PN}-dev = "${datadir}/${BPN}/build \ + ${datadir}/${BPN}/icons \ + ${datadir}/${BPN}/error \ ${bindir}/apr-config ${bindir}/apu-config \ ${libdir}/apr*.exp \ - ${includedir}/${PN} \ + ${includedir}/${BPN} \ ${libdir}/*.la \ ${libdir}/*.a" # manual to manual -FILES_${PN}-doc += " ${datadir}/${PN}/manual" +FILES_${PN}-doc += " ${datadir}/${BPN}/manual" # # override this too - here is the default, less datadir # FILES_${PN} = "${bindir} ${sbindir} ${libexecdir} ${libdir}/lib*.so.* ${sysconfdir} \ ${sharedstatedir} ${localstatedir} /bin /sbin /lib/*.so* \ - ${libdir}/${PN}" + ${libdir}/${BPN}" # we want htdocs and cgi-bin to go with the binary -FILES_${PN} += "${datadir}/${PN}/htdocs ${datadir}/${PN}/cgi-bin" +FILES_${PN} += "${datadir}/${BPN}/htdocs ${datadir}/${BPN}/cgi-bin" #make sure the lone .so links also get wrapped in the base package FILES_${PN} += "${libdir}/lib*.so ${libdir}/pkgconfig/*" -FILES_${PN}-dbg += "${libdir}/${PN}/modules/.debug" +FILES_${PN}-dbg += "${libdir}/${BPN}/modules/.debug" RDEPENDS_${PN} += "openssl libgcc" -