summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc8
-rw-r--r--meta/recipes-devtools/opkg/opkg_svn.bb3
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 50f1afc1fe..a649213916 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -7,7 +7,6 @@ BUGTRACKER = "http://code.google.com/p/opkg/issues/list"
7LICENSE = "GPLv2+" 7LICENSE = "GPLv2+"
8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba" 9 file://src/opkg-cl.c;beginline=1;endline=20;md5=321f658c3f6b6c832e25c8850b5dffba"
10DEPENDS = "curl gpgme openssl"
11DEPENDS_virtclass-native = "curl-native" 10DEPENDS_virtclass-native = "curl-native"
12DEPENDS_virtclass-nativesdk = "curl-nativesdk" 11DEPENDS_virtclass-nativesdk = "curl-nativesdk"
13 12
@@ -21,9 +20,14 @@ do_configure_prepend() {
21} 20}
22 21
23inherit autotools pkgconfig 22inherit autotools pkgconfig
23EXTRA_OECONF += " --disable-gpg \
24 --disable-openssl \
25 --disable-ssl-curl \
26 --disable-curl \
27 --disable-sha256"
24 28
25target_localstatedir := "${localstatedir}" 29target_localstatedir := "${localstatedir}"
26EXTRA_OECONF = "--with-opkglibdir=${localstatedir}/lib" 30EXTRA_OECONF += "--with-opkglibdir=${localstatedir}/lib"
27EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" 31EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
28EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl" 32EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_localstatedir}/lib --disable-gpg --disable-curl --disable-openssl"
29 33
diff --git a/meta/recipes-devtools/opkg/opkg_svn.bb b/meta/recipes-devtools/opkg/opkg_svn.bb
index 5664a09e1f..5964a474f1 100644
--- a/meta/recipes-devtools/opkg/opkg_svn.bb
+++ b/meta/recipes-devtools/opkg/opkg_svn.bb
@@ -7,6 +7,7 @@ RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-config-base"
7RDEPENDS_${PN}_virtclass-native = "" 7RDEPENDS_${PN}_virtclass-native = ""
8RDEPENDS_${PN}_virtclass-nativesdk = "" 8RDEPENDS_${PN}_virtclass-nativesdk = ""
9PACKAGE_ARCH_update-alternatives-cworth = "all" 9PACKAGE_ARCH_update-alternatives-cworth = "all"
10RREPLACES_${PN} = "opkg-nogpg"
10 11
11SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \ 12SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
12 file://add_vercmp.patch \ 13 file://add_vercmp.patch \
@@ -15,7 +16,7 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
15 16
16S = "${WORKDIR}/trunk" 17S = "${WORKDIR}/trunk"
17 18
18SRCREV = "596" 19SRCREV = "609"
19PV = "0.1.8+svnr${SRCPV}" 20PV = "0.1.8+svnr${SRCPV}"
20PR = "r2" 21PR = "r2"
21 22