From a6f36aedaf399b52ef2af07ee5429ce4d68a2649 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 19 Nov 2009 13:45:01 +0000 Subject: [PATCH] apt: Stage include headers in do_install and drop custom staging function Signed-off-by: Richard Purdie --- meta/packages/apt/apt-package.inc | 3 +++ meta/packages/apt/apt_0.7.14.bb | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/meta/packages/apt/apt-package.inc b/meta/packages/apt/apt-package.inc index 43f54cadab..9e104f12ed 100644 --- a/meta/packages/apt/apt-package.inc +++ b/meta/packages/apt/apt-package.inc @@ -98,4 +98,7 @@ do_install () { install -d ${D}${localstatedir}/cache/apt/archives/partial install -d ${D}${docdir}/apt/examples install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/ + + install -d ${D}${includedir}/apt-pkg/ + install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ } diff --git a/meta/packages/apt/apt_0.7.14.bb b/meta/packages/apt/apt_0.7.14.bb index efd7ab3bc5..1a9cf3602d 100644 --- a/meta/packages/apt/apt_0.7.14.bb +++ b/meta/packages/apt/apt_0.7.14.bb @@ -12,13 +12,3 @@ require apt-package.inc FILES_${PN} += "${bindir}/apt-key" apt-manpages += "doc/apt-key.8" -do_stage() { - install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/apt-pkg - eval `cat environment.mak | grep ^GLIBC_VER | sed -e's, = ,=,'` - oe_libinstall -so -C bin libapt-pkg$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-pkg$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-pkg.so - oe_libinstall -so -C bin libapt-inst$GLIBC_VER-6 ${STAGING_LIBDIR}/ - ln -sf libapt-inst$GLIBC_VER-6.so ${STAGING_LIBDIR}/libapt-inst.so - - install -m 0644 include/apt-pkg/*.h ${STAGING_INCDIR}/apt-pkg/ -}