From c11afe579262bdabdf3af8fdfcb24b3598bf0232 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Mon, 2 Jun 2003 21:41:34 +0000
Subject: Initial add of some package metadata.  Set OEDIR to an appropriate
 value based on the location of the upstream oe.conf & friends.

BKrev: 3edbc48evmfLau_MeGY-hUtHUWTSEg
---
 conf/PLACEHOLDER | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conf/PLACEHOLDER

(limited to 'conf')

diff --git a/conf/PLACEHOLDER b/conf/PLACEHOLDER
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From 7b8ba36d7179b809a8d2e82d250f8209a418f946 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Fri, 26 Sep 2003 23:09:24 +0000
Subject: Add sample local.conf.

BKrev: 3f74c724wvQtUt1q3J5xpTUe9KKG6Q
---
 conf/local.conf.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conf/local.conf.sample

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From 3c215bde798c3da3f19b343649d13d4a0eb1b46d Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 27 Sep 2003 06:07:48 +0000
Subject: Adjust greg's recent changesets to the new repository structure.

BKrev: 3f752934WZeI4hMB6HISkB4NTfsZ9w
---
 conf/PLACEHOLDER | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 conf/PLACEHOLDER

(limited to 'conf')

diff --git a/conf/PLACEHOLDER b/conf/PLACEHOLDER
deleted file mode 100644
index e69de29bb2..0000000000
-- 
cgit v1.2.3


From af4d5d0cfd2e6ae07d861c29af74f0ef7aa2d18f Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Wed, 24 Mar 2004 15:18:31 +0000
Subject: Update the local.conf.sample per the recent OE changes.

BKrev: 4061a6c7wFHqmRrSHEN81IZroqLxiA
---
 conf/local.conf.sample | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e69de29bb2..8083255286 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -0,0 +1,7 @@
+TARGET_ARCH = "arm"
+DL_DIR = "${HOME}/sources"
+OEFILES = "*/*.oe"
+# NOTE: only recent oemake's obey OEMASK directly
+OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia)"
+
+#INHERIT = "package_tar"
-- 
cgit v1.2.3


From 8963054b0dff67759f7b0ac0f8368da51f616951 Mon Sep 17 00:00:00 2001
From: Greg Gilbert <greg@treke.net>
Date: Wed, 7 Apr 2004 20:01:00 +0000
Subject: local.conf.sample:   Adding toolchain-external to the default sample
 oemask. Remove it   if you want to use a prebuilt toolchain.

BKrev: 40745dfc24KQ55tOsPB25kniIHOC2Q
---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 8083255286..cb42948700 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -2,6 +2,6 @@ TARGET_ARCH = "arm"
 DL_DIR = "${HOME}/sources"
 OEFILES = "*/*.oe"
 # NOTE: only recent oemake's obey OEMASK directly
-OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia)"
+OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|toolchain-external)"
 
 #INHERIT = "package_tar"
-- 
cgit v1.2.3


From 092c4db8d07a0d236e5efca15d1e52fdb87da55d Mon Sep 17 00:00:00 2001
From: Greg Gilbert <greg@treke.net>
Date: Fri, 9 Apr 2004 06:05:27 +0000
Subject: local.conf.sample:   Adding a commented out OEMASK for people using
 external toolchains. Unmasking gcc and binutils in the default OEMASK

BKrev: 40763d27DmOVP-a5K_GV6Ege5W3s3A
---
 conf/local.conf.sample | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index cb42948700..69f796ce30 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -2,6 +2,10 @@ TARGET_ARCH = "arm"
 DL_DIR = "${HOME}/sources"
 OEFILES = "*/*.oe"
 # NOTE: only recent oemake's obey OEMASK directly
-OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|toolchain-external)"
+OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external)"
+
+# Use this OEMASK if you want to use a prebuild toolchain. You will need to provide packages for toolchain
+# specific libraries yourself
+OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia)"
 
 #INHERIT = "package_tar"
-- 
cgit v1.2.3


From 6dbd9d40e77ecb293a2a1acaf9655c7d0c8c561b Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 17 Apr 2004 17:44:43 +0000
Subject: add more settings and documentation to local.conf.sample

BKrev: 40816d0br06SZQyBsd2UqnrOUo-N6g
---
 conf/local.conf.sample | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 69f796ce30..59fe1a6650 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,11 +1,35 @@
-TARGET_ARCH = "arm"
+#
+# OpenEmbedded local configuration file (sample)
+#
+
+# Use this to specify where OE should place the downloaded sources into
 DL_DIR = "${HOME}/sources"
+
+# Use this to specify what .oe files to consider for builds
 OEFILES = "*/*.oe"
-# NOTE: only recent oemake's obey OEMASK directly
+
+# Note that only recent oemake's obey OEMASK directly, in earlier versions,
+# you had to filter by hand and populate OEFILES accordingly
+# Use the OEMASK below unless you want to build something else than the default glibc based setup
 OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external)"
 
-# Use this OEMASK if you want to use a prebuild toolchain. You will need to provide packages for toolchain
-# specific libraries yourself
-OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia)"
+# Uncomment this OEMASK, if you want to use a prebuild toolchain.
+# You will need to provide packages for toolchain specific libraries yourself
+#OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia)"
+
+# Uncomment this to specify where OE should create its temporary files.
+# Note that a fully build of everything in OE will take GigaBytes of hard disk space,
+# so make sure to free enough space. The default TMPDIR is <package directory>/tmp
+#TMPDIR = /usr/local/projects/oetmp
+
+# Uncomment this to specify a machine to build for. See <oe>/conf/*.conf for machines
+# currently known to OpenEmbedded.
+#MACHINE = "collie"
+
+# Use this to specify the target architecture. Note that this is only needed when building
+# for a machine not known to OpenEmbedded. Better use the MACHINE attribute (see above)
+TARGET_ARCH = "arm"
 
+# Uncomment this to build .tar packages during the build process.
+# Also supported is "package_ipk"
 #INHERIT = "package_tar"
-- 
cgit v1.2.3


From 5b4c02f52c8a146fd9a417033d38e6aebd627680 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 12:58:23 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/packages

2004/04/23 14:58:12+02:00 uni-frankfurt.de!mickeyl
mask out glibc-cvs in the default configuration.
if that doesn't work, why isn't it in nonworking then?

