summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-09-13 21:30:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-13 17:11:10 +0100
commita1c62ae8f412600fe62226b19d4e7956dcf4b84f (patch)
treec3ee84e6e979e6f695a21c396b92d3f548deab86 /meta/recipes-devtools
parent50e184e0d9d7b38a08f979286eb65cd73d295f13 (diff)
downloadpoky-a1c62ae8f412600fe62226b19d4e7956dcf4b84f.tar.gz
dpkg: fix pkg_postinst_dpkg, don't supply {bindir}/update-alternatives
[YOCTO #1070]. The pkg_postinst_dpkg seems buggy, e.g., for dpkg-native, ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d doesn't exist. I think OE's version(do_install_prepend) at http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/dpkg/dpkg.inc is correct, so let's change to OE's version. And, bth dpkg and update-alternatives-cworth supply /usr/bin/update-alternatives and this causes conflict. e.g., bug 1070. We can resolve the issue by ask dpkg not to supply the binary. (From OE-Core rev: c7af358ec427487ccc053316d2f68f6121b97181) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc19
-rw-r--r--meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb2
2 files changed, 9 insertions, 12 deletions
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index aa5f90e8b3..8c2511dc43 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 = "r4" 5INC_PR = "r5"
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"
@@ -20,17 +20,14 @@ inherit autotools gettext perlnative
20 20
21DPKG_INIT_POSITION = "98" 21DPKG_INIT_POSITION = "98"
22 22
23pkg_postinst_dpkg () { 23do_install_prepend () {
24#!/bin/sh 24 install -d ${D}/${sysconfdir}/rcS.d
25if [ "x$D" != "x" ]; then
26 install -d $D/${sysconfdir}/rcS.d
27 # this happens at S98 where our good 'ole packages script used to run 25 # this happens at S98 where our good 'ole packages script used to run
28 echo -e "#!/bin/sh 26 printf "#!/bin/sh
29 dpkg --configure -a 27dpkg --configure -a
30 rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 28rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
31" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 29" > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
32 chmod 0755 $D/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure 30 chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
33fi
34} 31}
35 32
36do_configure () { 33do_configure () {
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 91535d38e3..99197c0b7f 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb
@@ -20,6 +20,6 @@ EXTRA_OECONF = "--without-static-progs \
20 20
21BBCLASSEXTEND = "native" 21BBCLASSEXTEND = "native"
22 22
23do_install_append_virtclass-native () { 23do_install_append () {
24 rm ${D}${bindir}/update-alternatives 24 rm ${D}${bindir}/update-alternatives
25} 25}