Patchwork opkg/opkg-utils/chkconfig: Clean up u-a-cworth references

login
register
mail settings
Submitter Richard Purdie
Date Jan. 17, 2014, 10:25 a.m.
Message ID <1389954353.14987.104.camel@ted>
Download mbox | patch
Permalink /patch/65043/
State Accepted
Commit 6644dac5d115dbb240de39b8079a4357a47e79dd
Headers show

Comments

Richard Purdie - Jan. 17, 2014, 10:25 a.m.
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>
---

Patch

diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_git.bb
index eb54a81..6aa5fb8 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 527fe5d..7bea26d 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 4560298..d285c50 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 \