[oe-commits] Koen Kooi : opkg: fix postinst script to work outside of OE as well

[GIT User account]

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

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Jan 19 09:24:03 2009 +0100

opkg: fix postinst script to work outside of OE as well
* $IMAGE_ROOTFS is an OE var, use $D instead

---

 packages/opkg/opkg-nogpg_svn.bb |    2 +-
 packages/opkg/opkg_svn.bb       |   10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/opkg/opkg-nogpg_svn.bb b/packages/opkg/opkg-nogpg_svn.bb
index b1942fb..f58df2f 100644
--- a/packages/opkg/opkg-nogpg_svn.bb
+++ b/packages/opkg/opkg-nogpg_svn.bb
@@ -3,7 +3,7 @@ require opkg_svn.bb
 DEPENDS = "curl"
 PROVIDES += "opkg"
 
-PR = "r1"
+PR = "r2"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb
index 24547d6..4cf1c5c 100644
--- a/packages/opkg/opkg_svn.bb
+++ b/packages/opkg/opkg_svn.bb
@@ -1,5 +1,7 @@
 require opkg.inc
 
+PR = "r1"
+
 PACKAGES =+ "libopkg-dev libopkg"
 
 FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
@@ -13,13 +15,13 @@ OPKG_INIT_POSITION_slugos = "41"
 pkg_postinst_${PN} () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
-	install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
+	install -d $D${sysconfdir}/rcS.d
 	# this happens at S98 where our good 'ole packages script used to run
 	echo "#!/bin/sh
 opkg-cl configure
-rm -f /${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
-" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
-	chmod 0755 ${IMAGE_ROOTFS}${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+rm -f ${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+" > $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
+	chmod 0755 $D${sysconfdir}/rcS.d/S${OPKG_INIT_POSITION}configure
 fi
 
 update-alternatives --install ${bindir}/opkg opkg ${bindir}/opkg-cl 100