From f3f89be396887d046b78d5bcd7f15671e124ccce Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 20 Jan 2011 22:43:25 +0000 Subject: opkg: Stop opkg-nativesdk providing update-alternatives-cwrorth and libopkg Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg.inc | 3 +++ meta/recipes-devtools/opkg/opkg_0.1.8.bb | 8 ++++---- meta/recipes-devtools/opkg/opkg_svn.bb | 8 ++++---- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index add1563c47..c3174917a5 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc @@ -31,3 +31,6 @@ EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/li #RPROVIDES_${PN} += "update-alternatives-native" BBCLASSEXTEND = "native nativesdk" + +PKGSUFFIX = "" +PKGSUFFIX_virtclass-nativesdk = "-nativesdk" diff --git a/meta/recipes-devtools/opkg/opkg_0.1.8.bb b/meta/recipes-devtools/opkg/opkg_0.1.8.bb index 4eb3ff9a11..6815474207 100644 --- a/meta/recipes-devtools/opkg/opkg_0.1.8.bb +++ b/meta/recipes-devtools/opkg/opkg_0.1.8.bb @@ -15,11 +15,11 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \ PR = "r3" -PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" +PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" -FILES_update-alternatives-cworth = "${bindir}/update-alternatives" -FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +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/" # 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 5096345e4b..141e00db06 100644 --- a/meta/recipes-devtools/opkg/opkg_svn.bb +++ b/meta/recipes-devtools/opkg/opkg_svn.bb @@ -19,11 +19,11 @@ S = "${WORKDIR}/trunk" PV = "0.1.8+svnr${SRCPV}" PR = "r1" -PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" +PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" -FILES_update-alternatives-cworth = "${bindir}/update-alternatives" -FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" -FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" +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/" # We need to create the lock directory do_install_append() { -- cgit v1.2.3-54-g00ecf