From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com ([134.134.136.24]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QgPjR-0005ba-EV for openembedded-core@lists.openembedded.org; Tue, 12 Jul 2011 01:17:41 +0200 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 11 Jul 2011 16:13:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,517,1304319600"; d="scan'208";a="26491830" Received: from unknown (HELO swold-MOBL.bigsur.com) ([10.255.13.180]) by orsmga001.jf.intel.com with ESMTP; 11 Jul 2011 16:13:40 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Mon, 11 Jul 2011 16:13:26 -0700 Message-Id: <6c6b7f52f170b2b5b052b62b6849cca53942cb1a.1310425837.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 19/26] opkg: Use bitbake default FILES for packaging X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Jul 2011 23:17:41 -0000 This will ensure correct -dev and -staticdev packging Signed-off-by: Saul Wold --- meta/recipes-devtools/opkg/opkg_0.1.8.bb | 10 ++++++---- meta/recipes-devtools/opkg/opkg_svn.bb | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb index 18cf042..f43cbc5 100644 --- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb +++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb @@ -13,13 +13,15 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \ file://headerfix.patch \ " -PR = "r4" +PR = "r5" -PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" +PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" -FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +FILES_libopkg${PKGSUFFIX} = "${libdir}/*${SOLIBS} ${localstatedir}/lib/opkg/" +FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*${SOLIBSDEV}" +FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a" +RDEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})" # We need to create the lock directory do_install_append() { diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb index 5f07c17..6f81419 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -17,13 +17,15 @@ S = "${WORKDIR}/trunk" SRCREV = "609" PV = "0.1.8+svnr${SRCPV}" -PR = "r2" +PR = "r3" -PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" +PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX}-staticdev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives" -FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.la ${libdir}/*${SOLIBSDEV}" +FILES_libopkg${PKGSUFFIX}-staticdev = "${libdir}/*.a" +RDEPENDS_libopkg${PKGSUFFIX}-staticdev = "libopkg${PKGSUFFIX}-dev (= ${EXTENDPKGV})" +FILES_libopkg${PKGSUFFIX} = "${libdir}/*${SOLIBS} ${localstatedir}/lib/opkg/" # We need to create the lock directory do_install_append() { -- 1.7.3.4