From 0e8ec4bdb0fe7c774664c58dd5749243de43c944 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Thu, 16 Jun 2005 19:40:09 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/06/16 20:13:21+01:00 reciva.com!pb round up escaped Xprint bits 2005/06/16 19:59:03+01:00 reciva.com!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mill.internal.reciva.com:/nexus/home/pb/oe/oe 2005/06/16 19:56:15+01:00 reciva.com!pb use $D, not ${D} 2005/06/16 20:52:57+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/16 20:52:32+02:00 mn-solutions.de!schurig some MNCI/RT3000 changes to base-files and mnci.conf 2005/06/16 20:51:32+02:00 mn-solutions.de!schurig classes/qpf.bbclass: allow font names like terminus-bold_240_75_t5.qpf 2005/06/15 12:44:41+02:00 mn-solutions.de!schurig Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/ into mnz66.mn-solutions.de:/usr/src/mnci54/oe 2005/06/15 12:44:17+02:00 mn-solutions.de!schurig more MNCI & RT3000 related changes BKrev: 42b1d599T2HX_lr1efBC_rS0YIhYBA --- classes/qpf.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/qpf.bbclass') diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index 7346b45c3d..d6e58871d5 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -26,7 +26,7 @@ python populate_packages_prepend() { postinst = bb.data.getVar('pkg_postinst_fonts', d, 1) postrm = bb.data.getVar('pkg_postrm_fonts', d, 1) fontdir = bb.data.getVar('palmtopdir', d, 1) + '/lib/fonts' - pkgregex = "^([a-z]*_[0-9]*).*.qpf$" + pkgregex = "^([a-z-]*_[0-9]*).*.qpf$" pkgpattern = bb.data.getVar('QPF_PKGPATTERN', d, 1) or 'qpf-%s' pkgdescription = bb.data.getVar('QPF_DESCRIPTION', d, 1) or 'QPF font %s' -- cgit 1.2.3-korg