summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/machine/a780.conf3
-rw-r--r--packages/ezx/ezx-boot-usb-native_0.1.0.bb30
-rw-r--r--packages/ezx/ezx-boot-usb-native_svn.bb (renamed from packages/ezx/ezx-boot-usb-native_1877.bb)7
-rw-r--r--packages/gnome/libbacon_svn.bb (renamed from packages/gnome/libbacon_cvs.bb)6
-rw-r--r--packages/linux/ixp4xx-kernel_2.6.19.bb2
5 files changed, 43 insertions, 5 deletions
diff --git a/conf/machine/a780.conf b/conf/machine/a780.conf
index fe3cdbc481..1c3ae63025 100644
--- a/conf/machine/a780.conf
+++ b/conf/machine/a780.conf
@@ -20,6 +20,9 @@ EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
+#the a780 needs a userspace daemon to stop the BP from shutting down the phone
+MACHINE_EXTRA_RDEPENDS += "opentapi"
+
ROOT_FLASH_SIZE = "24"
EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native"
diff --git a/packages/ezx/ezx-boot-usb-native_0.1.0.bb b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
new file mode 100644
index 0000000000..5919f28a11
--- /dev/null
+++ b/packages/ezx/ezx-boot-usb-native_0.1.0.bb
@@ -0,0 +1,30 @@
+DESCRIPTION = "Boots an EZX device with a user supplied kernel zImage"
+DEPENDS = "libusb-native"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PR = "r0"
+
+SRC_URI = "http://www.openezx.org/download/boot_usb-${PV}.tar.bz2"
+S = "${WORKDIR}/boot_usb-${PV}"
+
+inherit native
+
+do_compile() {
+ ${CC} ${CFLAGS} ${LDFLAGS} -lusb -o ezx-boot-usb boot_usb.c
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 ezx-boot-usb ${DEPLOY_DIR_IMAGE}/ezx-boot-usb
+}
+
+do_stage() {
+ :
+}
+
+do_install() {
+ :
+}
+
+addtask deploy before do_build after do_compile
diff --git a/packages/ezx/ezx-boot-usb-native_1877.bb b/packages/ezx/ezx-boot-usb-native_svn.bb
index 5fe3294fee..64e8a486e0 100644
--- a/packages/ezx/ezx-boot-usb-native_1877.bb
+++ b/packages/ezx/ezx-boot-usb-native_svn.bb
@@ -5,7 +5,12 @@ AUTHOR = "Harald Welte"
LICENSE = "GPL"
PR = "r1"
-SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${PV}"
+DEFAULT_PREFERENCE = "-1"
+
+REV = "1922"
+PV = "0.1.0+r${REV}"
+
+SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http;rev=${REV}"
S = "${WORKDIR}/boot_usb"
inherit native
diff --git a/packages/gnome/libbacon_cvs.bb b/packages/gnome/libbacon_svn.bb
index ce4b72ccab..2f36c3d808 100644
--- a/packages/gnome/libbacon_cvs.bb
+++ b/packages/gnome/libbacon_svn.bb
@@ -3,13 +3,13 @@ LICENSE = "GPLv2"
DEPENDS = "glib-2.0"
-PV = "0.0+cvs${SRCDATE}"
+PV = "0.0+svn${SRCDATE}"
inherit gnome
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=${PN}"
+SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk"
-S = "${WORKDIR}/${PN}"
+S = "${WORKDIR}/trunk"
do_stage() {
autotools_stage_all
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 321d24a035..6ee29d3d9a 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.bb
@@ -6,7 +6,7 @@
# http://trac.nslu2-linux.org/kernel/
#
# The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "644"
+IXP4XX_KERNEL_SVN_REV = "647"
#
# The directory containing the patches to be applied is
# specified below