summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-11-15 11:55:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-21 16:56:00 +0000
commiteaa7c3a37111e254217263a26306018aebd7953f (patch)
treeceabb7c2c341454eabe7ad2f556e12a295bf7e05
parent6809295d2f0eaa486c576c41411fa8ad7de40808 (diff)
downloadpoky-eaa7c3a37111e254217263a26306018aebd7953f.tar.gz
opkg: drop PACKAGE_ARCH setting for update-alternatives-cworth
* there is warning about update-alternatives-cworth ipk being overwritten in "all" feed when opkg is built for more architectures * see https://bugzilla.yoctoproject.org/show_bug.cgi?id=3390 for details (From OE-Core rev: 969d10d0aa5537a119ed9be9e8321dbd73d160fe) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc3
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index b3d587c63a..250eaa8582 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" 9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
10 10
11PE = "1" 11PE = "1"
12INC_PR = "r10" 12INC_PR = "r11"
13 13
14FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg" 14FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/opkg"
15 15
@@ -36,7 +36,6 @@ RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
36RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base" 36RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
37RDEPENDS_${PN}_class-native = "" 37RDEPENDS_${PN}_class-native = ""
38RDEPENDS_${PN}_class-nativesdk = "" 38RDEPENDS_${PN}_class-nativesdk = ""
39PACKAGE_ARCH_update-alternatives-cworth = "all"
40RREPLACES_${PN} = "opkg-nogpg" 39RREPLACES_${PN} = "opkg-nogpg"
41 40
42PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth" 41PACKAGES =+ "libopkg-dev libopkg-staticdev libopkg update-alternatives-cworth"