Patchwork [3/5] dpkg, dpkg-native: fix DEPENDS, RDEPENDS and pkg_postinst_dpkg

login
register
mail settings
Submitter Dexuan Cui
Date Sept. 6, 2011, 1:08 p.m.
Message ID <96b83521070f288a294160a093bc52943119d1b3.1315313790.git.dexuan.cui@intel.com>
Download mbox | patch
Permalink /patch/11057/
State New, archived
Headers show

Comments

Dexuan Cui - Sept. 6, 2011, 1:08 p.m.
dpkg-native should depend on update-alternatives-dpkg-native rather than
opkg-native.

dpkg should Rdepend on update-alternatives-dpkg rather than
update-alternatives-cworth.

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 corrent. So let's change to OE's version.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

Patch

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index aa5f90e..2ff757a 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -2,14 +2,14 @@  DESCRIPTION = "Package maintenance system for Debian."
 LICENSE = "GPL"
 SECTION = "base"
 
-INC_PR = "r4"
+INC_PR = "r5"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/d/dpkg/dpkg_${PV}.tar.bz2 \
            file://ignore_extra_fields.patch"
 
 DEPENDS = "zlib bzip2 perl"
-DEPENDS_virtclass-native = "bzip2-native zlib-native virtual/update-alternatives-native gettext-native perl-native-runtime"
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
+DEPENDS_virtclass-native = "bzip2-native zlib-native update-alternatives-dpkg-native gettext-native perl-native-runtime"
+RDEPENDS_${PN} = "update-alternatives-dpkg"
 RDEPENDS_${PN}_virtclass-native = ""
 
 S = "${WORKDIR}/${BPN}-${PV}"
@@ -20,17 +20,14 @@  inherit autotools gettext perlnative
 
 DPKG_INIT_POSITION = "98"
 
-pkg_postinst_dpkg () {
-#!/bin/sh
-if [ "x$D" != "x" ]; then
-	install -d $D/${sysconfdir}/rcS.d
+do_install_prepend () {
+	install -d ${D}/${sysconfdir}/rcS.d
 	# this happens at S98 where our good 'ole packages script used to run
-	echo -e "#!/bin/sh
-	dpkg --configure -a
-	rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-	chmod 0755 $D/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-fi
+	printf "#!/bin/sh
+dpkg --configure -a
+rm -f ${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
+" > ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
+	chmod 0755 ${D}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
 }
 
 do_configure () {