From 8c79f89fac09364e5ce494ee5fab133e7734583f Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@lge.com>
Date: Fri, 8 Feb 2013 11:20:40 +0100
Subject: [PATCH] webos.inc: Override OPKGLIBDIR instead of opkglibdir

[GF-5571] CCC: Upgrade to Yocto 1.4 Dylan

Open-webOS-DCO-1.0-Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Change-Id: I8da34c922fc43ff6e3a482da65d41d6d947cf083
Reviewed-on: https://g2g.palm.com/2213
Reviewed-by: Martin Jansa <Martin.Jansa@lge.com>
Tested-by: Martin Jansa <Martin.Jansa@lge.com>
---
 conf/distro/include/webos.inc                 |  6 +---
 .../opkg/opkg-collateral.bbappend             |  5 ----
 recipes-devtools/opkg/opkg-collateral/lists   |  2 --
 recipes-devtools/opkg/opkg_svn.bbappend       | 28 -------------------
 4 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 recipes-devtools/opkg/opkg-collateral.bbappend
 delete mode 100644 recipes-devtools/opkg/opkg-collateral/lists
 delete mode 100644 recipes-devtools/opkg/opkg_svn.bbappend

diff --git a/conf/distro/include/webos.inc b/conf/distro/include/webos.inc
index c9fbc5a4..7ae21d28 100644
--- a/conf/distro/include/webos.inc
+++ b/conf/distro/include/webos.inc
@@ -54,11 +54,7 @@ CACHE = "${TMPDIR}/cache/${TCMODE}-${TCLIBC}${@['', '/' + str(d.getVar('MACHINE'
 
 USER_CLASSES ?= ""
 
-# opkglibdir is used in rootfs-ipk, change that to
-# OPKGLIBDIR_webos := "${libdir}"
-# and remove opkg*bbappends when oe-core is upgraded to revision which includes this:
-# http://lists.linuxtogo.org/pipermail/openembedded-core/2013-February/035407.html 
-opkglibdir_forcevariable = "${libdir}/opkg"
+OPKGLIBDIR_forcevariable := "${libdir}"
 
 INHERIT_DISTRO ?= "debian devshell sstate license webos_base"
 
diff --git a/recipes-devtools/opkg/opkg-collateral.bbappend b/recipes-devtools/opkg/opkg-collateral.bbappend
deleted file mode 100644
index 3c37571b..00000000
--- a/recipes-devtools/opkg/opkg-collateral.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-
-PR_append = "webos1"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
diff --git a/recipes-devtools/opkg/opkg-collateral/lists b/recipes-devtools/opkg/opkg-collateral/lists
deleted file mode 100644
index 913511ad..00000000
--- a/recipes-devtools/opkg/opkg-collateral/lists
+++ /dev/null
@@ -1,2 +0,0 @@
-lists_dir ext /usr/lib/opkg
-
diff --git a/recipes-devtools/opkg/opkg_svn.bbappend b/recipes-devtools/opkg/opkg_svn.bbappend
deleted file mode 100644
index 9f65f7ab..00000000
--- a/recipes-devtools/opkg/opkg_svn.bbappend
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
-
-PR_append = "webos2"
-
-# for all 3 opkg classes use only prefix (/usr) because recipe itself appends /lib to it.
-target_localstatedir := "${prefix}"
-
-# for class-target we have to override whole EXTRA_OECONF because this one is using
-# ${localstatedir}/lib in original recipe
-EXTRA_OECONF_class-target = "\
-  --disable-gpg \
-  --disable-openssl \
-  --disable-ssl-curl \
-  --disable-curl \
-  --disable-sha256 \
-  --with-opkglibdir=${target_localstatedir}/lib \
-"
-
-do_install_append() {
-    # We need to create the lock directory
-    install -d ${D}${libdir}/opkg
-    # ${localstatedir}/lib/opkg is created by do_install_append in original .bb
-    rmdir ${D}${localstatedir}/lib/opkg
-    rmdir ${D}${localstatedir}/lib
-    rmdir ${D}${localstatedir}
-}
-
-FILES_libopkg = "${libdir}/*.so.* ${libdir}/opkg"