[oe-commits] Jeremy Lainé : dpkg: fix package configuration on first boot

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 6a891b26422ad8ca344a596a70ef7d7d8ede1e06
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=6a891b26422ad8ca344a596a70ef7d7d8ede1e06

Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Wed Sep 30 19:32:02 2009 +0200

dpkg: fix package configuration on first boot

* Use do_install to setup S98configure script, just like for
  the opkg package.

---

 recipes/dpkg/dpkg.inc        |   15 ++++++---------
 recipes/dpkg/dpkg_1.13.22.bb |    2 +-
 recipes/dpkg/dpkg_1.13.25.bb |    2 +-
 recipes/dpkg/dpkg_1.14.19.bb |    2 +-
 recipes/dpkg/dpkg_1.14.23.bb |    2 +-
 recipes/dpkg/dpkg_1.14.25.bb |    1 +
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/recipes/dpkg/dpkg.inc b/recipes/dpkg/dpkg.inc
index eb5778f..b15a636 100644
--- a/recipes/dpkg/dpkg.inc
+++ b/recipes/dpkg/dpkg.inc
@@ -19,17 +19,14 @@ inherit autotools gettext
 DPKG_INIT_POSITION = "98"
 DPKG_INIT_POSITION_slugos = "41"
 
-pkg_postinst_dpkg () {
-#!/bin/sh
-if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${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
 	printf "#!/bin/sh
-	dpkg --configure -a
-	rm -f /${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-\n" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-	chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${DPKG_INIT_POSITION}configure
-fi
+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/recipes/dpkg/dpkg_1.13.22.bb b/recipes/dpkg/dpkg_1.13.22.bb
index e4e7a3b..896346e 100644
--- a/recipes/dpkg/dpkg_1.13.22.bb
+++ b/recipes/dpkg/dpkg_1.13.22.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r5"
+PR = "r6"
 DEPENDS += "zlib bzip2"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/recipes/dpkg/dpkg_1.13.25.bb b/recipes/dpkg/dpkg_1.13.25.bb
index 8a2c8ab..f98cabf 100644
--- a/recipes/dpkg/dpkg_1.13.25.bb
+++ b/recipes/dpkg/dpkg_1.13.25.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r1"
+PR = "r2"
 DEPENDS += "zlib bzip2"
 SRC_URI += "file://noman.patch;patch=1"
 
diff --git a/recipes/dpkg/dpkg_1.14.19.bb b/recipes/dpkg/dpkg_1.14.19.bb
index 0377ce1..65d8309 100644
--- a/recipes/dpkg/dpkg_1.14.19.bb
+++ b/recipes/dpkg/dpkg_1.14.19.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r1"
+PR = "r2"
 DEPENDS += "zlib bzip2"
 #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
 SRC_URI += "file://noman.patch;patch=1"
diff --git a/recipes/dpkg/dpkg_1.14.23.bb b/recipes/dpkg/dpkg_1.14.23.bb
index 0377ce1..65d8309 100644
--- a/recipes/dpkg/dpkg_1.14.23.bb
+++ b/recipes/dpkg/dpkg_1.14.23.bb
@@ -1,5 +1,5 @@
 require dpkg.inc
-PR = "r1"
+PR = "r2"
 DEPENDS += "zlib bzip2"
 #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
 SRC_URI += "file://noman.patch;patch=1"
diff --git a/recipes/dpkg/dpkg_1.14.25.bb b/recipes/dpkg/dpkg_1.14.25.bb
index dac14f9..0377ce1 100644
--- a/recipes/dpkg/dpkg_1.14.25.bb
+++ b/recipes/dpkg/dpkg_1.14.25.bb
@@ -1,4 +1,5 @@
 require dpkg.inc
+PR = "r1"
 DEPENDS += "zlib bzip2"
 #RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
 SRC_URI += "file://noman.patch;patch=1"