diff options
| author | Lorn Potter <lpotter@trolltech.com> | 2004-08-18 21:35:27 +0000 |
|---|---|---|
| committer | Lorn Potter <lpotter@trolltech.com> | 2004-08-18 21:35:27 +0000 |
| commit | 9bbb395ed5dcc00cd212efa74636931b09fe0cbf (patch) | |
| tree | 409b5eff32a71173ab13e8e387579f0ce9cf0b67 | |
| parent | 58e29da5ea6b3b5b01c6d54a5fc35aeaa6c17824 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into polarbear.trolltech.com.au:/mnt/hdb1/oe2/packages
2004/08/19 07:25:03+10:00 trolltech.com.au!lpotter
poodle needs small console fonts
BKrev: 4123cb9f1mSi-6nBnKEx7rF55y1N5w
3 files changed, 7 insertions, 3 deletions
diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle index 789aba23ab..ed0e69a439 100644 --- a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/defconfig-poodle @@ -879,11 +879,12 @@ CONFIG_FBCON_ROTATE_R=y # CONFIG_FBCON_ROTATE_L is not set # CONFIG_FBCON_FONTWIDTH8_ONLY is not set CONFIG_FBCON_FONTS=y -CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y +# CONFIG_FONT_8x8 is not set +# CONFIG_FONT_8x16 is not set # CONFIG_FONT_SUN8x16 is not set # CONFIG_FONT_SUN12x22 is not set # CONFIG_FONT_6x11 is not set +CONFIG_FONT_4x6=y # CONFIG_FONT_PEARL_8x8 is not set # CONFIG_FONT_ACORN_8x8 is not set diff --git a/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/smallfonts.diff b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/smallfonts.diff new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/linux/openzaurus-pxa-2.4.18-rmk7-pxa3-embedix20031107/smallfonts.diff diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe index 9fa796a0a1..93034cc296 100644 --- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe +++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe @@ -35,7 +35,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \ file://disable-pcmcia-probe.patch;patch=1 \ file://linux-2.4.18-list_move.patch;patch=1 \ file://defconfig-${MACHINE}" - +if [ "${MACHINE}" == "poodle" ] + then + SRC_URI += "file://smallfonts.diff;patch=1" +fi # apply this when we have a kernel that builds with gcc 3.x: # SRC_URI_append = file://machtune-args.patch;patch=1 |