Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/05 18:01:03+02:00 uni-frankfurt.de!mickeyl
upgrade openzaurus 3.5.4.conf and revert 1.3211 + add a note about that

2005/05/05 16:29:35+02:00 uni-frankfurt.de!mickeyl
add wlan-ng-modules 0.2.1-pre26. DEFAULT_PREFERENCE=-1 for now since it has build problems on certain kernels.

BKrev: 427a4c5fCgevI4GjFZMNn-fZa-K6_w

diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf
index 3730056..cd315e4 100644 (file)
--- a/conf/distro/openzaurus-3.5.4.conf
+++ b/conf/distro/openzaurus-3.5.4.conf
@@ -13,7 +13,7 @@ FEED_URIS += " \
        console##http://openzaurus.org/official/unstable/3.5.3/feed/console     \
        devel##http://openzaurus.org/official/unstable/3.5.3/feed/devel"
 
-CVSDATE = "20050428"
+CVSDATE = "20050504"
 
 #
 # Zaurus

diff --git a/conf/distro/openzaurus.conf b/conf/distro/openzaurus.conf
index c4b103f..f6975ae 100644 (file)
--- a/conf/distro/openzaurus.conf
+++ b/conf/distro/openzaurus.conf
@@ -3,5 +3,7 @@
 #@DESCRIPTION: Distribution configuration for OpenZaurus (http://www.openzaurus.org)
 
 INHERIT += " package_ipk debian"
-TARGET_OS ?= "linux"
+# For some reason, this doesn't work
+# TARGET_OS ?= "linux"
+TARGET_OS = "linux"
 TARGET_FPU = "soft"

diff --git a/packages/apache/apache-2.0.48/init b/packages/apache/files/httpd.conf
similarity index 100%
rename from packages/apache/apache-2.0.48/init
rename to packages/apache/files/httpd.conf

diff --git a/packages/apache/files/init b/packages/apache/files/init
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb
new file mode 100644 (file)
index 0000000..e69de29