From 1d0757f16beb31551733d9d755d72337ccda9642 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 24 Aug 2010 11:32:01 +0100 Subject: opkg: use var for state files, not libdir Fixes [BUGID #221] Signed-off-by: Joshua Lock --- meta/packages/opkg/opkg.inc | 1 + meta/packages/opkg/opkg_0.1.8.bb | 6 +++--- meta/packages/opkg/opkg_svn.bb | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'meta') 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() { 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 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 \ 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 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 \ 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. -- cgit v1.2.3-54-g00ecf