Patchwork [13/17] apt: Package unpackaged files

login
register
mail settings
Submitter Richard Purdie
Date July 5, 2011, 10:51 p.m.
Message ID <1e134055b8c00dd2f93a40a50cf69377c7b325c0.1309906154.git.richard.purdie@linuxfoundation.org>
Download mbox | patch
Permalink /patch/7049/
State New, archived
Headers show

Comments

Richard Purdie - July 5, 2011, 10:51 p.m.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/apt/apt-package.inc |    2 +-
 meta/recipes-devtools/apt/apt_0.7.14.bb   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Phil Blundell - July 6, 2011, 9:17 a.m.
On Tue, 2011-07-05 at 23:51 +0100, Richard Purdie wrote:
> -FILES_${PN}-dev = "${libdir}/libapt*.so"
> +FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"

Is there a reason why the default FILES from bitbake.conf wouldn't work
there?  It looks like both the above would be included.

p.
Richard Purdie - July 6, 2011, 10:25 a.m.
On Wed, 2011-07-06 at 10:17 +0100, Phil Blundell wrote:
> On Tue, 2011-07-05 at 23:51 +0100, Richard Purdie wrote:
> > -FILES_${PN}-dev = "${libdir}/libapt*.so"
> > +FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
> 
> Is there a reason why the default FILES from bitbake.conf wouldn't work
> there?  It looks like both the above would be included.

The rest of apt's packaging its horrible and its unclear if there are
other things in the default -dev FILES expression which the apt
packaging wouldn't take well to or not. Really the whole thing needs
rewriting but I wasn't quite in the mood for it ;-).

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index 9e104f1..2e3be38 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -62,7 +62,7 @@  FILES_${PN}-utils = "${bindir}/apt-sortpkgs ${bindir}/apt-extracttemplates"
 FILES_${PN}-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-manpages', d, 1))} \
 		   ${docdir}/apt"
 FILES_${PN}-utils-doc = "${@get_files_apt_doc(d, bb, bb.data.getVar('apt-utils-manpages', d, 1))}"
-FILES_${PN}-dev = "${libdir}/libapt*.so"
+FILES_${PN}-dev = "${libdir}/libapt*.so ${includedir}"
 
 do_install () {
 	set -x
diff --git a/meta/recipes-devtools/apt/apt_0.7.14.bb b/meta/recipes-devtools/apt/apt_0.7.14.bb
index aa155d9..1335c16 100644
--- a/meta/recipes-devtools/apt/apt_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt_0.7.14.bb
@@ -3,10 +3,10 @@  RDEPENDS_${PN} = "dpkg"
 LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=0636e73ff0215e8d672dc4c32c317bb3"
 require apt.inc
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://nodoc.patch \
-	    file://includes-fix.patch "
+            file://includes-fix.patch "
 
 SRC_URI[md5sum] = "19efa18fb1ef20c58b9b44e94258b814"
 SRC_URI[sha256sum] = "8fc06effaf8a4e4333308eedcdc6840f1c8056f2e924210f151dfc076bcd4045"