summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 22:01:46 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 22:06:58 +0000
commit5e109fc37e1eaa9cb81d22b34f91b5c11af5a69b (patch)
tree83aa9f202214b160e86c2b6587894f356346dbab /meta/recipes-devtools
parent217a90f2ab02ec3c4e9653b528d7b584f6e37a42 (diff)
downloadpoky-5e109fc37e1eaa9cb81d22b34f91b5c11af5a69b.tar.gz
update-alternatives: Various fixes
dpkg-native's update-alternatives is broken for offline work so don't install it. Also list update-alternatives in the multiprovider whitelist to avoid unwanted multiple provider warnings when multiple package backends are enabled. (From OE-Core rev: 300336fc4a310ed16a14ad041744708d54aae189) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc14
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb2
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb2
3 files changed, 13 insertions, 5 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index a8486d9359..bf345d63d8 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Package maintenance system for Debian."
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "base" 3SECTION = "base"
4 4
5INC_PR = "r10" 5INC_PR = "r11"
6 6
7SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \ 7SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
8 file://ignore_extra_fields.patch" 8 file://ignore_extra_fields.patch"
@@ -47,10 +47,18 @@ rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
47} 47}
48 48
49do_install_append () { 49do_install_append () {
50 mv ${D}${bindir}/update-alternatives ${D}${sbindir} 50 if [ "${PN}" = "dpkg-native" ]; then
51 # update-alternatives doesn't have an offline mode
52 rm ${D}${bindir}/update-alternatives
53 else
54 mv ${D}${bindir}/update-alternatives ${D}${sbindir}
55 fi
51} 56}
52 57
53PROVIDES += "virtual/update-alternatives" 58PROV = "virtual/update-alternatives"
59PROV_virtclass-native = ""
60
61PROVIDES += "${PROV}"
54 62
55PACKAGES =+ "update-alternatives-dpkg" 63PACKAGES =+ "update-alternatives-dpkg"
56FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives" 64FILES_update-alternatives-dpkg = "${sbindir}/update-alternatives ${localstatedir}/lib/dpkg/alternatives ${sysconfdir}/alternatives"
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
index 8b45a00a6a..f1a0eebcd5 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
@@ -9,5 +9,5 @@ SRC_URI += "file://noman.patch \
9SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc" 9SRC_URI[md5sum] = "d1731d4147c1ea3b537a4d094519a6dc"
10SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5" 10SRC_URI[sha256sum] = "1ec1376471b04717a4497e5d7a27cd545248c92116898ce0c53ced8ea94267b5"
11 11
12PR = "${INC_PR}.0" 12PR = "${INC_PR}.1"
13 13
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 8f50f677bd..acb21f2cb9 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/trunk"
18 18
19SRCREV = "625" 19SRCREV = "625"
20PV = "0.1.8+svnr${SRCPV}" 20PV = "0.1.8+svnr${SRCPV}"
21PR = "r3" 21PR = "r4"
22 22
23PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" 23PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
24 24