summaryrefslogtreecommitdiffstats
path: root/meta
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 /meta
parent53ff069611e9b22d94ff1406cfa223564b7e54a6 (diff)
downloadpoky-1d0757f16beb31551733d9d755d72337ccda9642.tar.gz
opkg: use var for state files, not libdir
Fixes [BUGID #221] Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'meta')
-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 a602a6ff8f..667b6386e5 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/packages/opkg/opkg.inc
@@ -23,6 +23,7 @@ do_configure_prepend() {
23inherit autotools pkgconfig 23inherit autotools pkgconfig
24 24
25target_libdir := "${libdir}" 25target_libdir := "${libdir}"
26EXTRA_OECONF = "--with-opkglibdir=${localstatedir}/lib"
26EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl" 27EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl"
27EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl" 28EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_libdir} --disable-gpg --disable-curl --disable-openssl"
28 29
diff --git a/meta/packages/opkg/opkg_0.1.8.bb b/meta/packages/opkg/opkg_0.1.8.bb
index 0d6d615de8..1d05ef802e 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 \
13 file://headerfix.patch \ 13 file://headerfix.patch \
14" 14"
15 15
16PR = "r1" 16PR = "r2"
17 17
18PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" 18PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"
19 19
20FILES_update-alternatives-cworth = "${bindir}/update-alternatives" 20FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
21FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" 21FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
22FILES_libopkg = "${libdir}/*.so.* ${libdir}/opkg/" 22FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
23 23
24# We need to create the lock directory 24# We need to create the lock directory
25do_install_append() { 25do_install_append() {
26 install -d ${D}${libdir}/opkg 26 install -d ${D}${localstatedir}/lib/opkg
27} 27}
28 28
29# Define a variable to allow distros to run configure earlier. 29# 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 73bde7766b..1dc4c48006 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 \
17S = "${WORKDIR}/trunk" 17S = "${WORKDIR}/trunk"
18 18
19PV = "0.0+svnr${SRCREV}" 19PV = "0.0+svnr${SRCREV}"
20PR = "r13" 20PR = "r14"
21 21
22PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" 22PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"
23 23
24FILES_update-alternatives-cworth = "${bindir}/update-alternatives" 24FILES_update-alternatives-cworth = "${bindir}/update-alternatives"
25FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so" 25FILES_libopkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
26FILES_libopkg = "${libdir}/*.so.* ${libdir}/opkg/" 26FILES_libopkg = "${libdir}/*.so.* ${localstatedir}/lib/opkg/"
27 27
28# We need to create the lock directory 28# We need to create the lock directory
29do_install_append() { 29do_install_append() {
30 install -d ${D}${libdir}/opkg 30 install -d ${D}${localstatedir}/lib/opkg
31} 31}
32 32
33# Define a variable to allow distros to run configure earlier. 33# Define a variable to allow distros to run configure earlier.