summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2007-03-10 00:40:40 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2007-03-10 00:40:40 +0000
commit9147453916425a28607263ea17615124aa7acb2f (patch)
tree3eeaebb245eeff8b350494a39174f145802bb91a /packages
parent1d79a159550d59d7bbf64a1f04e9acfc1c20efda (diff)
parente73b534d30fdc40e7084b6f5b58e823266791ea4 (diff)
merge of '4cebc9fa43c5fb8dd332e091469cb2442c972ee8'
and 'c244a1e89df0e3ca27b127211ac2cb3a15ab39f9'
Diffstat (limited to 'packages')
-rw-r--r--packages/dfu-util/.mtn2git_empty0
-rw-r--r--packages/dfu-util/dfu-util-native_svn.bb16
-rw-r--r--packages/dfu-util/dfu-util_svn.bb17
-rw-r--r--packages/openmoko-base/openmoko-theme-standard_svn.bb2
-rw-r--r--packages/tasks/task-mokogateway.bb1
5 files changed, 35 insertions, 1 deletions
diff --git a/packages/dfu-util/.mtn2git_empty b/packages/dfu-util/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/dfu-util/.mtn2git_empty
diff --git a/packages/dfu-util/dfu-util-native_svn.bb b/packages/dfu-util/dfu-util-native_svn.bb
new file mode 100644
index 0000000000..af6603ddd1
--- /dev/null
+++ b/packages/dfu-util/dfu-util-native_svn.bb
@@ -0,0 +1,16 @@
+require dfu-util_${PV}.bb
+
+inherit native
+
+DEPENDS = "libusb-native"
+
+do_stage() {
+ install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}
+}
+
+do_deploy() {
+ install -d ${DEPLOY_DIR_IMAGE}
+ install -m 0755 src/dfu-util_static ${DEPLOY_DIR_IMAGE}/dfu-util
+}
+
+addtask deploy before do_package after do_install
diff --git a/packages/dfu-util/dfu-util_svn.bb b/packages/dfu-util/dfu-util_svn.bb
new file mode 100644
index 0000000000..6f2e050569
--- /dev/null
+++ b/packages/dfu-util/dfu-util_svn.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "USB Device Firmware Upgrade utility"
+SECTION = "devel"
+AUTHOR = "Harald Welte"
+LICENSE = "GPL"
+PV = "0.1+svn${SRCDATE}"
+PR = "r0"
+
+DEPENDS = "libusb"
+
+SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=dfu-util;proto=http"
+S = "${WORKDIR}/dfu-util"
+
+inherit autotools
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/packages/openmoko-base/openmoko-theme-standard_svn.bb b/packages/openmoko-base/openmoko-theme-standard_svn.bb
index d8a9ba5fa2..e7a6def235 100644
--- a/packages/openmoko-base/openmoko-theme-standard_svn.bb
+++ b/packages/openmoko-base/openmoko-theme-standard_svn.bb
@@ -5,7 +5,7 @@ PR = "r3"
inherit openmoko-base
-SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=https"
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/artwork;module=themes;proto=http"
S = "${WORKDIR}"
dirs = "themes/openmoko-standard"
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
index 690cb48ffd..493259e9f5 100644
--- a/packages/tasks/task-mokogateway.bb
+++ b/packages/tasks/task-mokogateway.bb
@@ -67,5 +67,6 @@ RRECOMMENDS_task-mokogateway-wifi = "\
kernel-module-michael-mic \
kernel-module-aes \
${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-zd1211rw", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "zd1211-firmware", "",d)} \
"