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) (From OE-Core rev: aa632292cc55b997a5b808b6c4a70ce33a3b9e7e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
10d9e0805e
commit
5d96094939
|
@ -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)) {
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
|
||||||
file://add_uname_support.patch \
|
file://add_uname_support.patch \
|
||||||
file://fix_installorder.patch \
|
file://fix_installorder.patch \
|
||||||
file://offline_postinstall.patch\
|
file://offline_postinstall.patch\
|
||||||
file://offlineroot_varname.patch \
|
|
||||||
file://track_parents.patch \
|
file://track_parents.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
@ -22,7 +21,7 @@ S = "${WORKDIR}/trunk"
|
||||||
|
|
||||||
SRCREV = "633"
|
SRCREV = "633"
|
||||||
PV = "0.1.8+svnr${SRCPV}"
|
PV = "0.1.8+svnr${SRCPV}"
|
||||||
PR = "r3"
|
PR = "r4"
|
||||||
|
|
||||||
PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
|
PACKAGES =+ "libopkg${PKGSUFFIX}-dev libopkg${PKGSUFFIX} update-alternatives-cworth${PKGSUFFIX}"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue