[oe-commits] Richard Purdie : opkg: Drop the offlineroot_varname patch

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 746ae269a475857ae57095b1fd164fe195b3d051
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=746ae269a475857ae57095b1fd164fe195b3d051

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon Dec 19 09:23:21 2011 +0000

opkg: Drop the offlineroot_varname patch

This break things for on target opkg usage since $D must remain
unset there.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../opkg/opkg/offlineroot_varname.patch            |   20 --------------------
 meta/recipes-devtools/opkg/opkg_svn.bb             |    3 +--
 2 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/meta/recipes-devtools/opkg/opkg/offlineroot_varname.patch b/meta/recipes-devtools/opkg/opkg/offlineroot_varname.patch
deleted file mode 100644
index a67f389..0000000
--- a/meta/recipes-devtools/opkg/opkg/offlineroot_varname.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-OE uses D as the offline install directory in its scripts, not PKG_ROOT.
-
-Upstream-Status: Inappropriate [OE specific usage]
-
-RP 2011/12/15
-
-Index: trunk/libopkg/pkg.c
-===================================================================
---- trunk.orig/libopkg/pkg.c	2011-12-15 15:58:39.000000000 +0000
-+++ trunk/libopkg/pkg.c	2011-12-15 20:04:50.109992736 +0000
-@@ -1280,7 +1280,7 @@
- 
-      opkg_msg(INFO, "Running script %s.\n", path);
- 
--     setenv("PKG_ROOT",
-+     setenv("D",
- 	    pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir, 1);
- 
-      if (! file_exists(path)) {
-
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index dbdfc7e..00591d1 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -14,7 +14,6 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
            file://add_uname_support.patch \
            file://fix_installorder.patch \
            file://offline_postinstall.patch\
-           file://offlineroot_varname.patch \
            file://track_parents.patch \
 "
 
@@ -22,7 +21,7 @@ S = "${WORKDIR}/trunk"
 
 SRCREV = "633"
 PV = "0.1.8+svnr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"