BKrev: 408912ef6U-dmdsRgJ7o6IUkVMXfvg
---
 conf/local.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 59fe1a6650..79179d60e1 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -11,11 +11,11 @@ OEFILES = "*/*.oe"
 # Note that only recent oemake's obey OEMASK directly, in earlier versions,
 # you had to filter by hand and populate OEFILES accordingly
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
-OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external)"
+OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external|glibc-cvs)"
 
 # Uncomment this OEMASK, if you want to use a prebuild toolchain.
 # You will need to provide packages for toolchain specific libraries yourself
-#OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia)"
+#OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|glibc-cvs)"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a fully build of everything in OE will take GigaBytes of hard disk space,
-- 
cgit v1.2.3


From f20b10080fcdad1c44f11d471023b88ff5802590 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 13:06:25 +0000
Subject: s/glibc-cvs/glibc_cvs/

BKrev: 408914d11z_zT3sE94Q4cpwjZJ-veg
---
 conf/local.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 79179d60e1..bb67e7f027 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -11,11 +11,11 @@ OEFILES = "*/*.oe"
 # Note that only recent oemake's obey OEMASK directly, in earlier versions,
 # you had to filter by hand and populate OEFILES accordingly
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
-OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external|glibc-cvs)"
+OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external|glibc_cvs)"
 
 # Uncomment this OEMASK, if you want to use a prebuild toolchain.
 # You will need to provide packages for toolchain specific libraries yourself
-#OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|glibc-cvs)"
+#OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|glibc_cvs)"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a fully build of everything in OE will take GigaBytes of hard disk space,
-- 
cgit v1.2.3


From 4cee67d2b20da1a36de74bcf63259fe4d88b8322 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 18:59:52 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/packages

2004/04/23 20:59:45+02:00 uni-frankfurt.de!mickeyl
reduce OEMASK to just grub and toolchain-external; handle qte, qpe and libc with PREFERRED_PROVIDERS - patch courtesy pb_.

BKrev: 408967a832OlnPWRcyzmfzqsCbSu1g
---
 conf/local.conf.sample | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index bb67e7f027..96e9b0ed1d 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -11,12 +11,15 @@ OEFILES = "*/*.oe"
 # Note that only recent oemake's obey OEMASK directly, in earlier versions,
 # you had to filter by hand and populate OEFILES accordingly
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
-OEMASK = "(uclibc|avr-libc|linux|grub|qte_|qte-for-qtopia|toolchain-external|glibc_cvs)"
+OEMASK = "(grub|toolchain-external)"
 
 # Uncomment this OEMASK, if you want to use a prebuild toolchain.
 # You will need to provide packages for toolchain specific libraries yourself
 #OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|glibc_cvs)"
 
+# Select between multiple alternative providers, if more than one is eligible
+PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a fully build of everything in OE will take GigaBytes of hard disk space,
 # so make sure to free enough space. The default TMPDIR is <package directory>/tmp
-- 
cgit v1.2.3


From 5474e0a8d4f42e1a14f386de099b981cdfb940e6 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Fri, 23 Apr 2004 20:39:04 +0000
Subject: Merge openembedded@openembedded.bkbits.net:packages into
 linux.local:/home/kergoth/code/packages

2004/04/23 16:39:01-04:00 local!kergoth
Correct TMPDIR description, and fix the external toolchain OEMASK, in local.conf.sample.

BKrev: 40897ee8zr0nRQ8FzTwKRezOH9WBKw
---
 conf/local.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 96e9b0ed1d..e16a07ad12 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -15,14 +15,14 @@ OEMASK = "(grub|toolchain-external)"
 
 # Uncomment this OEMASK, if you want to use a prebuild toolchain.
 # You will need to provide packages for toolchain specific libraries yourself
-#OEMASK = "-initial|/(binutils|uclibc|avr-libc|gcc|linux|grub|qte_|qte-for-qtopia|glibc_cvs)"
+#OEMASK = "(grub)"
 
 # Select between multiple alternative providers, if more than one is eligible
 PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a fully build of everything in OE will take GigaBytes of hard disk space,
-# so make sure to free enough space. The default TMPDIR is <package directory>/tmp
+# so make sure to free enough space. The default TMPDIR is <build directory>/tmp
 #TMPDIR = /usr/local/projects/oetmp
 
 # Uncomment this to specify a machine to build for. See <oe>/conf/*.conf for machines
-- 
cgit v1.2.3


From 13a479f63bd2fa8e73612be277e079e0bc60466f Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 21:28:13 +0000
Subject: remove grub from default OEMASK - patch courtesy pb_.

BKrev: 40898a6dW9W9uhv1fOW4HLuJCWnKCA
---
 conf/local.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e16a07ad12..70c010e097 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -11,11 +11,11 @@ OEFILES = "*/*.oe"
 # Note that only recent oemake's obey OEMASK directly, in earlier versions,
 # you had to filter by hand and populate OEFILES accordingly
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
-OEMASK = "(grub|toolchain-external)"
+OEMASK = "(toolchain-external)"
 
 # Uncomment this OEMASK, if you want to use a prebuild toolchain.
 # You will need to provide packages for toolchain specific libraries yourself
-#OEMASK = "(grub)"
+#OEMASK = "()"
 
 # Select between multiple alternative providers, if more than one is eligible
 PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-- 
cgit v1.2.3


From b9bbe6f906fa165ffa9d249545490c040132572a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 21:31:11 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/04/23 23:31:04+02:00 uni-frankfurt.de!mickey
fix typo

BKrev: 40898b1fvmx2pwsBxhp0nXerVBz54A
---
 conf/local.conf.sample | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 70c010e097..eaf55109e4 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -8,20 +8,20 @@ DL_DIR = "${HOME}/sources"
 # Use this to specify what .oe files to consider for builds
 OEFILES = "*/*.oe"
 
-# Note that only recent oemake's obey OEMASK directly, in earlier versions,
+# Note that only recent oemake's obey OEMASK directly. In earlier versions
 # you had to filter by hand and populate OEFILES accordingly
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
 OEMASK = "(toolchain-external)"
 
-# Uncomment this OEMASK, if you want to use a prebuild toolchain.
-# You will need to provide packages for toolchain specific libraries yourself
+# Uncomment this OEMASK, if you want to use a prebuilt toolchain.
+# You will need to provide packages for toolchain and additional libraries yourself
 #OEMASK = "()"
 
-# Select between multiple alternative providers, if more than one is eligible
+# Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 
 # Uncomment this to specify where OE should create its temporary files.
