Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/22 19:20:40+01:00 (none)!koen
timezones_cvs.bb:
  fix do_install, courtesy kergoth

2005/02/22 19:18:11+01:00 (none)!koen
timezones_cvs.bb:
  backout /'s

2005/02/22 19:14:31+01:00 (none)!koen
timezones_cvs.bb:
  add / between $D and ${datadir}, part II

2005/02/22 19:09:53+01:00 (none)!koen
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into lieve.(none):/data/build/oe/clean-tree/openembedded

2005/02/22 19:09:40+01:00 (none)!koen
timezones_cvs.bb:
  add / between ${D} and ${datadir}

BKrev: 421b7c8cCLJP9PA_BtDFgv7tX8XqYA

diff --git a/packages/timezones/timezones_cvs.bb b/packages/timezones/timezones_cvs.bb
index 4b6a814..5b5677b 100644 (file)
--- a/packages/timezones/timezones_cvs.bb
+++ b/packages/timezones/timezones_cvs.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 PV = "1.1.9+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/root"
 S = "${WORKDIR}/root"
@@ -20,7 +20,7 @@ python populate_packages_prepend() {
         pkgpattern = "timezones-%s"
         pkgdescription = "Timezone for %s"
 
-        do_split_packages(d, root='${datadir}/zoneinfo/', file_regex=pkgregex, output_pattern=pkgpattern, 
+        do_split_packages(d, root=bb.data.expand('${datadir}/zoneinfo/', d), file_regex=pkgregex, output_pattern=pkgpattern, 
                           description=pkgdescription,allow_dirs=True )
 }