summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2006-08-28 21:02:46 +0000
committerPhilip Balister <philip@balister.org>2006-08-28 21:02:46 +0000
commit2a9423d673ebfff421e0f5b1df53e08550b37f3d (patch)
tree0bd7b427617aee432516daebae29e6bcd3c57be0 /conf
parente46b6716b194488fc8eef47d29b1129806c3bd46 (diff)
parent8e9d509513711a45f5a6dce57226bf5afaa274c9 (diff)
merge of '924dc0c33239a73b288ecbb58f6d2ffae8848ed4'
and 'aebf88ce897b2503c671d3dd0b5828248df55257'
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf12
-rw-r--r--conf/machine/dht-walnut.conf20
-rw-r--r--conf/machine/rb500.conf8
3 files changed, 34 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 9f94bae3f5..2e3cb0f980 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -239,6 +239,12 @@ export MAKE = "make"
EXTRA_OEMAKE = "-e MAKEFLAGS="
##################################################################
+# Patch handling.
+##################################################################
+PATCHTOOL = 'quilt'
+PATCHRESOLVE = 'user'
+
+##################################################################
# Build flags and options.
##################################################################
@@ -336,12 +342,6 @@ SRC_URI = "file://${FILE}"
MKTEMPDIRCMD = "mktemp -d -q ${TMPBASE}"
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 -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
# a RCS, which freaks out those special folks with active Perforce clients
# the following makes patch ignore RCS:
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
new file mode 100644
index 0000000000..68b754f2d3
--- /dev/null
+++ b/conf/machine/dht-walnut.conf
@@ -0,0 +1,20 @@
+TARGET_ARCH = "powerpc"
+IPKG_ARCHS = "all powerpc ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-dht-walnut"
+
+#TARGET_FPU = "soft"
+TARGET_CPU = "405"
+OLDEST_KERNEL = "2.6.9"
+
+# TARGET_VENDOR = "-oe"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev"
+
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.5"
+# GLIBC_ADDONS = "nptl"
+# GLIBC_EXTRA_OECONF = "--with-tls"
+
+
diff --git a/conf/machine/rb500.conf b/conf/machine/rb500.conf
new file mode 100644
index 0000000000..aec2a8f726
--- /dev/null
+++ b/conf/machine/rb500.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Mikrotik RB500
+#@DESCRIPTION: Machine configuration for the MIPS based Routerboard
+
+TARGET_ARCH = "mipsel"
+TARGET_CC_ARCH = "-Os -mips2"
+IPKG_ARCHS = "all mipsel ${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-rb500"