summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 22:43:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-20 22:43:25 +0000
commitf3f89be396887d046b78d5bcd7f15671e124ccce (patch)
treefa18fb78ca82143b0e3e5eff49b96eebc9363b92
parent60ee8b569c8c5acc2e19f00b1b8f4494957f3268 (diff)
downloadpoky-f3f89be396887d046b78d5bcd7f15671e124ccce.tar.gz
opkg: Stop opkg-nativesdk providing update-alternatives-cwrorth and libopkg
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc3
-rw-r--r--meta/recipes-devtools/opkg/opkg_0.1.8.bb8
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb8
3 files changed, 11 insertions, 8 deletions
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
31#RPROVIDES_${PN} += "update-alternatives-native" 31#RPROVIDES_${PN} += "update-alternatives-native"
32 32
33BBCLASSEXTEND = "native nativesdk" 33BBCLASSEXTEND = "native nativesdk"
34
35PKGSUFFIX = ""
36PKGSUFFIX_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 \
15 15
16PR = "r3" 16PR = "r3"
17 17
18PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" 18PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
19 19
20FILES_update-alternatives-cworth = "${bindir}/update-alternatives" 20FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
21FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" 21FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
22FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" 22FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
23 23
24# We need to create the lock directory 24# We need to create the lock directory
25do_install_append() { 25do_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"
19PV = "0.1.8+svnr${SRCPV}" 19PV = "0.1.8+svnr${SRCPV}"
20PR = "r1" 20PR = "r1"
21 21
22PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" 22PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
23 23
24FILES_update-alternatives-cworth = "${bindir}/update-alternatives" 24FILES_update-alternatives-cworth${PKGSUFFIX} = "${bindir}/update-alternatives"
25FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" 25FILES_libopkg${PKGSUFFIX}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
26FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/" 26FILES_libopkg${PKGSUFFIX} = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
27 27
28# We need to create the lock directory 28# We need to create the lock directory
29do_install_append() { 29do_install_append() {