summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-24 11:32:01 +0100
committerJoshua Lock <josh@linux.intel.com>2010-08-25 11:15:16 +0100
commit1d0757f16beb31551733d9d755d72337ccda9642 (patch)
tree29aba96cf89e84d8225e41efa0f1733c131f325e
parent53ff069611e9b22d94ff1406cfa223564b7e54a6 (diff)
downloadopenembedded-core-1d0757f16beb31551733d9d755d72337ccda9642.tar.gz
openembedded-core-1d0757f16beb31551733d9d755d72337ccda9642.tar.bz2
openembedded-core-1d0757f16beb31551733d9d755d72337ccda9642.tar.xz
openembedded-core-1d0757f16beb31551733d9d755d72337ccda9642.zip
opkg: use var for state files, not libdir
Fixes [BUGID #221] Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/packages/opkg/opkg.inc1
-rw-r--r--meta/packages/opkg/opkg_0.1.8.bb6
-rw-r--r--meta/packages/opkg/opkg_svn.bb6
3 files changed, 7 insertions, 6 deletions
diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc
index a602a6ff8..667b6386e 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/packages/opkg/opkg.inc
@@ -23,6 +23,7 @@ do_configure_prepend() {
inherit autotools pkgconfig
target_libdir := "${libdir}"
+EXTRA_OECONF = "--with-opkglibdir=${localstatedir}/lib"
EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl"
EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl"
diff --git a/meta/packages/opkg/opkg_0.1.8.bb b/meta/packages/opkg/opkg_0.1.8.bb
index 0d6d615de..1d05ef802 100644
--- a/meta/packages/opkg/opkg_0.1.8.bb
+++ b/meta/packages/opkg/opkg_0.1.8.bb
@@ -13,17 +13,17 @@ SRC_URI = "http://opkg.googlecode.com/files/opkg-${PV}.tar.gz \
file://headerfix.patch \
"
-PR = "r1"
+PR = "r2"
PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"
FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libopkg = "${libdir}/*.so.* ${libdir}/opkg/"
+FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
# We need to create the lock directory
do_install_append() {
- install -d ${D}${libdir}/opkg
+ install -d ${D}${localstatedir}/lib/opkg
}
# Define a variable to allow distros to run configure earlier.
diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/packages/opkg/opkg_svn.bb
index 73bde7766..1dc4c4800 100644
--- a/meta/packages/opkg/opkg_svn.bb
+++ b/meta/packages/opkg/opkg_svn.bb
@@ -17,17 +17,17 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
S = "${WORKDIR}/trunk"
PV = "0.0+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"
FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
-FILES_libopkg = "${libdir}/*.so.* ${libdir}/opkg/"
+FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
# We need to create the lock directory
do_install_append() {
- install -d ${D}${libdir}/opkg
+ install -d ${D}${localstatedir}/lib/opkg
}
# Define a variable to allow distros to run configure earlier.