diff options
| author | Cliff Brake <cbrake@bec-systems.com> | 2006-12-11 15:28:13 +0000 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2006-12-11 15:28:13 +0000 |
| commit | a6bc58b1a0ab3bccea24bc42a8139494f02fa178 (patch) | |
| tree | 4d213a972b3800d9f4a29d0cb544efb1c3ae1dfb | |
| parent | 514c0ec267aca52243b5604bfe43c354fd62a32c (diff) | |
| parent | e59be84f1e7dc42189f2cf51dbf92f5658ae9b9d (diff) | |
merge of '7ccd015112b8aa69fbfe95acc1893ca13ac30992'
and 'f1d7476860f569e3fa2e97db12daf5c4513332f8'
| -rw-r--r-- | packages/apache2/apache2-native_2.2.3.bb | 2 | ||||
| -rw-r--r-- | packages/libeventdb/libeventdb_svn.bb (renamed from packages/libeventdb/libeventdb_cvs.bb) | 11 | ||||
| -rw-r--r-- | packages/linux/linux-storcenter_2.6.12.6.bb | 1 | ||||
| -rw-r--r-- | packages/uboot-utils/uboot-utils_1.1.2.bb | 5 |
4 files changed, 14 insertions, 5 deletions
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb index f961d7863a..9c6c862ad7 100644 --- a/packages/apache2/apache2-native_2.2.3.bb +++ b/packages/apache2/apache2-native_2.2.3.bb @@ -9,7 +9,7 @@ SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2" S = "${WORKDIR}/httpd-${PV}" do_configure () { - ./configure --prefix=${prefix} + ./configure --with-included-apr --prefix=${prefix} } do_populate_staging () { diff --git a/packages/libeventdb/libeventdb_cvs.bb b/packages/libeventdb/libeventdb_svn.bb index 3ea70bac01..4f00f4aac8 100644 --- a/packages/libeventdb/libeventdb_cvs.bb +++ b/packages/libeventdb/libeventdb_svn.bb @@ -1,18 +1,21 @@ -LICENSE = "LGPL" DESCRIPTION = "Database access library for GPE calendar" +LICENSE = "LGPL" SECTION = "gpe/libs" PRIORITY = "optional" + DEPENDS = "libgpewidget libgpepimc sqlite" -PV = "0.30+cvs${SRCDATE}" + +PV = "0.30+svn${SRCDATE}" PR = "r0" + DEFAULT_PREFERENCE = "-1" inherit pkgconfig gpe autotools -SRC_URI = "${HANDHELDS_CVS};module=gpe/base/${PN}" +SRC_URI = "${GPE_SVN}" S = "${WORKDIR}/${PN}" do_stage () { -autotools_stage_all + autotools_stage_all } diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb index 280cb5bd62..541f881fd0 100644 --- a/packages/linux/linux-storcenter_2.6.12.6.bb +++ b/packages/linux/linux-storcenter_2.6.12.6.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Linux Kernel for the Iomega storcenter platform" SECTION = "kernel" LICENSE = "GPL" +DEPENDS = "uboot-utils" PR = "r0" # notes on iom def kernel: diff --git a/packages/uboot-utils/uboot-utils_1.1.2.bb b/packages/uboot-utils/uboot-utils_1.1.2.bb index d70a055d2f..a24682af45 100644 --- a/packages/uboot-utils/uboot-utils_1.1.2.bb +++ b/packages/uboot-utils/uboot-utils_1.1.2.bb @@ -26,6 +26,11 @@ do_compile () { oe_runmake tools } +# install mkimage for the kernel makefile +do_stage() { + install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE} +} + do_install () { install -d ${D}/sbin install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv |