diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-23 14:49:31 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-23 14:49:31 +0000 |
| commit | 7800aa9b73b83aa07a4a10a6fda5d38c7b7a0bbe (patch) | |
| tree | 15c46c35c936b57cee0b9b68201859e83e877941 /packages | |
| parent | 9d3ba52bd742a24364085b377f168ff5b9898778 (diff) | |
| parent | a84b8856d44ae9b2f1d7db80da352a6bc04bce35 (diff) | |
merge of '39d1f65c6c8cf68a17022bdb86f69174b4586b1d'
and 'b1648e5bdf9c5d143bff2e5197a4b295ce80262b'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/mainstone-kernel_2.6.18.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 15 |
2 files changed, 5 insertions, 14 deletions
diff --git a/packages/linux/mainstone-kernel_2.6.18.bb b/packages/linux/mainstone-kernel_2.6.18.bb index 6b90f73f3e..d17b6097b8 100644 --- a/packages/linux/mainstone-kernel_2.6.18.bb +++ b/packages/linux/mainstone-kernel_2.6.18.bb @@ -2,12 +2,12 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for the Mainstone (PXA270 ref design)" LICENSE = "GPL" MAINTAINER = "Cliff Brake <cliff.brake@gmail.com>" -PR = "r0 +PR = "r0" SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.bz2 \ file://mainstone_defconfig" -S = "${WORKDIR}/linux-2.6.18 +S = "${WORKDIR}/linux-2.6.18" COMPATIBLE_HOST = 'arm.*-linux' diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 27632f628c..198556c58d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -62,19 +62,10 @@ EXTRA_OECONF = "--enable-composite --enable-sdl --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx --enable-w100 \ + --disable-dmx \ --with-default-font-path=built-ins \ --enable-tslib --enable-xcalibrate \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" -# w100 doesn't build for x86 -EXTRA_OECONF_x86 = "--enable-composite --enable-sdl --enable-kdrive \ - --disable-dga --disable-dri --disable-xinerama \ - --disable-xf86misc --disable-xf86vidmode \ - --disable-xorg --disable-xorgcfg \ - --disable-xkb --disable-xnest --disable-xvfb \ - --disable-xevie --disable-xprint --disable-xtrap \ - --disable-dmx --disable-w100 \ - --with-default-font-path=built-ins \ - --enable-tslib --enable-xcalibrate \ - ac_cv_file__usr_share_X11_sgml_defs_ent=no" +EXTRA_OECONF_append_arm = " --enable-w100" +EXTRA_OECONF_append_x86 = " --disable-w100" |