diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2014-01-16 17:59:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-19 16:32:09 +0000 |
commit | c76bf26d311a7fb74ab7a6e3f6ca3d171daa21d6 (patch) | |
tree | ffa11ba37f6a7f44c487af91eb68b2613081bb7e | |
parent | ab5bea71e2d1ceb42c50e3ec9dfe480d93e4b74f (diff) | |
download | poky-c76bf26d311a7fb74ab7a6e3f6ca3d171daa21d6.tar.gz |
opkg: No longer PROVIDES update-alternatives
The new provider is the opkg-utils recipe.
(From OE-Core rev: c63d241d15608ac431a1d716ec84ef568928cf85)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/opkg/opkg.inc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc index c9fb505bd3..527fe5dac0 100644 --- a/meta/recipes-devtools/opkg/opkg.inc +++ b/meta/recipes-devtools/opkg/opkg.inc | |||
@@ -39,17 +39,13 @@ EXTRA_OECONF = "\ | |||
39 | --with-opkglibdir=${OPKGLIBDIR} \ | 39 | --with-opkglibdir=${OPKGLIBDIR} \ |
40 | " | 40 | " |
41 | 41 | ||
42 | PROVIDES += "virtual/update-alternatives" | ||
43 | RPROVIDES_update-alternatives-cworth += "update-alternatives" | ||
44 | RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg" | ||
45 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" | 42 | RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" |
46 | RDEPENDS_${PN}_class-native = "" | 43 | RDEPENDS_${PN}_class-native = "" |
47 | RDEPENDS_${PN}_class-nativesdk = "" | 44 | RDEPENDS_${PN}_class-nativesdk = "" |
48 | RREPLACES_${PN} = "opkg-nogpg" | 45 | RREPLACES_${PN} = "opkg-nogpg" |
49 | 46 | ||
50 | PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" | 47 | PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg" |
51 | 48 | ||
52 | FILES_update-alternatives-cworth = "${bindir}/update-alternatives" | ||
53 | FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg" | 49 | FILES_libopkg-dev = "${libdir}/*.la ${libdir}/*.so ${includedir}/libopkg" |
54 | FILES_libopkg-staticdev = "${libdir}/*.a" | 50 | FILES_libopkg-staticdev = "${libdir}/*.a" |
55 | FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" | 51 | FILES_libopkg = "${libdir}/*.so.* ${OPKGLIBDIR}/opkg/" |
@@ -74,10 +70,8 @@ do_install_append() { | |||
74 | ln -sf opkg-cl ${D}${bindir}/opkg | 70 | ln -sf opkg-cl ${D}${bindir}/opkg |
75 | } | 71 | } |
76 | 72 | ||
77 | do_install_append_class-native() { | 73 | do_install_append() { |
78 | if [ "${PREFERRED_PROVIDER_virtual/update-alternatives-native}" != "${PN}" ]; then | 74 | rm ${D}${bindir}/update-alternatives |
79 | rm ${D}${bindir}/update-alternatives | ||
80 | fi | ||
81 | } | 75 | } |
82 | 76 | ||
83 | pkg_postinst_${PN} () { | 77 | pkg_postinst_${PN} () { |