From 7451853acecd4a26860afc0dbaeafbf6e32170ae Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 16 Jun 2010 16:50:03 +0200 Subject: ezx: replace ezx-gen-blob_svn.bb with ezx-gen-blob_git.bb gen-blob is now at git.openezx.org, replace the old svn recipe with one which fetches the code from the git repository. Signed-off-by: Antonio Ospite Acked-by: Michael 'Mickey' Lauer --- recipes/ezx/ezx-gen-blob_git.bb | 41 +++++++++++++++++++++++++++++++++++++++++ recipes/ezx/ezx-gen-blob_svn.bb | 41 ----------------------------------------- 2 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 recipes/ezx/ezx-gen-blob_git.bb delete mode 100644 recipes/ezx/ezx-gen-blob_svn.bb diff --git a/recipes/ezx/ezx-gen-blob_git.bb b/recipes/ezx/ezx-gen-blob_git.bb new file mode 100644 index 0000000000..5ebcad100c --- /dev/null +++ b/recipes/ezx/ezx-gen-blob_git.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform" +SECTION = "bootloaders" +AUTHOR = "OpenEZX Team" +HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob" +LICENSE = "GPL" +PROVIDES = "virtual/bootloader" +DEPENDS = "virtual/kernel" +SRCREV = "48d1cf4dbc8228b982ff40c36922769f70347da1" +PV = "1.0.0+gitr${SRCPV}" +PR = "r0" +PE = "1" + +SRC_URI = "\ + git://git.openezx.org/gen-blob.git;protocol=git;branch=master \ + file://remove-bogus-sed.patch \ +" +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "\ + --with-board=lubbock \ + --with-cpu=pxa262 \ + --with-linux-prefix=${STAGING_KERNEL_DIR} \ + --enable-usb \ +" + +do_configure() { + gnu-configize + oe_runconf +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 src/blob/blob-a780 ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE} + install -m 0644 src/blob/blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE} +} + +addtask deploy before do_build after do_compile + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes/ezx/ezx-gen-blob_svn.bb b/recipes/ezx/ezx-gen-blob_svn.bb deleted file mode 100644 index 39cec891a2..0000000000 --- a/recipes/ezx/ezx-gen-blob_svn.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "Generic Blob [Bootloader] for the Motorola EZX platform" -SECTION = "bootloaders" -AUTHOR = "OpenEZX Team" -HOMEPAGE = "http://people.openezx.org/wyrm/gen-blob" -LICENSE = "GPL" -PROVIDES = "virtual/bootloader" -DEPENDS = "virtual/kernel" -SRCREV = "2519" -PV = "1.0.0+svnr${SRCPV}" -PE = "1" -PR = "r2" - -SRC_URI = "\ - svn://svn.openezx.org/trunk/src/blob/;module=gen-blob;proto=http \ - file://remove-bogus-sed.patch \ -" -S = "${WORKDIR}/gen-blob" - -inherit autotools - -EXTRA_OECONF = "\ - --with-board=lubbock \ - --with-cpu=pxa262 \ - --with-linux-prefix=${STAGING_KERNEL_DIR} \ - --enable-usb \ -" - -do_configure() { - gnu-configize - oe_runconf -} - -do_deploy() { - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 src/blob/blob-a780 ${DEPLOY_DIR_IMAGE}/gen-blob-for-1stgen.${SRCDATE} - install -m 0644 src/blob/blob-a1200 ${DEPLOY_DIR_IMAGE}/gen-blob-for-2ndgen.${SRCDATE} -} - -addtask deploy before do_build after do_compile - -PACKAGE_ARCH = "${MACHINE_ARCH}" -- cgit v1.2.3 From d8fd4a34d047fc16589fa99364a82a9f52c8dc3a Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Wed, 16 Jun 2010 16:27:24 +0200 Subject: ezx: rename ezx-boot-usb recipe to moto-boot-usb, use git boot_usb is now named moto-boot-usb and is hosted on git.openezx.org, move recipes/ezx/ezx-boot-usb-native_svn.bb to recipes/ezx/moto-boot-usb-native_git.bb and fix it. Signed-off-by: Antonio Ospite Acked-by: Michael 'Mickey' Lauer --- recipes/ezx/ezx-boot-usb-native_svn.bb | 29 ----------------------------- recipes/ezx/moto-boot-usb-native_git.bb | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 29 deletions(-) delete mode 100644 recipes/ezx/ezx-boot-usb-native_svn.bb create mode 100644 recipes/ezx/moto-boot-usb-native_git.bb diff --git a/recipes/ezx/ezx-boot-usb-native_svn.bb b/recipes/ezx/ezx-boot-usb-native_svn.bb deleted file mode 100644 index 280de30e24..0000000000 --- a/recipes/ezx/ezx-boot-usb-native_svn.bb +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION = "Boot a Motorola EZX device with a user supplied kernel" -DEPENDS = "virtual/libusb0-native virtual/kernel" -SECTION = "devel" -AUTHOR = "Team OpenEZX " -LICENSE = "GPL" -SRCREV = "2522" -PV = "0.3.0+svnr${SRCPV}" - -SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" -S = "${WORKDIR}/boot_usb" - -EXTRA_OECONF := '--with-kernel-dir="${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"' - -inherit autotools native - -do_deploy() { - install -d ${DEPLOY_DIR_TOOLS} - install -m 0755 src/boot_usb ${DEPLOY_DIR_TOOLS}/ezx-boot-usb-${PV} -} - -do_stage() { - : -} - -do_install() { - : -} - -addtask deploy before do_build after do_compile diff --git a/recipes/ezx/moto-boot-usb-native_git.bb b/recipes/ezx/moto-boot-usb-native_git.bb new file mode 100644 index 0000000000..e6fdaa19cb --- /dev/null +++ b/recipes/ezx/moto-boot-usb-native_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Boot a Motorola EZX device with a user supplied kernel" +DEPENDS = "virtual/libusb0-native virtual/kernel" +SECTION = "devel" +AUTHOR = "Team OpenEZX " +LICENSE = "GPL" +SRCREV = "d7136c6c9fe9d62b8f3defccef5dca47258bef63" +PV = "0.3.0+gitr${SRCPV}" +PR = "r0" +PE = "1" + +SRC_URI = "git://git.openezx.org/moto-boot-usb.git;protocol=git;branch=master" +S = "${WORKDIR}/git" + +EXTRA_OECONF := '--with-kernel-dir="${STAGING_DIR}/${MACHINE_ARCH}${TARGET_VENDOR}-${TARGET_OS}/kernel"' + +inherit autotools native + +do_deploy() { + install -d ${DEPLOY_DIR_TOOLS} + install -m 0755 src/moto-boot-usb ${DEPLOY_DIR_TOOLS}/moto-boot-usb-${PV} +} + +do_install() { + : +} + +addtask deploy before do_build after do_compile -- cgit v1.2.3 From 08dddb40c87ada67ae1ba619437fa6c7075c38e5 Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Thu, 17 Jun 2010 16:42:37 +0200 Subject: ezx: rename references to ezx-boot-usb into moto-boot-usb Signed-off-by: Antonio Ospite Acked-by: Michael 'Mickey' Lauer --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- conf/machine/include/motorola-ezx-base.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 4ae673c624..3020fe90c0 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -334,7 +334,6 @@ PREFERRED_VERSION_expat ?= "2.0.0" PREFERRED_VERSION_expat-native ?= "1.95.7" PREFERRED_VERSION_expect ?= "5.44.1" PREFERRED_VERSION_ez-ipupdate ?= "3.0.10" -PREFERRED_VERSION_ezx-boot-usb-native ?= "0.1.0" PREFERRED_VERSION_ezx-gpiotool ?= "1877" PREFERRED_VERSION_faac ?= "1.24" PREFERRED_VERSION_faad2 ?= "2.0" @@ -1275,6 +1274,7 @@ PREFERRED_VERSION_monotone-4 ?= "0.19" PREFERRED_VERSION_monotone-5 ?= "0.25.2" PREFERRED_VERSION_monotone-6 ?= "0.34" PREFERRED_VERSION_motion ?= "3.2.6" +PREFERRED_VERSION_moto-boot-usb-native ?= "0.1.0" PREFERRED_VERSION_mousepad ?= "0.2.12" PREFERRED_VERSION_mp3blaster ?= "3.2.3" PREFERRED_VERSION_mpc ?= "0.12.1" diff --git a/conf/machine/include/motorola-ezx-base.inc b/conf/machine/include/motorola-ezx-base.inc index a4780412d4..d65b5b2c71 100644 --- a/conf/machine/include/motorola-ezx-base.inc +++ b/conf/machine/include/motorola-ezx-base.inc @@ -56,7 +56,7 @@ MKUBIFS_ARGS = "-m 1 -e 130944 -c 487" UBINIZE_ARGS = "-m 1 -p 128KiB " -EXTRA_IMAGEDEPENDS += "ezx-boot-usb-native ezx-gen-blob" +EXTRA_IMAGEDEPENDS += "moto-boot-usb-native ezx-gen-blob" IMAGE_INSTALL_append += "\ kernel-module-ohci-hcd \ -- cgit v1.2.3 From dbf77a6a15ea7926bf8f75dd728ff7bd55c60b11 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 21 Jun 2010 14:00:37 +0200 Subject: gdb-cross-sdk: remove conflicting files --- recipes/gdb/gdb-cross-sdk.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/gdb/gdb-cross-sdk.inc b/recipes/gdb/gdb-cross-sdk.inc index eb15bb55e7..797a5add79 100644 --- a/recipes/gdb/gdb-cross-sdk.inc +++ b/recipes/gdb/gdb-cross-sdk.inc @@ -1,7 +1,7 @@ require gdb-cross.inc LICENSE = "GPLv3" -INC_PR = "r5" +INC_PR = "r6" inherit sdk @@ -18,6 +18,7 @@ do_install_append() { # we don't care about these infos, installed from binutils rm -f ${D}/${infodir}/{configure,standards,bfd}.info + rm -f ${D}/${infodir}/dir # We use libiberty from binutils rm -f ${D}${prefix}/${TARGET_SYS}/lib/libiberty.a -- cgit v1.2.3 From 8056b6e3e7d67329b7a199ef8d6481560d3a5afa Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Mon, 21 Jun 2010 14:32:17 +0200 Subject: openezx-kernel_git.bb: bump SRCREV This new revision fixes some misnamed #defines and fixes the pcap-regulator voltage tables. Signed-off-by: Antonio Ospite --- recipes/linux/openezx-kernel_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/linux/openezx-kernel_git.bb b/recipes/linux/openezx-kernel_git.bb index 76929e0a47..efd782d0e8 100644 --- a/recipes/linux/openezx-kernel_git.bb +++ b/recipes/linux/openezx-kernel_git.bb @@ -1,10 +1,10 @@ DESCRIPTION = "OpenEZX 2.6 Linux Development Kernel for the Motorola EZX GSM phones" AUTHOR = "The OpenEZX Team " HOMEPAGE = "http://www.openezx.org" -SRCREV = "c485cc5953bbebdab1c52032754accca75031837" +SRCREV = "ce4e7c09de3ce6fb582440a7c7b9682527f36521" KV = "2.6.34-oe" PV = "${KV}+gitr${SRCREV}" -PR = "r5" +PR = "r6" require linux.inc -- cgit v1.2.3 From a185021b298010edd0a212bfca9634c95355bdd5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 21 Jun 2010 19:01:29 +0200 Subject: gcc-cross-sdl 4.5: make it fail in do_install instead of do_compile --- recipes/gcc/gcc-cross-sdk_4.5.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipes/gcc/gcc-cross-sdk_4.5.bb b/recipes/gcc/gcc-cross-sdk_4.5.bb index a316cd282e..a3b2215e2b 100644 --- a/recipes/gcc/gcc-cross-sdk_4.5.bb +++ b/recipes/gcc/gcc-cross-sdk_4.5.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" inherit sdk @@ -7,4 +7,5 @@ require gcc-cross-sdk.inc EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \ --disable-libgomp --disable-libmudflap \ - --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" + --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \ + --with-system-zlib" -- cgit v1.2.3