diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-08 07:58:38 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-08-08 07:58:38 +0000 |
| commit | 024e5baced24b9369c1564229305c9f0a634e49f (patch) | |
| tree | 0feeac08ed6392215cef35155cf7c4823deee7f4 | |
| parent | bf0561f41898b938a6f772a4006a113bbf51393a (diff) | |
| parent | 16ad89629fee5be7cc5f3d9e4d33e07bd47740ae (diff) | |
merge of '484354fc7d908c35f064448e992d669099255726'
and 'f048a9bae79ea733471cb26e128894d77a0d80d6'
| -rw-r--r-- | conf/machine/palmt680.conf | 2 | ||||
| -rw-r--r-- | conf/machine/palmtc.conf | 2 | ||||
| -rw-r--r-- | conf/machine/palmtt.conf | 2 | ||||
| -rw-r--r-- | packages/libopie/libopie2_cvs.bb | 4 | ||||
| -rw-r--r-- | packages/libqpe/libqpe-opie_cvs.bb | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/conf/machine/palmt680.conf b/conf/machine/palmt680.conf index b5e8aebb54..1852455e2b 100644 --- a/conf/machine/palmt680.conf +++ b/conf/machine/palmt680.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm Treo 680 -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Treo 680 require conf/machine/include/palm.conf diff --git a/conf/machine/palmtc.conf b/conf/machine/palmtc.conf index b1139c21fa..24d13c1381 100644 --- a/conf/machine/palmtc.conf +++ b/conf/machine/palmtc.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm TC -#@DESCRIPTION: Machine configuration for the Palm TX +#@DESCRIPTION: Machine configuration for the Palm Tungsten C require conf/machine/include/palm.conf diff --git a/conf/machine/palmtt.conf b/conf/machine/palmtt.conf index 72b1f310ad..1f6d5c377d 100644 --- a/conf/machine/palmtt.conf +++ b/conf/machine/palmtt.conf @@ -1,6 +1,6 @@ #@TYPE: Machine #@NAME: Palm Tungsten T -#@DESCRIPTION: Machine configuration for Palm Zire 71 +#@DESCRIPTION: Machine configuration for Palm Tungsten T/T2 TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv5te" diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 2e5772cd81..338ddd28bd 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc -PV = "1.2.2+cvs${SRCDATE}" -PR = "r10" +PV = "${OPIE_CVS_PV}" +PR = "r11" DEFAULT_PREFERENCE = "-1" diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index f206529480..1596e987cf 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc -PV = "1.2.2+cvs${SRCDATE}" -PR = "r10" +PV = "${OPIE_CVS_PV}" +PR = "r11" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ |