aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-17 10:25:53 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-17 10:32:09 +0000
commita9ff0bbac5ae0688525c71f0a358f0750a277269 (patch)
tree7ae46992ca4ba553a47efcfdcb4ae8f1df3f73a2
parent7e0adf676da45e49287b7ce6478a6dbfd8fa117f (diff)
downloadopenembedded-core-contrib-a9ff0bbac5ae0688525c71f0a358f0750a277269.tar.gz
openembedded-core-contrib-a9ff0bbac5ae0688525c71f0a358f0750a277269.tar.bz2
openembedded-core-contrib-a9ff0bbac5ae0688525c71f0a358f0750a277269.zip
opkg/opkg-utils/chkconfig: Clean up u-a-cworth references
Catch some u-a-cworth references that slipped through the move of u-a to opkg-utils and its rename to -opkg. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg-utils/opkg-utils_git.bb1
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc1
-rw-r--r--meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb2
3 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index eb54a816f9..6aa5fb839e 100644
--- a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
+++ b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
@@ -1,4 +1,5 @@
SUMMARY = "Additional utilities for the opkg package manager"
+SUMMARY_update-alternatives-opkg = "Utility for managing the alternatives system"
SECTION = "base"
HOMEPAGE = "http://code.google.com/p/opkg/"
LICENSE = "GPLv2+"
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 527fe5dac0..7bea26d42c 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -1,6 +1,5 @@
SUMMARY = "Open Package Manager"
SUMMARY_libopkg = "Open Package Manager library"
-SUMMARY_update-alternatives-cworth = "Utility for managing the alternatives system"
SECTION = "base"
HOMEPAGE = "http://code.google.com/p/opkg/"
BUGTRACKER = "http://code.google.com/p/opkg/issues/list"
diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
index 4560298eca..d285c5047c 100644
--- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
+++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb
@@ -56,7 +56,7 @@ SUMMARY_${PN}-alternatives-doc = "${SUMMARY_${PN}-alternatives} - Documentation
DESCRIPTION_${PN}-alternatives-doc = "${DESCRIPTION_${PN}-alternatives} \
This package contains documentation."
RPROVIDES_${PN}-alternatives += "update-alternatives"
-RCONFLICTS_${PN}-alternatives = "update-alternatives-cworth update-alternatives-dpkg"
+RCONFLICTS_${PN}-alternatives = "update-alternatives-opkg update-alternatives-dpkg"
FILES_${PN}-alternatives = "${sbindir}/alternatives ${sbindir}/update-alternatives \
${sysconfdir}/alternatives ${localstatedir}/lib/alternatives"
FILES_${PN}-alternatives-doc = "${mandir}/man8/alternatives.8 \