-# Note that a fully build of everything in OE will take GigaBytes of hard disk space,
+# Note that a full build of everything in OE will take GigaBytes of hard disk space,
 # so make sure to free enough space. The default TMPDIR is <build directory>/tmp
 #TMPDIR = /usr/local/projects/oetmp
 
-- 
cgit v1.2.3


From 10f57c847219e356274c39d40a9296ddd7d4f618 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 21:32:08 +0000
Subject: readd -initial to OEMASK

BKrev: 40898b58VMEYm0fsR7_KWpr7fA9x5Q
---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index eaf55109e4..5c111f7175 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -15,7 +15,7 @@ OEMASK = "(toolchain-external)"
 
 # Uncomment this OEMASK, if you want to use a prebuilt toolchain.
 # You will need to provide packages for toolchain and additional libraries yourself
-#OEMASK = "()"
+#OEMASK = "-initial|()"
 
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
-- 
cgit v1.2.3


From 8a7b4af253d5c4139a7f729cfa09212c99c9c1b8 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 23 Apr 2004 23:18:49 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 gandalf.tm.informatik.uni-frankfurt.de:/usr/local/projects/packages

2004/04/24 01:18:42+02:00 uni-frankfurt.de!mickeyl
illustrate DISTRO in local.conf.sample - patch courtesy pb_.

BKrev: 4089a459r9gS4pO-CvAC1XxjAgFDdg
---
 conf/local.conf.sample | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 5c111f7175..e5ecd661aa 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -33,6 +33,10 @@ PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqp
 # for a machine not known to OpenEmbedded. Better use the MACHINE attribute (see above)
 TARGET_ARCH = "arm"
 
+# Uncomment this to select a distribution policy.
+#DISTRO = "familiar"
+
 # Uncomment this to build .tar packages during the build process.
 # Also supported is "package_ipk"
+# Usually better to set DISTRO instead (see above)
 #INHERIT = "package_tar"
-- 
cgit v1.2.3


From 9fd9d7cd84d2fec07c1c279b9ce7df6d74294565 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 26 Apr 2004 12:37:23 +0000
Subject: add preferred provider for libsdl

BKrev: 408d0283Jkx12T-Nenfy2mtTp3Cdew
---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e5ecd661aa..2599e7dd71 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -18,7 +18,7 @@ OEMASK = "(toolchain-external)"
 #OEMASK = "-initial|()"
 
 # Select between multiple alternative providers, if more than one is eligible.
-PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie virtual/libsdl:libsdl-qpe"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a full build of everything in OE will take GigaBytes of hard disk space,
-- 
cgit v1.2.3


From 5c76c320af6f82794823215c081469d3de8e64e4 Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Tue, 27 Apr 2004 02:53:54 +0000
Subject: - binutils 2.15.90.0.3 / gcc 3.4.0 toolchain - support in glibc and
 uclibc for gcc 3.4.0 - new target setup for uclibc, TARGET_OS=linux-uclibc to
 match the uclibc   project's setup and modern config.sub already has support
 for it.

BKrev: 408dcb42JOaGKxGg3PSn6IwU4Kimfw
---
 conf/local.conf.sample | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 2599e7dd71..8ee6887cca 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -33,6 +33,12 @@ PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqp
 # for a machine not known to OpenEmbedded. Better use the MACHINE attribute (see above)
 TARGET_ARCH = "arm"
 
+# Use this to specify the target operating system.  This is "linux" for a normal
+# linux system with glibc.  Set this to "linux-uclibc" if you want to build a
+# uclibc based system.
+#TARGET_OS = "linux"
+#TARGET_OS = "linux-uclibc"
+
 # Uncomment this to select a distribution policy.
 #DISTRO = "familiar"
 
-- 
cgit v1.2.3


From af8f5c1e9c1ea0da47d154896dbd181dd0e1bffd Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 30 Apr 2004 17:11:49 +0000
Subject: replace toolchain-external with ASSUME_PROVIDED, and supply default
 CACHE - patch courtesy pb_.

BKrev: 409288d5J6L1ISDoL1nbkJZ9paLQSQ
---
 conf/local.conf.sample | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 8ee6887cca..060520d373 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -13,9 +13,9 @@ OEFILES = "*/*.oe"
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
 OEMASK = "(toolchain-external)"
 
-# Uncomment this OEMASK, if you want to use a prebuilt toolchain.
+# Uncomment this if you want to use a prebuilt toolchain.
 # You will need to provide packages for toolchain and additional libraries yourself
-#OEMASK = "-initial|()"
+# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie virtual/libsdl:libsdl-qpe"
@@ -46,3 +46,6 @@ TARGET_ARCH = "arm"
 # Also supported is "package_ipk"
 # Usually better to set DISTRO instead (see above)
 #INHERIT = "package_tar"
+
+# Comment this out if you do not wish to use a parse cache
+CACHE=/var/tmp/oe-cache.${USER}
-- 
cgit v1.2.3


From 9ed8fdba4602bac0c22ce36afc866689f77727a1 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 2 May 2004 15:43:50 +0000
Subject: add comment for ASSUME_PROVIDED usage w/ linux 2.4 embedix

BKrev: 40951736OtVgc0PJwk6oKJ2j_zx1lg
---
 conf/local.conf.sample | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 060520d373..1f64a1b062 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -15,7 +15,9 @@ OEMASK = "(toolchain-external)"
 
 # Uncomment this if you want to use a prebuilt toolchain.
 # You will need to provide packages for toolchain and additional libraries yourself
-# ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
+# You will definitly need to say ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" to build any of two
+# Linux 2.4 Embedix kernels, i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18.
+#ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie virtual/libsdl:libsdl-qpe"
@@ -47,5 +49,5 @@ TARGET_ARCH = "arm"
 # Usually better to set DISTRO instead (see above)
 #INHERIT = "package_tar"
 
-# Comment this out if you do not wish to use a parse cache
+#Comment this out if you do not wish to use a parse cache (not recommended).
 CACHE=/var/tmp/oe-cache.${USER}
-- 
cgit v1.2.3


From 643ac8a808c00971eb44b7712b9aac0b84b17502 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 May 2004 15:39:36 +0000
Subject: catch up with external-toolchain lossage

BKrev: 409667b8Km7W_QpaVM488qlStfXo4w
---
 conf/local.conf.sample | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 1f64a1b062..edbb1e6572 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -8,10 +8,8 @@ DL_DIR = "${HOME}/sources"
 # Use this to specify what .oe files to consider for builds
 OEFILES = "*/*.oe"
 
