From c5f8d1b4300f9f5912800e17a9bf91cceee0abb6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 20 Jul 2008 21:49:07 +0000 Subject: linux-openmoko-devel git compile ext2fs into kernel to ease booting from SD --- packages/linux/linux-openmoko-devel/defconfig-oe | 2 +- packages/linux/linux-openmoko-devel_git.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux/linux-openmoko-devel/defconfig-oe b/packages/linux/linux-openmoko-devel/defconfig-oe index 1741cbab88..c4d80f66c7 100644 --- a/packages/linux/linux-openmoko-devel/defconfig-oe +++ b/packages/linux/linux-openmoko-devel/defconfig-oe @@ -1484,7 +1484,7 @@ CONFIG_RTC_DRV_S3C=m # # File systems # -CONFIG_EXT2_FS=m +CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set CONFIG_EXT3_FS=y diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb index f8a315f558..24ff29d0f1 100644 --- a/packages/linux/linux-openmoko-devel_git.bb +++ b/packages/linux/linux-openmoko-devel_git.bb @@ -9,7 +9,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}" # If you use a rc, you will need to use this: PV = "${KERNEL_RELEASE}+gitr${SRCREV}" -PR = "r2" +PR = "r3" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" -- cgit v1.2.3 From d9bf097029dc46a6fd3eb4a0e7b02bad58e6327c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 20 Jul 2008 21:57:52 +0000 Subject: u-boot-openmoko * remove deprecated svn versions, add git versions --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/u-boot/u-boot-openmoko-devel_git.bb | 70 +------------------ packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb | 86 ------------------------ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 77 --------------------- packages/u-boot/u-boot-openmoko_svn.bb | 82 ---------------------- 5 files changed, 4 insertions(+), 313 deletions(-) delete mode 100644 packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb delete mode 100644 packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb delete mode 100644 packages/u-boot/u-boot-openmoko_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index de0f6a2a0f..8c488467bc 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -166,7 +166,7 @@ SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "4297" +SRCREV_pn-u-boot-openmoko ?= "1dd080c17b105da5cd4720307fa62de38276796a" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" diff --git a/packages/u-boot/u-boot-openmoko-devel_git.bb b/packages/u-boot/u-boot-openmoko-devel_git.bb index c1a5cefe77..3659241dfa 100644 --- a/packages/u-boot/u-boot-openmoko-devel_git.bb +++ b/packages/u-boot/u-boot-openmoko-devel_git.bb @@ -1,72 +1,8 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support" -AUTHOR = "Harald Welte " -LICENSE = "GPL" -SECTION = "bootloader" -PRIORITY = "optional" -PROVIDES = "virtual/bootloader" -LOCALVERSION = "+git${SRCREV}" -PV = "1.3.1${LOCALVERSION}" -PR = "r1" +require u-boot-openmoko.inc -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" - -DEFAULT_PREFERENCE = "-1" - -SRCREV_FORMAT = "git.openmoko.org" - -SRCREV = "1dd080c17b105da5cd4720307fa62de38276796a" - -SRC_URI = "git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \ - file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ +SRC_URI = "\ + git://git.openmoko.org/git/u-boot.git;protocol=git;branch=andy \ file://makefile-no-dirafter.patch;patch=1 \ " S = "${WORKDIR}/git" -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -do_svnrev() { - mv -f tools/setlocalversion tools/setlocalversion.old - echo "echo ${LOCALVERSION}" >>tools/setlocalversion -} - -do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - find board -name lowlevel_foo.bin -exec rm '{}' \; - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin - else - find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \; - fi - done -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - for mach in ${UBOOT_MACHINES} - do - install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin - if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin - fi - done - install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -} - -do_deploy[dirs] = "${S}" -addtask deploy before do_package after do_install -addtask quilt before do_patch after do_unpack -addtask svnrev before do_patch after do_quilt diff --git a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb deleted file mode 100644 index 2610e16040..0000000000 --- a/packages/u-boot/u-boot-openmoko_1.2.0+git+svn.bb +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) support" -AUTHOR = "Harald Welte , Openmoko " -LICENSE = "GPL" -SECTION = "bootloader" -PRIORITY = "optional" - -UBOOT_UPSTREAM_REV = "f34024d4a328e6edd906456da98d2c537155c4f7" -UBOOT_OPENMOKO_REV = "2943" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4" - -LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" -PV = "1.2.0${LOCALVERSION}" -PR = "r2" - -PROVIDES = "virtual/bootloader" -S = "${WORKDIR}/git" - -SRC_URI = "\ - git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \ - file://uboot-eabi-fix-HACK.patch \ - file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ - file://makefile-no-dirafter.patch;patch=1 \ -" - -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -do_quilt() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - rm -Rf patches .pc -} - -do_svnrev() { - mv -f tools/setlocalversion tools/setlocalversion.old - echo "echo ${LOCALVERSION}" >>tools/setlocalversion -} - -do_configure_prepend() { - find . -name "*.mk" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - find . -name "Makefile" -exec sed -i 's,-mabi=apcs-gnu,,' {} \; - cat ${WORKDIR}/uboot-eabi-fix-HACK.patch |patch -p1 -} - -do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - find board -name lowlevel_foo.bin -exec rm '{}' \; - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin \ - lowlevel_foo_${mach}.bin - else - find board -name lowlevel_foo.bin \ - -exec mv '{}' lowlevel_foo_${mach}.bin \; - fi - done -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - for mach in ${UBOOT_MACHINES} - do - install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin - if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin - fi - done - install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -} - -do_deploy[dirs] = "${S}" -addtask deploy before do_package after do_install -addtask quilt before do_patch after do_unpack -addtask svnrev before do_patch after do_quilt diff --git a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb deleted file mode 100644 index 502a62b6ea..0000000000 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ /dev/null @@ -1,77 +0,0 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support" -AUTHOR = "Harald Welte , Openmoko " -LICENSE = "GPL" -SECTION = "bootloader" -PRIORITY = "optional" - -UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" -SRCREV_FORMAT = "patchset" - -PV = "1.3.1+svnr${SRCREV}+git${UBOOT_UPSTREAM_REV}" -PR = "r3" - -PROVIDES = "virtual/bootloader" -S = "${WORKDIR}/git" - -SRC_URI = "\ - git://www.denx.de/git/u-boot.git;protocol=git;tag=${UBOOT_UPSTREAM_REV};name=upstream \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patchset \ - file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ -" - -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -do_quilt() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - rm -Rf patches .pc -} - -do_svnrev() { - mv -f tools/setlocalversion tools/setlocalversion.old - echo "echo ${LOCALVERSION}" >>tools/setlocalversion -} - -do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - find board -name lowlevel_foo.bin -exec rm '{}' \; - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin \ - lowlevel_foo_${mach}.bin - else - find board -name lowlevel_foo.bin \ - -exec mv '{}' lowlevel_foo_${mach}.bin \; - fi - done -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - for mach in ${UBOOT_MACHINES} - do - install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin - if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin - fi - done - install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -} - -do_deploy[dirs] = "${S}" -addtask deploy before do_package after do_install -addtask quilt before do_patch after do_unpack -addtask svnrev before do_patch after do_quilt diff --git a/packages/u-boot/u-boot-openmoko_svn.bb b/packages/u-boot/u-boot-openmoko_svn.bb deleted file mode 100644 index ba172c094e..0000000000 --- a/packages/u-boot/u-boot-openmoko_svn.bb +++ /dev/null @@ -1,82 +0,0 @@ -DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support" -AUTHOR = "Harald Welte " -LICENSE = "GPL" -SECTION = "bootloader" -PRIORITY = "optional" -PROVIDES = "virtual/bootloader" -LOCALVERSION = "+git${SRCDATE}+svnr${SRCREV}" -PV = "1.3.1${LOCALVERSION}" -PR = "r1" - -SRCREV_FORMAT = "patches" - -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" - -DEFAULT_PREFERENCE = "-1" - -BLESSED_GIT_REV = "928d1d77f8623c120d8763e20e1ca58df9c5c4c6" - -SRC_URI = "\ - -git://www.denx.de/git/u-boot.git/;protocol=git;name=upstream;tag=${BLESSED_GIT_REV} \ - svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http;name=patches \ - file://uboot-eabi-fix-HACK.patch;patch=1;maxrev=3773 \ - file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ - file://makefile-no-dirafter.patch;patch=1 \ - file://boot-menu-gfx-fix-openmoko-bug-1140.patch;patch=1;maxrev=3775 \ -" -S = "${WORKDIR}/git" - -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" -TARGET_LDFLAGS = "" - -do_quilt() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - rm -Rf patches .pc -} - -do_svnrev() { - mv -f tools/setlocalversion tools/setlocalversion.old - echo "echo ${LOCALVERSION}" >>tools/setlocalversion -} - -do_compile () { - chmod +x board/neo1973/gta*/split_by_variant.sh - for mach in ${UBOOT_MACHINES} - do - oe_runmake ${mach}_config - oe_runmake clean - find board -name lowlevel_foo.bin -exec rm '{}' \; - oe_runmake all - oe_runmake u-boot.udfu - if [ -f u-boot.udfu ]; then - mv u-boot.udfu u-boot_${mach}.bin - else - mv u-boot.bin u-boot_${mach}.bin - fi - if [ -f board/${mach}/lowlevel_foo.bin ]; then - mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin - else - find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \; - fi - done -} - -do_deploy () { - install -d ${DEPLOY_DIR_IMAGE} - for mach in ${UBOOT_MACHINES} - do - install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin - if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then - install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin - ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin - fi - done - install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage -} - -do_deploy[dirs] = "${S}" -addtask deploy before do_package after do_install -addtask quilt before do_patch after do_unpack -addtask svnrev before do_patch after do_quilt -- cgit v1.2.3 From 3fbb365c826659525fbb5fb5b89e3c6e9276a1b0 Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Sun, 20 Jul 2008 22:02:01 +0000 Subject: Added machine file for Olimex AT91SAM development board linux_2.6.25, r3 Added support for Olimex AT91SAM development board --- conf/machine/at91-l9260.conf | 24 ++++++++++++++++++++++++ packages/linux/linux_2.6.25.bb | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 conf/machine/at91-l9260.conf diff --git a/conf/machine/at91-l9260.conf b/conf/machine/at91-l9260.conf new file mode 100644 index 0000000000..16d0705a24 --- /dev/null +++ b/conf/machine/at91-l9260.conf @@ -0,0 +1,24 @@ +#@TYPE: Machine +#@Name: Olimex eval board for the AT91SAM9260 +#@DESCRIPTION: Machine.inciguration for the AT91SAM9260 development board with a at91sam9260 processor + +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4t armv5te" + +PREFERRED_PROVIDER_virtual/kernel = "linux" +PREFERRED_VERSION_linux = "2.6.25" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" + +KERNEL_IMAGETYPE = "uImage" + +#don't try to access tty1 +USE_VT = "0" + +MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget" + +# used by sysvinit_2 +SERIAL_CONSOLE = "115200 ttyS0" +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n" + +require conf/machine/include/tune-arm926ejs.inc diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index e228860a49..62c0b14fb9 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -1,6 +1,6 @@ require linux.inc -PR = "r2" +PR = "r3" # Mark archs/machines that this kernel supports DEFAULT_PREFERENCE = "-1" @@ -32,6 +32,10 @@ SRC_URI_append_at32stk1000 = " \ http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.25.6.atmel.1.patch.bz2;patch=1 \ " +SRC_URI_append_at91-l9260 = " \ + http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz;patch=1 \ +" + CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=1 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2" FILES_kernel-image_cm-x270 = "" -- cgit v1.2.3 From f75762fcbb8174e9c8e47fcc336cd0b5c5fa1a59 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 20 Jul 2008 22:08:51 +0000 Subject: u-boot-openmoko * refactor into .inc file and update sane-srcrevs --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/u-boot/u-boot-openmoko.inc | 62 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 packages/u-boot/u-boot-openmoko.inc diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 8c488467bc..cdd4c6f993 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -166,7 +166,7 @@ SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "1dd080c17b105da5cd4720307fa62de38276796a" +SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" diff --git a/packages/u-boot/u-boot-openmoko.inc b/packages/u-boot/u-boot-openmoko.inc new file mode 100644 index 0000000000..c25afd38f6 --- /dev/null +++ b/packages/u-boot/u-boot-openmoko.inc @@ -0,0 +1,62 @@ +DESCRIPTION = "U-boot bootloader w/ Neo1973 (GTA01) and Neo FreeRunner (GTA02) support" +AUTHOR = "Harald Welte et. al." +LICENSE = "GPL" +SECTION = "bootloader" +PRIORITY = "optional" +PROVIDES = "virtual/bootloader" +LOCALVERSION = "+gitr${SRCREV}" +PV = "1.3.1${LOCALVERSION}" +PR = "r0" + +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v4 gta02v5" + +DEFAULT_PREFERENCE = "-1" + +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +do_svnrev() { + mv -f tools/setlocalversion tools/setlocalversion.old + echo "echo ${LOCALVERSION}" >>tools/setlocalversion +} + +do_compile () { + chmod +x board/neo1973/gta*/split_by_variant.sh + for mach in ${UBOOT_MACHINES} + do + oe_runmake ${mach}_config + oe_runmake clean + find board -name lowlevel_foo.bin -exec rm '{}' \; + oe_runmake all + oe_runmake u-boot.udfu + if [ -f u-boot.udfu ]; then + mv u-boot.udfu u-boot_${mach}.bin + else + mv u-boot.bin u-boot_${mach}.bin + fi + if [ -f board/${mach}/lowlevel_foo.bin ]; then + mv board/${mach}/lowlevel_foo.bin lowlevel_foo_${mach}.bin + else + find board -name lowlevel_foo.bin -exec mv '{}' lowlevel_foo_${mach}.bin \; + fi + done +} + +do_deploy () { + install -d ${DEPLOY_DIR_IMAGE} + for mach in ${UBOOT_MACHINES} + do + install -m 0644 ${S}/u-boot_${mach}.bin ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/u-boot-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/uboot-${mach}-latest.bin + if [ -f ${S}/lowlevel_foo_${mach}.bin ]; then + install -m 0644 ${S}/lowlevel_foo_${mach}.bin ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin + ln -sf ${DEPLOY_DIR_IMAGE}/lowlevel_foo-${mach}-${PV}-${PR}.bin ${DEPLOY_DIR_IMAGE}/lowlevel-foo-${mach}-latest.bin + fi + done + install -m 0755 tools/mkimage ${STAGING_BINDIR_NATIVE}/uboot-mkimage +} + +do_deploy[dirs] = "${S}" +addtask deploy before do_package after do_install +addtask quilt before do_patch after do_unpack +addtask svnrev before do_patch after do_quilt -- cgit v1.2.3 From 0f3931ecb1c0a1987bb417da4201d72757efb048 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 08:59:52 +0000 Subject: generate-manifest-2.5.py: not in sync with manifest.inc * python-compression with tarfile is not in generate-manifest --- contrib/python/generate-manifest-2.5.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 8f1ee88937..0eab961d43 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -184,8 +184,8 @@ if __name__ == "__main__": m.addPackage( 0, "python-compiler", "Python Compiler Support", "python-core", "compiler" ) # package - m.addPackage( 0, "python-compression", "Python High Level Compression Support", "python-core python-zlib", - "gzip.* zipfile.*" ) + m.addPackage( 1, "python-compression", "Python High Level Compression Support", "python-core python-zlib", + "gzip.* zipfile.* tarfile.*" ) m.addPackage( 1, "python-crypt", "Python Basic Cryptographic and Hashing Support", "python-core", "hashlib.* md5.* sha.* lib-dynload/crypt.so lib-dynload/_hashlib.so lib-dynload/_sha256.so lib-dynload/_sha512.so" ) -- cgit v1.2.3 From f0e7c6dbe2141e8e7ce189f3b2e6011cc441e569 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:00:30 +0000 Subject: generate-manifest-2.5.py: pdb requires pprint --- contrib/python/generate-manifest-2.5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 0eab961d43..1a30b7865a 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -205,7 +205,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-db", "Python File-Based Database Support", "python-core", "anydbm.* dumbdbm.* whichdb.* " ) - m.addPackage( 0, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell", + m.addPackage( 1, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint", "bdb.* pdb.*" ) m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core", -- cgit v1.2.3 From 4f39c69d732f72bef35affd07866728380cf9916 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:02:00 +0000 Subject: generate-manifest-2.5.py: add python-difflib --- contrib/python/generate-manifest-2.5.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 1a30b7865a..049fc32553 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -330,4 +330,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", "mailbox.*" ) + m.addPackage( 0, "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", + "difflib.*" ) + m.make() -- cgit v1.2.3 From 784f75ef1337630304dad3c69d31f700a7f5618d Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:02:41 +0000 Subject: generate-manifest-2.5.py: add python-doctest --- contrib/python/generate-manifest-2.5.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 049fc32553..291251b87d 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -333,4 +333,7 @@ if __name__ == "__main__": m.addPackage( 0, "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", "difflib.*" ) + m.addPackage( 0, "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", + "doctest.*" ) + m.make() -- cgit v1.2.3 From 8a70396a87b461003d0a0bdd1f43ed77d1dad196 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 21 Jul 2008 09:05:24 +0000 Subject: python-2.5-manifest.inc: update by generate-manifest-2.5.py * bump python_2.5.2.bb PR --- packages/python/python-2.5-manifest.inc | 20 +++++++++++++++----- packages/python/python_2.5.2.bb | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/python/python-2.5-manifest.inc b/packages/python/python-2.5-manifest.inc index 06c187fe91..95a7bd8e0b 100644 --- a/packages/python/python-2.5-manifest.inc +++ b/packages/python/python-2.5-manifest.inc @@ -1,5 +1,5 @@ ######################################################################################################################## -### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Thu May 1 12:24:55 2008 +### AUTO-GENERATED by '../../contrib/python/generate-manifest-2.5.py' [(C) 2002-2008 Michael 'Mickey' Lauer ] on Mon Jul 21 17:03:43 2008 ### ### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy ### @@ -8,9 +8,9 @@ ######################################################################################################################## -PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PROVIDES+="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-doctest python-tests python-core-dbg python-resource python-devel python-difflib python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " -PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-tests python-core-dbg python-resource python-devel python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " +PACKAGES="python-profile python-threading python-distutils python-textutils python-codecs python-ctypes python-pickle python-datetime python-core python-io python-compiler python-compression python-re python-xmlrpc python-terminal python-email python-image python-doctest python-tests python-core-dbg python-resource python-devel python-difflib python-math python-hotshot python-unixadmin python-syslog python-tkinter python-gdbm python-fcntl python-netclient python-pprint python-netserver python-curses python-smtpd python-html python-readline python-subprocess python-pydoc python-logging python-mailbox python-xml python-mime python-sqlite3 python-sqlite3-tests python-unittest python-stringold python-robotparser python-lib-old-and-deprecated python-compile python-debugger python-shell python-bsddb python-mmap python-zlib python-db python-crypt python-idle python-lang python-audio " DESCRIPTION_python-profile="Python Basic Profiling Support" PR_python-profile="ml0" @@ -97,6 +97,11 @@ PR_python-image="ml0" RDEPENDS_python-image="python-core" FILES_python-image="${libdir}/python2.5/colorsys.* ${libdir}/python2.5/imghdr.* ${libdir}/python2.5/lib-dynload/imageop.so ${libdir}/python2.5/lib-dynload/rgbimg.so " +DESCRIPTION_python-doctest="Python framework for running examples in docstrings." +PR_python-doctest="ml0" +RDEPENDS_python-doctest="python-core python-lang python-io python-re python-unittest python-debugger python-difflib" +FILES_python-doctest="${libdir}/python2.5/doctest.* " + DESCRIPTION_python-tests="Python Tests" PR_python-tests="ml0" RDEPENDS_python-tests="python-core" @@ -117,6 +122,11 @@ PR_python-devel="ml0" RDEPENDS_python-devel="python-core" FILES_python-devel="${includedir} ${libdir}/python2.5/config " +DESCRIPTION_python-difflib="Python helpers for computing deltas between objects." +PR_python-difflib="ml0" +RDEPENDS_python-difflib="python-lang python-re" +FILES_python-difflib="${libdir}/python2.5/difflib.* " + DESCRIPTION_python-math="Python Math Support" PR_python-math="ml0" RDEPENDS_python-math="python-core" @@ -253,8 +263,8 @@ RDEPENDS_python-compile="python-core" FILES_python-compile="${libdir}/python2.5/py_compile.* ${libdir}/python2.5/compileall.* " DESCRIPTION_python-debugger="Python Debugger" -PR_python-debugger="ml0" -RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell" +PR_python-debugger="ml1" +RDEPENDS_python-debugger="python-core python-io python-lang python-re python-stringold python-shell python-pprint" FILES_python-debugger="${libdir}/python2.5/bdb.* ${libdir}/python2.5/pdb.* " DESCRIPTION_python-shell="Python Shell-Like Functionality" diff --git a/packages/python/python_2.5.2.bb b/packages/python/python_2.5.2.bb index 9617871fff..b47ed0b7cf 100644 --- a/packages/python/python_2.5.2.bb +++ b/packages/python/python_2.5.2.bb @@ -6,7 +6,7 @@ PRIORITY = "optional" DEPENDS = "python-native readline zlib gdbm openssl sqlite3 tcl tk" DEPENDS_sharprom = "python-native readline zlib gdbm openssl" # bump this on every change in contrib/python/generate-manifest-2.5.py -PR = "ml6" +PR = "ml7" PYTHON_MAJMIN = "2.5" -- cgit v1.2.3 From 7c3ab51907d9e974a12bf43e73c7d7070101da3f Mon Sep 17 00:00:00 2001 From: Shane Volpe Date: Mon, 21 Jul 2008 11:03:58 +0000 Subject: Added at91-l9260 to supported machines for the linux-2.6.25 kernel --- packages/linux/linux_2.6.25.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/linux/linux_2.6.25.bb b/packages/linux/linux_2.6.25.bb index 62c0b14fb9..dc9a35e3bb 100644 --- a/packages/linux/linux_2.6.25.bb +++ b/packages/linux/linux_2.6.25.bb @@ -10,6 +10,7 @@ DEFAULT_PREFERENCE_sequoia = "1" DEFAULT_PREFERENCE_cm-x270 = "1" DEFAULT_PREFERENCE_alix = "1" DEFAULT_PREFERENCE_at32stk1000 = "1" +DEFAULT_PREFERENCE_at91-l9260 = "1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ file://defconfig" -- cgit v1.2.3 From 4f512b95406a1e0354cb64ce4e679c6ed1437b17 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Mon, 21 Jul 2008 11:23:18 +0000 Subject: libusb1 0.9.0: Added patch to allow compilation with gcc 3.4 libusb-compat 0.0.9+0.1.0-beta1: Added patch to allow compilation with gcc 3.4 --- .../libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty | 0 .../0.1.0-beta1-gcc3.4-fix.patch | 13 +++++++++++++ packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb | 2 ++ packages/libusb/libusb1-0.9.0/.mtn2git_empty | 0 packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch | 13 +++++++++++++ packages/libusb/libusb1_0.9.0.bb | 3 +++ 6 files changed, 31 insertions(+) create mode 100644 packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty create mode 100644 packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch create mode 100644 packages/libusb/libusb1-0.9.0/.mtn2git_empty create mode 100644 packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch new file mode 100644 index 0000000000..501ba3fb29 --- /dev/null +++ b/packages/libusb/libusb-compat-0.0.9+0.1.0-beta1/0.1.0-beta1-gcc3.4-fix.patch @@ -0,0 +1,13 @@ +Index: libusb-compat-0.1.0-beta1/configure.ac +=================================================================== +--- libusb-compat-0.1.0-beta1.orig/configure.ac 2008-07-21 13:14:42.000000000 +0200 ++++ libusb-compat-0.1.0-beta1/configure.ac 2008-07-21 13:15:03.000000000 +0200 +@@ -55,7 +55,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + AC_SUBST(AM_CFLAGS) + + AC_CONFIG_FILES([libusb.pc] [libusb-config] [Makefile] [libusb/Makefile] [examples/Makefile]) diff --git a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb index b42e572196..fec42b1df7 100644 --- a/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb +++ b/packages/libusb/libusb-compat_0.0.9+0.1.0-beta1.bb @@ -5,10 +5,12 @@ SECTION = "libs" LICENSE = "LGPL" PE = "1" +PR = "r1" DEPENDS = "libusb1" SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-compat-0.1.0-beta1.tar.bz2 \ + file://0.1.0-beta1-gcc3.4-fix.patch;patch=1 \ " S = "${WORKDIR}/libusb-compat-0.1.0-beta1" diff --git a/packages/libusb/libusb1-0.9.0/.mtn2git_empty b/packages/libusb/libusb1-0.9.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch b/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch new file mode 100644 index 0000000000..1b06945d1a --- /dev/null +++ b/packages/libusb/libusb1-0.9.0/0.9.0-gcc3.4-compat-fix.patch @@ -0,0 +1,13 @@ +Index: libusb-0.9.0/configure.ac +=================================================================== +--- libusb-0.9.0.orig/configure.ac 2008-07-21 08:04:03.000000000 +0200 ++++ libusb-0.9.0/configure.ac 2008-07-21 08:04:16.000000000 +0200 +@@ -62,7 +62,7 @@ + CFLAGS="$saved_cflags" + + AC_DEFINE([API_EXPORTED], [__attribute__((visibility("default")))], [Default visibility]) +-AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wno-pointer-sign -Wshadow" ++AM_CFLAGS="-std=gnu99 $inline_cflags -Wall -Wundef -Wunused -Wstrict-prototypes -Werror-implicit-function-declaration -Wshadow" + AC_SUBST(AM_CFLAGS) + + AC_CONFIG_FILES([libusb-1.0.pc] [Makefile] [libusb/Makefile] [examples/Makefile] [doc/Makefile]) diff --git a/packages/libusb/libusb1_0.9.0.bb b/packages/libusb/libusb1_0.9.0.bb index 784d9b523b..ce102c0cfc 100644 --- a/packages/libusb/libusb1_0.9.0.bb +++ b/packages/libusb/libusb1_0.9.0.bb @@ -4,8 +4,11 @@ HOMEPAGE = "http://libusb.sf.net" SECTION = "libs" LICENSE = "LGPL" +PR = "r1" + SRC_URI = "\ ${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2 \ + file://0.9.0-gcc3.4-compat-fix.patch;patch=1 \ " S = "${WORKDIR}/libusb-${PV}" -- cgit v1.2.3 From b6dcbb6854484bc16afcfbf6ef0f6d94753332ad Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 14:07:47 +0000 Subject: u-boot-mkimage-openmoko-native oe unbreak, thanks svolpe. --- packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb index 08c0062fab..8b5564c14c 100644 --- a/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb +++ b/packages/u-boot/u-boot-mkimage-openmoko-native_oe.bb @@ -1,4 +1,4 @@ -require u-boot-openmoko_svn.bb +require u-boot-openmoko_git.bb inherit native -- cgit v1.2.3 From 712964dacb068f6a1fdea879a0a7beff5d68a907 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 16:00:52 +0000 Subject: u-boot-openmoko git add missing file --- packages/u-boot/u-boot-openmoko_git.bb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 packages/u-boot/u-boot-openmoko_git.bb diff --git a/packages/u-boot/u-boot-openmoko_git.bb b/packages/u-boot/u-boot-openmoko_git.bb new file mode 100644 index 0000000000..8555f5fdc2 --- /dev/null +++ b/packages/u-boot/u-boot-openmoko_git.bb @@ -0,0 +1,7 @@ +require u-boot-openmoko.inc + +SRC_URI = "\ + git://git.openmoko.org/git/u-boot.git;protocol=git;branch=stable \ + file://makefile-no-dirafter.patch;patch=1 \ +" +S = "${WORKDIR}/git" -- cgit v1.2.3 From 714adbc0d90aaa38bceda464d269eb8f03aba475 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 21 Jul 2008 20:24:23 +0000 Subject: omapfbplay: check in updated patch --- packages/ffmpeg/omapfbplay/fbplay-static.diff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/ffmpeg/omapfbplay/fbplay-static.diff b/packages/ffmpeg/omapfbplay/fbplay-static.diff index 439fc6e6bb..f1f7015c2a 100644 --- a/packages/ffmpeg/omapfbplay/fbplay-static.diff +++ b/packages/ffmpeg/omapfbplay/fbplay-static.diff @@ -1,10 +1,10 @@ ---- /tmp/Makefile 2008-07-10 12:59:00.000000000 +0200 -+++ git/Makefile 2008-07-10 12:57:38.723198000 +0200 +--- /tmp/Makefile 2008-07-21 22:08:58.000000000 +0200 ++++ git/Makefile 2008-07-21 22:10:08.023198000 +0200 @@ -5,6 +5,6 @@ CFLAGS = -O3 -Wall -fomit-frame-pointer -mcpu=cortex-a8 -mfpu=neon \ -I$(LINUX)/include -I$(FFMPEG) LDFLAGS = -L$(FFMPEG)/libavcodec -L$(FFMPEG)/libavformat -L$(FFMPEG)/libavutil --LDLIBS = -lavformat -lavcodec -lavutil -lm -lz -lpthread -+LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread +-LDLIBS = -lavformat -lavcodec -lavutil -lm -lz -lpthread -lrt ++LDLIBS = -lavformat -lavcodec -lavutil -lz -ldl -lbz2 -lfaac -lgsm -lmp3lame -lm -lpthread -lrt all: omapfbplay -- cgit v1.2.3 From c333977e1cd10d8c40b200b3bbf63c329d629e1e Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Mon, 21 Jul 2008 20:37:16 +0000 Subject: alsa-oss: fix libio.patch *stupid else vs. #else from some how dont break uclibc build so I catched not _fildes vs __filedes, fixed now to, thanks to shoragan to spot this * add LEAD_SONAME as suggested by bitbake * bump PR this time the rightway --- packages/alsa/alsa-oss_1.0.15.bb | 4 +++- packages/alsa/files/libio.patch | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/alsa/alsa-oss_1.0.15.bb b/packages/alsa/alsa-oss_1.0.15.bb index 3cfe886d61..de840e73fe 100644 --- a/packages/alsa/alsa-oss_1.0.15.bb +++ b/packages/alsa/alsa-oss_1.0.15.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa OSS Compatibility Package" SECTION = "libs/multimedia" LICENSE = "GPL" DEPENDS = "alsa-lib" -PR = "1" +PR = "r2" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ file://libio.patch;patch=1 \ @@ -10,6 +10,8 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ inherit autotools +LEAD_SONAME = "libaoss.so.0" + do_configure_prepend () { touch NEWS README AUTHORS ChangeLog } diff --git a/packages/alsa/files/libio.patch b/packages/alsa/files/libio.patch index 83345a98d3..a053e4c604 100644 --- a/packages/alsa/files/libio.patch +++ b/packages/alsa/files/libio.patch @@ -1,7 +1,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c =================================================================== --- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-20 22:29:46.767474560 +0200 ++++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200 @@ -37,7 +37,9 @@ #endif @@ -18,8 +18,8 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c result = fopencookie (fdc,"w", fns); +#ifdef HAVE_FILENO result->_fileno = fdc->fd; /* ugly patchy slimy kludgy hack */ -+else -+ result->_filedes = fdc->fd; ++#else ++ result->__filedes = fdc->fd; +#endif } return result; @@ -27,7 +27,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c Index: alsa-oss-1.0.15/configure.in =================================================================== --- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/configure.in 2008-07-20 22:49:45.455837502 +0200 ++++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200 @@ -33,6 +33,12 @@ LIBS="$OLD_LIBS" fi -- cgit v1.2.3 From e3ee355521dd49a2539326d35cf977794f60880e Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Mon, 21 Jul 2008 21:54:02 +0000 Subject: iscsi-target: Add package iscsi-target --- packages/iscsi-target/.mtn2git_empty | 0 packages/iscsi-target/files/.mtn2git_empty | 0 packages/iscsi-target/files/ietd.conf | 17 ++++++++++ packages/iscsi-target/files/init | 36 ++++++++++++++++++++++ packages/iscsi-target/files/libs.patch | 11 +++++++ packages/iscsi-target/iscsi-target_0.4.16.bb | 43 ++++++++++++++++++++++++++ packages/iscsi-target/iscsi-target_svn.bb | 46 ++++++++++++++++++++++++++++ 7 files changed, 153 insertions(+) create mode 100644 packages/iscsi-target/.mtn2git_empty create mode 100644 packages/iscsi-target/files/.mtn2git_empty create mode 100644 packages/iscsi-target/files/ietd.conf create mode 100644 packages/iscsi-target/files/init create mode 100644 packages/iscsi-target/files/libs.patch create mode 100644 packages/iscsi-target/iscsi-target_0.4.16.bb create mode 100644 packages/iscsi-target/iscsi-target_svn.bb diff --git a/packages/iscsi-target/.mtn2git_empty b/packages/iscsi-target/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/iscsi-target/files/.mtn2git_empty b/packages/iscsi-target/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/iscsi-target/files/ietd.conf b/packages/iscsi-target/files/ietd.conf new file mode 100644 index 0000000000..0a100ac664 --- /dev/null +++ b/packages/iscsi-target/files/ietd.conf @@ -0,0 +1,17 @@ +Target iqn.2007-01.org.foonas:iSCSI.sda.target1 + Lun 0 Path=/dev/sda,Type=blockio + MaxConnections 1 + HeaderDigest None + DataDigest None + InitialR2T Yes + ImmediateData No + MaxRecvDataSegmentLength 8192 + MaxXmitDataSegmentLength 8192 + MaxBurstLength 262144 + FirstBurstLength 65536 + DefaultTime2Wait 2 + DefaultTime2Retain 20 + MaxOutstandingR2T 8 + DataPDUInOrder Yes + DataSequenceInOrder Yes + ErrorRecoveryLevel 0 diff --git a/packages/iscsi-target/files/init b/packages/iscsi-target/files/init new file mode 100644 index 0000000000..d000adfe3c --- /dev/null +++ b/packages/iscsi-target/files/init @@ -0,0 +1,36 @@ +#!/bin/sh +# +# Start the iSCSI Enterprise Target. +# + +PATH=/sbin:/bin:/usr/sbin:/usr/bin + +start_server() +{ + modprobe -q crc32c + modprobe iscsi_trgt + start-stop-daemon --start --quiet --pidfile /var/run/iscsi_trgt.pid --exec /sbin/ietd +} + +stop_server() +{ + ietadm --op delete + start-stop-daemon --stop --quiet --pidfile /var/run/iscsi_trgt.pid --exec /sbin/ietd + sleep 1 + modprobe -r iscsi_trgt +} + +case "$1" in + start) + start_server + ;; + stop) + stop_server + ;; + *) + echo "Usage: {start|stop}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/packages/iscsi-target/files/libs.patch b/packages/iscsi-target/files/libs.patch new file mode 100644 index 0000000000..5108027cc4 --- /dev/null +++ b/packages/iscsi-target/files/libs.patch @@ -0,0 +1,11 @@ +diff -urN iscsitarget-0.4.15/usr/Makefile iscsitarget-0.4.15.new/usr/Makefile +--- iscsitarget-0.4.15/usr/Makefile 2006-07-03 14:09:30.000000000 +0000 ++++ iscsitarget-0.4.15.new/usr/Makefile 2007-07-29 23:16:45.000000000 +0000 +@@ -1,6 +1,6 @@ + CFLAGS += -O2 -fno-inline -Wall -Wstrict-prototypes -g -I../include + PROGRAMS = ietd ietadm +-LIBS = -lcrypto ++LIBS = -lcrypto $(LDFLAGS) + + all: $(PROGRAMS) + diff --git a/packages/iscsi-target/iscsi-target_0.4.16.bb b/packages/iscsi-target/iscsi-target_0.4.16.bb new file mode 100644 index 0000000000..0e50bfe22b --- /dev/null +++ b/packages/iscsi-target/iscsi-target_0.4.16.bb @@ -0,0 +1,43 @@ + +DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" +HOMEPAGE = "http://iscsitarget.sourceforge.net/" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/iscsitarget/iscsitarget-${PV}.tar.gz \ + file://libs.patch;patch=1 \ + file://init \ + " + +DEPENDS = " openssl" +S = "${WORKDIR}/iscsitarget-${PV}" + +inherit module + +do_configure() { +} + +CFLAGS = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}" +LDFLAGS = "-L${STAGING_LIBDIR}" +FILES_${PN} += " ${base_sbindir}" + +do_compile() { + oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' +} + +do_install() { + # Module + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi + install -m 0644 kernel/iscsi_trgt.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko + + # Userspace utilities + install -d ${D}${base_sbindir} + install -m 0755 usr/ietd ${D}${base_sbindir}/ietd + install -m 0755 usr/ietadm ${D}${base_sbindir}/ietadm + + # Config files, init scripts + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ../init ${D}${sysconfdir}/init.d/iscsi-target + install -m 0644 etc/initiators.allow ${D}${sysconfdir}/ + install -m 0644 etc/initiators.deny ${D}${sysconfdir}/ +} diff --git a/packages/iscsi-target/iscsi-target_svn.bb b/packages/iscsi-target/iscsi-target_svn.bb new file mode 100644 index 0000000000..6671934c48 --- /dev/null +++ b/packages/iscsi-target/iscsi-target_svn.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "iSCSI Enterprise Target is for building an iSCSI storage system on Linux" +HOMEPAGE = "http://iscsitarget.sourceforge.net/" +LICENSE = "GPL" +PR = "r12" + +SRC_URI = "svn://svn.berlios.de/iscsitarget/;module=trunk;rev=HEAD \ + file://libs.patch;patch=1 \ + file://init \ + file://ietd.conf \ + " + +DEPENDS = " openssl" +RDEPENDS = "kernel-module-crc32c kernel-module-libcrc32c" + +S = "${WORKDIR}/trunk" + +inherit module + +do_configure() { +} + +CFLAGS = "-isystem${STAGING_KERNEL_DIR}/include -I${STAGING_INCDIR} -L${STAGING_LIBDIR}" +LDFLAGS = "-L${STAGING_LIBDIR}" +FILES_${PN} += " ${base_sbindir}" + +do_compile() { + oe_runmake KSRC=${STAGING_KERNEL_DIR} CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}' +} + +do_install() { + # Module + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi + install -m 0644 kernel/iscsi_trgt.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/iscsi/iscsi_trgt.ko + + # Userspace utilities + install -d ${D}${base_sbindir} + install -m 0755 usr/ietd ${D}${base_sbindir}/ietd + install -m 0755 usr/ietadm ${D}${base_sbindir}/ietadm + + # Config files, init scripts + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ../init ${D}${sysconfdir}/init.d/iscsi-target + install -m 0644 ${WORKDIR}/ietd.conf ${D}${sysconfdir}/ + install -m 0644 etc/initiators.allow ${D}${sysconfdir}/ + install -m 0644 etc/initiators.deny ${D}${sysconfdir}/ +} -- cgit v1.2.3 From f3dcbf1b17b629701e6ed12be7bfd1181b7f5ef0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 22:43:18 +0000 Subject: illume svn increase packaging granularity --- packages/openmoko-projects/illume/.mtn2git_empty | 0 packages/openmoko-projects/illume_svn.bb | 55 +++++++++++++++++------- 2 files changed, 40 insertions(+), 15 deletions(-) delete mode 100644 packages/openmoko-projects/illume/.mtn2git_empty diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb index f3fb611e09..b58bc2c1d6 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects/illume_svn.bb @@ -1,25 +1,50 @@ -DESCRIPTION = "Illume - Mobile UI module for Enlightenment" -HOMEPAGE = "http://illume.projects.openmoko.org/" +DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager" +HOMEPAGE = "http://illume.projects.openmoko.org" +AUTHOR = "Rasterman" LICENSE = "MIT/BSD" DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" -RRECOMMENDS = "wamerican" PV = "0.0+svnr${SRCREV}" -PR = "r6" - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https" +PR = "r7" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http" S = "${WORKDIR}/${PN}" inherit autotools pkgconfig -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ +" + +RRECOMMENDS_${PN} = "\ + wamerican \ + ${PN}-config \ + ${PN}-dicts-default \ + ${PN}-keyboards-default \ + ${PN}-keyboards-numbers \ +" + +PACKAGES =+ "\ + ${PN}-config \ + ${PN}-dicts-default \ + ${PN}-keyboards-default \ + ${PN}-keyboards-numbers \ +" +PACKAGE_ARCH_${PN}-config = "all" +PACKAGE_ARCH_${PN}-dicts-default = "all" +PACKAGE_ARCH_${PN}-keyboards-default = "all" +PACKAGE_ARCH_${PN}-keyboards-numbers = "all" + +FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume" +FILES_${PN}-dicts-default = "${libdir}/enlightenment/modules/illume/dicts/Default.dic" +FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd" +FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd" -FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj \ - ${libdir}/enlightenment/modules/*/*.desktop \ - ${libdir}/enlightenment/modules/*/*/* \ - ${datadir}/enlightenment/data/config/*/* \ - ${datadir}/${PN} " +FILES_${PN} = "\ + ${libdir}/enlightenment/modules/*/*.edj \ + ${libdir}/enlightenment/modules/*/*.desktop \ + ${libdir}/enlightenment/modules/*/*/* \ +" FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" -- cgit v1.2.3 From 61b058d96219197c85e2dda14b6f8fe968d16115 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 22:43:49 +0000 Subject: remove tangogps, it now has its own directory --- packages/openmoko-projects/tangogps/.mtn2git_empty | 0 .../tangogps/global-config-h.patch | 30 ---------------------- packages/openmoko-projects/tangogps_0.7.bb | 17 ------------ 3 files changed, 47 deletions(-) delete mode 100644 packages/openmoko-projects/tangogps/.mtn2git_empty delete mode 100644 packages/openmoko-projects/tangogps/global-config-h.patch delete mode 100644 packages/openmoko-projects/tangogps_0.7.bb diff --git a/packages/openmoko-projects/tangogps/.mtn2git_empty b/packages/openmoko-projects/tangogps/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects/tangogps/global-config-h.patch deleted file mode 100644 index 973710c942..0000000000 --- a/packages/openmoko-projects/tangogps/global-config-h.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: tangoGPS-0.7/src/globals.c -=================================================================== ---- tangoGPS-0.7.orig/src/globals.c 2008-03-13 14:21:02.000000000 +0800 -+++ tangoGPS-0.7/src/globals.c 2008-03-13 14:28:49.000000000 +0800 -@@ -3,11 +3,11 @@ - * License GPLv2 - ****************************************************************************/ - -+#include "globals.h" -+ - #include - #include - --#include "globals.h" -- - GdkPixmap *pixmap = NULL; - GtkWidget *window1 = NULL; - GtkWidget *window2 = NULL; -Index: tangoGPS-0.7/src/globals.h -=================================================================== ---- tangoGPS-0.7.orig/src/globals.h 2008-03-13 14:27:46.000000000 +0800 -+++ tangoGPS-0.7/src/globals.h 2008-03-13 14:27:48.000000000 +0800 -@@ -1,3 +1,7 @@ -+#ifdef HAVE_CONFIG_H -+# include -+#endif -+ - #include - #include - diff --git a/packages/openmoko-projects/tangogps_0.7.bb b/packages/openmoko-projects/tangogps_0.7.bb deleted file mode 100644 index 63513ffe00..0000000000 --- a/packages/openmoko-projects/tangogps_0.7.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "tangoGPS map" -AUTHOR = "Marcus Bauer " -HOMEPAGE = "http://tangogps.org/" -SECTION = "openmoko/pim" -PRIORITY = "optional" -LICENSE = "GPLv2" -DEPENDS = "curl gtk+ gpsd" -PR = "r1" - -SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \ - file://global-config-h.patch;patch=1" - -S = "${WORKDIR}/tangoGPS-0.7" - -inherit autotools - -CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/" -- cgit v1.2.3 From 3f1855ad462f58ff1fdcbbfe52240b9375c5ab4c Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 22:50:31 +0000 Subject: frameworkd git increase package granularity --- packages/freesmartphone/frameworkd_git.bb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 20c655e98d..f26b0a282d 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.1+gitr${SRCREV}" -PR = "r9" +PR = "r10" inherit distutils update-rc.d @@ -34,7 +34,16 @@ RDEPENDS_${PN} += "\ python-pyyaml \ python-shell \ python-syslog \ + \ + ${PN}-config \ " -FILES_${PN} += "${sysconfdir} ${datadir}" + +PACKAGES =+ "${PN}-config" + +PACKAGE_ARCH_${PN}-config = "${MACHINE_ARCH}" +FILES_${PN}-config = "${sysconfdir}" + +PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}" +FILES_${PN} += "${datadir}" FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/framework/subsystems/*/.debug" -- cgit v1.2.3 From 0935caa6479bc3278828175bd6e54db58065740b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 23:22:54 +0000 Subject: busybox 1.11.1 apply first two hotfixes --- packages/busybox/busybox_1.11.1.bb | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/packages/busybox/busybox_1.11.1.bb b/packages/busybox/busybox_1.11.1.bb index 67c52939cb..945ab7f718 100644 --- a/packages/busybox/busybox_1.11.1.bb +++ b/packages/busybox/busybox_1.11.1.bb @@ -1,18 +1,23 @@ require busybox.inc -PR = "r0" +PR = "r1" -SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ - file://udhcpscript.patch;patch=1 \ - file://busybox-cron \ - file://busybox-httpd \ - file://busybox-udhcpd \ - file://default.script \ - file://hwclock.sh \ - file://mount.busybox \ - file://syslog \ - file://syslog.conf \ - file://umount.busybox \ - file://defconfig" +SRC_URI = "\ + http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ + http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch;patch=1 \ + http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch;patch=1 \ + \ + file://udhcpscript.patch;patch=1 \ + file://busybox-cron \ + file://busybox-httpd \ + file://busybox-udhcpd \ + file://default.script \ + file://hwclock.sh \ + file://mount.busybox \ + file://syslog \ + file://syslog.conf \ + file://umount.busybox \ + file://defconfig \ +" EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" -- cgit v1.2.3 From 85bbfb6c7cae9f5d49c97663670c4c5aadc74173 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 21 Jul 2008 23:49:22 +0000 Subject: generate-manifest-2.5.py restore alphabetical order and update version --- contrib/python/generate-manifest-2.5.py | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/contrib/python/generate-manifest-2.5.py b/contrib/python/generate-manifest-2.5.py index 291251b87d..08a8a47f15 100755 --- a/contrib/python/generate-manifest-2.5.py +++ b/contrib/python/generate-manifest-2.5.py @@ -13,7 +13,7 @@ VERSION = "2.5.2" BASEREV = 0 __author__ = "Michael 'Mickey' Lauer " -__version__ = "20080306" +__version__ = "20080722" class MakefileMaker: @@ -22,14 +22,9 @@ class MakefileMaker: self.packages = {} self.targetPrefix = "${libdir}/python%s/" % VERSION[:3] self.output = outfile - self.out( "#" * 120 ) - self.out( "### AUTO-GENERATED by '%s' [(C) 2002-2008 Michael 'Mickey' Lauer ] on %s" % ( sys.argv[0], time.asctime() ) ) - self.out( "###" ) - self.out( "### Visit THE Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) - self.out( "###" ) - self.out( "### Warning: Manual edits will be lost!" ) - self.out( "###" ) - self.out( "#" * 120 ) + self.out( "# WARNING: This file is AUTO GENERATED: Manual edits will be lost next time I regenerate the file." ) + self.out( "# Generator: '%s' Version %s (C) 2002-2008 Michael 'Mickey' Lauer " % ( sys.argv[0], __version__ ) ) + self.out( "# Visit the Python for Embedded Systems Site => http://www.Vanille.de/projects/python.spy" ) # # helper functions # @@ -208,9 +203,15 @@ if __name__ == "__main__": m.addPackage( 1, "python-debugger", "Python Debugger", "python-core python-io python-lang python-re python-stringold python-shell python-pprint", "bdb.* pdb.*" ) + m.addPackage( 0, "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", + "difflib.*" ) + m.addPackage( 0, "python-distutils", "Python Distribution Utilities", "python-core", "config distutils" ) # package + m.addPackage( 0, "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", + "doctest.*" ) + m.addPackage( 0, "python-email", "Python Email Support", "python-core python-io python-re python-mime python-audio python-image", "email" ) # package @@ -330,10 +331,4 @@ if __name__ == "__main__": m.addPackage( 0, "python-mailbox", "Python Mailbox Format Support", "python-core python-mime", "mailbox.*" ) - m.addPackage( 0, "python-difflib", "Python helpers for computing deltas between objects.", "python-lang python-re", - "difflib.*" ) - - m.addPackage( 0, "python-doctest", "Python framework for running examples in docstrings.", "python-core python-lang python-io python-re python-unittest python-debugger python-difflib", - "doctest.*" ) - m.make() -- cgit v1.2.3 From f8a4782d36b59b457c49a86d6630de7a8699e36b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 22 Jul 2008 08:33:45 +0000 Subject: linux omap2 git: update TWL4030 patches for beagle, add mrus clock patches --- .../linux-omap2-git/beagleboard/TWL4030-01.patch | 49 +--- .../linux-omap2-git/beagleboard/TWL4030-02.patch | 49 +--- .../linux-omap2-git/beagleboard/TWL4030-03.patch | 50 +--- .../linux-omap2-git/beagleboard/TWL4030-04.patch | 49 +--- .../linux-omap2-git/beagleboard/TWL4030-05.patch | 208 ++++++++++------- .../linux-omap2-git/beagleboard/TWL4030-06.patch | 83 ++----- .../linux-omap2-git/beagleboard/TWL4030-07.patch | 62 +---- .../linux-omap2-git/beagleboard/TWL4030-08.patch | 231 +++++++++--------- .../linux-omap2-git/beagleboard/TWL4030-09.patch | 258 ++++++++++++--------- .../linux-omap2-git/beagleboard/mru-clocks1.diff | 25 ++ .../linux-omap2-git/beagleboard/mru-clocks2.diff | 62 +++++ packages/linux/linux-omap2_git.bb | 4 +- 12 files changed, 517 insertions(+), 613 deletions(-) create mode 100644 packages/linux/linux-omap2-git/beagleboard/mru-clocks1.diff create mode 100644 packages/linux/linux-omap2-git/beagleboard/mru-clocks2.diff diff --git a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch index b6142ea1f5..c361c33d61 100644 --- a/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch +++ b/packages/linux/linux-omap2-git/beagleboard/TWL4030-01.patch @@ -1,42 +1,6 @@ -X-Mozilla-Status: 0001 -X-Mozilla-Status2: 00000000 -Return-Path: -X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on shovel.geekisp.com -X-Spam-Level: -X-Spam-Status: No, score=-1.1 required=5.0 tests=AWL,DKIM_POLICY_SIGNSOME - autolearn=ham version=3.2.1 -Delivered-To: balister.org-philip@balister.org -Received: (qmail 26975 invoked by uid 1003); 18 Jul 2008 01:35:27 -0000 -Received: from vger.kernel.org (209.132.176.167) - by mail.geekisp.com with SMTP; 18 Jul 2008 01:35:27 -0000 -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1756265AbYGRBf0 (ORCPT ); - Thu, 17 Jul 2008 21:35:26 -0400 -Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751582AbYGRBfZ - (ORCPT ); - Thu, 17 Jul 2008 21:35:25 -0400 -Received: from utopia.booyaka.com ([72.9.107.138]:49361 "EHLO - utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1752321AbYGRBfX (ORCPT - ); Thu, 17 Jul 2008 21:35:23 -0400 -Received: (qmail 13868 invoked by uid 526); 18 Jul 2008 01:35:22 -0000 -MBOX-Line: From nobody Thu Jul 17 19:34:49 2008 -From: Paul Walmsley -Subject: [PATCH 1/9] TWL4030: remove superfluous PWR interrupt status clear - before masking -To: linux-omap@vger.kernel.org -Date: Thu, 17 Jul 2008 19:34:49 -0600 -Message-ID: <20080718013448.18943.6984.stgit@localhost.localdomain> -In-Reply-To: <20080718013205.18943.34047.stgit@localhost.localdomain> -References: <20080718013205.18943.34047.stgit@localhost.localdomain> -User-Agent: StGIT/0.14.3.163.g06f9 -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 7bit -Sender: linux-omap-owner@vger.kernel.org