summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2005-08-27 00:35:47 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-27 00:35:47 +0000
commitc9310255bcef16e59907891f5ef65a897bd52297 (patch)
tree8202942e8390597aa917e22fc0de92b109611d79 /packages
parent5da3f4af1e4e6b558b6249b9db7ba89306ed9db2 (diff)
parentbfe154780c963a74e76688b840786da3ffe3fbe2 (diff)
merge of bdbeb53fb07854a8484b17504b9ab11113e0fe51
and fda50be34c5e8aeb2a40fcb38520b83eea2db043
Diffstat (limited to 'packages')
-rw-r--r--packages/cairo/cairo_1.0.0.bb15
-rw-r--r--packages/efl/ecore-fb_0.9.9.013.bb5
-rw-r--r--packages/efl/ecore-native_0.9.9.013.bb4
-rw-r--r--packages/efl/ecore-x11_0.9.9.013.bb1
-rw-r--r--packages/efl/ecore.inc1
-rw-r--r--packages/efl/evas-fb_0.9.9.013.bb52
-rw-r--r--packages/efl/evas-native_0.9.9.013.bb2
-rw-r--r--packages/efl/evas.inc1
-rw-r--r--packages/efl/ewl_0.0.4.004.bb1
-rw-r--r--packages/gpe-announce/gpe-announce_0.13.bb5
-rw-r--r--packages/gpe-buttonbox/.mtn2git_empty (renamed from packages/qc-usb-messenger/.mtn2git_empty)0
-rw-r--r--packages/gpe-buttonbox/gpe-buttonbox_cvs.bb15
-rw-r--r--packages/gpe-calendar/gpe-calendar_0.63.bb10
-rw-r--r--packages/gpe-clock/gpe-clock_0.21.bb10
-rw-r--r--packages/gpe-nmf/gpe-nmf_0.22.bb28
-rw-r--r--packages/gpe-package/gpe-package_0.3.bb10
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.64.bb31
-rw-r--r--packages/gpsdrive/gpsdrive_cvs.bb3
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty0
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/defconfig66
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/init39
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff12
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff26
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty0
-rw-r--r--packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig66
-rw-r--r--packages/hostap/hostap-daemon_0.4.4.bb31
-rw-r--r--packages/hostap/hostap-modules-0.4.4/.mtn2git_empty0
-rw-r--r--packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch11
-rw-r--r--packages/hostap/hostap-modules-0.4.4/mtx_compat.diff20
-rw-r--r--packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff81
-rw-r--r--packages/hostap/hostap-modules_0.4.4.bb42
-rw-r--r--packages/hostap/hostap-utils_0.4.0.bb24
-rw-r--r--packages/initscripts/initscripts_1.0.bb4
-rw-r--r--packages/kdepimpi/kdepimpi_2.2.3.bb (renamed from packages/kdepimpi/kdepimpi_2.2.2.bb)0
-rw-r--r--packages/kdepimpi/pwmpi_2.2.3.bb (renamed from packages/kdepimpi/pwmpi_2.2.2.bb)0
-rw-r--r--packages/libao/libao_0.8.6.bb26
-rw-r--r--packages/libdaemon/libdaemon_0.6.bb2
-rw-r--r--packages/libdvb/files/.mtn2git_empty0
-rw-r--r--packages/libdvb/files/topf2ps.patch123
-rw-r--r--packages/libdvb/libdvb_0.5.5.1.bb7
-rw-r--r--packages/libopie/libopie2.inc5
-rw-r--r--packages/libschedule/libschedule_0.15.bb21
-rw-r--r--packages/libxsettings-client/libxsettings-client_0.14.bb20
-rw-r--r--packages/linux-hotplug/linux-hotplug_20040329.bb7
-rw-r--r--packages/linux-hotplug/linux-hotplug_20040920.bb8
-rw-r--r--packages/linux/linux-openzaurus_2.6.11.bb10
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb55
-rw-r--r--packages/linux/unslung-kernel/defconfig13
-rw-r--r--packages/linux/unslung-kernel_2.4.22.l2.3r63.bb2
-rw-r--r--packages/meta/e-image-core.bb18
-rw-r--r--packages/meta/e-image.bb19
-rw-r--r--packages/meta/meta-e-x11.bb22
-rw-r--r--packages/meta/meta-sdk.bb28
-rw-r--r--packages/meta/openslug-packages.bb1
-rw-r--r--packages/meta/opie-collections.inc19
-rw-r--r--packages/musicpd/mpd_0.11.5.bb23
-rw-r--r--packages/obexpush/obexpush-native_1.0.0.bb4
-rw-r--r--packages/obexpush/obexpush_1.0.0.bb4
-rw-r--r--packages/pcmcia-cs/files/arm/pcmcia19
-rw-r--r--packages/pcmciautils/pcmciautils_001.bb34
-rw-r--r--packages/pcmciautils/pcmciautils_002.bb36
-rw-r--r--packages/pcmciautils/pcmciautils_005.bb29
-rw-r--r--packages/pcmciautils/pcmciautils_007.bb (renamed from packages/pcmciautils/pcmciautils_003.bb)0
-rw-r--r--packages/qc-usb/qc-usb-messenger_0.8.bb (renamed from packages/qc-usb-messenger/qc-usb-messenger_0.8.bb)0
-rw-r--r--packages/rrdtool/rrdtool_1.0.49.bb2
-rw-r--r--packages/scap/files/scap.desktop2
-rw-r--r--packages/scap/files/scap.sh9
-rw-r--r--packages/scap/scap_0.1.bb2
-rw-r--r--packages/sharprom-toolchain/.mtn2git_empty0
-rw-r--r--packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb24
-rw-r--r--packages/syslog-ng/files/.mtn2git_empty0
-rw-r--r--packages/syslog-ng/files/initscript45
-rw-r--r--packages/syslog-ng/syslog-ng_1.6.8.bb21
-rw-r--r--packages/x11/x11-common/etc/X11/Xserver2
-rw-r--r--packages/xscreensaver/files/.mtn2git_empty0
-rw-r--r--packages/xscreensaver/files/XScreenSaver (renamed from packages/xscreensaver/xscreensaver-4.16/XScreenSaver)0
-rw-r--r--packages/xscreensaver/files/fixes.patch (renamed from packages/xscreensaver/xscreensaver-4.16/fixes.patch)0
-rw-r--r--packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty0
-rw-r--r--packages/xscreensaver/xscreensaver-4.22/configure.in.patch15
-rw-r--r--packages/xscreensaver/xscreensaver_4.22.bb58
-rw-r--r--packages/xst/xst_0.15.bb (renamed from packages/xst/xst_0.14.bb)0
-rw-r--r--packages/zd1211/zd1211-4916/.mtn2git_empty0
-rw-r--r--packages/zd1211/zd1211-4916/copy-break.patch11
-rw-r--r--packages/zd1211/zd1211-4916/explicit-key-change.patch24
-rw-r--r--packages/zd1211/zd1211-4916/get-stats.patch77
-rw-r--r--packages/zd1211/zd1211-4916/makefile.patch28
-rw-r--r--packages/zd1211/zd1211-4916/syntax.patch20
-rw-r--r--packages/zd1211/zd1211-4916/usb-endian.patch298
-rw-r--r--packages/zd1211/zd1211-4916/usb-ids.patch21
-rw-r--r--packages/zd1211/zd1211_4916.bb35
90 files changed, 1633 insertions, 232 deletions
diff --git a/packages/cairo/cairo_1.0.0.bb b/packages/cairo/cairo_1.0.0.bb
new file mode 100644
index 0000000000..aa97a9f4de
--- /dev/null
+++ b/packages/cairo/cairo_1.0.0.bb
@@ -0,0 +1,15 @@
+SECTION = "libs"
+PRIORITY = "optional"
+MAINTAINER = "Phil Blundell <pb@debian.org>"
+DEPENDS = "x11 libpng fontconfig libxrender"
+DESCRIPTION = "Cairo graphics library"
+LICENSE = "MPL LGPL"
+PR = "r1"
+
+SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+do_stage () {
+ oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+}
diff --git a/packages/efl/ecore-fb_0.9.9.013.bb b/packages/efl/ecore-fb_0.9.9.013.bb
index 87fea43d20..1f3db9ddfe 100644
--- a/packages/efl/ecore-fb_0.9.9.013.bb
+++ b/packages/efl/ecore-fb_0.9.9.013.bb
@@ -1,6 +1,5 @@
include ecore.inc
-PROVIDES += "virtual/ecore"
-PR = "r1"
+PR = "r2"
EXTRA_OECONF = "--enable-ecore-fb \
--enable-ecore-job \
@@ -16,6 +15,8 @@ EXTRA_OECONF = "--enable-ecore-fb \
--enable-ecore-ipc \
--enable-ecore-txt \
--disable-ecore-x \
+ --disable-curl \
+ --without-curl-config \
--enable-ecore-config \
--disable-openssl"
diff --git a/packages/efl/ecore-native_0.9.9.013.bb b/packages/efl/ecore-native_0.9.9.013.bb
index 6968415d34..abfb41d63b 100644
--- a/packages/efl/ecore-native_0.9.9.013.bb
+++ b/packages/efl/ecore-native_0.9.9.013.bb
@@ -1,3 +1,5 @@
include ecore-fb_${PV}.bb
inherit native
-DEPENDS = "curl-native eet-native evas-native"
+# disable curl for now (see EXTRA_OECONF in ecore-fb), we may reenable it when we need it
+# DEPENDS = "curl-native eet-native evas-native"
+DEPENDS = "eet-native evas-native"
diff --git a/packages/efl/ecore-x11_0.9.9.013.bb b/packages/efl/ecore-x11_0.9.9.013.bb
index 36a9c06413..b6b452cb71 100644
--- a/packages/efl/ecore-x11_0.9.9.013.bb
+++ b/packages/efl/ecore-x11_0.9.9.013.bb
@@ -1,5 +1,4 @@
include ecore.inc
-PROVIDES += "virtual/ecore"
DEPENDS += "evas-x11"
PR = "r2"
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index ecd5fef642..ccc88b10c3 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -5,6 +5,7 @@ LEAD_SONAME = "libecore.so"
LICENSE = "MIT"
# can also have openssl, dbus
DEPENDS = "virtual/evas curl eet"
+PROVIDES = "virtual/ecore"
inherit efl
diff --git a/packages/efl/evas-fb_0.9.9.013.bb b/packages/efl/evas-fb_0.9.9.013.bb
index 9286853d5e..492a0badb1 100644
--- a/packages/efl/evas-fb_0.9.9.013.bb
+++ b/packages/efl/evas-fb_0.9.9.013.bb
@@ -1,31 +1,31 @@
include evas.inc
-PROVIDES += "virtual/evas"
-PR = "r1"
+DEPENDS = "freetype libpng jpeg eet"
+PR = "r2"
-EXTRA_OECONF = "--enable-fb \
- --disable-directfb \
- --disable-buffer \
- --disable-software-qtopia \
- --disable-software-x11 \
- --disable-gl-x11 \
- --enable-image-loader-eet \
- --enable-image-loader-edb \
- --enable-image-loader-png \
- --enable-image-loader-jpeg \
- --enable-small-dither-mask \
- --enable-cpu-c \
- --enable-font-loader-eet \
- --enable-scale-sample \
- --enable-scale-smooth \
- --enable-convert-yuv \
- --disable-convert-8-rgb-332 \
- --disable-convert-8-rgb-666 \
- --disable-convert-8-rgb-232 \
- --disable-convert-8-rgb-222 \
- --disable-convert-8-rgb-221 \
- --disable-convert-8-rgb-121 \
- --disable-convert-8-rgb-111 \
- --enable-convert-16-rgb-565 \
+EXTRA_OECONF = "--enable-fb \
+ --disable-directfb \
+ --disable-buffer \
+ --disable-software-qtopia \
+ --disable-software-x11 \
+ --disable-gl-x11 \
+ --enable-image-loader-eet \
+ --disable-image-loader-edb \
+ --enable-image-loader-png \
+ --enable-image-loader-jpeg \
+ --enable-small-dither-mask \
+ --enable-cpu-c \
+ --enable-font-loader-eet \
+ --enable-scale-sample \
+ --enable-scale-smooth \
+ --enable-convert-yuv \
+ --disable-convert-8-rgb-332 \
+ --disable-convert-8-rgb-666 \
+ --disable-convert-8-rgb-232 \
+ --disable-convert-8-rgb-222 \
+ --disable-convert-8-rgb-221 \
+ --disable-convert-8-rgb-121 \
+ --disable-convert-8-rgb-111 \
+ --enable-convert-16-rgb-565 \
--disable-convert-16-rgb-555 \
--disable-convert-16-rgb-444 \
--disable-convert-16-rgb-ipq \
diff --git a/packages/efl/evas-native_0.9.9.013.bb b/packages/efl/evas-native_0.9.9.013.bb
index 3eaa12cf9e..fd94b48ef2 100644
--- a/packages/efl/evas-native_0.9.9.013.bb
+++ b/packages/efl/evas-native_0.9.9.013.bb
@@ -1,3 +1,3 @@
include evas-fb_${PV}.bb
inherit native
-DEPENDS = "freetype-native libpng-native jpeg-native eet-native edb-native"
+DEPENDS = "freetype-native libpng-native jpeg-native eet-native"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 60f60f3c82..5876c1fd4e 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -5,6 +5,7 @@ your CPU or graphics hardware are too slow."
LICENSE = "MIT"
# can also depend on valgrind (?)
DEPENDS = "freetype libpng jpeg eet edb"
+PROVIDES = "virtual/evas"
inherit efl
diff --git a/packages/efl/ewl_0.0.4.004.bb b/packages/efl/ewl_0.0.4.004.bb
index 0ea977fbe0..0205de4216 100644
--- a/packages/efl/ewl_0.0.4.004.bb
+++ b/packages/efl/ewl_0.0.4.004.bb
@@ -1,5 +1,6 @@
DESCRIPTION = "The Enlightened Widget Library, \
a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
+# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb
DEPENDS = "edb virtual/evas virtual/ecore edje emotion"
RDEPENDS += "libewl-themes"
LICENSE = "MIT"
diff --git a/packages/gpe-announce/gpe-announce_0.13.bb b/packages/gpe-announce/gpe-announce_0.13.bb
new file mode 100644
index 0000000000..6124b4c4a8
--- /dev/null
+++ b/packages/gpe-announce/gpe-announce_0.13.bb
@@ -0,0 +1,5 @@
+inherit gpe
+
+DEPENDS = "libsoundgen libschedule gtk+ libgpewidget"
+LICENSE = "GPL"
+
diff --git a/packages/qc-usb-messenger/.mtn2git_empty b/packages/gpe-buttonbox/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/qc-usb-messenger/.mtn2git_empty
+++ b/packages/gpe-buttonbox/.mtn2git_empty
diff --git a/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
new file mode 100644
index 0000000000..44c2779c47
--- /dev/null
+++ b/packages/gpe-buttonbox/gpe-buttonbox_cvs.bb
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+DESCIPTION = "Buttonbox for gpe"
+
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=gpe/base/gpe-buttonbox"
+
+DEPENDS = "libgpewidget libgpelaunch"
+
+S = "${WORKDIR}/${PN}"
+PV = "0.0+cvs-${CVSDATE}"
+PR = "r1"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/gpe"
+
diff --git a/packages/gpe-calendar/gpe-calendar_0.63.bb b/packages/gpe-calendar/gpe-calendar_0.63.bb
new file mode 100644
index 0000000000..2a2530808b
--- /dev/null
+++ b/packages/gpe-calendar/gpe-calendar_0.63.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+PR = "r1"
+
+inherit autotools gpe
+
+DEPENDS = "libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+DESCRIPTION = "GPE calendar"
+
diff --git a/packages/gpe-clock/gpe-clock_0.21.bb b/packages/gpe-clock/gpe-clock_0.21.bb
new file mode 100644
index 0000000000..f9b8c4dbe1
--- /dev/null
+++ b/packages/gpe-clock/gpe-clock_0.21.bb
@@ -0,0 +1,10 @@
+inherit gpe
+
+DESCRIPTION = "GPE panel clock"
+DEPENDS = "gtk+ libschedule libgpewidget gpe-announce atd libgpelaunch"
+RDEPENDS = "gpe-announce atd"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+
diff --git a/packages/gpe-nmf/gpe-nmf_0.22.bb b/packages/gpe-nmf/gpe-nmf_0.22.bb
new file mode 100644
index 0000000000..06c115a7cf
--- /dev/null
+++ b/packages/gpe-nmf/gpe-nmf_0.22.bb
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+inherit gpe pkgconfig
+
+DESCRIPTION = "GPE audio player"
+DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins"
+RDEPENDS = "esd \
+ gst-plugins \
+ gst-plugin-audio \
+ gst-plugin-audioconvert \
+ gst-plugin-audiofile \
+ gst-plugin-esd \
+ gst-plugin-typefindfunctions \
+ gst-plugin-decodebin \
+ gst-plugin-volume"
+RRECOMMENDS = "gst-plugin-mad \
+ gst-plugin-tagedit \
+ gst-plugin-ivorbis \
+ gst-plugin-tcp"
+
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+PARALLEL_MAKE=""
+
+do_compile() {
+ oe_runmake PREFIX=${prefix} GST_VERSION="0.8"
+}
diff --git a/packages/gpe-package/gpe-package_0.3.bb b/packages/gpe-package/gpe-package_0.3.bb
new file mode 100644
index 0000000000..0084b7e3c3
--- /dev/null
+++ b/packages/gpe-package/gpe-package_0.3.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+PR = "r0"
+inherit gpe pkgconfig
+
+DESCRIPTION = "A package manager GUI for GPE"
+DEPENDS = "ipkg libgpewidget"
+RDEPENDS = "gpe-icons"
+SECTION = "gpe"
+PRIORITY = "optional"
+
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
new file mode 100644
index 0000000000..cf62a9a2d0
--- /dev/null
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.64.bb
@@ -0,0 +1,31 @@
+LICENSE = "GPL"
+PR = "r0"
+
+inherit gpe
+
+DESCRIPTION = "GPE session startup scripts"
+SECTION = "gpe"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+RDEPENDS_${PN} = "matchbox gpe-session-starter gpe-bluetooth xstroke xtscal gpe-question gpe-clock matchbox-applet-inputmanager xrandr xmodmap xdpyinfo x11-common"
+# more rdepends: keylaunch ipaq-sleep apmd blueprobe
+DEPENDS = "matchbox-wm matchbox-panel gpe-bluetooth xstroke xtscal gpe-question matchbox-applet-inputmanager gpe-clock xrandr xmodmap xdpyinfo x11-common"
+
+SRC_URI += "file://matchbox-session \
+ file://disable-composite.xsettings \
+ file://remove-x11-common-files.patch;patch=1"
+
+do_install_append() {
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ if [ "${GUI_MACHINE_CLASS}" != "bigscreen" ]; then
+ echo "Gtk/ToolbarStyle:S:icons" > ${D}${sysconfdir}/gpe/xsettings-default.d/toolbar
+ fi
+ install -d ${D}${sysconfdir}/matchbox
+ install ${WORKDIR}/matchbox-session ${D}${sysconfdir}/matchbox/session
+
+ install -d ${D}${sysconfdir}/gpe/xsettings-default.d
+ install -m 0644 ${WORKDIR}/disable-composite.xsettings ${D}${sysconfdir}/gpe/xsettings-default.d/disable-composite
+}
+
+# This makes use of GUI_MACHINE_CLASS, so set PACKAGE_ARCH appropriately
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/packages/gpsdrive/gpsdrive_cvs.bb b/packages/gpsdrive/gpsdrive_cvs.bb
index ba4432f5ca..271ea1f375 100644
--- a/packages/gpsdrive/gpsdrive_cvs.bb
+++ b/packages/gpsdrive/gpsdrive_cvs.bb
@@ -6,7 +6,7 @@ DEFAULT_PREFERENCE="-1"
PACKAGES += "gpsdrive-add"
DESCRIPTION = "GPS navigation/map display software"
-DEPENDS = "virtual/libc gtk+ pcre gpsd"
+DEPENDS = "virtual/libc libart-lgpl gtk+ pcre gpsd"
RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd"
MAINTAINER = "Koen Kooi <koen@handhelds.org>"
SECTION = "x11"
@@ -14,7 +14,6 @@ PRIORITY = "optional"
LICENSE = "GPL"
SRC_URI = "cvs://anonymous@cvs.gpsdrive.cc/cvsroot;module=gpsdrive \
- file://gpsdrive-pda-fix.patch;patch=1;pnum=1 \
file://gpsdrive.desktop"
S = "${WORKDIR}/gpsdrive"
diff --git a/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty b/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/.mtn2git_empty
diff --git a/packages/hostap/hostap-daemon-0.4.4/defconfig b/packages/hostap/hostap-daemon-0.4.4/defconfig
new file mode 100644
index 0000000000..d0e22f2586
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/defconfig
@@ -0,0 +1,66 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+#CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src
+
+# Driver interface for Prism54 driver
+CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# Integrated EAP authenticator
+CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP authenticator
+CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP authenticator
+CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP authenticator
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP authenticator
+CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP authenticator
+CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP authenticator
+CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP authenticator
+#CONFIG_EAP_SIM=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# authenticator from external hosts using RADIUS.
+CONFIG_RADIUS_SERVER=y
diff --git a/packages/hostap/hostap-daemon-0.4.4/init b/packages/hostap/hostap-daemon-0.4.4/init
new file mode 100644
index 0000000000..b0736c0baa
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/init
@@ -0,0 +1,39 @@
+#!/bin/sh
+DAEMON=/usr/sbin/hostapd
+NAME=httpd
+DESC="HOSTAP Daemon"
+ARGS="/etc/hostapd.conf"
+
+test -f $DAEMON || exit 0
+
+set -e
+
+case "$1" in
+ start)
+ echo -n "starting $DESC: $NAME... "
+ start-stop-daemon -S -b -n $NAME -a $DAEMON -- $ARGS
+ echo "done."
+ ;;
+ stop)
+ echo -n "stopping $DESC: $NAME... "
+ start-stop-daemon -K -n $NAME
+ echo "done."
+ ;;
+ restart)
+ echo "restarting $DESC: $NAME... "
+ $0 stop
+ $0 start
+ echo "done."
+ ;;
+ reload)
+ echo -n "reloading $DESC: $NAME... "
+ killall -HUP $(basename ${DAEMON})
+ echo "done."
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff b/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff
new file mode 100644
index 0000000000..d9dab26a15
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/madwifi-bsd-fix.diff
@@ -0,0 +1,12 @@
+--- driver_madwifi.c.orig 2005-03-18 15:12:53.392793216 +0100
++++ driver_madwifi.c 2005-03-18 15:13:09.246383104 +0100
+@@ -21,7 +21,8 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+
+-#include <include/compat.h>
++#include <net80211/compat.h>
++#include <net80211/_ieee80211.h>
+ #include <net80211/ieee80211.h>
+ #include <net80211/ieee80211_crypto.h>
+ #include <net80211/ieee80211_ioctl.h>
diff --git a/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff b/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff
new file mode 100644
index 0000000000..25d2ca34bb
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/makefile-cross.diff
@@ -0,0 +1,26 @@
+--- Makefile.orig 2005-03-18 14:34:27.274376504 +0100
++++ Makefile 2005-03-18 14:35:56.609795456 +0100
+@@ -1,7 +1,9 @@
+-CC=gcc
++CC?=gcc
+ DIR_WPA_SUPPLICANT=.
+ DIR_HOSTAP=.
+
++TARGET_PREFIX ?= /usr/local/bin/
++
+ ifndef CFLAGS
+ CFLAGS = -MMD -O2 -Wall -g
+ endif
+@@ -170,10 +172,10 @@
+ fi
+
+ install: all
+- for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
++ for i in $(ALL); do cp $$i $(TARGET_PREFIX)/$$i; done
+
+ hostapd: $(OBJS)
+- $(CC) -o hostapd $(OBJS) $(LIBS)
++ $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
+
+ driver_conf.c: Makefile .config
+ rm -f driver_conf.c
diff --git a/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty b/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/mtx-1/.mtn2git_empty
diff --git a/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig b/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig
new file mode 100644
index 0000000000..8c3065c3b9
--- /dev/null
+++ b/packages/hostap/hostap-daemon-0.4.4/mtx-1/defconfig
@@ -0,0 +1,66 @@
+# Example hostapd build time configuration
+#
+# This file lists the configuration options that are used when building the
+# hostapd binary. All lines starting with # are ignored. Configuration option
+# lines must be commented out complete, if they are not to be included, i.e.,
+# just setting VARIABLE=n is not disabling that variable.
+#
+# This file is included in Makefile, so variables like CFLAGS and LIBS can also
+# be modified from here. In most cass, these lines should use += in order not
+# to override previous values of the variables.
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
+# Driver interface for wired authenticator
+CONFIG_DRIVER_WIRED=y
+
+# Driver interface for madwifi driver
+CONFIG_DRIVER_MADWIFI=y
+#CFLAGS += -I../head # change to reflect local setup; directory for madwifi src
+
+# Driver interface for Prism54 driver
+CONFIG_DRIVER_PRISM54=y
+
+# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
+#CONFIG_DRIVER_BSD=y
+#CFLAGS += -I/usr/local/include
+#LIBS += -L/usr/local/lib
+
+# IEEE 802.11F/IAPP
+CONFIG_IAPP=y
+
+# WPA2/IEEE 802.11i RSN pre-authentication
+CONFIG_RSN_PREAUTH=y
+
+# Integrated EAP authenticator
+CONFIG_EAP=y
+
+# EAP-MD5 for the integrated EAP authenticator
+CONFIG_EAP_MD5=y
+
+# EAP-TLS for the integrated EAP authenticator
+CONFIG_EAP_TLS=y
+
+# EAP-MSCHAPv2 for the integrated EAP authenticator
+CONFIG_EAP_MSCHAPV2=y
+
+# EAP-PEAP for the integrated EAP authenticator
+CONFIG_EAP_PEAP=y
+
+# EAP-GTC for the integrated EAP authenticator
+CONFIG_EAP_GTC=y
+
+# EAP-TTLS for the integrated EAP authenticator
+CONFIG_EAP_TTLS=y
+
+# EAP-SIM for the integrated EAP authenticator
+#CONFIG_EAP_SIM=y
+
+# PKCS#12 (PFX) support (used to read private key and certificate file from
+# a file that usually has extension .p12 or .pfx)
+CONFIG_PKCS12=y
+
+# RADIUS authentication server. This provides access to the integrated EAP
+# authenticator from external hosts using RADIUS.
+CONFIG_RADIUS_SERVER=y
diff --git a/packages/hostap/hostap-daemon_0.4.4.bb b/packages/hostap/hostap-daemon_0.4.4.bb
new file mode 100644
index 0000000000..9363a10d91
--- /dev/null
+++ b/packages/hostap/hostap-daemon_0.4.4.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "hostap-modules (${PV}) hostap-utils (${PV})"
+DEPENDS_mtx-1_append = "madwifi-modules"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz \
+ file://makefile-cross.diff;patch=1;pnum=0 \
+ file://madwifi-bsd-fix.diff;patch=1;pnum=0 \
+ file://defconfig \
+ file://init"
+
+S = "${WORKDIR}/hostapd-${PV}"
+
+do_configure() {
+ install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+}
+
+do_compile() {
+ CFLAGS='${CFLAGS}' CC='${CC}' make
+}
+
+do_install() {
+ install -d ${D}${sbindir} ${D}${sysconfdir}/init.d
+ make TARGET_PREFIX=${D}${sbindir} install
+ install -m 0644 hostapd.conf ${D}${sysconfdir}
+ install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/hostapd
+}
diff --git a/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/.mtn2git_empty
diff --git a/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
new file mode 100644
index 0000000000..b139ef38f1
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/ipaq_compat.patch
@@ -0,0 +1,11 @@
+--- hostap-driver-0.3.7/driver/modules/hostap_compat.h.old 2005-04-17 09:12:38.304421464 +0100
++++ hostap-driver-0.3.7/driver/modules/hostap_compat.h 2005-04-17 09:13:04.413452288 +0100
+@@ -5,7 +5,7 @@
+ #define NEW_MODULE_CODE
+ #endif
+
+-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44))
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,44)) && !defined(CONFIG_IPAQ_HANDHELD)
+
+ #define HOSTAP_QUEUE struct tq_struct
+
diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
new file mode 100644
index 0000000000..c2d6662d69
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/mtx_compat.diff
@@ -0,0 +1,20 @@
+--- driver/modules/hostap_compat.h.orig 2004-08-09 16:16:48.359929856 +0200
++++ driver/modules/hostap_compat.h 2004-08-09 16:17:12.383277752 +0200
+@@ -13,7 +13,7 @@
+ MOD_INC_USE_COUNT; \
+ if (schedule_task((q)) == 0) \
+ MOD_DEC_USE_COUNT;
+-
++/*
+ static inline void flush_scheduled_work(void)
+ {
+ flush_scheduled_tasks();
+@@ -27,7 +27,7 @@
+ tq->routine = routine;
+ tq->data = data;
+ }
+-
++*/
+ #else /* kernel < 2.5.44 */
+
+ #define HOSTAP_QUEUE struct work_struct
diff --git a/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
new file mode 100644
index 0000000000..e979b72d93
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.4.4/mtx_hostap_deferred_irq.diff
@@ -0,0 +1,81 @@
+--- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100
++++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100
+@@ -50,6 +50,13 @@
+ };
+
+
++#define DEFERRED_IRQ_INITIALIZATION
++
++#ifdef DEFERRED_IRQ_INITIALIZATION
++struct net_device *devb[MAX_PARM_DEVICES];
++#endif
++
++
+ #ifdef PRISM2_IO_DEBUG
+
+ static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v)
+@@ -280,6 +287,10 @@
+
+ pci_set_drvdata(pdev, dev);
+
++#ifdef DEFERRED_IRQ_INITIALIZATION
++ printk("%s: deferred initialization of IRQs\n", dev_info);
++ devb[cards_found-1] = dev;
++#else
+ if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name,
+ dev)) {
+ printk(KERN_WARNING "%s: request_irq failed\n", dev->name);
+@@ -295,7 +306,7 @@
+
+ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: "
+ "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq);
+-
++#endif
+ return hostap_hw_ready(dev);
+
+ fail:
+@@ -399,18 +410,43 @@
+ };
+
+
++#ifdef DEFERRED_IRQ_INITIALIZATION
++static void deferred_init(int num_devices)
++{
++ int n;
++ for (n=0; n<num_devices && n<MAX_PARM_DEVICES; n++)
++ {
++ if (request_irq(devb[n]->irq, prism2_interrupt, SA_SHIRQ, devb[n]->name,
++ devb[n])) {
++ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name);
++ }
++ if (prism2_hw_config(devb[n], 1)) {
++ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name)
++;
++ }
++ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]->
++irq);
++ }
++}
++#endif
++
+ static int __init init_prism2_pci(void)
+ {
+ printk(KERN_INFO "%s: %s\n", dev_info, version);
+
+ #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10))
+- if (pci_register_driver(&prism2_pci_drv_id) <= 0) {
++ int n;
++ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) {
+ printk("hostap_pci: No devices found, driver not "
+ "installed.\n");
+ pci_unregister_driver(&prism2_pci_drv_id);
+ return -ENODEV;
+ }
+
++#ifdef DEFERRED_IRQ_INITIALIZATION
++ deferred_init(n);
++#endif
++
+ return 0;
+ #else
+ return pci_register_driver(&prism2_pci_drv_id);
diff --git a/packages/hostap/hostap-modules_0.4.4.bb b/packages/hostap/hostap-modules_0.4.4.bb
new file mode 100644
index 0000000000..fd7a3eaff9
--- /dev/null
+++ b/packages/hostap/hostap-modules_0.4.4.bb
@@ -0,0 +1,42 @@
+DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset"
+SECTION = "kernel/modules"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
+ file://hostap_cs.conf "
+
+SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
+ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
+SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
+
+S = "${WORKDIR}/hostap-driver-${PV}"
+
+inherit module
+
+# Hack Alert :D
+ARCH_mipsel = "mips"
+MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'"
+
+NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep"
+
+do_install() {
+ install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \
+ ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \
+ ${D}${sysconfdir}/pcmcia
+ for i in ${NET_MODULES}
+ do
+ install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/
+ done
+ install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/
+ install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf
+ cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf
+}
+
+PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules"
+FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/"
+FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}"
+FILES_hostap-modules = "/lib/modules/"
+RDEPENDS_hostap-modules-cs = "hostap-modules"
+RDEPENDS_hostap-modules-pci = "hostap-modules"
diff --git a/packages/hostap/hostap-utils_0.4.0.bb b/packages/hostap/hostap-utils_0.4.0.bb
new file mode 100644
index 0000000000..7601129934
--- /dev/null
+++ b/packages/hostap/hostap-utils_0.4.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "User mode helpers for the hostap driver"
+HOMEPAGE = "http://hostap.epitest.fi"
+SECTION = "kernel/userland"
+PRIORITY = "optional"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+LICENSE = "GPL"
+RDEPENDS = "hostap-modules (${PV})"
+PR = "r1"
+
+SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \
+ file://hostap-fw-load.patch;patch=1"
+S = "${WORKDIR}/hostap-utils-${PV}"
+
+BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \
+ hostap_rid prism2_param prism2_srec split_combined_hex"
+
+do_install() {
+ install -d ${D}${sbindir}/
+ for f in ${BINARIES}
+ do
+ install -m 0755 $f ${D}${sbindir}/
+ done
+}
+
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 60346f70d9..4c92d07130 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
DEPENDS_openzaurus = "makedevs virtual/kernel"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r56"
+PR = "r57"
SRC_URI = "file://halt \
file://ramdisk \
@@ -103,7 +103,7 @@ do_install () {
fi
case ${MACHINE} in
- c7x0 | tosa | spitz | akita )
+ c7x0 | tosa | spitz | akita | borzoi )
install -m 0755 ${WORKDIR}/keymap ${D}${sysconfdir}/init.d
ln -sf ../init.d/keymap ${D}${sysconfdir}/rcS.d/S00keymap
install -m 0644 ${WORKDIR}/keymap-*.map ${D}${sysconfdir}
diff --git a/packages/kdepimpi/kdepimpi_2.2.2.bb b/packages/kdepimpi/kdepimpi_2.2.3.bb
index f3dde1a2fd..f3dde1a2fd 100644
--- a/packages/kdepimpi/kdepimpi_2.2.2.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.3.bb
diff --git a/packages/kdepimpi/pwmpi_2.2.2.bb b/packages/kdepimpi/pwmpi_2.2.3.bb
index 904f640955..904f640955 100644
--- a/packages/kdepimpi/pwmpi_2.2.2.bb
+++ b/packages/kdepimpi/pwmpi_2.2.3.bb
diff --git a/packages/libao/libao_0.8.6.bb b/packages/libao/libao_0.8.6.bb
new file mode 100644
index 0000000000..62275f14fb
--- /dev/null
+++ b/packages/libao/libao_0.8.6.bb
@@ -0,0 +1,26 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cross platform audio library"
+HOMEPAGE = "http://www.xiph.org/ao/"
+SECTION = "libs"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://downloads.xiph.org/releases/ao/libao-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-esd --disable-esdtest \
+ --disable-alsa --disable-alsa09 \
+ --disable-arts --disable-nas"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/ao
+ install -m 0644 ${S}/include/ao/ao.h ${S}/include/ao/os_types.h \
+ ${S}/include/ao/plugin.h ${STAGING_INCDIR}/ao/
+
+ oe_libinstall -so -C src libao ${STAGING_LIBDIR}
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 ao.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN} += "${libdir}/ao/plugins-2/*.so"
diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb
index 83afaacefe..578c9b7674 100644
--- a/packages/libdaemon/libdaemon_0.6.bb
+++ b/packages/libdaemon/libdaemon_0.6.bb
@@ -12,7 +12,7 @@ EXTRA_OECONF = "--disable-lynx --disable-doxygen"
do_stage () {
oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR}
install -d ${STAGING_INCDIR}/libdaemon
- for i in dlog.h dfork.h dsignal.h dnonblock.h dpid.h; do
+ for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/
done
}
diff --git a/packages/libdvb/files/.mtn2git_empty b/packages/libdvb/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libdvb/files/.mtn2git_empty
diff --git a/packages/libdvb/files/topf2ps.patch b/packages/libdvb/files/topf2ps.patch
new file mode 100644
index 0000000000..93503ca92d
--- /dev/null
+++ b/packages/libdvb/files/topf2ps.patch
@@ -0,0 +1,123 @@
+diff -ruN libdvb-0.5.5/Makefile libdvb-0.5.5-topfield/Makefile
+--- libdvb-0.5.5/Makefile 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/Makefile 2004-12-03 15:53:24.677184191 +1100
+@@ -68,7 +68,7 @@
+ make -C libdvbmpeg clean
+ make -C sample_progs clean
+ make -C dvb-mpegtools clean
+- rm include/*~
++ -rm -f include/*~
+
+ dist:
+ mkdir libdvb-$(VERSION)
+diff -ruN libdvb-0.5.5/dvb-mpegtools/Makefile libdvb-0.5.5-topfield/dvb-mpegtools/Makefile
+--- libdvb-0.5.5/dvb-mpegtools/Makefile 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/dvb-mpegtools/Makefile 2004-12-03 12:38:58.000000000 +1100
+@@ -16,7 +16,7 @@
+ pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
+ insert_pat_pmt get_http extract_pes extract_pes_payload\
+ change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
+- change_aspect_221_1
++ change_aspect_221_1 topf2ps
+
+ .PHONY: depend clean install uninstall
+
+diff -ruN libdvb-0.5.5/dvb-mpegtools/main.cc libdvb-0.5.5-topfield/dvb-mpegtools/main.cc
+--- libdvb-0.5.5/dvb-mpegtools/main.cc 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/dvb-mpegtools/main.cc 2004-12-03 12:45:39.000000000 +1100
+@@ -52,7 +52,7 @@
+ write(STDOUT_FILENO, buf, count);
+ }
+
+-#define PROGS 29
++#define PROGS 30
+
+ char *prognames[PROGS+1] = { "streamtype", // 0
+ "ts2pes", // 1
+@@ -83,6 +83,7 @@
+ "change_aspect_4_3",
+ "change_aspect_16_9",
+ "change_aspect_221_1", // 28
++ "topf2ps",
+ " "
+ };
+
+@@ -116,6 +117,7 @@
+ change_aspect_4_3_,
+ change_aspect_16_9_,
+ change_aspect_221_1_, // 28
++ topf2ps_,
+ none_,
+ };
+
+@@ -226,6 +228,11 @@
+ cerr << "or insert_pat_pmt < <filename> (or pipe)" << endl;
+ break;
+
++ case topf2ps_:
++ cerr << "usage: topf2ps <filename>" << endl;
++ cerr << "or topf2ps < <filename> (or pipe)" << endl;
++ break;
++
+ case get_http_:
+ cerr << "usage: get_http <URL>" << endl;
+ break;
+@@ -345,6 +352,10 @@
+ }
+ break;
+
++ case topf2ps_:
++ topf_to_ps(fd, STDOUT_FILENO);
++ break;
++
+ case insert_pat_pmt_:
+ insert_pat_pmt( fd, STDOUT_FILENO);
+ break;
+diff -ruN libdvb-0.5.5/include/transform.h libdvb-0.5.5-topfield/include/transform.h
+--- libdvb-0.5.5/include/transform.h 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/include/transform.h 2004-12-03 12:49:20.000000000 +1100
+@@ -192,6 +192,7 @@
+ void kpes_to_ts( p2p *p,uint8_t *buf ,int count );
+ void setup_ts2pes( p2p *pa, p2p *pv, uint32_t pida, uint32_t pidv,
+ void (*pes_write)(uint8_t *buf, int count, void *p));
++ void topf_to_ps(int fdin, int fdout);
+ void kts_to_pes( p2p *p, uint8_t *buf);
+ void pes_repack(p2p *p);
+ void extract_from_pes(int fdin, int fdout, uint8_t id, int es);
+diff -ruN libdvb-0.5.5/libdvbmpeg/transform.c libdvb-0.5.5-topfield/libdvbmpeg/transform.c
+--- libdvb-0.5.5/libdvbmpeg/transform.c 2004-09-16 04:56:21.000000000 +1000
++++ libdvb-0.5.5-topfield/libdvbmpeg/transform.c 2004-12-03 12:50:55.000000000 +1100
+@@ -1247,6 +1247,30 @@
+
+ }
+
++void topf_to_ps( int fdin, int fdout)
++{
++
++ uint16_t pida, pidv;
++ uint8_t buf[1880];
++ int count = 1;
++
++ if ((count = save_read(fdin, buf, sizeof(buf))) < 0)
++ perror("reading");
++
++ if ((count != sizeof(buf)) || (buf[0] != 'T') || (buf[1] != 'F') ||
++ (buf[2] != 'r') || (buf[3] != 'c')) {
++
++ fprintf(stderr, "Couldn't read Topfield header\n");
++ return;
++ }
++
++ pida = (buf[24] << 8) + buf[25];
++ pidv = ((buf[26] & 0x7f) << 8) + buf[27];
++
++ fprintf(stderr, "apid %d (0x%02x)\n",pida,pida);
++ fprintf(stderr, "vpid %d (0x%02x)\n",pidv,pidv);
++ ts_to_pes(fdin, pida, pidv, 1);
++}
+
+ #define INN_SIZE 2*IN_SIZE
+ void insert_pat_pmt( int fdin, int fdout)
+
+
+
diff --git a/packages/libdvb/libdvb_0.5.5.1.bb b/packages/libdvb/libdvb_0.5.5.1.bb
index 62ce3c61e5..0e0c2b9caf 100644
--- a/packages/libdvb/libdvb_0.5.5.1.bb
+++ b/packages/libdvb/libdvb_0.5.5.1.bb
@@ -1,12 +1,15 @@
LICENSE = "GPL"
DESCRIPTION = "Linux Digital Video Broadcast library"
+DESCRIPTION_libdvb-dev = "Headers for libdvb development"
HOMEPAGE = "http://www.metzlerbros.org/dvb/index.html"
MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
SECTION = "libs"
PRIORITY = "optional"
-PR = "r0"
+PR = "r2"
+
+SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz \
+ file://topf2ps.patch;patch=1"
-SRC_URI = "http://www.metzlerbros.org/dvb/${PN}-${PV}.tar.gz"
S = "${WORKDIR}/${PN}-${PV}"
inherit autotools pkgconfig
diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc
index 703ae6db34..b19a71c1f9 100644
--- a/packages/libopie/libopie2.inc
+++ b/packages/libopie/libopie2.inc
@@ -4,7 +4,7 @@ SECTION = "opie/libs"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "LGPL"
I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie sqlite3 libpcap"
+DEPENDS = "libqpe-opie libpcap sqlite3"
PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
S = "${WORKDIR}/libopie2"
@@ -20,7 +20,8 @@ EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \
DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \
LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"'
-EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=y'
+#NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images
+EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n'
MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui"
LIBS = "core2 db2 mm2 net2 pim2 security2 ui2"
diff --git a/packages/libschedule/libschedule_0.15.bb b/packages/libschedule/libschedule_0.15.bb
new file mode 100644
index 0000000000..e186262cde
--- /dev/null
+++ b/packages/libschedule/libschedule_0.15.bb
@@ -0,0 +1,21 @@
+LICENSE = "LGPL"
+PR = "r1"
+DESCRIPTION = "RTC alarm handling library for GPE"
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+MAINTAINER = "Philip Blundell <pb@handhelds.org>"
+DEPENDS = "glib-2.0 sqlite"
+
+inherit autotools libtool pkgconfig gpe
+
+headers = "schedule.h"
+
+do_stage () {
+ oe_libinstall -so libschedule ${STAGING_LIBDIR}
+
+ mkdir -p ${STAGING_INCDIR}/gpe
+ for h in ${headers}; do
+ install -m 0644 ${S}/gpe/$h ${STAGING_INCDIR}/gpe/$h
+ done
+}
+
diff --git a/packages/libxsettings-client/libxsettings-client_0.14.bb b/packages/libxsettings-client/libxsettings-client_0.14.bb
new file mode 100644
index 0000000000..da6a88b31a
--- /dev/null
+++ b/packages/libxsettings-client/libxsettings-client_0.14.bb
@@ -0,0 +1,20 @@
+SECTION = "gpe/libs"
+LICENSE = "BSD-X"
+PRIORITY = "optional"
+DEPENDS = "libgpewidget libxsettings x11"
+
+inherit autotools pkgconfig gpe
+
+SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
+S = ${WORKDIR}/xsettings-client-${PV}
+
+
+headers = "xsettings-client.h xsettings-common.h"
+do_stage () {
+ oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
+ mkdir -p ${STAGING_INCDIR}
+ for h in ${headers}; do
+ install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
+ done
+}
+
diff --git a/packages/linux-hotplug/linux-hotplug_20040329.bb b/packages/linux-hotplug/linux-hotplug_20040329.bb
index 9f06cd7c55..06d9faee77 100644
--- a/packages/linux-hotplug/linux-hotplug_20040329.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040329.bb
@@ -3,9 +3,10 @@ DESCRIPTION = "This package contains the scripts necessary \
for hotplug Linux support, and lets you plug in new devices \
and use them immediately."
LICENSE = "GPL"
-RPROVIDES = "hotplug"
-RCONFLICTS = "hotplug"
-RREPLACES = "hotplug"
+RPROVIDES_${PN} = "hotplug"
+RCONFLICTS_${PN} = "hotplug"
+RREPLACES_${PN} = "hotplug"
+PR = "r1"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_29.tar.gz \
file://busybox.patch;patch=1 \
diff --git a/packages/linux-hotplug/linux-hotplug_20040920.bb b/packages/linux-hotplug/linux-hotplug_20040920.bb
index db4cf3f408..ce503a219e 100644
--- a/packages/linux-hotplug/linux-hotplug_20040920.bb
+++ b/packages/linux-hotplug/linux-hotplug_20040920.bb
@@ -3,12 +3,12 @@ for hotplug Linux support, and lets you plug in new devices \
and use them immediately."
HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
LICENSE = "GPL"
-RPROVIDES = "hotplug"
-RCONFLICTS = "hotplug"
-RREPLACES = "hotplug"
+RPROVIDES_${PN} = "hotplug"
+RCONFLICTS_${PN} = "hotplug"
+RREPLACES_${PN} = "hotplug"
SECTION = "base"
RSUGGESTS = "pciutils usbutils"
-PR = "r6"
+PR = "r7"
SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_09_20.tar.gz \
file://userspecified_hcd.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.11.bb b/packages/linux/linux-openzaurus_2.6.11.bb
index ef1a97d2e4..f3204a3030 100644
--- a/packages/linux/linux-openzaurus_2.6.11.bb
+++ b/packages/linux/linux-openzaurus_2.6.11.bb
@@ -32,19 +32,19 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
${RPSRC}/pxa_rtc-r1.patch;patch=1 \
${RPSRC}/archive/pxa_irda-r1.patch;patch=1 \
${RPSRC}/archive/pxaudc_susres-r1.patch;patch=1 \
- ${RPSRC}/sharp_multi_pcmcia-r2.patch;patch=1 \
+ ${RPSRC}/archive/sharp_multi_pcmcia-r2.patch;patch=1 \
${RPSRC}/archive/pxa_turbo-r0.patch;patch=1 \
${RPSRC}/archive/sharpsl_mapprom-r1.patch;patch=1 \
${RPSRC}/archive/input_power-r1.patch;patch=1 \
- ${RPSRC}/corgi_irda-r2.patch;patch=1 \
- ${RPSRC}/corgi_base_extras1-r2.patch;patch=1 \
+ ${RPSRC}/archive/corgi_irda-r2.patch;patch=1 \
+ ${RPSRC}/archive/corgi_base_extras1-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
${RPSRC}/archive/corgi_power-r22.patch;patch=1 \
- ${RPSRC}/corgi_power1-r1.patch;patch=1 \
+ ${RPSRC}/archive/corgi_power1-r1.patch;patch=1 \
${RPSRC}/archive/ide_fixes-r1.patch;patch=1 \
${RPSRC}/archive/mmc_sd-r4.patch;patch=1 \
${RPSRC}/mmc_timeout-r0.patch;patch=1 \
- ${RPSRC}/corgi_snd-r6.patch;patch=1 \
+ ${RPSRC}/archive/corgi_snd-r6.patch;patch=1 \
${RPSRC}/archive/w100_split-r5-r1.patch;patch=1 \
${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
${DOSRC}/tc6393-device-r2.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 065d5d9eb8..a29faf201f 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r11"
+PR = "r16"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -38,23 +38,38 @@ BASRC = "http://www.orca.cx/zaurus/patches"
# Patches submitted upstream are towards top of this list
+# Hacks should clearly named and at the bottom
SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.13-rc5.bz2;patch=1 \
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc5/2.6.13-rc5-mm1/2.6.13-rc5-mm1.bz2;patch=1 \
${RPSRC}/reverse_pagefault-r3.patch;patch=1 \
${RPSRC}/corgi_tspmufix-r0.patch;patch=1 \
${RPSRC}/nwfpe_x80-r0.patch;patch=1 \
- ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
- ${RPSRC}/pxa_irda-r2.patch;patch=1 \
+ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
+ ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/ohci_portcount-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_power-r0.patch;patch=1 \
+ ${RPSRC}/pxa_ohci_platform-r0.patch;patch=1 \
+ ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
+ ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
+ ${RPSRC}/pxa_remove_static-r0.patch;patch=1 \
+ ${RPSRC}/pxafb_hsync-r2.patch;patch=1 \
+ ${RPSRC}/pxa27x_extraregs-r4.patch;patch=1 \
${RPSRC}/sharp_multi_pcmcia-r3.patch;patch=1 \
- ${RPSRC}/input_power-r2.patch;patch=1 \
- ${RPSRC}/corgi_irda-r2.patch;patch=1 \
- ${RPSRC}/corgi_base_extras4-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_ssp-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_lcd-r1.patch;patch=1 \
+ ${RPSRC}/sharpsl_ts-r3.patch;patch=1 \
+ ${RPSRC}/sharpsl_bl-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_pm-r1.patch;patch=1 \
+ ${RPSRC}/corgi_pm-r0.patch;patch=1 \
+ ${RPSRC}/spitzkbd-r1.patch;patch=1 \
+ ${RPSRC}/spitzcf-r1.patch;patch=1 \
+ ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
+ ${RPSRC}/pxa_irda-r3.patch;patch=1 \
+ ${RPSRC}/corgi_irda-r3.patch;patch=1 \
+ ${RPSRC}/input_power-r2.patch;patch=1 \
${RPSRC}/jffs2_longfilename-r0.patch;patch=1 \
- ${RPSRC}/corgi_power-r24.patch;patch=1 \
- ${RPSRC}/corgi_power1-r1.patch;patch=1 \
- ${DOSRC}/mmc-bulk-r0.patch;patch=1 \
- ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
+ ${RPSRC}/sharpsl_bl_kick-r0.patch;patch=1 \
${RPSRC}/corgi_snd-r10.patch;patch=1 \
${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \
${RPSRC}/spitz_mtd-r0.patch;patch=1 \
@@ -79,21 +94,12 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
- ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
- ${RPSRC}/spitzbase-r5.patch;patch=1 \
- ${RPSRC}/spitzkbd-r1.patch;patch=1 \
- ${RPSRC}/spitzssp-r4.patch;patch=1 \
- ${RPSRC}/spitzbl-r1.patch;patch=1 \
- ${RPSRC}/spitzts-r1.patch;patch=1 \
- ${RPSRC}/spitzcf-r1.patch;patch=1 \
- ${RPSRC}/spitz_power-r1.patch;patch=1 \
- ${RPSRC}/spitz_usbhost-r0.patch;patch=1 \
- ${RPSRC}/spitz_usbsuspend-r0.patch;patch=1 \
+ ${RPSRC}/spitz_base-r10.patch;patch=1 \
+ ${RPSRC}/spitz_pm-r0.patch;patch=1 \
${RPSRC}/scoop_susres-r0.patch;patch=1 \
- ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
${RPSRC}/pcmcia_dev_ids-r0.patch;patch=1 \
+ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \
${RPSRC}/pxa_cf_initorder_hack-r1.patch;patch=1 \
- ${RPSRC}/pxa_pcmcia_init-r0.patch;patch=1 \
file://add-oz-release-string.patch;patch=1 \
file://add-elpp-stuff.patch;patch=1 \
file://pxa-serial-hack.patch;patch=1 \
@@ -153,6 +159,11 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_MEM} debug"
#
ENABLE_ELPP = ${@bb.data.getVar("OZ_KERNEL_ENABLE_ELPP",d,1) or "no"}
+###############################################################
+# module configs specific to this kernel
+#
+module_autoload_pxaficp_ir = "pxaficp_ir"
+
do_configure() {
install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig
index 208041c6d6..d9a01070d5 100644
--- a/packages/linux/unslung-kernel/defconfig
+++ b/packages/linux/unslung-kernel/defconfig
@@ -596,7 +596,18 @@ CONFIG_PPP_BSDCOMP=m
#
# Wireless LAN (non-hamradio)
#
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
+# CONFIG_STRIP is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_ARLAN is not set
+# CONFIG_AIRONET4500 is not set
+# CONFIG_AIRONET4500_NONCS is not set
+# CONFIG_AIRONET4500_PROC is not set
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_PLX_HERMES is not set
+# CONFIG_PCI_HERMES is not set
+CONFIG_NET_WIRELESS=y
#
# Token Ring devices
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index 0a7a8f3dd2..4acc6d7a5f 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb
DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device"
MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>"
-PR = "r2"
+PR = "r3"
KERNEL_SUFFIX = "unslung"
diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb
new file mode 100644
index 0000000000..c7a7630da4
--- /dev/null
+++ b/packages/meta/e-image-core.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager"
+LICENSE = "MIT"
+PR = "r0"
+
+export IMAGE_BASENAME = "e-image-core"
+export IMAGE_LINGUAS = ""
+
+DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+
+export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11-core xserver-kdrive-fbdev"
+
+inherit image_ipk
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index d58215d3a7..2183674b6f 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,18 +1,7 @@
DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
-export IMAGE_BASENAME = "e-image"
-export IMAGE_LINGUAS = ""
-
-DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/evas = "evas-x11"
-PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
-PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
-PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+include e-image-core.bb
-export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
-
-inherit image_ipk
+export IMAGE_BASENAME = "e-image"
+export IPKG_INSTALL += "task-enlightenment-x11" \ No newline at end of file
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 4ff955e06b..47bec68cac 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta-package for Enlightenment/X11"
LICENSE = "MIT"
-PACKAGES = "task-enlightenment-x11"
-PR = "r4"
+PACKAGES = "task-enlightenment-x11 task-enlightenment-x11-core"
+PR = "r5"
FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -11,14 +11,20 @@ ALLOW_EMPTY = 1
#
# X
#
-DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
- ttf-bitstream-vera bash chkhinge"
-RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
- ttf-bitstream-vera chkhinge"
+DEPENDS_task-enlightenment-x11-core += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
+ ttf-bitstream-vera chkhinge"
+RDEPENDS_task-enlightenment-x11-core += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+ ttf-bitstream-vera chkhinge"
+
+#
+# E-core
+#
+DEPENDS_task-enlightenment-x11-core += "entrance e-wm"
+RDEPENDS_task-enlightenment-x11-core += "entrance e-wm"
#
# E
#
-DEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
-RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
+DEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
+RDEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 9be1e321bd..d28b6cebc8 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -3,9 +3,9 @@ LICENSE = MIT
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \
binutils-cross-sdk gcc-cross-sdk gdb-cross \
libidl libsvg-cairo sed-native \
- meta-gpe \
+ meta-gpe gstreamer\
opie-mail"
-PR = "r5"
+PR = "r8"
PACKAGES = ""
@@ -51,24 +51,14 @@ libice-dev \
libidl-2-dev \
libipkg-dev \
libjpeg-dev \
-libmailwrapper-dev \
libmb-dev \
libmimedir-dev \
libopenobex-1.0-dev \
-libopiebluez2-dev \
-libopiedb2-dev \
-libopiecore2-dev \
-libopienet2-dev \
-libopiepim2-dev \
-libopieui2-dev \
libpcap-dev \
libpixman-dev \
libpng-dev \
libpng12-dev \
libpopt-dev \
-libqpe1-dev \
-libqte2-dev \
-libqtaux2-dev \
libreadline-dev \
libschedule-dev \
libsm-dev \
@@ -95,7 +85,6 @@ libxpm-dev \
libxrandr-dev \
libxrender-dev \
libxsettings-client-dev \
-libxsettings-dev \
libxss-dev \
libxt-dev \
libxtst-dev \
@@ -113,8 +102,21 @@ xextensions-dev \
libxmu-dev \
xproto-dev \
xtrans-dev \
+gstreamer-dev \
"
+#libopiebluez2-dev \
+#libopiedb2-dev \
+#libopiecore2-dev \
+#libopienet2-dev \
+#libopiepim2-dev \
+#libopieui2-dev \
+#libqpe1-dev \
+#libqte2-dev \
+#libqtaux2-dev \
+#libmailwrapper-dev \
+
+
do_populate_sdk() {
touch ${DEPLOY_DIR_IPK}/Packages
ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 2febd8d2b3..80c0a5be09 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -97,6 +97,7 @@ OPENSLUG_PACKAGES = "\
puppy \
pwc \
python \
+ qc-usb-messenger \
quilt \
reiserfsprogs reiser4progs \
rsync \
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 052ddac474..f45f5916e4 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -33,17 +33,22 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \
opie-style-metal opie-style-web opie-style-phase"
-OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \
- openobex-apps libopieobex0 wireless-tools usbutils"
-OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \
- bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools "
+OPIE_BLUETOOTH_DEPENDS = "bluez-utils-nodbus openobex obexftp openobex-apps obexpush \
+ libopieobex0 libopietooth1 \
+ opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+OPIE_BLUETOOTH_RDEPENDS = "bluez-utils-nodbus obexftp openobex-apps obexpush \
+ opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+
+OPIE_BASE_DEPENDS = "ipkg timezones ntp irda-utils wireless-tools usbutils ${OPIE_BLUETOOTH_DEPENDS}"
+OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset wireless-tools ${OPIE_BLUETOOTH_RDEPENDS}"
#
# Clamshell models can benefit from the autorotate applet
#
-OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_borzoi = " opie-autorotateapplet"
# Keyboard models can benefit from the VT and logout applets
OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet"
diff --git a/packages/musicpd/mpd_0.11.5.bb b/packages/musicpd/mpd_0.11.5.bb
new file mode 100644
index 0000000000..395d69e79e
--- /dev/null
+++ b/packages/musicpd/mpd_0.11.5.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "Music Player Daemon (mpd)"
+HOMEPAGE = "http://www.musicpd.org"
+LICENSE = "GPLv2"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "console/multimedia"
+DEPENDS = "libvorbis libogg libid3tag libao zlib libmikmod libmad flac audiofile"
+PR = "r2"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz"
+
+inherit autotools
+
+# Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
+# be built, instead we use the OE built versions which should be installed
+# in staging - remove the --with and replace with --enable to use the local
+# versions.
+
+EXTRA_OECONF = "--enable-ogg \
+ --with-id3tag-libraries=${STAGING_LIBDIR} \
+ --with-id3tag-includes=${STAGING_INCDIR} \
+ --with-mad-libraries=${STAGING_LIBDIR} \
+ --with-mad-includes=${STAGING_INCDIR} \
+ --without-faad"
diff --git a/packages/obexpush/obexpush-native_1.0.0.bb b/packages/obexpush/obexpush-native_1.0.0.bb
index 6e63de5c98..64840797cd 100644
--- a/packages/obexpush/obexpush-native_1.0.0.bb
+++ b/packages/obexpush/obexpush-native_1.0.0.bb
@@ -3,6 +3,10 @@ inherit native
FILESPATH = "${FILE_DIRNAME}/obexpush-${PV}:${FILE_DIRNAME}/obexpush:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+do_stage() {
+ :
+}
+
do_install() {
:
}
diff --git a/packages/obexpush/obexpush_1.0.0.bb b/packages/obexpush/obexpush_1.0.0.bb
index b441e7c3a6..a01b6ddee6 100644
--- a/packages/obexpush/obexpush_1.0.0.bb
+++ b/packages/obexpush/obexpush_1.0.0.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php"
SECTION = "console/network"
LICENSE = "GPL"
DEPENDS = "glib-2.0 openobex bluez-libs"
-PR = "r1"
+PR = "r2"
SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
file://add-obextool.patch;patch=1 \
@@ -41,6 +41,6 @@ do_install() {
install -m 0755 opd/opd ${D}${sbindir}
install -d ${D}${sysconfdir}/init.d
- install -m 0644 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd
+ install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/opd
}
diff --git a/packages/pcmcia-cs/files/arm/pcmcia b/packages/pcmcia-cs/files/arm/pcmcia
index 3dc330db21..d42bc84e77 100644
--- a/packages/pcmcia-cs/files/arm/pcmcia
+++ b/packages/pcmcia-cs/files/arm/pcmcia
@@ -1,6 +1,14 @@
case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
*XScale-PXA2*)
- PCIC=pxa_cs
+
+ case "`uname -r`" in
+ 2.4*)
+ PCIC=pxa_cs
+ ;;
+ 2.6*)
+ PCIC=pxa2xx_core
+ ;;
+ esac
;;
*StrongARM-1100* | *StrongARM-1110*)
PCIC=sa1100_cs
@@ -12,6 +20,11 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
esac
if grep -q iPAQ /proc/cpuinfo; then
- PCIC_EXTRA=h3600_generic_sleeve
+ case `module_id` in
+ "HP iPAQ H2200")
+ ;;
+ *)
+ PCIC_EXTRA=h3600_generic_sleeve
+ ;;
+ esac
fi
-
diff --git a/packages/pcmciautils/pcmciautils_001.bb b/packages/pcmciautils/pcmciautils_001.bb
deleted file mode 100644
index 59e0cdb86f..0000000000
--- a/packages/pcmciautils/pcmciautils_001.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-DEPENDS += "sysfsutils"
-DESCRIPTION = "2.6 pcmcia utilities"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "base"
-PRIORITY = "optional"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
-
-export HOSTCC = "${BUILD_CC}"
-export etcdir = "${sysconfdir}"
-export hotplugdir = "${sysconfdir}/hotplug"
-export pcmciaconfdir = "${sysconfdir}/pcmcia"
-LD = "${CC}"
-
-EXTRA_OEMAKE = "-e \
- 'STRIP=echo'"
-
-do_compile () {
- oe_runmake build/ccdv
- oe_runmake
-}
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
-RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/pcmciautils/pcmciautils_002.bb b/packages/pcmciautils/pcmciautils_002.bb
deleted file mode 100644
index 440d925313..0000000000
--- a/packages/pcmciautils/pcmciautils_002.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-DEPENDS += "sysfsutils virtual/libintl"
-DESCRIPTION = "2.6 pcmcia utilities"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-SECTION = "base"
-PRIORITY = "optional"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
-
-export HOSTCC = "${BUILD_CC}"
-export etcdir = "${sysconfdir}"
-export hotplugdir = "${sysconfdir}/hotplug"
-export pcmciaconfdir = "${sysconfdir}/pcmcia"
-LD = "${CC}"
-CFLAGS =+ "-I${S}/src"
-
-EXTRA_OEMAKE = "-e \
- 'STRIP=echo' \
- 'LIB_OBJS=-lc -lsysfs -lintl'"
-
-do_compile () {
- oe_runmake build/ccdv
- oe_runmake
-}
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
-RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/pcmciautils/pcmciautils_005.bb b/packages/pcmciautils/pcmciautils_005.bb
deleted file mode 100644
index ad8cf7e2f4..0000000000
--- a/packages/pcmciautils/pcmciautils_005.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "2.6 pcmcia utilities"
-DEPENDS = "sysfsutils"
-SECTION = "kernel/userland"
-PRIORITY = "optional"
-
-SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
-S = "${WORKDIR}/pcmciautils-${PV}"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "coldplug"
-INITSCRIPT_PARAMS = "defaults"
-
-export HOSTCC = "${BUILD_CC}"
-export etcdir = "${sysconfdir}"
-export hotplugdir = "${sysconfdir}/hotplug"
-export pcmciaconfdir = "${sysconfdir}/pcmcia"
-LD = "${CC}"
-CFLAGS =+ "-I${S}/src"
-
-PARALLEL_MAKE = ""
-EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'"
-
-do_install () {
- oe_runmake 'DESTDIR=${D}' install
-}
-
-CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts"
-RCONFLICTS_${PN} += "pcmcia-cs"
diff --git a/packages/pcmciautils/pcmciautils_003.bb b/packages/pcmciautils/pcmciautils_007.bb
index ad8cf7e2f4..ad8cf7e2f4 100644
--- a/packages/pcmciautils/pcmciautils_003.bb
+++ b/packages/pcmciautils/pcmciautils_007.bb
diff --git a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb b/packages/qc-usb/qc-usb-messenger_0.8.bb
index 2720b3af59..2720b3af59 100644
--- a/packages/qc-usb-messenger/qc-usb-messenger_0.8.bb
+++ b/packages/qc-usb/qc-usb-messenger_0.8.bb
diff --git a/packages/rrdtool/rrdtool_1.0.49.bb b/packages/rrdtool/rrdtool_1.0.49.bb
index bea4ae1a1e..ab482b1131 100644
--- a/packages/rrdtool/rrdtool_1.0.49.bb
+++ b/packages/rrdtool/rrdtool_1.0.49.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool"
LICENSE = "GPLv2"
DEPENDS = "libpng zlib"
PR = "r1"
-SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-${PV}.tar.gz \
+SRC_URI = "http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-${PV}.tar.gz \
file://perl-make-options.diff;patch=1;pnum=0"
inherit autotools
diff --git a/packages/scap/files/scap.desktop b/packages/scap/files/scap.desktop
index 6209d8f69c..bba17259bb 100644
--- a/packages/scap/files/scap.desktop
+++ b/packages/scap/files/scap.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Online Screenshot
+Name=Upload Screenshot
Comment=Upload a screenshot to http://handhelds.org/scap
Exec=scap
Terminal=0
diff --git a/packages/scap/files/scap.sh b/packages/scap/files/scap.sh
index 6fccdd400e..ba8bc7e584 100644
--- a/packages/scap/files/scap.sh
+++ b/packages/scap/files/scap.sh
@@ -1,5 +1,9 @@
#!/bin/sh
+sleep 2
+if [ -x /usr/bin/bl ]; then
+ bl toggle
+fi
MODEL=`cat /proc/cpuinfo | grep ^Hardware | sed "s/.* //"`
test -e /etc/scap.conf && USER=`cat /etc/scap.conf`
RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"`
@@ -10,4 +14,7 @@ RES=`fbset 2>/dev/null | awk "/geometry/ { print \$2 "x" \$3 }"`
echo "Host: www.handhelds.org"
echo ""
cat /dev/fb0) | nc www.handhelds.org 80
-
+if [ -x /usr/bin/bl ]; then
+ bl toggle
+fi
+
diff --git a/packages/scap/scap_0.1.bb b/packages/scap/scap_0.1.bb
index 1348e6ed6f..7bef893e59 100644
--- a/packages/scap/scap_0.1.bb
+++ b/packages/scap/scap_0.1.bb
@@ -1,5 +1,5 @@
LICENSE = "OSL"
-PR = "r1"
+PR = "r4"
DESCRIPTION = "handhelds.org screen capture utility"
SRC_URI = "file://scap.sh file://scap.desktop file://scap.png"
diff --git a/packages/sharprom-toolchain/.mtn2git_empty b/packages/sharprom-toolchain/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sharprom-toolchain/.mtn2git_empty
diff --git a/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
new file mode 100644
index 0000000000..e60180e6d8
--- /dev/null
+++ b/packages/sharprom-toolchain/sharprom-toolchain-native_1.0.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Precompiled SharpROM toolchain glue package"
+LICENSE = "GPL"
+SECTION = "base"
+# This needs to be extracted to /usr/local/arm :
+# SRC_URI = "http://handhelds.org/download/projects/toolchain/archive/cross-2.95.3.tar.bz2"
+
+inherit native
+DEPENDS = ""
+
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+do_stage() {
+ if [ ! -e /usr/local/arm/2.95.3/bin/arm-linux-gcc-2.95 ]
+ then
+ die "You need to install the Sharp Toolchain to /usr/local/arm and rename the compiler to arm-linux-gcc-2.95"
+ fi
+ if [ ! -e /usr/local/arm/2.95.3/bin/arm-linux-ld-2.11.2 ]
+ then
+ die "You need to install the Sharp Toolchain to /usr/local/arm and rename the linker to arm-linux-ld-2.11.2"
+ fi
+ ln -sf /usr/local/arm/2.95.3/bin/arm-linux-gcc-2.95 ${STAGING_BINDIR}/arm-linux-gcc
+ ln -sf /usr/local/arm/2.95.3/bin/arm-linux-ld-2.11.2 ${STAGING_BINDIR}/arm-linux-ld
+}
+
diff --git a/packages/syslog-ng/files/.mtn2git_empty b/packages/syslog-ng/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/syslog-ng/files/.mtn2git_empty
diff --git a/packages/syslog-ng/files/initscript b/packages/syslog-ng/files/initscript
new file mode 100644
index 0000000000..b95e8adc20
--- /dev/null
+++ b/packages/syslog-ng/files/initscript
@@ -0,0 +1,45 @@
+#! /bin/sh
+#
+# This is an init script for openembedded
+# Copy it to /etc/init.d/syslog-ng and type
+# > update-rc.d syslog-ng defaults 5
+#
+
+
+syslog_ng=/usr/sbin/syslog-ng
+test -x "$syslog_ng" || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting syslog-ng:"
+ start-stop-daemon --start --quiet --exec $syslog_ng
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping syslog-ng:"
+ start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
+ echo "."
+ ;;
+ reload|force-reload)
+ start-stop-daemon --stop --quiet --signal 1 --exec $syslog_ng
+ ;;
+ restart)
+ echo "Stopping syslog-ng:"
+ start-stop-daemon --stop --quiet --pidfile /var/run/syslog-ng.pid
+ echo -n "Waiting for syslog-ng to die off"
+ for i in 1 2 3 ;
+ do
+ sleep 1
+ echo -n "."
+ done
+ echo ""
+ echo -n "Starting syslog-ng:"
+ start-stop-daemon --start --quiet --exec $syslog_ng
+ echo "."
+ ;;
+ *)
+ echo "Usage: /etc/init.d/syslog-ng {start|stop|reload|restart|force-reload}"
+ exit 1
+esac
+
+exit 0
diff --git a/packages/syslog-ng/syslog-ng_1.6.8.bb b/packages/syslog-ng/syslog-ng_1.6.8.bb
index a4c2fde2d2..bc41020b71 100644
--- a/packages/syslog-ng/syslog-ng_1.6.8.bb
+++ b/packages/syslog-ng/syslog-ng_1.6.8.bb
@@ -1,17 +1,30 @@
-PR = "r4"
+PR = "r7"
MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org"
+DESCRIPTION = "Alternative system logger daemon"
DEPENDS = "libol"
-SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.balabit.com/downloads/syslog-ng/1.6/src/${PN}-${PV}.tar.gz \
+ file://initscript"
S = "${WORKDIR}/${PN}-${PV}"
-inherit autotools
+inherit autotools update-rc.d
EXTRA_OECONF = "--with-libol=${STAGING_BINDIR}/"
CONFFILES_${PN} = "${sysconfdir}/${PN}/syslog-ng.conf"
+INITSCRIPT_NAME = "syslog-ng"
+INITSCRIPT_PARAMS = "defaults 05"
do_install_append() {
install -d ${D}/${sysconfdir}/${PN}
install ${S}/doc/syslog-ng.conf.sample ${D}${sysconfdir}/${PN}/syslog-ng.conf
-
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 755 ${WORKDIR}/initscript ${D}/${sysconfdir}/init.d/syslog-ng
+}
+
+pkg_postinst() {
+ update-rc.d -f syslog remove
+}
+
+pkg_postrm() {
+ update-rc.d syslog add 5
}
diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver
index e7e6dd1ddb..8492bfe214 100644
--- a/packages/x11/x11-common/etc/X11/Xserver
+++ b/packages/x11/x11-common/etc/X11/Xserver
@@ -63,7 +63,7 @@ case `module_id` in
"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
ARGS="$ARGS -rgba rgb" ;;
"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- ARGS="$ARGS -rgba rgb -screen 640x480@270" ;;
+ ARGS="$ARGS -rgba rgb -screen 480x640@270" ;;
"Simpad")
ARGS="$ARGS -rgba rgb" ;;
"Generic OMAP1510/1610/1710")
diff --git a/packages/xscreensaver/files/.mtn2git_empty b/packages/xscreensaver/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xscreensaver/files/.mtn2git_empty
diff --git a/packages/xscreensaver/xscreensaver-4.16/XScreenSaver b/packages/xscreensaver/files/XScreenSaver
index fa27d2c536..fa27d2c536 100644
--- a/packages/xscreensaver/xscreensaver-4.16/XScreenSaver
+++ b/packages/xscreensaver/files/XScreenSaver
diff --git a/packages/xscreensaver/xscreensaver-4.16/fixes.patch b/packages/xscreensaver/files/fixes.patch
index 3d138bc490..3d138bc490 100644
--- a/packages/xscreensaver/xscreensaver-4.16/fixes.patch
+++ b/packages/xscreensaver/files/fixes.patch
diff --git a/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty b/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-4.22/.mtn2git_empty
diff --git a/packages/xscreensaver/xscreensaver-4.22/configure.in.patch b/packages/xscreensaver/xscreensaver-4.22/configure.in.patch
new file mode 100644
index 0000000000..1538315e3b
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-4.22/configure.in.patch
@@ -0,0 +1,15 @@
+--- xscreensaver-4.22~/configure.in 2005-08-26 10:00:58.000000000 -0700
++++ xscreensaver-4.22/configure.in 2005-08-26 10:01:27.000000000 -0700
+@@ -1080,9 +1080,9 @@
+
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+-AC_NO_OBJECTIVE_C
++#AC_PROG_CC_ANSI
++#AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
++#AC_NO_OBJECTIVE_C
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
diff --git a/packages/xscreensaver/xscreensaver_4.22.bb b/packages/xscreensaver/xscreensaver_4.22.bb
new file mode 100644
index 0000000000..e4ca0acc3a
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver_4.22.bb
@@ -0,0 +1,58 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+SRC_URI="http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+ file://fixes.patch;patch=1 \
+ file://configure.in.patch;patch=1 \
+ file://XScreenSaver"
+
+DESCRIPTION="*The* screensaver package for X11"
+LICENSE="BSD"
+HOMEPAGE="http://www.jwz.org/xscreensaver/"
+PR = "r0"
+SECTION="x11-misc"
+
+DEPENDS="intltool x11 gtk+ libxml2 libglade"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
+ --with-jpeg --with-xpm"
+
+PACKAGES =+ " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \
+ /usr/X11R6/lib/X11/app-defaults"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+ ${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_configure_prepend() {
+ sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+}
+
+do_compile() {
+ oe_runmake GNOME_DATADIR=${datadir} all
+}
+
+do_install() {
+ unset KDEDIR
+ oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+ install_prefix=${D} install
+
+ oe_runmake -C ${S}/hacks install_prefix=${D} install-program
+
+ # Install the defaults file
+ install -d ${D}/usr/X11R6/lib/X11/app-defaults
+ install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
+}
+
+python populate_packages_prepend () {
+ hackdir = bb.data.expand('${libexecdir}/xscreensaver', d)
+ do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}
diff --git a/packages/xst/xst_0.14.bb b/packages/xst/xst_0.15.bb
index 76ab7af26f..76ab7af26f 100644
--- a/packages/xst/xst_0.14.bb
+++ b/packages/xst/xst_0.15.bb
diff --git a/packages/zd1211/zd1211-4916/.mtn2git_empty b/packages/zd1211/zd1211-4916/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/.mtn2git_empty
diff --git a/packages/zd1211/zd1211-4916/copy-break.patch b/packages/zd1211/zd1211-4916/copy-break.patch
new file mode 100644
index 0000000000..a08c543550
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/copy-break.patch
@@ -0,0 +1,11 @@
+--- zd1211-4916-r0/src/zd1205.c.cborig 2005-03-08 14:20:22.846179000 -0800
++++ zd1211-4916-r0/src/zd1205.c 2005-03-08 14:21:09.432096896 -0800
+@@ -267,7 +267,7 @@
+ zd1205_SwTcbQ_t free_txq_buf, active_txq_buf;
+ struct net_device *g_dev;
+ zd_80211Obj_t dot11Obj = {0};
+-#define RX_COPY_BREAK 0//1518 //we do bridge, don't care IP header alignment
++#define RX_COPY_BREAK MAX_WLAN_SIZE //It doesn't appear that unaligned frames work with TCP/UDP beyond a certain size
+ #define BEFORE_BEACON 5
+ /* Definition of Wireless Extension */
+
diff --git a/packages/zd1211/zd1211-4916/explicit-key-change.patch b/packages/zd1211/zd1211-4916/explicit-key-change.patch
new file mode 100644
index 0000000000..ef01f3cb3e
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/explicit-key-change.patch
@@ -0,0 +1,24 @@
+--- zd1211-4916-r0/src/zd1205.c.korig 2005-03-04 13:45:07.000000000 -0800
++++ zd1211-4916-r0/src/zd1205.c 2005-03-08 10:43:26.304994072 -0800
+@@ -5528,7 +5528,8 @@
+ /* Check if the key is not marked as invalid */
+
+ if (!(erq->flags & IW_ENCODE_NOKEY)){
+- pSetting->EncryKeyId = index;
++ // Only change the current keyid when explicitly asked
++ // pSetting->EncryKeyId = index;
+
+
+ memcpy(&pSetting->keyVector[index][0], key, pSetting->WepKeyLen);
+--- zd1211-4916-r0/src/zd1211.c.orig 2005-03-08 17:15:24.085747960 -0800
++++ zd1211-4916-r0/src/zd1211.c 2005-03-08 17:05:02.044312632 -0800
+@@ -3423,8 +3423,8 @@
+ //update card setting
+
+ if (test_bit(KEVENT_UPDATE_SETTING, &macp->kevent_flags)){
+- zd_UpdateCardSetting(&macp->cardSetting);
+ clear_bit(KEVENT_UPDATE_SETTING, &macp->kevent_flags);
++ zd_UpdateCardSetting(&macp->cardSetting);
+ }
+
+
diff --git a/packages/zd1211/zd1211-4916/get-stats.patch b/packages/zd1211/zd1211-4916/get-stats.patch
new file mode 100644
index 0000000000..0525522b43
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/get-stats.patch
@@ -0,0 +1,77 @@
+--- zd1211-4916-r0/src/zd1205.h.orig 2005-01-28 22:55:15.000000000 -0800
++++ zd1211-4916-r0/src/zd1205.h 2005-03-04 13:41:16.879006208 -0800
+@@ -611,6 +611,9 @@
+ ***************************************************************************/
+ struct driver_stats {
+ struct net_device_stats net_stats;
++#ifdef CONFIG_NET_WIRELESS
++ struct iw_statistics iw_stats;
++#endif
+ unsigned long tx_late_col;
+ unsigned long tx_ok_defrd;
+ unsigned long tx_one_retry;
+--- zd1211-4916-r0/src/zd1205.c.orig 2005-03-03 18:43:48.000000000 -0800
++++ zd1211-4916-r0/src/zd1205.c 2005-03-04 13:45:07.134002128 -0800
+@@ -4196,6 +4196,42 @@
+ return &(macp->drv_stats.net_stats);
+ }
+
++/**
++ * zd1205wext_iw_get_stats - get driver statistics
++
++ * @dev: adapter's net_device struct
++ *
++ * This routine is called when the OS wants the adapter's wireless
++ * stats returned. It returns the address of the iw_statistics
++ * stucture for the device. If the statistics are currently being
++ * updated, then they might be incorrect for a short while. However,
++ * since this cannot actually cause damage, no locking is used.
++ */
++#if WIRELESS_EXT > 12
++struct iw_statistics *
++zd1205wext_iw_get_stats(struct net_device *dev)
++{
++ struct zd1205_private *macp = dev->priv;
++ struct iw_statistics *iw_stats = &macp->drv_stats.iw_stats;
++
++ iw_stats->qual.noise = 161;
++ iw_stats->qual.qual = 0;//macp->rxInfo.rxSignalQuality;
++ iw_stats->qual.level = 0;//macp->rxInfo.rxSignalStrength;
++ iw_stats->qual.updated = 7;
++
++ iw_stats->discard.nwid = 0;
++ iw_stats->discard.code = 0;
++ iw_stats->discard.fragment = 0;
++ iw_stats->discard.retries = macp->retryFailCnt;
++ iw_stats->discard.misc = macp->DropFirstFragCnt + macp->ErrLongFrmCnt +
++ macp->ErrShortFrmCnt + macp->ErrZeroLenFrmCnt;
++
++ iw_stats->miss.beacon = 0;
++
++ return iw_stats;
++}
++#endif
++
+
+ /**
+ * zd1205_set_mac - set the MAC address
+--- zd1211-4916-r0/src/zd1211.c.orig 2005-03-03 18:43:49.000000000 -0800
++++ zd1211-4916-r0/src/zd1211.c 2005-03-04 13:44:31.122476712 -0800
+@@ -1873,6 +1873,9 @@
+ #define ZD1211_TX_TIMEOUT (HZ*10)
+ #define ZD1211_MTU 1500
+ extern struct iw_handler_def p80211wext_handler_def;
++#ifdef CONFIG_NET_WIRELESS
++extern struct iw_statistics *zd1205wext_iw_get_stats(struct net_device *);
++#endif
+
+ u8 zd1211_InitSetup(struct net_device *dev, struct zd1205_private *macp)
+
+@@ -1964,6 +1967,7 @@
+
+ #if WIRELESS_EXT > 12
+ dev->wireless_handlers = (struct iw_handler_def *)&p80211wext_handler_def;
++ dev->get_wireless_stats = &zd1205wext_iw_get_stats;
+ #endif
+
+ dev->hard_start_xmit = zd1205_xmit_frame;
diff --git a/packages/zd1211/zd1211-4916/makefile.patch b/packages/zd1211/zd1211-4916/makefile.patch
new file mode 100644
index 0000000000..a01cb085bc
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/makefile.patch
@@ -0,0 +1,28 @@
+--- zd1211-4916-r0/Makefile.orig 2005-01-28 22:55:15.000000000 -0800
++++ zd1211-4916-r0/Makefile 2005-02-18 17:03:09.009560224 -0800
+@@ -11,12 +11,12 @@
+
+
+ # if the kernel is 2.6.x, trun on this
+-KERN_26=y
+-KERNEL_SOURCE=/usr/src/linux-2.6.7
++#KERN_26=y
++#KERNEL_SOURCE=/usr/src/linux-2.6.7
+
+ # if the kernel is 2.4.x, trun on this
+-#KERN_24=y
+-#KERNEL_SOURCE=/usr/src/linux-2.4.24
++KERN_24=y
++KERNEL_SOURCE=/usr/src/linux-2.4.24
+
+ SRC_DIR=src
+ DEFINES=-D__KERNEL__ -DMODULE=1
+@@ -154,7 +154,7 @@
+ all: $(MODULE)
+
+ $(MODULE): $(OBJECTS)
+- ld -r $(OBJECTS) -o $(MODULE)
++ $(LD) -r $(OBJECTS) -o $(MODULE)
+ chmod -x $(MODULE)
+
+ %.o: %.c
diff --git a/packages/zd1211/zd1211-4916/syntax.patch b/packages/zd1211/zd1211-4916/syntax.patch
new file mode 100644
index 0000000000..969839e8dd
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/syntax.patch
@@ -0,0 +1,20 @@
+--- zd1211-4916-r0/src/zd1205.c.orig 2005-01-28 22:55:14.000000000 -0800
++++ zd1211-4916-r0/src/zd1205.c 2005-02-18 17:40:39.136488936 -0800
+@@ -5182,6 +5182,7 @@
+
+
+ exit:
++ 1;
+ //read_unlock(&(macp->isolate_lock));
+
+ }
+--- zd1211-4916-r0/src/zdhci.c.orig 2005-01-28 22:55:15.000000000 -0800
++++ zd1211-4916-r0/src/zdhci.c 2005-02-18 21:01:45.426134088 -0800
+@@ -10,6 +10,7 @@
+ #define MAX_CHANNEL_ALLOW 13
+ zd_80211Obj_t *pdot11Obj = 0;
+ U16 CurrScanCH = 1;
++void zd_ChooseAP(void);
+
+ BOOLEAN zd_SendPkt(U8 *pEthHdr, U8 *pBody, U32 bodyLen, void *buf, U8 bEapol, void *pHash)
+ {
diff --git a/packages/zd1211/zd1211-4916/usb-endian.patch b/packages/zd1211/zd1211-4916/usb-endian.patch
new file mode 100644
index 0000000000..f2516ff783
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/usb-endian.patch
@@ -0,0 +1,298 @@
+diff -ur zdold/Makefile zd1211-4916-r0/Makefile
+--- zdold/Makefile 2005-02-18 21:58:36.000000000 -0800
++++ zd1211-4916-r0/Makefile 2005-02-28 17:59:05.000000000 -0800
+@@ -149,7 +149,7 @@
+ CFLAGS += -DfNEW_CODE_MAP=1
+ CFLAGS += -DfWRITE_WORD_REG=1
+ CFLAGS += -DfREAD_MUL_REG=1
+-#CFLAGS += -DENHANCE_RX=1
++CFLAGS += -DENHANCE_RX=1
+
+ all: $(MODULE)
+
+diff -ur zdold/src/zd1211.c zd1211-4916-r0/src/zd1211.c
+--- zdold/src/zd1211.c 2005-01-28 22:55:15.000000000 -0800
++++ zd1211-4916-r0/src/zd1211.c 2005-03-01 14:41:07.003613776 -0800
+@@ -429,16 +429,16 @@
+ memset(pRegBuffer, 0x0, size);
+
+
+- ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_PROG_FLSH;
+- ((PUSB_SET_RF) pRegBuffer)->Value = Value[0];
+- ((PUSB_SET_RF) pRegBuffer)->Index = Value[1];
++ ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_PROG_FLSH);
++ ((PUSB_SET_RF) pRegBuffer)->Value = cpu_to_le16(Value[0]);
++ ((PUSB_SET_RF) pRegBuffer)->Index = cpu_to_le16(Value[1]);
+
+
+
+
+
+ for (ii = 2; ii < RegCount; ii ++)
+- ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = Value[ii];
++ ((PUSB_SET_RF)pRegBuffer)->Data[ii - 2] = cpu_to_le16(Value[ii]);
+
+
+ bufSize = sizeof(u16) * (1+RegCount);
+@@ -513,7 +513,7 @@
+ }else
+ memset(pRegBuffer, 0x0, size);
+
+- ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID = REGID_READ;
++ ((PUSB_READ_REG_REQ)pRegBuffer)->RequestID = cpu_to_le16(REGID_READ);
+
+
+
+@@ -526,7 +526,7 @@
+ else if ((Address[ii] & BASE_ADDR_MASK_HOST) == USB_BASE_ADDR_EEPROM)
+ Address[ii] = ((Address[ii] - USB_BASE_ADDR_EEPROM) / 2) + cFIRMWARE_EEPROM_OFFSET;
+ //0x9900 //0xF817
+- ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = Address[ii];
++ ((PUSB_READ_REG_REQ) pRegBuffer)->Address[ii] = cpu_to_le16(Address[ii]);
+
+ }
+
+@@ -608,7 +608,7 @@
+ }
+ else {
+ for (ii = 0; ii < (macp->ReadRegCount-2) / 4; ii++){
+- pValue[ii] = *((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1);
++ pValue[ii] = le16_to_cpu(*((u16 *) macp->IntEPBuffer2 + 1 + ii * 2 + 1));
+ }
+ ret = 0;
+
+@@ -686,7 +686,7 @@
+ }
+
+ down(&macp->reg_sem);
+-
++
+
+
+ if ((RegCount == 0) || (!macp->bUSBDeveiceAttached) || !test_bit(ZD1211_RUNNING, &macp->flags)) {
+@@ -712,7 +712,7 @@
+
+
+
+- ((PUSB_WRITE_REG)pRegBuffer)->RequestID = REGID_WRITE;
++ ((PUSB_WRITE_REG)pRegBuffer)->RequestID = cpu_to_le16(REGID_WRITE);
+
+ if (RegCount > cMIN_MULTI_WRITE_REG_NUM){
+ for (i=cMIN_MULTI_WRITE_REG_NUM; i<RegCount; i++){
+@@ -724,8 +724,8 @@
+ else if ((Address[i] & BASE_ADDR_MASK_HOST) == USB_BASE_ADDR_EEPROM)
+ Address[i] = ((Address[i] - USB_BASE_ADDR_EEPROM) / 2) + cFIRMWARE_EEPROM_OFFSET;
+
+- ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].Address = Address[i];
+- ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = Value[i];
++ ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].Address = cpu_to_le16(Address[i]);
++ ((PUSB_WRITE_REG)pRegBuffer)->WritePackage[i].WriteData_low = cpu_to_le16(Value[i]);
+ }
+ }
+
+@@ -1726,17 +1726,17 @@
+
+
+
+- ((PUSB_SET_RF)pRegBuffer)->RequestID = REGID_RFOFDMSET;
++ ((PUSB_SET_RF)pRegBuffer)->RequestID = cpu_to_le16(REGID_RFOFDMSET);
+
+ if (bIs3683A)
+- ((PUSB_SET_RF)pRegBuffer)->Value = 1;
++ ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(1);
+ else
+- ((PUSB_SET_RF)pRegBuffer)->Value = 2;
++ ((PUSB_SET_RF)pRegBuffer)->Value = cpu_to_le16(2);
+
+- ((PUSB_SET_RF)pRegBuffer)->Index = (u16)S_bit_cnt;
++ ((PUSB_SET_RF)pRegBuffer)->Index = cpu_to_le16((u16)S_bit_cnt);
+
+ for (i = 0; i < S_bit_cnt; i ++)
+- ((PUSB_SET_RF)pRegBuffer)->Data[i] = InputValue[i];
++ ((PUSB_SET_RF)pRegBuffer)->Data[i] = cpu_to_le16(InputValue[i]);
+
+
+ bufSize = sizeof(u16) * (3+S_bit_cnt);
+@@ -2229,7 +2229,7 @@
+
+
+
+- ZD1211DEBUG(4, "actual_length = %x\n", urb->actual_length);
++ ZD1211DEBUG(2, "actual_length = %x\n", urb->actual_length);
+
+
+ rx_struct = list_entry(macp->active_rx_list.next,
+@@ -2266,7 +2266,7 @@
+ if (last_pkt_len <= (macp->wMaxPacketSize - 4)){
+
+
+- if (((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1] == 0x697E){
++ if (le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) - 1]) == 0x697E){
+
+ total_rx_struct = 3;
+ //ZD1211DEBUG(0, "Got merged Rx Frames!!\n");
+@@ -2288,8 +2288,8 @@
+ int CurFrmLen;
+
+ if (total_rx_struct> 1){
+- CurFrmLen = ((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4];
+- //ZD1211DEBUG(2, "CurFrmLen = %x\n", CurFrmLen);
++ CurFrmLen = le16_to_cpu(((u16 *) pRxBuffer)[TotalLength / sizeof(u16) + i - 4]);
++ //ZD1211DEBUG(2, "[RX] CurFrmLen = %x\n", CurFrmLen);
+ }
+
+ else
+@@ -2316,22 +2316,22 @@
+
+
+
+- rfd->CbStatus = RFD_STATUS_COMPLETE;
+- rfd->ActualCount = CurFrmLen;
++ rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE);
++ rfd->ActualCount = cpu_to_le32(CurFrmLen);
+
+
+ if (i > 0){
+ memcpy(&rfd->RxBuffer[macp->rxOffset],
+ pRxBuffer + tmpLen,
+- rfd->ActualCount);
++ CurFrmLen);
+
+ }
+
+
+- tmpLen += (rfd->ActualCount & ~0x03);
++ tmpLen += (CurFrmLen & ~0x03);
+
+
+- if (rfd->ActualCount & 0x03)
++ if (CurFrmLen & 0x03)
+ tmpLen += 4;
+
+ }
+@@ -2361,8 +2361,8 @@
+
+ #else
+
+- rfd->CbStatus = RFD_STATUS_COMPLETE;
+- rfd->ActualCount = TotalLength;
++ rfd->CbStatus = cpu_to_le32(RFD_STATUS_COMPLETE);
++ rfd->ActualCount = cpu_to_le32(TotalLength);
+ zd1205_rx_isr(macp);
+ #endif
+
+@@ -2521,8 +2521,8 @@
+ // this is USB_READ_REGISTER response
+ macp->ReadRegCount = (u16)actual_length;
+
+- intNum = *(u16 *)(macp->IntEPBuffer+2);
+- //intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8);
++ //intNum = *(u16 *)(macp->IntEPBuffer+2);
++ intNum = macp->IntEPBuffer[2] + (((u16)macp->IntEPBuffer[3]) << 8);
+
+ if (intNum == (InterruptCtrl | macp->USBCSRAddress)){
+ // Handle non-RxTx interrupt
+@@ -2549,8 +2549,8 @@
+ case EPINT_RetryFial_Event:
+ {
+ u8 *pMacAddr = macp->IntEPBuffer + 4;
+- u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2));
+- //u8 NewRate = macp->IntEPBuffer[2];
++ //u8 NewRate = (u8)(*(u16 *)(macp->IntEPBuffer + 2));
++ u8 NewRate = (u8)macp->IntEPBuffer[2];
+ u16 aid;
+
+
+@@ -2568,7 +2568,7 @@
+ //ZD1211DEBUG(2, "NewRate = %x\n", NewRate);
+ aid = zd_AidLookUp(pMacAddr);
+ zd_EventNotify(EVENT_TX_COMPLETE, ZD_RETRY_FAILED, 0xff, (U32)aid);
+- macp->retryFailCnt += *(u16 *)(macp->IntEPBuffer + 10);
++ macp->retryFailCnt += le16_to_cpu(*(u16 *)(macp->IntEPBuffer + 10));
+ break;
+
+ }
+@@ -2634,7 +2634,7 @@
+ // in current design, no need to use spinlock
+
+
+- intr_status = *(u16 *)(macp->IntEPBuffer3+4);
++ intr_status = le16_to_cpu(*(u16 *)(macp->IntEPBuffer3+4));
+ //ZD1211DEBUG(2, "intr_status = %x\n", intr_status);
+
+ if (!intr_status)
+@@ -2765,7 +2765,7 @@
+
+ sw_tcb = macp->activeTxQ->first;
+ if (sw_tcb)
+- sw_tcb->pTcb->CbStatus = CB_STATUS_COMPLETE;
++ sw_tcb->pTcb->CbStatus = cpu_to_le32(CB_STATUS_COMPLETE);
+
+ zd1205_tx_isr(macp);
+
+@@ -2889,23 +2889,25 @@
+ Tbd++;
+
+ //Mac Header
+- memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount);
++ memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart),
++ le32_to_cpu(Tbd->TbdCount));
+
+ ZD1211DEBUG(2, "MAC Header Length = %x\n", Tbd->TbdCount);
+- dst += Tbd->TbdCount;
++ dst += le32_to_cpu(Tbd->TbdCount);
+
+- TotalLength += Tbd->TbdCount;
++ TotalLength += le32_to_cpu(Tbd->TbdCount);
+
+ Tbd++;
+
+ //MAC Body
+- memcpy(dst, (u8 *)Tbd->TbdBufferAddrLowPart, Tbd->TbdCount);
++ memcpy(dst, (u8 *)le32_to_cpu(Tbd->TbdBufferAddrLowPart),
++ le32_to_cpu(Tbd->TbdCount));
+
+ ZD1211DEBUG(2, "Tx DATA Length = %x\n", Tbd->TbdCount);
+- dst += Tbd->TbdCount;
++ dst += le32_to_cpu(Tbd->TbdCount);
+
+
+- TotalLength += Tbd->TbdCount;
++ TotalLength += le32_to_cpu(Tbd->TbdCount);
+ Tbd++;
+
+ ZD1211DEBUG(2, "TotalLength = %x\n", TotalLength);
+@@ -2914,7 +2916,7 @@
+
+
+ // write down total length
+- *((u16 *)(macp->tx_buff+4)) = (u16)TotalLength + 14;
++ *((u16 *)(macp->tx_buff+4)) = cpu_to_le16((u16)TotalLength + 14);
+
+ ZD1211DEBUG(2, "macp->tx_buff+4 = %x\n", *((u16 *)(macp->tx_buff+4)));
+
+diff -ur zdold/src/zd1211.h zd1211-4916-r0/src/zd1211.h
+--- zdold/src/zd1211.h 2005-01-28 22:55:14.000000000 -0800
++++ zd1211-4916-r0/src/zd1211.h 2005-03-01 14:12:15.023914712 -0800
+@@ -146,7 +146,9 @@
+ typedef struct _USB_WRITE_REG {
+ u16 RequestID;
+ USB_WRITE_REG_PACKAGE WritePackage[cMAX_MULTI_WRITE_REG_NUM];
+-} USB_WRITE_REG, * PUSB_WRITE_REG;
++} __attribute__((__packed__));
++
++typedef struct _USB_WRITE_REG USB_WRITE_REG, * PUSB_WRITE_REG;
+
+
+ typedef struct _USB_SET_RF {
+diff -ur zdold/src/zdshared.c zd1211-4916-r0/src/zdshared.c
+--- zdold/src/zdshared.c 2005-01-28 22:55:15.000000000 -0800
++++ zd1211-4916-r0/src/zdshared.c 2005-03-01 14:43:35.078103032 -0800
+@@ -416,6 +416,7 @@
+ U16 len;
+ Frame_t *pf = pfrmDesc->mpdu;
+
++ pf->header[2] = pf->header[3] = 0; // Initialize them to something?
+ setFrameType(pf, ST_PROBE_REQ);
+ pf->body = pfrmDesc->buffer;
+ body = pf->body;
diff --git a/packages/zd1211/zd1211-4916/usb-ids.patch b/packages/zd1211/zd1211-4916/usb-ids.patch
new file mode 100644
index 0000000000..3bb9b00e35
--- /dev/null
+++ b/packages/zd1211/zd1211-4916/usb-ids.patch
@@ -0,0 +1,21 @@
+--- zd1211-4916-r0/src/zdusb.h~ 2005-01-29 17:25:15.000000000 +1030
++++ zd1211-4916-r0/src/zdusb.h 2005-08-24 10:39:06.000000000 +0930
+@@ -10,6 +10,8 @@
+ #define PRODUCT_1211 0x1211
+ #define VENDOR_ZYXEL 0x0586 //ZyXEL
+ #define PRODUCT_G220 0x3401
++#define VENDOR_3COM 0x6891 //3COM
++#define PRODUCT_3CRUSB10075 0xa727
+
+
+ #endif
+--- zd1211-4916-r0/src/zdusb.c~ 2005-01-29 17:25:15.000000000 +1030
++++ zd1211-4916-r0/src/zdusb.c 2005-08-24 10:39:30.000000000 +0930
+@@ -59,6 +59,7 @@
+ static struct usb_device_id zd1211_ids [] = {
+ { USB_DEVICE(VENDOR_ZYDAS, PRODUCT_1211) },
+ { USB_DEVICE(VENDOR_ZYXEL, PRODUCT_G220) },
++ { USB_DEVICE(VENDOR_3COM, PRODUCT_3CRUSB10075) },
+ { } /* Terminating entry */
+ };
+
diff --git a/packages/zd1211/zd1211_4916.bb b/packages/zd1211/zd1211_4916.bb
new file mode 100644
index 0000000000..4d49409b5e
--- /dev/null
+++ b/packages/zd1211/zd1211_4916.bb
@@ -0,0 +1,35 @@
+SRC_URI = "${SOURCEFORGE_MIRROR}/zd1211/sf-zd1211-${PV}-src.tar.gz \
+ file://makefile.patch;patch=1 \
+ file://syntax.patch;patch=1 \
+ file://usb-endian.patch;patch=1 \
+ file://usb-ids.patch;patch=1 \
+ file://get-stats.patch;patch=1 \
+ file://explicit-key-change.patch;patch=1 \
+ file://copy-break.patch;patch=1"
+S = "${WORKDIR}"
+LICENSE = "GPL"
+
+inherit module-base
+SECTION = "base"
+
+do_configure() {
+ :
+}
+
+CFLAGS = "-DLINUX_OS -D__KERNEL__ -DMODULE -I${S}/src/includes -I${S}/src/includes/pcmcia -I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+ unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+ oe_runmake KERNEL_PATH=${STAGING_KERNEL_DIR} \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
+ KERNEL_VERSION=${KERNEL_VERSION} \
+ CC="${KERNEL_CC}" LD="${KERNEL_LD}" \
+ ${MAKE_TARGETS}
+}
+
+do_install() {
+ install -d ${D}/opt/lib/modules/${KERNEL_VERSION}/wireless
+ install -m 0644 zd1211.o ${D}/opt/lib/modules/${KERNEL_VERSION}/wireless/zd1211.o
+}
+
+FILES_${PN} = "/opt/lib/modules"