summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/include/sane-srcrevs.inc14
-rw-r--r--conf/distro/minimal-uclibc.conf (renamed from conf/distro/generic-uclibc.conf)6
-rw-r--r--conf/distro/minimal.conf (renamed from conf/distro/generic.conf)7
-rw-r--r--conf/machine/include/motorola-ezx-base.inc2
-rw-r--r--packages/dfu-util/dfu-util-native_svn.bb6
-rw-r--r--packages/dfu-util/dfu-util_svn.bb4
-rw-r--r--packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty0
-rw-r--r--packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty0
-rw-r--r--packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty0
-rw-r--r--packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-git/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap2-git/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty0
-rw-r--r--packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty0
-rw-r--r--packages/linux/linux-openezx-devel_svn.bb63
-rw-r--r--packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty0
-rw-r--r--packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty0
-rw-r--r--packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty0
-rw-r--r--packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty0
-rw-r--r--packages/linux/linux-tornado-omap2/.mtn2git_empty0
-rw-r--r--packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty0
-rw-r--r--packages/openocd/openocd-native_svn.bb4
-rw-r--r--packages/openocd/openocd_svn.bb6
-rw-r--r--packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb10
-rw-r--r--packages/s3c24xx-utils/s3c24xx-gpio_svn.bb5
-rw-r--r--packages/s3c24xx-utils/sjf2410-linux-native_svn.bb8
45 files changed, 100 insertions, 35 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 6660c6dfe1..f60c218772 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -80,7 +80,7 @@ SRCREV_pn-matchbox-keyboard ?= "1910"
SRCREV_pn-matchbox-keyboard-inputmethod ?= "1910"
SRCREV_pn-matchbox-panel-2 ?= "1626"
SRCREV_pn-matchbox-stroke ?= "1820"
-SRCREV_pn-mickeyterm ?= "7b91951addfd51850a23c23ad8ba7f853c4d3416;hb=7b91951addfd51850a23c23ad8ba7f853c4d3416"
+SRCREV_pn-mickeyterm ?= "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
SRCREV_pn-moko-gtk-engine ?= "3612"
SRCREV_pn-mpd-alsa ?= "6952"
SRCREV_pn-mplayer ?= "27047"
@@ -165,10 +165,10 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pty-forward-native ?= "4214"
SRCREV_pn-python-etk ?= "8b51535150cbc88467e3d8b578e54df27eac643"
-SRCREV_pn-python-odeviced ?= "2f02576532b52732251b3c530a09e4c08685a911"
-SRCREV_pn-python-oeventd ?= "d9646ee640fe6eabd023b82a7a0b8ed529cf07b7"
-SRCREV_pn-python-ophoned ?= "8bb89a912163c8a846be7a14b2a6e2f832f91bd6"
-SRCREV_pn-python-ousaged ?= "c7f83c3f696b6e72f3cab244af4e88dc4851018e"
+SRCREV_pn-python-odeviced ?= "fcf6f975b18d478ce618284c0dcc2f28f5c43cc1"
+SRCREV_pn-python-oeventd ?= "9053e5be847d694681c3664664ed669543a0a777"
+SRCREV_pn-python-ophoned ?= "82c318b8592588bc7ce8bccdfc090e59cfc9b98c"
+SRCREV_pn-python-ousaged ?= "836c091405eea3e29efdba3e1351befd1c96267b"
SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
@@ -176,7 +176,7 @@ SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
-SRCREV_pn-python-pyrtc = "4b7fd8841ab62d81fa78509ef7f9b14d2118dcae"
+SRCREV_pn-python-pyrtc = "af7c48d424f9c03f7aa8979f1c06e3b2c70acdff"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "2006"
@@ -194,4 +194,4 @@ SRCREV_pn-wlan-ng-modules ?= "1859"
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
-SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"
+SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de"
diff --git a/conf/distro/generic-uclibc.conf b/conf/distro/minimal-uclibc.conf
index 1f2356e734..d76a9c444f 100644
--- a/conf/distro/generic-uclibc.conf
+++ b/conf/distro/minimal-uclibc.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Generic uClibC
-#@DESCRIPTION: Generic uClibC Embedded Linux Distribution Configuration
+#@NAME: Minimal uClibC
+#@DESCRIPTION: uClibC Embedded Linux Distribution Configuration (minimal)
#
#@COMMENT: This distribution configuration serves as a starting point for
#@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -13,7 +13,7 @@ require conf/distro/generic.conf
#
# Header
#
-DISTRO_NAME = "generic-uClibC"
+DISTRO_NAME = "minimal-uclibc"
#
# Target OS & FPU system
diff --git a/conf/distro/generic.conf b/conf/distro/minimal.conf
index d67be1d738..b54b0c8c8b 100644
--- a/conf/distro/generic.conf
+++ b/conf/distro/minimal.conf
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------
#@TYPE: Distribution
-#@NAME: Generic
-#@DESCRIPTION: Generic Embedded Linux Distribution Configuration
+#@NAME: Minimal
+#@DESCRIPTION: Embedded Linux Distribution Configuration (minimal)
#
#@COMMENT: This distribution configuration serves as a starting point for
#@COMMENT: the integration of new target platforms, machines, or distributions.
@@ -11,7 +11,7 @@
#
# Header
#
-DISTRO_NAME = "generic-glibc"
+DISTRO_NAME = "minimal-glibc"
DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
#DISTRO_TYPE = "release"
DISTRO_TYPE = "debug"
@@ -80,3 +80,4 @@ require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc
index b8d818ad8c..52c2b04690 100644
--- a/conf/machine/include/motorola-ezx-base.inc
+++ b/conf/machine/include/motorola-ezx-base.inc
@@ -2,7 +2,7 @@ TARGET_ARCH = "arm"
PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-ezx"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-ezx"
#cat /proc/mtd
#dev: size erasesize name
diff --git a/packages/dfu-util/dfu-util-native_svn.bb b/packages/dfu-util/dfu-util-native_svn.bb
index 457094df9e..6304fad55b 100644
--- a/packages/dfu-util/dfu-util-native_svn.bb
+++ b/packages/dfu-util/dfu-util-native_svn.bb
@@ -6,12 +6,12 @@ DEPENDS = "libusb-native usbpath-native"
do_stage() {
install -d ${STAGING_BINDIR_NATIVE}
- install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}/
+ install -m 0755 src/dfu-util ${STAGING_BINDIR_NATIVE}/dfu-util-${PV}
}
do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 src/dfu-util_static ${DEPLOY_DIR_IMAGE}/dfu-util
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 src/dfu-util_static ${DEPLOY_DIR_TOOLS}/dfu-util-${PV}
}
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
index 1f34a5bc24..2e1afd55b1 100644
--- a/packages/dfu-util/dfu-util_svn.bb
+++ b/packages/dfu-util/dfu-util_svn.bb
@@ -1,9 +1,9 @@
DESCRIPTION = "USB Device Firmware Upgrade utility"
SECTION = "devel"
-AUTHOR = "Harald Welte"
+AUTHOR = "Harald Welte <laforge@openmoko.org>"
LICENSE = "GPL"
PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
DEPENDS = "libusb usbpath"
diff --git a/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-amsdelta-2.6-2.6.16-omap2/.mtn2git_empty
diff --git a/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-h6300-omap1-2.6.12-rc5/.mtn2git_empty
diff --git a/packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-h6300-omap1-2.6.14.3/.mtn2git_empty
diff --git a/packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty b/packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-h6300-omap1-2.6.16.16/.mtn2git_empty
diff --git a/packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty b/packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap-2.6-2.6.9-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap1610h2/.mtn2git_empty
diff --git a/packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap-2.6-2.6.9-omap1/omap5912osk/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty b/packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.12-rc2/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty b/packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.12-rc2/nokia770/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty b/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.12-rc2/omap5912osk/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty b/packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.18+git/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.18-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.19-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.20-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.22-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.23-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.24-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty b/packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.25-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-2.6.x+git/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-git/.mtn2git_empty b/packages/linux/linux-omap1-git/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-git/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty b/packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-git/omap1710h3/.mtn2git_empty
diff --git a/packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty b/packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap1-git/omap5912osk/.mtn2git_empty
diff --git a/packages/linux/linux-omap2-git/.mtn2git_empty b/packages/linux/linux-omap2-git/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap2-git/.mtn2git_empty
diff --git a/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty b/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap2-git/beagleboard/.mtn2git_empty
diff --git a/packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty b/packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap2-git/omap2420h4/.mtn2git_empty
diff --git a/packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty b/packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap2-git/omap2430sdp/.mtn2git_empty
diff --git a/packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty b/packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-omap2-git/omap3evm/.mtn2git_empty
diff --git a/packages/linux/linux-openezx-devel_svn.bb b/packages/linux/linux-openezx-devel_svn.bb
new file mode 100644
index 0000000000..34daac007c
--- /dev/null
+++ b/packages/linux/linux-openezx-devel_svn.bb
@@ -0,0 +1,63 @@
+DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM phones"
+AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
+HOMEPAGE = "http://www.openezx.org"
+
+DEFAULT_PREFERENCE = "-1"
+
+require linux.inc
+
+RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
+
+KERNEL_RELEASE = "2.6.24"
+KERNEL_PATCHES = "kernel-2.6.24.x-patches"
+PV = "${KERNEL_RELEASE}+svnr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "\
+ ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \
+ svn://svn.openezx.org/branches;module=${KERNEL_PATCHES};proto=http \
+# file://logo_linux_clut224.ppm \
+"
+S = "${WORKDIR}/linux-${KERNEL_RELEASE}"
+
+
+##############################################################
+# kernel image resides on a seperate flash partition (for now)
+# But we can flash it from userspace (flash_unlock /dev/mtdX && flash_eraseall /dev/mtdX && flashcp /boot/zImage /dev/mtdX)
+# so lets make a package of it. What about a postinst that flashes the new kernel?
+
+COMPATIBLE_HOST = "arm.*-linux"
+COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
+
+# For now the code for serial console is disabled in compress.c
+#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
+CMDLINE_CON = "console=tty1 "
+
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootwait=1"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=1 "
+# Uncomment to enable dyntick
+#CMDLINE_OTHER = "dyntick=enable"
+CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
+CMDLINE_IP = "ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0"
+CMDLINE_MEM = "mem=32M@0xA0000000 mem=16M@0xAC000000"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
+# Uncomment to use root-over-nfs-over-usb
+#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
+
+# 1024x1024 once was the maximum kernel size for boot-over-usb -- is it still?
+#KERNEL_IMAGE_MAXSIZE = "1294336"
+
+###############################################################
+# module configs specific to this kernel
+#
+#module_autoload_pxaficp_ir = "pxaficp_ir"
+#module_autoload_snd-pcm-oss = "snd-pcm-oss"
+
+do_prepatch() {
+ mv ${WORKDIR}/${KERNEL_PATCHES}/defconfig-${MACHINE} ${WORKDIR}/defconfig
+ mv ${WORKDIR}/${KERNEL_PATCHES} ${S}/patches && cd ${S} && quilt push -av
+ mv patches patches.openezx
+ mv .pc .pc.old
+}
+
+addtask prepatch after do_unpack before do_patch
diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/.mtn2git_empty
diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt/.mtn2git_empty
diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmtt2/.mtn2git_empty
diff --git a/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-palm-omap1-2.6.22-omap1/palmz71/.mtn2git_empty
diff --git a/packages/linux/linux-tornado-omap2/.mtn2git_empty b/packages/linux/linux-tornado-omap2/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-tornado-omap2/.mtn2git_empty
diff --git a/packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty b/packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/linux/linux-tornado-omap2/htctornado/.mtn2git_empty
diff --git a/packages/openocd/openocd-native_svn.bb b/packages/openocd/openocd-native_svn.bb
index 4ab1d37fe2..3ca688b5c3 100644
--- a/packages/openocd/openocd-native_svn.bb
+++ b/packages/openocd/openocd-native_svn.bb
@@ -10,8 +10,8 @@ do_stage() {
}
do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 src/openocd ${DEPLOY_DIR_IMAGE}/openocd
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 src/openocd ${DEPLOY_DIR_TOOLS}/openocd-${PV}
}
addtask deploy before do_package after do_install
diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb
index d5c5ba05cd..6823eabb98 100644
--- a/packages/openocd/openocd_svn.bb
+++ b/packages/openocd/openocd_svn.bb
@@ -1,8 +1,8 @@
DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"
HOMEPAGE = "http://openocd.berlios.de/"
LICENSE = "GPL"
-PV = "0.0+r${SRCREV}"
-PR = "r2"
+PV = "0.0+svnr${SRCREV}"
+PR = "r3"
inherit autotools
@@ -11,4 +11,4 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
S = "${WORKDIR}/trunk"
DEPENDS = "libftdi"
-EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"
+EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"
diff --git a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
index 671606c201..675d07c910 100644
--- a/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
+++ b/packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
@@ -1,10 +1,10 @@
DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
DEPENDS = "libusb-native"
SECTION = "devel"
-AUTHOR = "Harald Welte"
+AUTHOR = "Harald Welte <laforge@openmoko.org>"
LICENSE = "GPL"
-PV = "0.1.0+svn${SRCREV}"
-PR = "r0"
+PV = "0.1.0+svnr${SRCREV}"
+PR = "r1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
S = "${WORKDIR}/s3c2410_boot_usb"
@@ -16,8 +16,8 @@ do_compile() {
}
do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_IMAGE}
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 s3c2410-boot-usb ${DEPLOY_DIR_TOOLS}/s3c2410-boot-usb-${PV}
}
do_stage() {
diff --git a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
index 516fbb0c3a..0a57d2c0e6 100644
--- a/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
+++ b/packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
@@ -1,8 +1,9 @@
DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
SECTION = "console/utils"
+AUTHOR = "Werner Almesberger <werner@openmoko.org>"
LICENSE = "GPL"
-PV = "1.0+svn${SRCREV}"
-PR = "r1"
+PV = "1.0+svnr${SRCREV}"
+PR = "r2"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
S = "${WORKDIR}/gpio"
diff --git a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
index bead6039f8..fcfbba923d 100644
--- a/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
+++ b/packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
@@ -1,8 +1,8 @@
DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
SECTION = "devel"
-AUTHOR = "Harald Welte"
+AUTHOR = "Harald Welte <laforge@openmoko.org>"
LICENSE = "GPL"
-PV = "0.1+svn${SRCREV}"
+PV = "0.1+svnr${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
@@ -17,8 +17,8 @@ do_compile() {
}
do_deploy() {
- install -d ${DEPLOY_DIR_IMAGE}
- install -m 0755 sjf2410 ${DEPLOY_DIR_IMAGE}/sjf2410
+ install -d ${DEPLOY_DIR_TOOLS}
+ install -m 0755 sjf2410 ${DEPLOY_DIR_TOOLS}/sjf2410-${PV}
}
do_stage() {