summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTick Chen <ticktock35@gmail.com>2008-12-29 19:41:47 +0800
committerTick Chen <ticktock35@gmail.com>2008-12-29 19:41:47 +0800
commitcc9825d97962287df75e164aec456901292e1b7f (patch)
tree94cf0156cadd85c6194c8e1acfa6772bbe160e01
parentd6fbdc2b09df88b66008ea72c92cbe20f1de703e (diff)
opkg: Bump up opkg to latest versions 0.1.6 R194
opkg-collateral: Update new options sample and move the opkg.conf to correct place New stuff: Moving opkg to http://code.google.com/p/opkg/ apply patch of opkg_wget.patch and adding new configuration disable the noise message of nogpg enhance the data structure of void_list remove all the malloc to calloc enhance the algorithm of checking out of date files. adding option check_signature (default is disable)
-rw-r--r--conf/distro/include/sane-srcrevs.inc6
-rw-r--r--packages/opkg/opkg-collateral.bb7
-rw-r--r--packages/opkg/opkg-collateral/opkg.conf.comments3
-rw-r--r--packages/opkg/opkg-nogpg-nocurl_svn.bb6
-rw-r--r--packages/opkg/opkg-nogpg_svn.bb1
-rw-r--r--packages/opkg/opkg.inc7
6 files changed, 15 insertions, 15 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index e6adf18ec1..684ea7aa73 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -170,9 +170,9 @@ SRCREV_pn-openmoko-toolchain-scripts ?= "4878"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4838"
-SRCREV_pn-opkg-native ?= "4755"
-SRCREV_pn-opkg-sdk ?= "4755"
+SRCREV_pn-opkg ?= "194"
+SRCREV_pn-opkg-native ?= "194"
+SRCREV_pn-opkg-sdk ?= "192"
SRCREV_pn-opkg-utils ?= "4578"
SRCREV_pn-opkg-utils-native ?= "4595"
SRCREV_pn-oprofileui ?= "173"
diff --git a/packages/opkg/opkg-collateral.bb b/packages/opkg/opkg-collateral.bb
index 79c741d7be..d3fc2b87ff 100644
--- a/packages/opkg/opkg-collateral.bb
+++ b/packages/opkg/opkg-collateral.bb
@@ -1,6 +1,7 @@
DESCRIPTION = "opkg configuration files"
SECTION = "base"
LICENSE = "MIT"
+PR = 1
SRC_URI = "file://opkg.conf.comments \
file://lists \
@@ -15,8 +16,8 @@ do_compile () {
}
do_install () {
- install -d ${D}${sysconfdir}/
- install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg.conf
+ install -d ${D}${sysconfdir}/opkg
+ install -m 0644 ${WORKDIR}/opkg.conf ${D}${sysconfdir}/opkg/opkg.conf
}
-CONFFILES_${PN} = "${sysconfdir}/opkg.conf"
+CONFFILES_${PN} = "${sysconfdir}/opkg/opkg.conf"
diff --git a/packages/opkg/opkg-collateral/opkg.conf.comments b/packages/opkg/opkg-collateral/opkg.conf.comments
index 51623f4d53..e1fdada9b5 100644
--- a/packages/opkg/opkg-collateral/opkg.conf.comments
+++ b/packages/opkg/opkg-collateral/opkg.conf.comments
@@ -18,6 +18,9 @@
#option proxy_username <username>
#option proxy_password <password>
+# Enable GPGME signature
+# option check_signature 1
+
# Offline mode (for use in constructing flash images offline)
#option offline_root target
diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
index 8560178287..5a566b853a 100644
--- a/packages/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -3,9 +3,7 @@ require opkg_svn.bb
DEPENDS = ""
PROVIDES += "opkg"
-SRC_URI += "file://opkg_wget.patch;patch=1 \
- file://reduce-nogpg-noise.patch;patch=1 \
- file://opkg_wget_nogpg_01_use_vfork_gunzip.patch;patch=1 \
+SRC_URI += "file://opkg_wget_nogpg_01_use_vfork_gunzip.patch;patch=1 \
file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \
file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
"
@@ -13,7 +11,7 @@ PR = "r1"
SRCREV = "${SRCREV_pn-opkg}"
-EXTRA_OECONF += "--disable-gpg --enable-static --disable-shared"
+EXTRA_OECONF += "--disable-gpg --disable-curl --enable-static --disable-shared"
# The nogpg version isn't getting much love and has an unused variable which trips up -Werror
do_configure_prepend() {
diff --git a/packages/opkg/opkg-nogpg_svn.bb b/packages/opkg/opkg-nogpg_svn.bb
index 7a56b4d7fd..b1942fb6c5 100644
--- a/packages/opkg/opkg-nogpg_svn.bb
+++ b/packages/opkg/opkg-nogpg_svn.bb
@@ -3,7 +3,6 @@ require opkg_svn.bb
DEPENDS = "curl"
PROVIDES += "opkg"
-SRC_URI += "file://reduce-nogpg-noise.patch;patch=1"
PR = "r1"
SRCREV = "${SRCREV_pn-opkg}"
diff --git a/packages/opkg/opkg.inc b/packages/opkg/opkg.inc
index 104e0fdb42..b586e70ab9 100644
--- a/packages/opkg/opkg.inc
+++ b/packages/opkg/opkg.inc
@@ -3,11 +3,10 @@ DESCRIPTION_libopkg = "Opkg Package Manager Library"
SECTION = "base"
LICENSE = "GPL"
DEPENDS = "curl gpgme"
-PV = "0.1.4+svnr${SRCREV}"
+PV = "0.1.6+svnr${SRCREV}"
-SRC_URI = "svn://svn.openmoko.org/trunk/src/target/;module=opkg;proto=http \
- file://fix_endianness.patch;patch=1;maxrev=4246"
-S = "${WORKDIR}/opkg"
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http"
+S = "${WORKDIR}/trunk"
inherit autotools pkgconfig