-# Note that only recent oemake's obey OEMASK directly. In earlier versions
-# you had to filter by hand and populate OEFILES accordingly
 # Use the OEMASK below unless you want to build something else than the default glibc based setup
-OEMASK = "(toolchain-external)"
+OEMASK = ""
 
 # Uncomment this if you want to use a prebuilt toolchain.
 # You will need to provide packages for toolchain and additional libraries yourself
-- 
cgit v1.2.3


From 2ee471598276af8ac6a531bfa29321782eb95cdb Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Mon, 3 May 2004 18:10:09 +0000
Subject: add notes about OEDEBUG and OEINCLUDELOGS We should follow the habit
 of documenting every useful variable in local.conf.sample before we forget
 them ;)

BKrev: 40968b01MhDoprM0qyOkZZPiaDdjHA
---
 conf/local.conf.sample | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index edbb1e6572..637fbc3f25 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -47,5 +47,11 @@ TARGET_ARCH = "arm"
 # Usually better to set DISTRO instead (see above)
 #INHERIT = "package_tar"
 
-#Comment this out if you do not wish to use a parse cache (not recommended).
+# Comment this out if you do not wish to use a parse cache (not recommended).
 CACHE=/var/tmp/oe-cache.${USER}
+
+# Uncomment this if you want OE to emit debugging output
+#OEDEBUG = "yes"
+
+# Uncomment this if you want OE to emit the log if a build fails.
+#OEINCLUDELOGS = "yes"
-- 
cgit v1.2.3


From 606503bd1fe275b8ee2662d7ea3c44d3378d4ef5 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 5 May 2004 22:58:46 +0000
Subject: add default CVS_TARBALL_STASH to local.conf.sample - patch courtesy
 pb_.

BKrev: 409971a6SXyRtStHcICbdKUNvNKHPA
---
 conf/local.conf.sample | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 637fbc3f25..c853a6c5bd 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -55,3 +55,8 @@ CACHE=/var/tmp/oe-cache.${USER}
 
 # Uncomment this if you want OE to emit the log if a build fails.
 #OEINCLUDELOGS = "yes"
+
+# Specifies a location to search for pre-generated tarballs when fetching
+# a cvs:// URI.  Comment this out if you always want to pull directly 
+# from the CVS tree.
+CVS_TARBALL_STASH = "http://www.treke.net/oe/source/"
-- 
cgit v1.2.3


From 8ac75c8ecf9296d8a3b8ed3c453abf49429d19a8 Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Tue, 11 May 2004 04:46:22 +0000
Subject: update local.conf sample to nuke unneccsary prefprov example

BKrev: 40a05a9eh0gzdGr5RpKWfbYxj-DnXw
---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index c853a6c5bd..d3d1f6fbbe 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -18,7 +18,7 @@ OEMASK = ""
 #ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Select between multiple alternative providers, if more than one is eligible.
-PREFERRED_PROVIDERS = "virtual/libc:glibc virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie virtual/libsdl:libsdl-qpe"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a full build of everything in OE will take GigaBytes of hard disk space,
-- 
cgit v1.2.3


From 46b90c522ed51c1a985ad02039952dd8f9204196 Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Thu, 13 May 2004 05:59:06 +0000
Subject: clean up local.conf.sample as if it were documentation or something.

BKrev: 40a30eaa6mR3f0bAhbDp6qHlkATVGg
---
 conf/local.conf.sample | 60 ++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 44 insertions(+), 16 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index d3d1f6fbbe..ebd6682297 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,41 +1,65 @@
 #
 # OpenEmbedded local configuration file (sample)
 #
+# Please visit the Wiki at http://openembedded.org/ for more info.
+#
+
+# Be SURE to read these comments and setup your build environment before
+# proceeding.  Once you have done that, remove the line at the end of this
+# file and build away.
+
+# The recommended setup is to create a build directory, such as
+# ${HOME}/oe/build/ (you may want to put OE and the packages into your
+# ${HOME}/oe/oe/ and ${HOME}/oe/packages/ respectively too).  Within your
+# build environment, you should copy this file into conf/local.conf, and
+# then EDIT IT.  Fixup any paths to point to the correct locations, and
+# setup the target specifications appropriately.
+
+# Once you have done that, you will want to cd into your build environment
+# (${HOME}/oe/build/ in this example), then run "oemake targets..."  This
+# will build into ${TMPDIR} which defaults to ${TOPDIR}/tmp (${TOPDIR} is
+# the current directory when oemake was executed).
 
 # Use this to specify where OE should place the downloaded sources into
 DL_DIR = "${HOME}/sources"
 
 # Use this to specify what .oe files to consider for builds
-OEFILES = "*/*.oe"
+OEFILES = "/path/to/packages/*/*.oe"
 
-# Use the OEMASK below unless you want to build something else than the default glibc based setup
+# Use the OEMASK below unless you want to build something else than the
+# default glibc based setup
 OEMASK = ""
 
-# Uncomment this if you want to use a prebuilt toolchain.
-# You will need to provide packages for toolchain and additional libraries yourself
-# You will definitly need to say ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95" to build any of two
-# Linux 2.4 Embedix kernels, i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18.
+# Uncomment this if you want to use a prebuilt toolchain.  You will need to
+# provide packages for toolchain and additional libraries yourself You will
+# definitely need to say:
+#     ASSUME_PROVIDED = "virtual/arm-linux-gcc-2.95"
+# to build any of two Linux 2.4 Embedix kernels,
+# i.e. openzaurus-sa-2.4.18 and openzaurus-pxa-2.4.18.
 #ASSUME_PROVIDED = "virtual/${TARGET_PREFIX}gcc virtual/libc"
 
 # Select between multiple alternative providers, if more than one is eligible.
-PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
+PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
 
 # Uncomment this to specify where OE should create its temporary files.
-# Note that a full build of everything in OE will take GigaBytes of hard disk space,
-# so make sure to free enough space. The default TMPDIR is <build directory>/tmp
+# Note that a full build of everything in OE will take GigaBytes of hard
+# disk space, so make sure to free enough space. The default TMPDIR is
+# <build directory>/tmp
 #TMPDIR = /usr/local/projects/oetmp
 
-# Uncomment this to specify a machine to build for. See <oe>/conf/*.conf for machines
-# currently known to OpenEmbedded.
+# Uncomment this to specify a machine to build for. See <oe>/conf/*.conf
+# for machines currently known to OpenEmbedded.
 #MACHINE = "collie"
 
