[oe-commits] [meta-openembedded] 09/46: apache2: Correct packaging of build and doc related files

git at git.openembedded.org git at git.openembedded.org
Sat Apr 27 17:13:41 UTC 2019


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit e7f13b68fe7e6b1fa595200e4ac10e05fe1b6b51
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Sat Apr 20 01:56:02 2019 +0200

    apache2: Correct packaging of build and doc related files
    
    The build related files (${datadir}/${BPN}/build and ${bindir}/apxs)
    belong in the -dev package, and the manual belong in the -doc package.
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
index c6961ef..2bd21f7 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.39.bb
@@ -184,12 +184,17 @@ CONFFILES_${PN} = "${sysconfdir}/${BPN}/httpd.conf \
 
 # We override here rather than append so that .so links are
 # included in the runtime package rather than here (-dev)
-# and to get icons, error into the -dev package
-FILES_${PN}-dev = "${datadir}/${BPN}/icons \
+# and to get build, icons, error into the -dev package
+FILES_${PN}-dev = "${datadir}/${BPN}/build \
+                   ${datadir}/${BPN}/icons \
                    ${datadir}/${BPN}/error \
                    ${includedir}/${BPN} \
+                   ${bindir}/apxs \
                   "
 
+# Add the manual to -doc
+FILES_${PN}-doc += " ${datadir}/${BPN}/manual"
+
 FILES_${PN}-scripts += "${bindir}/dbmmanage"
 
 # Override this too - here is the default, less datadir

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list