diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-07 11:11:46 +0000 |
|---|---|---|
| committer | Florian Boor <florian.boor@kernelconcepts.de> | 2006-08-07 11:11:46 +0000 |
| commit | 298dd441a0efb859be6fc0da4b3ae069e3b1de3f (patch) | |
| tree | 32c081aca477ae67b953f441331ccb186654e009 /conf | |
| parent | af5f0bd309b34453fcc397c05ed34c33f53f33ef (diff) | |
| parent | 578337a073332bac0da58ce23ded325ae294b035 (diff) | |
merge of 70cd861a84040db0f14008d8552b1f2dbc5c8084
and a7904b535294d222e83d153c9fc22b575a5952c4
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | conf/machine/ipaq-pxa270.conf | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index c9192b6720..0a141f883e 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -341,7 +341,7 @@ MKTEMPCMD = "mktemp -q ${TMPBASE}" # Program to be used to patch sources, use 'inherit patcher' to overwrite this: PATCHCLEANCMD = 'if [ -n "`quilt applied`" ]; then quilt pop -a -R -f || exit 1; fi' -PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -n $name $patch; chmod u+w patches/$name; quilt push" +PATCHCMD = "pnum='%s'; name='%s'; patch='%s'; mkdir -p patches ; quilt upgrade >/dev/null 2>&1; quilt import -f -p $pnum -P $name $patch; chmod u+w patches/$name; quilt push" PATCH_DEPENDS = "quilt-native" # GNU patch tries to be intellgent about checking out read-only files from diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 020e3f98a3..058f39214e 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -51,7 +51,7 @@ PREFERRED_VERSION_freetype = "2.2.1" #Small machines prefer kdrive, but we might ship full Xorg in other images PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" -PREFERRED_PROVIDER_xserver ?= "xserver-drive" +PREFERRED_PROVIDER_xserver ?= "xserver-kdrive" require conf/distro/include/preferred-xorg-versions-X11R7.1.inc diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index f509cd0a5d..fa3675fb59 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv4t iwmmxt armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" #use this for a hx47xx ipaq PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6" @@ -37,10 +37,10 @@ include conf/machine/include/handheld-common.conf GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. -include conf/machine/include/tune-xscale.conf +#include conf/machine/include/tune-xscale.conf # Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first -#include conf/machine/include/tune-iwmmxt.conf +include conf/machine/include/tune-iwmmxt.conf # These modules are now compiled into the kernel: |