-# Use this to specify the target architecture. Note that this is only needed when building
-# for a machine not known to OpenEmbedded. Better use the MACHINE attribute (see above)
+# Use this to specify the target architecture. Note that this is only
+# needed when building for a machine not known to OpenEmbedded. Better use
+# the MACHINE attribute (see above)
 TARGET_ARCH = "arm"
 
-# Use this to specify the target operating system.  This is "linux" for a normal
-# linux system with glibc.  Set this to "linux-uclibc" if you want to build a
-# uclibc based system.
+# Use this to specify the target operating system.  This is "linux" for a
+# normal linux system with glibc.  Set this to "linux-uclibc" if you want
+# to build a uclibc based system.
 #TARGET_OS = "linux"
 #TARGET_OS = "linux-uclibc"
 
@@ -60,3 +84,7 @@ CACHE=/var/tmp/oe-cache.${USER}
 # a cvs:// URI.  Comment this out if you always want to pull directly 
 # from the CVS tree.
 CVS_TARBALL_STASH = "http://www.treke.net/oe/source/"
+
+# EDIT THIS FILE and then remove the line below before using
+REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
+
-- 
cgit v1.2.3


From 78e5bdcf2b7a5c6f6253bb79dff74a705c23eb80 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Thu, 13 May 2004 22:40:15 +0000
Subject: test commit

BKrev: 40a3f94f2BenIClbULk_2pHZDMf0oQ
---
 conf/local.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index ebd6682297..e3826ed0eb 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -85,6 +85,6 @@ CACHE=/var/tmp/oe-cache.${USER}
 # from the CVS tree.
 CVS_TARBALL_STASH = "http://www.treke.net/oe/source/"
 
-# EDIT THIS FILE and then remove the line below before using
+# EDIT THIS FILE and then remove the line below before using!
 REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
 
-- 
cgit v1.2.3


From b709e21beeef14aef785627968bb49a2a6ac7724 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 15 May 2004 10:13:47 +0000
Subject: Add gcc-snapshot builds, currently from CVS HEAD.

NOTE: You *need* to update your local.conf per the
current PREFERRED_PROVIDERS in local.conf.sample!

BKrev: 40a5ed5bYhe3m6mCjn8sHnhfoAxLqg
---
 conf/local.conf.sample | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e3826ed0eb..ddcbaa5adb 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -41,6 +41,9 @@ OEMASK = ""
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-snapshot-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-snapshot-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-snapshot-cross"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a full build of everything in OE will take GigaBytes of hard
-- 
cgit v1.2.3


From 36451af74db8f0cbb93ff65126a978b9e90e15e6 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Mon, 17 May 2004 00:19:42 +0000
Subject: Correct the toolchain default providers.

BKrev: 40a8051e4Jy-Jd6AwLP7IUgg4CVqdg
---
 conf/local.conf.sample | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index ddcbaa5adb..60e8fe74c7 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -41,9 +41,9 @@ OEMASK = ""
 # Select between multiple alternative providers, if more than one is eligible.
 PREFERRED_PROVIDERS = "virtual/qte:qte-for-opie virtual/libqpe:libqpe-opie"
 PREFERRED_PROVIDERS += " virtual/libsdl:libsdl-qpe"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-snapshot-cross-initial"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-snapshot-cross"
-PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-snapshot-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
+PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
 # Uncomment this to specify where OE should create its temporary files.
 # Note that a full build of everything in OE will take GigaBytes of hard
-- 
cgit v1.2.3


From 3287e53a7c135062e71e24e19f59e0974e331e2d Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Thu, 27 May 2004 18:22:09 +0000
Subject: Merge ssh://openembedded@openembedded.bkbits.net/packages into
 doomcom.org:/home/gbritton/devel/OE/packages

2004/05/27 14:22:04-04:00 doomcom.org!gbritton
users are more naive than we thought, make local.conf.sample (more) idiotproof

BKrev: 40b631d1NlwafI2ZkNOOUhWcmtSyUg
---
 conf/local.conf.sample | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 60e8fe74c7..126d2088fd 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -24,7 +24,10 @@
 DL_DIR = "${HOME}/sources"
 
 # Use this to specify what .oe files to consider for builds
-OEFILES = "/path/to/packages/*/*.oe"
+#OEFILES = "/path/to/packages/*/*.oe"
+OEFILES := "${@oe.fatal('Edit your conf/local.conf: OEFILES')}"
+# Delete the line above.  Then uncomment and edit the other line to point
+# to the proper place where your .oe files are.
 
 # Use the OEMASK below unless you want to build something else than the
 # default glibc based setup
-- 
cgit v1.2.3


From 2f42d96097b3e05c9f38d8426d1a1e77169312aa Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Thu, 27 May 2004 18:36:06 +0000
Subject: add a quick example to local.conf.sample

BKrev: 40b63516_ftibhNe7UcDB7AjLpTqXw
---
 conf/local.conf.sample | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 126d2088fd..14117f96a2 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -20,6 +20,21 @@
 # will build into ${TMPDIR} which defaults to ${TOPDIR}/tmp (${TOPDIR} is
 # the current directory when oemake was executed).
 
+#
+# Quick example of the described stuff above (builds the busybox packages):
+#
+# mkdir $HOME/sources
+# mkdir $HOME/oe
+#  .. clone oe and packages into $HOME/oe/oe and $HOME/oe/packages ..
+# mkdir $HOME/oe/build-arm
+# mkdir $HOME/oe/build-arm/conf
+# cd $HOME/oe/build-arm
+# cp ../packages/conf/local.conf.sample conf/local.conf
+#  .. EDIT conf/local.conf to set OEFILES and other vars properly!! ..
+# oemake busybox
+#  .. busybox is built in tmp/ from the current dir ($HOME/oe/build-arm) ..
+#
+
 # Use this to specify where OE should place the downloaded sources into
 DL_DIR = "${HOME}/sources"
 
-- 
cgit v1.2.3


From b396e6a8f3e697c4759bb905657cd0094ddc7d27 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 20 Jun 2004 01:32:33 +0000
Subject: disambiguate local.conf.sample

BKrev: 40d4e931AiHTPuDCi6YFMZu-dckQ1w
---
 conf/local.conf.sample | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 14117f96a2..6bc2af0032 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -38,11 +38,9 @@
 # Use this to specify where OE should place the downloaded sources into
 DL_DIR = "${HOME}/sources"
 
