[PATCH 0/1] fix to bug 1070

[PATCH 0/1] fix to bug 1070

[Dexuan Cui]

The following changes since commit 8fce8180c802ad187c4df44c17207bfb026ce6c7:

  shadow: add patch for useradd lossage (2011-09-09 18:42:47 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib dcui/deb
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/deb

Dexuan Cui (1):
  dpkg: fix pkg_postinst_dpkg, don't supply
    {bindir}/update-alternatives

 meta/recipes-devtools/dpkg/dpkg.inc         |   19 ++++++++-----------
 meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb |    2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

-- 
1.7.6

[PATCH 1/1] dpkg: fix pkg_postinst_dpkg, don't supply {bindir}/update-alternatives

[Dexuan Cui]

[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.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
 meta/recipes-devtools/dpkg/dpkg.inc         |   19 ++++++++-----------
 meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb |    2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index aa5f90e..8c2511d 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."
 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"
@@ -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 () {
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 91535d3..99197c0 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 \
 
 BBCLASSEXTEND = "native"
 
-do_install_append_virtclass-native () {
+do_install_append () {
 	rm ${D}${bindir}/update-alternatives
 }
-- 
1.7.6

Re: [PATCH 1/1] dpkg: fix pkg_postinst_dpkg, don't supply {bindir}/update-alternatives

[Richard Purdie]

On Tue, 2011-09-13 at 21:30 +0800, Dexuan Cui wrote:
> [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.
> 
> Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
> ---
>  meta/recipes-devtools/dpkg/dpkg.inc         |   19 ++++++++-----------
>  meta/recipes-devtools/dpkg/dpkg_1.15.8.7.bb |    2 +-
>  2 files changed, 9 insertions(+), 12 deletions(-)

Merged to master, thanks.

Richard