summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/opkg/opkg-native_svn.bb12
-rw-r--r--meta/packages/opkg/opkg-nativesdk_svn.bb8
-rw-r--r--meta/packages/opkg/opkg.inc13
-rw-r--r--meta/packages/opkg/opkg/fix_prototype.patch (renamed from meta/packages/opkg/files/fix_prototype.patch)0
-rw-r--r--meta/packages/opkg/opkg/opkg-fix-gcc-warnings.patch (renamed from meta/packages/opkg/files/opkg-fix-gcc-warnings.patch)0
-rw-r--r--meta/packages/opkg/opkg/opkg_unarchive.patch (renamed from meta/packages/opkg/files/opkg_unarchive.patch)0
-rw-r--r--meta/packages/opkg/opkg/sighandlerfix.patch (renamed from meta/packages/opkg/files/sighandlerfix.patch)0
-rw-r--r--meta/packages/opkg/opkg_svn.bb2
8 files changed, 14 insertions, 21 deletions
diff --git a/meta/packages/opkg/opkg-native_svn.bb b/meta/packages/opkg/opkg-native_svn.bb
deleted file mode 100644
index a385f0df28..0000000000
--- a/meta/packages/opkg/opkg-native_svn.bb
+++ /dev/null
@@ -1,12 +0,0 @@
1require opkg.inc
2
3DEPENDS = "curl-native"
4PROVIDES += "virtual/update-alternatives-native"
5RPROVIDES_${PN} += "update-alternatives-native"
6PR = "r5"
7
8target_libdir := "${libdir}"
9
10inherit native
11
12EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
diff --git a/meta/packages/opkg/opkg-nativesdk_svn.bb b/meta/packages/opkg/opkg-nativesdk_svn.bb
deleted file mode 100644
index 05f5e6f472..0000000000
--- a/meta/packages/opkg/opkg-nativesdk_svn.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require opkg.inc
2
3DEPENDS = "curl-nativesdk"
4PR = "r3"
5
6inherit nativesdk
7
8EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
diff --git a/meta/packages/opkg/opkg.inc b/meta/packages/opkg/opkg.inc
index d82f6d53f2..1d1cb5c26f 100644
--- a/meta/packages/opkg/opkg.inc
+++ b/meta/packages/opkg/opkg.inc
@@ -4,6 +4,8 @@ DESCRIPTION_update-alternatives-cworth = "Update alternatives"
4SECTION = "base" 4SECTION = "base"
5LICENSE = "GPL" 5LICENSE = "GPL"
6DEPENDS = "curl gpgme" 6DEPENDS = "curl gpgme"
7DEPENDS_virtclass-native = "curl-native"
8DEPENDS_virtclass-nativesdk = "curl-nativesdk"
7PV = "0.0+svnr${SRCREV}" 9PV = "0.0+svnr${SRCREV}"
8PE = "1" 10PE = "1"
9 11
@@ -14,9 +16,20 @@ SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
14 16
15S = "${WORKDIR}/trunk" 17S = "${WORKDIR}/trunk"
16 18
19FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/opkg"
20
17# Werror gives all kinds bounds issuses with gcc 4.3.3 21# Werror gives all kinds bounds issuses with gcc 4.3.3
18do_configure_prepend() { 22do_configure_prepend() {
19 sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am 23 sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am
20} 24}
21 25
22inherit autotools_stage pkgconfig 26inherit autotools_stage pkgconfig
27
28target_libdir := "${libdir}"
29EXTRA_OECONF_virtclass-native = "--with-opkglibdir=${target_libdir} --disable-gpg"
30EXTRA_OECONF_virtclass-nativesdk = "--with-opkglibdir=${target_libdir} --disable-gpg"
31
32#PROVIDES_append_virtclass-native = "virtual/update-alternatives-native"
33#RPROVIDES_${PN} += "update-alternatives-native"
34
35BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/packages/opkg/files/fix_prototype.patch b/meta/packages/opkg/opkg/fix_prototype.patch
index 4be881aa7e..4be881aa7e 100644
--- a/meta/packages/opkg/files/fix_prototype.patch
+++ b/meta/packages/opkg/opkg/fix_prototype.patch
diff --git a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch b/meta/packages/opkg/opkg/opkg-fix-gcc-warnings.patch
index 149542ed6a..149542ed6a 100644
--- a/meta/packages/opkg/files/opkg-fix-gcc-warnings.patch
+++ b/meta/packages/opkg/opkg/opkg-fix-gcc-warnings.patch
diff --git a/meta/packages/opkg/files/opkg_unarchive.patch b/meta/packages/opkg/opkg/opkg_unarchive.patch
index 9e5ccfb714..9e5ccfb714 100644
--- a/meta/packages/opkg/files/opkg_unarchive.patch
+++ b/meta/packages/opkg/opkg/opkg_unarchive.patch
diff --git a/meta/packages/opkg/files/sighandlerfix.patch b/meta/packages/opkg/opkg/sighandlerfix.patch
index b60245f581..b60245f581 100644
--- a/meta/packages/opkg/files/sighandlerfix.patch
+++ b/meta/packages/opkg/opkg/sighandlerfix.patch
diff --git a/meta/packages/opkg/opkg_svn.bb b/meta/packages/opkg/opkg_svn.bb
index 0d68939346..b84f63d540 100644
--- a/meta/packages/opkg/opkg_svn.bb
+++ b/meta/packages/opkg/opkg_svn.bb
@@ -6,7 +6,7 @@ RCONFLICTS_update-alternatives-cworth = "update-alternatives-dpkg"
6RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}" 6RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_update-alternatives}"
7PACKAGE_ARCH_update-alternatives-cworth = "all" 7PACKAGE_ARCH_update-alternatives-cworth = "all"
8 8
9PR = "r3" 9PR = "r6"
10 10
11PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth" 11PACKAGES =+ "libopkg-dev libopkg update-alternatives-cworth"
12 12