-# Use this to specify what .oe files to consider for builds
-#OEFILES = "/path/to/packages/*/*.oe"
+# Delete the line below. Then specify which .oe files to consider for
+# your build. Typically this will be something like OEFILES = "/path/to/packages/*/*.oe"
 OEFILES := "${@oe.fatal('Edit your conf/local.conf: OEFILES')}"
-# Delete the line above.  Then uncomment and edit the other line to point
-# to the proper place where your .oe files are.
 
 # Use the OEMASK below unless you want to build something else than the
 # default glibc based setup
-- 
cgit v1.2.3


From 5df1997cce171d566ceef2c1dcbad31aaa6b2b70 Mon Sep 17 00:00:00 2001
From: Gerald Britton <gbritton@doomcom.org>
Date: Thu, 24 Jun 2004 01:40:54 +0000
Subject: add section discussing not using ~ and the need for absoulte paths.

BKrev: 40da3126gKKJF0sZxTA-KlpTs--Vkg
---
 conf/local.conf.sample | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 6bc2af0032..93179b5f2f 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -15,6 +15,16 @@
 # then EDIT IT.  Fixup any paths to point to the correct locations, and
 # setup the target specifications appropriately.
 
+# ** READ THIS CAREFULLY **
+#
+# NOTE: Do NOT use ~ in your paths, OE does NOT expand ~ for you.  If you
+# must have paths relative to your homedir use ${HOME} (note the {}'s there
+# you MUST have them for the variable expansion to be done by OE).  Your
+# paths should all be absolute paths (They should all start with a / after
+# expansion.  Stuff like starting with ${HOME} or ${TOPDIR} is ok).
+#
+# ** READ THIS CAREFULLY **
+
 # Once you have done that, you will want to cd into your build environment
 # (${HOME}/oe/build/ in this example), then run "oemake targets..."  This
 # will build into ${TMPDIR} which defaults to ${TOPDIR}/tmp (${TOPDIR} is
-- 
cgit v1.2.3


From 5a11d1607ad15fbd73ca14716883add8e4333d15 Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sun, 27 Jun 2004 21:06:57 +0000
Subject: add tiny notice about IMAGE_FSTYPE to local.conf.sample

BKrev: 40df36f128M56dmjySkIj8ojEmQ2jQ
---
 conf/local.conf.sample | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'conf')

diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 93179b5f2f..f27a2f627d 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -100,6 +100,10 @@ TARGET_ARCH = "arm"
 # Usually better to set DISTRO instead (see above)
 #INHERIT = "package_tar"
 
+# Uncomment one of these lines to get a rootfs image type other than jffs2
+#IMAGE_FSTYPE = "tar"
+#IMAGE_FSTYPE = "cramfs"
+
 # Comment this out if you do not wish to use a parse cache (not recommended).
 CACHE=/var/tmp/oe-cache.${USER}
 
-- 
cgit v1.2.3


From d5027f3fc10c370c0f31e2d606f2079925667c7f Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Thu, 1 Jul 2004 23:52:27 +0000
Subject: Merge odin.(none):/home/kergoth/code/packages into
 odin.(none):/home/kergoth/code/packages.safe

2004/07/01 18:52:12-05:00 (none)!kergoth
Move our associated OE metadata (configuration, oeclasses, and CONFIG_SITE
files) into the packages repository.

BKrev: 40e4a3bbtGGnb-XHAG0xqU2KdwtAPQ
---
 conf/collie.conf          | 0
 conf/corgi.conf           | 0
 conf/epia.conf            | 0
 conf/familiar.conf        | 0
 conf/h3600.conf           | 0
 conf/h3900.conf           | 0
 conf/handheld-common.conf | 0
 conf/husky.conf           | 0
 conf/innovator.conf       | 0
 conf/ipaq-pxa-2.6.conf    | 0
 conf/oe.conf              | 0
 conf/opensimpad.conf      | 0
 conf/openzaurus.conf      | 0
 conf/poodle.conf          | 0
 conf/ramses.conf          | 0
 conf/shepherd.conf        | 0
 conf/simpad.conf          | 0
 conf/tosa.conf            | 0
 conf/tune-strongarm.conf  | 0
 conf/tune-xscale.conf     | 0
 conf/x86-uml.conf         | 0
 conf/zaurus-pxa.conf      | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 conf/collie.conf
 create mode 100644 conf/corgi.conf
 create mode 100644 conf/epia.conf
 create mode 100644 conf/familiar.conf
 create mode 100644 conf/h3600.conf
 create mode 100644 conf/h3900.conf
 create mode 100644 conf/handheld-common.conf
 create mode 100644 conf/husky.conf
 create mode 100644 conf/innovator.conf
 create mode 100644 conf/ipaq-pxa-2.6.conf
 create mode 100644 conf/oe.conf
 create mode 100644 conf/opensimpad.conf
 create mode 100644 conf/openzaurus.conf
 create mode 100644 conf/poodle.conf
 create mode 100644 conf/ramses.conf
 create mode 100644 conf/shepherd.conf
 create mode 100644 conf/simpad.conf
 create mode 100644 conf/tosa.conf
 create mode 100644 conf/tune-strongarm.conf
 create mode 100644 conf/tune-xscale.conf
 create mode 100644 conf/x86-uml.conf
 create mode 100644 conf/zaurus-pxa.conf

(limited to 'conf')

diff --git a/conf/collie.conf b/conf/collie.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/corgi.conf b/conf/corgi.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/epia.conf b/conf/epia.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/familiar.conf b/conf/familiar.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/h3600.conf b/conf/h3600.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/h3900.conf b/conf/h3900.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/husky.conf b/conf/husky.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/innovator.conf b/conf/innovator.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/ipaq-pxa-2.6.conf b/conf/ipaq-pxa-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/oe.conf b/conf/oe.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/opensimpad.conf b/conf/opensimpad.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/openzaurus.conf b/conf/openzaurus.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/poodle.conf b/conf/poodle.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/ramses.conf b/conf/ramses.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/shepherd.conf b/conf/shepherd.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/simpad.conf b/conf/simpad.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/tosa.conf b/conf/tosa.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/tune-strongarm.conf b/conf/tune-strongarm.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/tune-xscale.conf b/conf/tune-xscale.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/x86-uml.conf b/conf/x86-uml.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
new file mode 100644
index 0000000000..e69de29bb2
-- 
cgit v1.2.3


