[oe-commits] org.oe.dev merge of '02a39af291136338c522414fbff2def4040eb591'
oe commit
oe at amethyst.openembedded.net
Tue Jun 24 21:36:09 UTC 2008
merge of '02a39af291136338c522414fbff2def4040eb591'
and '473d5c321625b5815050da1ae6ceb5089264efa3'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 1892656c5ce529dead53f59db6ef9665cc34a6a0
ViewMTN: http://monotone.openembedded.org/revision/info/1892656c5ce529dead53f59db6ef9665cc34a6a0
Files:
1
conf/distro/include/sane-srcrevs.inc
conf/distro/generic-uclibc.conf
conf/distro/minimal-uclibc.conf
conf/distro/generic.conf
conf/distro/minimal.conf
packages/linux/linux-openezx-devel_svn.bb
conf/machine/include/motorola-ezx-base.inc
packages/dfu-util/dfu-util-native_svn.bb
packages/dfu-util/dfu-util_svn.bb
packages/openocd/openocd-native_svn.bb
packages/openocd/openocd_svn.bb
packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
Diffs:
#
# mt diff -r02a39af291136338c522414fbff2def4040eb591 -r1892656c5ce529dead53f59db6ef9665cc34a6a0
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [3d76b802ee411de675a661b6622637dacf88c43e]
# to [d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 3d76b802ee411de675a661b6622637dacf88c43e
+++ conf/distro/include/sane-srcrevs.inc d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341
@@ -38,6 +38,7 @@ SRCREV_pn-ffmpeg ?= "12186"
SRCREV_pn-epiphany ?= "7837"
SRCREV_pn-fbgrab-viewer-native ?= "1943"
SRCREV_pn-ffmpeg ?= "12186"
+SRCREV_pn-frameworkd ?= "0c2b55d857ac1e62c1c8538b86c0d8d62a80ccd6"
SRCREV_pn-fstests ?= "204"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
#
# mt diff -r473d5c321625b5815050da1ae6ceb5089264efa3 -r1892656c5ce529dead53f59db6ef9665cc34a6a0
#
#
#
# rename "conf/distro/generic-uclibc.conf"
# to "conf/distro/minimal-uclibc.conf"
#
# rename "conf/distro/generic.conf"
# to "conf/distro/minimal.conf"
#
# add_file "packages/linux/linux-openezx-devel_svn.bb"
# content [7bd4eadd5d685a33b182d47ad133fe9a1daf0863]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [b0af0b2703e705c557cad4ceafce97f63f0e7d27]
# to [d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341]
#
# patch "conf/distro/minimal-uclibc.conf"
# from [86d233ffa29fe7b850743b7e58fde2e37d4d6f5a]
# to [16152acb6930f654a0c14dba1cd30a71388dbbd1]
#
# patch "conf/distro/minimal.conf"
# from [db433081a402e43aa3eb5a775393123ae9753a54]
# to [bd599ccea87a555d1025fc9d422556bb405c21d9]
#
# patch "conf/machine/include/motorola-ezx-base.inc"
# from [28864b40bfccdef2bc58e78166ec75925ea5eff1]
# to [2c0ddf142a1303beaeb3155cf9975668f5125973]
#
# patch "packages/dfu-util/dfu-util-native_svn.bb"
# from [36c7a32697727fceeefe1a12b0c3abb728831cd4]
# to [2fd60160899052185e3c54eb1e057336861e0c4a]
#
# patch "packages/dfu-util/dfu-util_svn.bb"
# from [ecc120ec36e47364e4715f34bd86856b6f93370f]
# to [ad9faa3d95d88fb20a79172199dce4ad77822880]
#
# patch "packages/openocd/openocd-native_svn.bb"
# from [b8df1c3c4be21f505f7af19f6847682f34a5d9c1]
# to [0aa4deade2673283ecdaee8cc1a5ff63f8203d51]
#
# patch "packages/openocd/openocd_svn.bb"
# from [5863de22800841c9bcd0fe5b4014ef3d911f91a2]
# to [51dfa450490bce260bffac6c15e675150a040611]
#
# patch "packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb"
# from [b75660af4d2976417371bd6521760757571bf7bd]
# to [e028e39f22c448b3473558339e2ba624da3a32ab]
#
# patch "packages/s3c24xx-utils/s3c24xx-gpio_svn.bb"
# from [7cee2203504f78f69abd1d1993c7f7b8955ebb4d]
# to [7fa49f2bbe6b9af54bbb26e7daeda28d787cd141]
#
# patch "packages/s3c24xx-utils/sjf2410-linux-native_svn.bb"
# from [9a022b0f5e9ee48883d86a30efdf184681913e3a]
# to [c2c61d71d6dab65f7a840170d0c9d7603e70a71b]
#
============================================================
--- packages/linux/linux-openezx-devel_svn.bb 7bd4eadd5d685a33b182d47ad133fe9a1daf0863
+++ packages/linux/linux-openezx-devel_svn.bb 7bd4eadd5d685a33b182d47ad133fe9a1daf0863
@@ -0,0 +1,63 @@
+DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM phones"
+AUTHOR = "The OpenEZX Team <openezx-devel at 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 at 0xA0000000 mem=16M at 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
============================================================
--- conf/distro/include/sane-srcrevs.inc b0af0b2703e705c557cad4ceafce97f63f0e7d27
+++ conf/distro/include/sane-srcrevs.inc d8f2f4e91dcd8f0d0cd6a261d2dea5fb517e2341
@@ -80,7 +80,7 @@ SRCREV_pn-matchbox-stroke ?= "1820"
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-python-etk ?= "8b51535150cbc88
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-python-lightmediascanner = "68
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-xserver-kdrive-glamo ?= "a5136
SRCREV_pn-wlan-ng-utils ?= "1859"
SRCREV_pn-xoo ?= "1971"
SRCREV_pn-xserver-kdrive-glamo ?= "a51364e2f23d4b6331c5ed613ce3f7e15f8e540f"
+SRCREV_pn-zhone ?= "900105c27bd176fdca4e8f896b2c8221181491de"
-SRCREV_pn-zhone ?= "c1b73d7b4bc3a1abacc871a30cd8c0fb44a5d38b"
============================================================
--- conf/distro/generic-uclibc.conf 86d233ffa29fe7b850743b7e58fde2e37d4d6f5a
+++ conf/distro/minimal-uclibc.conf 16152acb6930f654a0c14dba1cd30a71388dbbd1
@@ -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
============================================================
--- conf/distro/generic.conf db433081a402e43aa3eb5a775393123ae9753a54
+++ conf/distro/minimal.conf bd599ccea87a555d1025fc9d422556bb405c21d9
@@ -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 @@ PREFERRED_PROVIDER_virtual/libx11 ?= "li
require conf/distro/include/sane-srcrevs.inc
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
+require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
============================================================
--- conf/machine/include/motorola-ezx-base.inc 28864b40bfccdef2bc58e78166ec75925ea5eff1
+++ conf/machine/include/motorola-ezx-base.inc 2c0ddf142a1303beaeb3155cf9975668f5125973
@@ -2,7 +2,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
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
============================================================
--- packages/dfu-util/dfu-util-native_svn.bb 36c7a32697727fceeefe1a12b0c3abb728831cd4
+++ packages/dfu-util/dfu-util-native_svn.bb 2fd60160899052185e3c54eb1e057336861e0c4a
@@ -6,12 +6,12 @@ do_stage() {
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
============================================================
--- packages/dfu-util/dfu-util_svn.bb ecc120ec36e47364e4715f34bd86856b6f93370f
+++ packages/dfu-util/dfu-util_svn.bb ad9faa3d95d88fb20a79172199dce4ad77822880
@@ -1,9 +1,9 @@ SECTION = "devel"
DESCRIPTION = "USB Device Firmware Upgrade utility"
SECTION = "devel"
-AUTHOR = "Harald Welte"
+AUTHOR = "Harald Welte <laforge at openmoko.org>"
LICENSE = "GPL"
PV = "0.1+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
DEPENDS = "libusb usbpath"
============================================================
--- packages/openocd/openocd-native_svn.bb b8df1c3c4be21f505f7af19f6847682f34a5d9c1
+++ packages/openocd/openocd-native_svn.bb 0aa4deade2673283ecdaee8cc1a5ff63f8203d51
@@ -10,8 +10,8 @@ do_deploy() {
}
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
============================================================
--- packages/openocd/openocd_svn.bb 5863de22800841c9bcd0fe5b4014ef3d911f91a2
+++ packages/openocd/openocd_svn.bb 51dfa450490bce260bffac6c15e675150a040611
@@ -1,8 +1,8 @@ LICENSE = "GPL"
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 @@ DEPENDS = "libftdi"
S = "${WORKDIR}/trunk"
DEPENDS = "libftdi"
+EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"
-EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"
============================================================
--- packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b75660af4d2976417371bd6521760757571bf7bd
+++ packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb e028e39f22c448b3473558339e2ba624da3a32ab
@@ -1,10 +1,10 @@ SECTION = "devel"
DESCRIPTION = "Boots a S3C2410 device with a user supplied kernel zImage"
DEPENDS = "libusb-native"
SECTION = "devel"
-AUTHOR = "Harald Welte"
+AUTHOR = "Harald Welte <laforge at 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_deploy() {
}
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() {
============================================================
--- packages/s3c24xx-utils/s3c24xx-gpio_svn.bb 7cee2203504f78f69abd1d1993c7f7b8955ebb4d
+++ packages/s3c24xx-utils/s3c24xx-gpio_svn.bb 7fa49f2bbe6b9af54bbb26e7daeda28d787cd141
@@ -1,8 +1,9 @@ SECTION = "console/utils"
DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
SECTION = "console/utils"
+AUTHOR = "Werner Almesberger <werner at 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"
============================================================
--- packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9a022b0f5e9ee48883d86a30efdf184681913e3a
+++ packages/s3c24xx-utils/sjf2410-linux-native_svn.bb c2c61d71d6dab65f7a840170d0c9d7603e70a71b
@@ -1,8 +1,8 @@ SECTION = "devel"
DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device"
SECTION = "devel"
-AUTHOR = "Harald Welte"
+AUTHOR = "Harald Welte <laforge at 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_deploy() {
}
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() {
More information about the Openembedded-commits
mailing list