summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-19 09:23:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-19 09:29:16 +0000
commit13951117392241e37b899043b045d2d29f83fcc8 (patch)
treedb3f78bbf1982657e0457bc761fe5ca158bd7697
parentf4c80d646f633215ba8341c389875b99f7f526e6 (diff)
downloadpoky-13951117392241e37b899043b045d2d29f83fcc8.tar.gz
opkg: Drop the offlineroot_varname patch
This break things for on target opkg usage since $D must remain unset there. (From OE-Core rev: 746ae269a475857ae57095b1fd164fe195b3d051) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/opkg/opkg/offlineroot_varname.patch20
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb3
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 a67f389bac..0000000000
--- a/meta/recipes-devtools/opkg/opkg/offlineroot_varname.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1OE uses D as the offline install directory in its scripts, not PKG_ROOT.
2
3Upstream-Status: Inappropriate [OE specific usage]
4
5RP 2011/12/15
6
7Index: trunk/libopkg/pkg.c
8===================================================================
9--- trunk.orig/libopkg/pkg.c 2011-12-15 15:58:39.000000000 +0000
10+++ trunk/libopkg/pkg.c 2011-12-15 20:04:50.109992736 +0000
11@@ -1280,7 +1280,7 @@
12
13 opkg_msg(INFO, "Running script %s.\n", path);
14
15- setenv("PKG_ROOT",
16+ setenv("D",
17 pkg->dest ? pkg->dest->root_dir : conf->default_dest->root_dir, 1);
18
19 if (! file_exists(path)) {
20
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index dbdfc7e82b..00591d168f 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 \
14 file://add_uname_support.patch \ 14 file://add_uname_support.patch \
15 file://fix_installorder.patch \ 15 file://fix_installorder.patch \
16 file://offline_postinstall.patch\ 16 file://offline_postinstall.patch\
17 file://offlineroot_varname.patch \
18 file://track_parents.patch \ 17 file://track_parents.patch \
19" 18"
20 19
@@ -22,7 +21,7 @@ S = "${WORKDIR}/trunk"
22 21
23SRCREV = "633" 22SRCREV = "633"
24PV = "0.1.8+svnr${SRCPV}" 23PV = "0.1.8+svnr${SRCPV}"
25PR = "r3" 24PR = "r4"
26 25
27PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}" 26PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
28 27