From a3764bfaf2fd3c04c91d502244994d6c429c952a Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 3 Jul 2004 09:30:34 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 stealth.(none):/home/pb/oe/oe-packages

2004/07/03 10:30:22+01:00 (none)!pb
remove modules-collateral, hostap-modules, orinoco-modules

BKrev: 40e67cbamvnjqpKWWp34hwTS5RswvQ
---
 conf/h3900.conf | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'conf')

diff --git a/conf/h3900.conf b/conf/h3900.conf
index e69de29bb2..f2fc8f2805 100644
--- a/conf/h3900.conf
+++ b/conf/h3900.conf
@@ -0,0 +1,12 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ipaqpxa h3900"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
+EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"
+
+include conf/handheld-common.conf
+# not using tune-xscale so as to retain backwards compatibility
+include conf/tune-strongarm.conf
+
-- 
cgit v1.2.3


From 9942eee1fb440704b7ce5afa03189b509b71368d Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 3 Jul 2004 09:31:09 +0000
Subject: set TARGET_CC_ARCH, not FULL_OPTIMIZATION

BKrev: 40e67cdde-lPvGXinRP2oDUSZ7xgQg
---
 conf/tune-strongarm.conf | 2 ++
 conf/tune-xscale.conf    | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'conf')

diff --git a/conf/tune-strongarm.conf b/conf/tune-strongarm.conf
index e69de29bb2..8654c996ef 100644
--- a/conf/tune-strongarm.conf
+++ b/conf/tune-strongarm.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+
diff --git a/conf/tune-xscale.conf b/conf/tune-xscale.conf
index e69de29bb2..0b98f09fc8 100644
--- a/conf/tune-xscale.conf
+++ b/conf/tune-xscale.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_ARCH = "armv5te"
+
-- 
cgit v1.2.3


From 26a2ccf7aeabd1128346838c2c985649af0c6d23 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 3 Jul 2004 16:37:00 +0000
Subject: add atmelwlandriver to simpad bootstrap

BKrev: 40e6e0acPSBoxj6BYElW-I-E0R_gWA
---
 conf/simpad.conf | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'conf')

diff --git a/conf/simpad.conf b/conf/simpad.conf
index e69de29bb2..046d09c1d9 100644
--- a/conf/simpad.conf
+++ b/conf/simpad.conf
@@ -0,0 +1,15 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "opensimpad"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep atmelwlandriver"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+EXTRA_IMAGEDEPENDS = ""
+INHERIT += "simpad_flashimg"
+SERIAL_CONSOLE = "ttySA0 38400 vt100"
+
+include conf/handheld-common.conf
+include conf/tune-strongarm.conf
+
-- 
cgit v1.2.3


From e73f01bb504ccad8144bd0af92aa909d55011f84 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 3 Jul 2004 18:56:20 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 dixie.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/03 19:55:50+01:00 nexus.co.uk!pb
move some module recommends from simpad.conf to handheld-common.conf; add pcnet_cs

BKrev: 40e70154RAlWmqYxCy5H8y5eWRahpw
---
 conf/handheld-common.conf | 4 ++++
 conf/simpad.conf          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
index e69de29bb2..aa7c5c5742 100644
--- a/conf/handheld-common.conf
+++ b/conf/handheld-common.conf
@@ -0,0 +1,4 @@
+# Configuration bits for "generic handheld"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep kernel-module-pcnet+cs"
diff --git a/conf/simpad.conf b/conf/simpad.conf
index 046d09c1d9..1d5822c4b4 100644
--- a/conf/simpad.conf
+++ b/conf/simpad.conf
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep atmelwlandriver"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules atmelwlandriver"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 INHERIT += "simpad_flashimg"
-- 
cgit v1.2.3


From 2df9120cefb8b31221c21f49cfc3846585ea4390 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sat, 3 Jul 2004 22:46:03 +0000
Subject: change naming of zaurus image files: .rootfs.jffs2 is now an actual
 jffs2 image, and .rootfs.img is the flashable binary.

BKrev: 40e7372bIVdcoj8XDZU7bxR7bU9n8Q
---
 conf/zaurus-pxa.conf | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'conf')

diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index e69de29bb2..4a7e23c1ed 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -0,0 +1,23 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+kernel-module-ip+gre kernel-module-ipip kernel-module-irnet kernel-module-net+fd kernel-module-registers kernel-module-pxa+bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
+EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --squash --faketime \
+		   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+		   ${EXTRA_IMAGECMD}; \
+		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+		   ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 > \
+	           ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+
+include conf/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/tune-strongarm.conf
+
-- 
cgit v1.2.3


From f8790318128135669c3d7fe5aa2a3a4ab8c0f814 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 4 Jul 2004 14:22:01 +0000
Subject: remove modules-collateral; add sa1100_ir

BKrev: 40e81289SsaN8IEFpxORHE7PTdlE4A
---
 conf/simpad.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'conf')

diff --git a/conf/simpad.conf b/conf/simpad.conf
index 1d5822c4b4..d179b9d693 100644
--- a/conf/simpad.conf
+++ b/conf/simpad.conf
@@ -2,9 +2,9 @@ TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "opensimpad"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral"
-BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
+BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules atmelwlandriver kernel-module-sa1100-ir"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 EXTRA_IMAGEDEPENDS = ""
 INHERIT += "simpad_flashimg"
-- 
cgit v1.2.3


From fd62b55281f1493f24bd4dd0a9c6a2c078390221 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 4 Jul 2004 15:24:14 +0000
Subject: rationalise module handling in kernel packages and MACHINE.conf
 files. changed module naming to use - rather than + as replacement for
 underscore. ignore errors from update-modules in postinst, in case
 modutils-collateral is in use. add postrm scripts.

BKrev: 40e8211eLQcjqqTncCe6a_iEukTM_g
---
 conf/collie.conf          | 15 ++++++++++
 conf/h3600.conf           | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 conf/h3900.conf           |  6 ++--
 conf/handheld-common.conf |  6 +++-
 conf/ipaq-common.conf     |  0
 conf/poodle.conf          | 15 ++++++++++
 conf/zaurus-pxa.conf      |  3 +-
 7 files changed, 112 insertions(+), 5 deletions(-)
 create mode 100644 conf/ipaq-common.conf

(limited to 'conf')

