diff options
| author | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-05 16:39:59 +0000 |
|---|---|---|
| committer | nslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net> | 2005-05-05 16:39:59 +0000 |
| commit | 6314c1d8078f2f6ab0c73a36d20bc8c9c378b4f8 (patch) | |
| tree | 6d6f0abcb723ef6f9aad1751b85ae9f84fa8f74b | |
| parent | be8a8aee064feb50cc3dd13a67487c9b95aeee02 (diff) | |
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
| -rw-r--r-- | conf/distro/openzaurus-3.5.4.conf | 2 | ||||
| -rw-r--r-- | conf/distro/openzaurus.conf | 4 | ||||
| -rw-r--r-- | packages/apache/files/httpd.conf (renamed from packages/apache/apache-2.0.48/init) | 0 | ||||
| -rw-r--r-- | packages/apache/files/init | 0 | ||||
| -rw-r--r-- | packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in | 0 | ||||
| -rw-r--r-- | packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch | 0 | ||||
| -rw-r--r-- | packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb | 0 |
7 files changed, 4 insertions, 2 deletions
diff --git a/conf/distro/openzaurus-3.5.4.conf b/conf/distro/openzaurus-3.5.4.conf index 373005636b..cd315e4cba 100644 --- 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 c4b103fab0..f6975ae961 100644 --- 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 index e69de29bb2..e69de29bb2 100644 --- a/packages/apache/apache-2.0.48/init +++ b/packages/apache/files/httpd.conf diff --git a/packages/apache/files/init b/packages/apache/files/init new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/apache/files/init 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/config.in 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules-0.2.1-pre26/no-compat.patch 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 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wlan-ng/wlan-ng-modules_0.2.1-pre26.bb |