diff --git a/conf/collie.conf b/conf/collie.conf
index e69de29bb2..198a9c11e1 100644
--- a/conf/collie.conf
+++ b/conf/collie.conf
@@ -0,0 +1,15 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support \
+kernel-module-devinfo kernel-module-gpio kernel-module-ip-gre  \
+kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor " 
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+include conf/handheld-common.conf
+include conf/tune-strongarm.conf
+
diff --git a/conf/h3600.conf b/conf/h3600.conf
index e69de29bb2..e9e302f9ad 100644
--- a/conf/h3600.conf
+++ b/conf/h3600.conf
@@ -0,0 +1,72 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ipaqsa h3600"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
+EXTRA_IMAGECMD_h3600 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3600_MODULES}')}"
+
+H3600_MODULES = "\
+dma-backpaq \
+h3600-asic \
+h3600-backpaq-accel \
+h3600-backpaq-camera \
+h3600-backpaq-fpga \
+h3600-backpaq-gasgauge \
+h3600-backpaq-sram \
+h3600-backpaq \
+h3600-generic-sleeve \
+h3600-micro \
+h3600-microkbd \
+h3600-stowaway \
+h3600-ts \
+h3600-uda1341 \
+hid \
+hwtimer \
+input \
+ip-gre \
+ip-tables \
+ipaq-hal \
+ipaq-mtd-asset \
+ipaq-sleeve \
+ipip \
+irda \
+irlan \
+irnet \
+irport \
+irtty \
+l3-backpaq \
+loop \
+nfs \
+nvrd \
+pcmcia-core \
+pcnet-cs \
+ppp-async \
+ppp-deflate \
+ppp-generic \
+ppp-mppe \
+sa1100-cs \
+sa1100-ir \
+sa1100-wdt \
+sa1100-audio \
+sa1100-rtc \
+sa1100usb-core \
+sd-mod \
+serial-cs \
+serial-h3800 \
+serial \
+serio \
+serport \
+sunrpc \
+tun \
+uda1341 \
+uinput \
+usb-char \
+usb-eth \
+usb-storage \
+usbcore"
+
+include conf/ipaq-common.conf
+include conf/handheld-common.conf
+include conf/tune-strongarm.conf
+
diff --git a/conf/h3900.conf b/conf/h3900.conf
index f2fc8f2805..1e1a611d38 100644
--- a/conf/h3900.conf
+++ b/conf/h3900.conf
@@ -4,9 +4,11 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
 EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
 BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')}"
+H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400"
 
+include conf/ipaq-common.conf
 include conf/handheld-common.conf
+
 # not using tune-xscale so as to retain backwards compatibility
 include conf/tune-strongarm.conf
-
diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
index aa7c5c5742..912484a09d 100644
--- a/conf/handheld-common.conf
+++ b/conf/handheld-common.conf
@@ -1,4 +1,8 @@
+HANDHELD_MODULES = "ipv6 ipsec mip6-mn ide-cs ide-disk vfat ppp-async nfs btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco pcnet-cs af_packet ext2"
+
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools kernel-module-ipv6 kernel-module-ipsec kernel-module-mip6+mn kernel-module-ide-cs kernel-module-vfat kernel-module-ppp+async kernel-module-btuart+cs kernel-module-dtl1+cs kernel-module-bt3c+cs kernel-module-rfcomm kernel-module-bnep kernel-module-pcnet+cs"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${HANDHELD_MODULES}')}"
+
+INHERIT += "linux_modules"
diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/conf/poodle.conf b/conf/poodle.conf
index e69de29bb2..ca6ebb0e94 100644
--- a/conf/poodle.conf
+++ b/conf/poodle.conf
@@ -0,0 +1,15 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+kernel-module-ip-gre  \
+kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --squash --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+include conf/handheld-common.conf
diff --git a/conf/zaurus-pxa.conf b/conf/zaurus-pxa.conf
index 4a7e23c1ed..91cbead965 100644
--- a/conf/zaurus-pxa.conf
+++ b/conf/zaurus-pxa.conf
@@ -4,7 +4,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-kernel-module-ip+gre kernel-module-ipip kernel-module-irnet kernel-module-net+fd kernel-module-registers kernel-module-pxa+bi \
+kernel-module-ip-gre kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
 kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
 
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
@@ -20,4 +20,3 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --squash --faketime \
 include conf/handheld-common.conf
 # not using tune-xscale.conf so as to retain backwards compatibility
 include conf/tune-strongarm.conf
-
-- 
cgit v1.2.3


From 9576fa9974b8b831bf01aeb21a0249f4e02064a2 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 4 Jul 2004 16:11:31 +0000
Subject: add more ipaq modules

BKrev: 40e82c33kFFsqTNX-OgmHxkQZe1O0A
---
 conf/ipaq-common.conf | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'conf')

diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
index e69de29bb2..225cef8863 100644
--- a/conf/ipaq-common.conf
+++ b/conf/ipaq-common.conf
@@ -0,0 +1,4 @@
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd hostap-cs hostap-crypt-wep orinoco-cs airo-cs wvlan-cs pcmf502rd pcmf502re sa1100-rtc"
+
+BOOTSTRAP_EXTRA_DEPENDS += "freeswan mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
-- 
cgit v1.2.3


From d4d77f2b2e754f81cd29cde4e5f1227562ce2cd6 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 4 Jul 2004 16:49:28 +0000
Subject: default to opensimpad-64+0 on simpad

BKrev: 40e83518cPMN7MfhNTBsPkOdrnGngg
---
 conf/simpad.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/simpad.conf b/conf/simpad.conf
index d179b9d693..5e817e921d 100644
--- a/conf/simpad.conf
+++ b/conf/simpad.conf
@@ -1,7 +1,7 @@
 TARGET_ARCH = "arm"
 IPKG_ARCHS = "all arm ${MACHINE}"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "opensimpad"
+PREFERRED_PROVIDER_virtual/kernel = "opensimpad-64+0"
 BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules freeswan mipv6 atmelwlandriver"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel"
 BOOTSTRAP_EXTRA_RRECOMMENDS = "freeswan mipv6 hostap-modules orinoco-modules atmelwlandriver kernel-module-sa1100-ir"
-- 
cgit v1.2.3


From fbcd2d6ee80c7392f65420533dbde9a5e5a9eb28 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Sun, 4 Jul 2004 18:36:22 +0000
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages into
 dixie.nexus.co.uk:/home/pb/oe/oe-packages

2004/07/04 19:43:18+02:00 uni-frankfurt.de!mickey
Merge bk://openembedded@openembedded.bkbits.net/packages
into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/04 19:43:12+02:00 uni-frankfurt.de!mickey
add bo