From 579bf2572c3688fafa0a2f5674c3a088c38daba0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 9 Mar 2008 01:33:31 +0000 Subject: initramfs-module-bootldr-buster: Use sane console setup. --- packages/initrdscripts/files/01-bootldr-buster.sh | 2 +- packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/initrdscripts/files/01-bootldr-buster.sh b/packages/initrdscripts/files/01-bootldr-buster.sh index 46d01903ed..c3b79b5328 100644 --- a/packages/initrdscripts/files/01-bootldr-buster.sh +++ b/packages/initrdscripts/files/01-bootldr-buster.sh @@ -7,7 +7,7 @@ if expr "$cmdl" : '.*mtdparts=ipaq' > /dev/null; then echo "Detected Compaq bootldr or derivative" echo "Kernel command line is assumed to be bogus and ignored" echo "!!!!!!!!" - CMDLINE=" " + CMDLINE="console=ttyS0,115200 console=tty0" sleep 3 fi diff --git a/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb b/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb index a3141f5a9f..8c4c2f7e93 100644 --- a/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootldr-buster_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://01-bootldr-buster.sh" -PR = "r1" +PR = "r2" DESCRIPTION = "An initramfs module for ignoring bogus kernel commandline from Compaq bootldr" RDEPENDS = "initramfs-uniboot" -- cgit v1.2.3 From 8fd3f13e159ef7506aeed77b3ad2120f91492aae Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 9 Mar 2008 01:35:38 +0000 Subject: initramfs-*: Use $CONSOLE for input/output. --- packages/initrdscripts/files/30-bootmenu.sh | 22 +++++++++++----------- packages/initrdscripts/files/87-kexecboot.sh | 6 +++--- packages/initrdscripts/files/init.sh | 3 ++- .../initrdscripts/initramfs-module-bootmenu_1.0.bb | 2 +- .../initramfs-module-kexecboot_1.0.bb | 2 +- packages/initrdscripts/initramfs-uniboot_1.0.bb | 2 +- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index f5ecb8c828..283daadd44 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -36,14 +36,14 @@ add_menu_item() } show_menu() { - echo -e -n "${E}3;0H" + echo -e -n "${E}3;0H" >$CONSOLE cnt=0 echo -e $list | \ while read l; do if [ $cnt == $num ]; then - echo -e -n "${E}1m" + echo -e -n "${E}1m" >$CONSOLE fi - echo -e "$cnt: $l${E}0m" + echo -e "$cnt: $l${E}0m" >$CONSOLE cnt=$((cnt + 1)) done } @@ -109,14 +109,14 @@ total=`echo -e $list | wc -l` num=0 # Draw UI -stty -echo -echo -e -n "${E}2J" -echo -e -n "${E}0;0H" -echo "Select boot image:" +stty -F $CONSOLE -echo +echo -e -n "${E}2J" >$CONSOLE +echo -e -n "${E}0;0H" >$CONSOLE +echo "Select boot image:" >$CONSOLE # Main loop show_menu -while read -n1 i; do +while read -s -n1 i; do case "$i" in "A") num=$((num - 1)) @@ -139,7 +139,7 @@ while read -n1 i; do esac show_menu # echo "*$esc$i" -done +done < $CONSOLE stty echo @@ -170,8 +170,8 @@ else CMDLINE="$CMDLINE root=$ROOT_DEVICE" fi -echo ROOT_DEVICE=$ROOT_DEVICE -echo CMDLINE=$CMDLINE +echo ROOT_DEVICE=$ROOT_DEVICE >$CONSOLE +echo CMDLINE=$CMDLINE >$CONSOLE ############################## fi diff --git a/packages/initrdscripts/files/87-kexecboot.sh b/packages/initrdscripts/files/87-kexecboot.sh index 9232934f98..2a51b4d9c8 100644 --- a/packages/initrdscripts/files/87-kexecboot.sh +++ b/packages/initrdscripts/files/87-kexecboot.sh @@ -3,15 +3,15 @@ if [ -n "$BOOT_ROOT" -a -f "$BOOT_ROOT/boot/zImage" ]; then if ! expr "$CMDLINE" : '.*nokexec'; then - echo "Kernel found in rootfs:" - ls -l "$BOOT_ROOT/boot/zImage" + echo "Kernel found in rootfs:" >$CONSOLE + ls -l "$BOOT_ROOT/boot/zImage" >$CONSOLE initramfs="" if [ -f "$BOOT_ROOT/boot/initramfs.bin" ]; then echo "Initramfs found in rootfs:" ls -l "$BOOT_ROOT/boot/initramfs.bin" initramfs="--initrd=$BOOT_ROOT/boot/initramfs.bin" fi - echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" + echo /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" >$CONSOLE sleep 10 /usr/sbin/kexec -f "$BOOT_ROOT/boot/zImage" $initramfs --command-line="$CMDLINE nokexec" sleep 10000 diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index c3b4336e40..06b9119a1c 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -41,6 +41,7 @@ read_args() { load_modules() { for module in $MODULE_DIR/$1; do + # Cannot redir to $CONSOLE here easily - may not be set yet echo "initramfs: Loading $module module" source $module done @@ -67,7 +68,7 @@ load_modules '0*' read_args if [ -n "$rootdelay" ]; then - echo "Waiting $rootdelay seconds for devices to settle..." + echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE sleep $rootdelay fi diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 6c01b5edc5..6be8d733c9 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r15" +PR = "r16" DESCRIPTION = "An initramfs module with UI for selection of boot device." RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. diff --git a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb index 35100a94e6..face73038a 100644 --- a/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb +++ b/packages/initrdscripts/initramfs-module-kexecboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://87-kexecboot.sh" -PR = "r0.4" +PR = "r1" DESCRIPTION = "An initramfs module for kexecing kernel from rootfs." RDEPENDS = "initramfs-uniboot kexec-static" diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index cfa065b619..95eda7d954 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r6" +PR = "r7" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS = "kernel-module-mtdblock" -- cgit v1.2.3 From 84c5f5d53e3417913c75df26cf33678efe0a148e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 9 Mar 2008 01:41:02 +0000 Subject: initramfs-uniboot: Set default rootdelay globally, instead of initramfs-module-bootmenu. * That's because otherwise it's half-solution - after kexec, there won't be delay, and rootfs won't be detected. * Again, people who don't need and don't want delay, should pass rootdelay=0. --- packages/initrdscripts/files/30-bootmenu.sh | 7 ------- packages/initrdscripts/files/init.sh | 5 +++++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb | 2 +- packages/initrdscripts/initramfs-uniboot_1.0.bb | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 283daadd44..c77bd662af 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -15,13 +15,6 @@ if ! (echo " " | read -n1 foo) >/dev/null 2>&1; then exit 1 fi -if [ -z "$rootdelay" ]; then - echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay" - echo "If you would like to avoid this delay, pass explicit rootdelay=0" - sleep 2 - dev_setup -fi - mkdir -p $MOUNTLOC list="" diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh index 06b9119a1c..60d2e5da8b 100644 --- a/packages/initrdscripts/files/init.sh +++ b/packages/initrdscripts/files/init.sh @@ -67,6 +67,11 @@ load_modules '0*' read_args +if [ -z "$rootdelay" ]; then + echo "rootdelay parameter was not passed on kernel command line - assuming 2s delay" + echo "If you would like to avoid this delay, pass explicit rootdelay=0" + rootdelay="2" +fi if [ -n "$rootdelay" ]; then echo "Waiting $rootdelay seconds for devices to settle..." >$CONSOLE sleep $rootdelay diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb index 6be8d733c9..5893420742 100644 --- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb +++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh" -PR = "r16" +PR = "r17" DESCRIPTION = "An initramfs module with UI for selection of boot device." RDEPENDS = "klibc-utils-static-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs" # For VFAT mounting. diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb index 95eda7d954..403db0b562 100644 --- a/packages/initrdscripts/initramfs-uniboot_1.0.bb +++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://init.sh" -PR = "r7" +PR = "r8" DESCRIPTON = "A modular initramfs init script system." RRECOMMENDS = "kernel-module-mtdblock" -- cgit v1.2.3 From 2477626fdbe8e70c201e58b47fbd40b1e9b27478 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Mar 2008 11:17:58 +0000 Subject: siteinfo.bbclass: Add common-linux file --- classes/siteinfo.bbclass | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index a3b67b5798..701777bbcc 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -21,40 +21,40 @@ def get_siteinfo_list(d): target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1) targetinfo = {\ - "armeb-linux": "endian-big bit-32 common-glibc arm-common",\ - "armeb-linux-gnueabi": "endian-big bit-32 common-glibc arm-common armeb-linux",\ - "armeb-linux-uclibc": "endian-big bit-32 common-uclibc arm-common",\ - "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-uclibc arm-common armeb-linux-uclibc",\ + "armeb-linux": "endian-big bit-32 common-linux common-glibc arm-common",\ + "armeb-linux-gnueabi": "endian-big bit-32 common-linux common-glibc arm-common armeb-linux",\ + "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ + "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ - "arm-linux": "endian-little bit-32 common-glibc arm-common",\ - "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ - "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ - "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\ - "avr32-linux": "endian-big bit-32 common-glibc avr32-common",\ - "avr32-linux-uclibc": "endian-big bit-32 common-uclibc avr32-common",\ + "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ + "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\ + "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ + "arm-linux-uclibcgnueabi": "endian-little bit-32 common-linux common-uclibc arm-common arm-linux-uclibc",\ + "avr32-linux": "endian-big bit-32 common-linux common-glibc avr32-common",\ + "avr32-linux-uclibc": "endian-big bit-32 common-linux common-uclibc avr32-common",\ "bfin-uclinux-uclibc": "endian-little bit-32 common-uclibc bfin-common",\ - "i386-linux": "endian-little bit-32 common-glibc ix86-common",\ - "i486-linux": "endian-little bit-32 common-glibc ix86-common",\ - "i586-linux": "endian-little bit-32 common-glibc ix86-common",\ - "i686-linux": "endian-little bit-32 common-glibc ix86-common",\ - "i386-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ - "i486-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ - "i586-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ - "i686-linux-uclibc": "endian-little bit-32 common-uclibc ix86-common",\ - "mipsel-linux": "endian-little bit-32 common-glibc",\ - "mipsel-linux-uclibc": "endian-little bit-32 common-uclibc",\ - "mips-linux": "endian-big bit-32 common-glibc",\ - "mips-linux-uclibc": "endian-big bit-32 common-uclibc",\ + "i386-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i486-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i586-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i686-linux": "endian-little bit-32 common-linux common-glibc ix86-common",\ + "i386-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ + "i486-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ + "i586-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ + "i686-linux-uclibc": "endian-little bit-32 common-linux common-uclibc ix86-common",\ + "mipsel-linux": "endian-little bit-32 common-linux common-glibc",\ + "mipsel-linux-uclibc": "endian-little bit-32 common-linux common-uclibc",\ + "mips-linux": "endian-big bit-32 common-linux common-glibc",\ + "mips-linux-uclibc": "endian-big bit-32 common-linux common-uclibc",\ "powerpc-darwin": "endian-big bit-32 common-darwin",\ - "ppc-linux": "endian-big bit-32 common-glibc powerpc-common",\ - "powerpc-linux": "endian-big bit-32 common-glibc powerpc-common",\ - "powerpc-linux-uclibc": "endian-big bit-32 common-uclibc powerpc-common",\ - "sh3-linux": "endian-little bit-32 common-glibc sh-common",\ - "sh4-linux": "endian-little bit-32 common-glibc sh-common",\ - "sh4-linux-uclibc": "endian-little bit-32 common-uclibc sh-common",\ - "sparc-linux": "endian-big bit-32 common-glibc",\ - "x86_64-linux": "endian-little bit-64 common-glibc",\ - "x86_64-linux-uclibc": "endian-little bit-64 common-uclibc"} + "ppc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "powerpc-linux": "endian-big bit-32 common-linux common-glibc powerpc-common",\ + "powerpc-linux-uclibc": "endian-big bit-32 common-linux common-uclibc powerpc-common",\ + "sh3-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ + "sh4-linux": "endian-little bit-32 common-linux common-glibc sh-common",\ + "sh4-linux-uclibc": "endian-little bit-32 common-linux common-uclibc sh-common",\ + "sparc-linux": "endian-big bit-32 common-linux common-glibc",\ + "x86_64-linux": "endian-little bit-64 common-linux common-glibc",\ + "x86_64-linux-uclibc": "endian-little bit-64 common-linux common-uclibc"} if target in targetinfo: info = targetinfo[target].split() info.append(target) -- cgit v1.2.3 From e1a38c70fdf701da6daf74713fd27434dfb22a60 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Mar 2008 11:19:22 +0000 Subject: site: Move ac_cv_file__dev_zero definition to common-linux --- site/arm-linux | 3 --- site/arm-linux-uclibc | 1 - site/armeb-linux | 1 - site/common-linux | 2 ++ 4 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 site/common-linux diff --git a/site/arm-linux b/site/arm-linux index 9e13fb3630..033366a93c 100644 --- a/site/arm-linux +++ b/site/arm-linux @@ -179,6 +179,3 @@ gnet_sockaddr_family_field_name=${gnet_sockaddr_family_field_name=ss_family} # rp-pppoe rpppoe_cv_pack_bitfields=${rpppoe_cv_pack_bitfields=rev} - -# apr -ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} diff --git a/site/arm-linux-uclibc b/site/arm-linux-uclibc index 5120795f7a..2933c3f3be 100644 --- a/site/arm-linux-uclibc +++ b/site/arm-linux-uclibc @@ -115,4 +115,3 @@ samba_cv_sig_atomic_t=${samba_cv_sig_atomic_t=yes} samba_cv_socklen_t=${samba_cv_socklen_t=yes} samba_cv_unixsocket=${samba_cv_unixsocket=yes} samba_cv_volatile=${samba_cv_volatile=yes} - diff --git a/site/armeb-linux b/site/armeb-linux index d75c1c8bb1..c852f00fee 100644 --- a/site/armeb-linux +++ b/site/armeb-linux @@ -51,4 +51,3 @@ samba_cv_STAT_STATVFS64=${samba_cv_STAT_STATVFS64=yes} samba_cv_SIZEOF_OFF_T=${samba_cv_SIZEOF_OFF_T=yes} samba_cv_SIZEOF_INO_T=${samba_cv_SIZEOF_INO_T=yes} samba_cv_HAVE_STRUCT_FLOCK64=${samba_cv_HAVE_STRUCT_FLOCK64=yes} - diff --git a/site/common-linux b/site/common-linux new file mode 100644 index 0000000000..aeb256b4a9 --- /dev/null +++ b/site/common-linux @@ -0,0 +1,2 @@ +# apr +ac_cv_file__dev_zero=${ac_cv_file__dev_zero=yes} -- cgit v1.2.3 From 6b6cf4dab96836c4c814ffc79a05fc12ff113a62 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Mar 2008 12:28:55 +0000 Subject: rm_work: Use the completion bitbake scheduler by default --- classes/rm_work.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 97de5e2774..917fadd750 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -6,6 +6,10 @@ # INHERIT += "rm_work" # +# Use the completion scheulder by default when rm_work is active +# to try and reduce disk usage +BB_SCHEDULER ?= "completion" + RMWORK_ORIG_TASK := "${BB_DEFAULT_TASK}" BB_DEFAULT_TASK = "rm_work_all" -- cgit v1.2.3 From 84f86f51d4b5c67bc99294eba8fb1b7a5baf4578 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 16:37:07 +0000 Subject: gypsy: workaround automake failure in docs/reference --- packages/gypsy/files/docs-reference-am.patch | 17 +++++++++++++++++ packages/gypsy/gypsy_svn.bb | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 packages/gypsy/files/docs-reference-am.patch diff --git a/packages/gypsy/files/docs-reference-am.patch b/packages/gypsy/files/docs-reference-am.patch new file mode 100644 index 0000000000..9eb0051d79 --- /dev/null +++ b/packages/gypsy/files/docs-reference-am.patch @@ -0,0 +1,17 @@ +Index: gypsy/docs/reference/Makefile.am +=================================================================== +--- gypsy.orig/docs/reference/Makefile.am 2008-03-10 13:15:06.000000000 +0800 ++++ gypsy/docs/reference/Makefile.am 2008-03-10 13:15:24.000000000 +0800 +@@ -88,10 +88,10 @@ + + # Other files to distribute + # e.g. EXTRA_DIST += version.xml.in +-EXTRA_DIST += version.xml.in \ ++EXTRA_DIST = version.xml.in \ + gypsy-design.png + +-CLEANFILES += $(dbus_docs) ++CLEANFILES = $(dbus_docs) + + ref-%.xml: $(top_srcdir)/interfaces/%-full.xml + $(XSLT) -o $@ $(top_srcdir)/docs/tools/spec-to-docbook.xsl $< diff --git a/packages/gypsy/gypsy_svn.bb b/packages/gypsy/gypsy_svn.bb index 45e283b6b7..bb1038d86a 100644 --- a/packages/gypsy/gypsy_svn.bb +++ b/packages/gypsy/gypsy_svn.bb @@ -3,7 +3,8 @@ require gypsy.inc DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ - file://fixups.patch;patch=1;maxrev=107" + file://fixups.patch;patch=1;maxrev=107 \ + file://docs-reference-am.patch;patch=1;minrev=134" PV = "0.0+svnr${SRCREV}" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 713e0a97c9115eb9b04b2ab7ee7c48723a614097 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 16:46:36 +0000 Subject: diversity: Diversity is a framework for Internet + GPS applications. It communicates with a server for location exchange.It also allows you to tag and share a location with your friends. * update sane-srcrevs.inc and moko-autorev.inc accordingly --- conf/distro/include/moko-autorev.inc | 2 ++ conf/distro/include/sane-srcrevs.inc | 2 ++ packages/openmoko-projects/.mtn2git_empty | 0 packages/openmoko-projects/diversity-daemon_svn.bb | 19 +++++++++++++++++++ packages/openmoko-projects/diversity-nav_svn.bb | 16 ++++++++++++++++ 5 files changed, 39 insertions(+) create mode 100644 packages/openmoko-projects/.mtn2git_empty create mode 100644 packages/openmoko-projects/diversity-daemon_svn.bb create mode 100644 packages/openmoko-projects/diversity-nav_svn.bb diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index aa2d39f3db..56b89ac983 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -7,6 +7,8 @@ SRCREV_pn-libmokoui2 ?= "${AUTOREV}" SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" +SRCREV_pn-diversity-daemon ?= "${AUTOREV}" +SRCREV_pn-diversity-nav ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" SRCREV_pn-opkg ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index d8b9ddb63b..0b2b35a9be 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -18,6 +18,8 @@ SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dfu-util ?= "2866" SRCREV_pn-dfu-util-native ?= "2866" +SRCREV_pn-diversity-daemon ?= "127" +SRCREV_pn-diversity-nav ?= "238" SRCREV_pn-eds-dbus ?= "659" SRCREV_pn-eglibc ?= "4355" SRCREV_pn-eglibc-initial ?= "4355" diff --git a/packages/openmoko-projects/.mtn2git_empty b/packages/openmoko-projects/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb new file mode 100644 index 0000000000..6ea4f54a92 --- /dev/null +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Diveristy Daemon" +HOMEPAGE = "http://diversity.projects.openmoko.org/" +SECTION = "net/misc" +LICENSE = "GPL" +DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl" +RDEPENDS = "eds-dbus gypsy openmoko-dialer2" +PV = "0.0+svnr${SRCREV}" +PR = "r1" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https" + +S = "${WORKDIR}/diversity-daemon" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus" + +FILES_${PN} += "${datadir}/dbus-1/" +FILES_${PN} += "${sysconfdir}/dbus-1/" diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb new file mode 100644 index 0000000000..58090e9baf --- /dev/null +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Diversity_nav - a GPS location based communicative application" +HOMEPAGE = "http://diversity.projects.openmoko.org/" +SECTION = "openmoko/applications" +LICENSE = "GPL" +DEPENDS = "evas edje ecore edbus" +RDEPENDS = "libevas-engine-buffer libevas-engine-software-16 libevas-engine-software-16-x11 libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-eet libevas-loader-jpeg libevas-loader-png" +PV = "0.0.1+svnr${SRCREV}" +PR = "r1" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" + +S = "${WORKDIR}/diversity-nav" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" -- cgit v1.2.3 From 4683d62ca408939ab573237c345ded7b02147cbb Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 16:52:37 +0000 Subject: packagekit: PackageKit is a system designed to make installing and updating software on your computer easier. The primary design goal is to unify all the software graphical tools used in different distributions, and use some of the latest technology like PolicyKit to make the process suck less. --- packages/packagekit/.mtn2git_empty | 0 packages/packagekit/files/.mtn2git_empty | 0 .../packagekit/files/disable-docbook2man.patch | 12 ++++++++++ packages/packagekit/packagekit_git.bb | 27 ++++++++++++++++++++++ 4 files changed, 39 insertions(+) create mode 100644 packages/packagekit/.mtn2git_empty create mode 100644 packages/packagekit/files/.mtn2git_empty create mode 100644 packages/packagekit/files/disable-docbook2man.patch create mode 100644 packages/packagekit/packagekit_git.bb diff --git a/packages/packagekit/.mtn2git_empty b/packages/packagekit/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/packagekit/files/.mtn2git_empty b/packages/packagekit/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/packagekit/files/disable-docbook2man.patch b/packages/packagekit/files/disable-docbook2man.patch new file mode 100644 index 0000000000..0c7d4239d4 --- /dev/null +++ b/packages/packagekit/files/disable-docbook2man.patch @@ -0,0 +1,12 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac 2008-02-20 17:57:44.000000000 +0800 ++++ git/configure.ac 2008-02-20 17:58:30.000000000 +0800 +@@ -115,6 +115,7 @@ + if test "$DOCBOOK2MAN" = "no" ; then + AC_MSG_WARN([docbook2man not found, will not be able to build man documentation]) + fi ++DOCBOOK2MAN="no" + AM_CONDITIONAL(HAVE_DOCBOOK2MAN, [test "$DOCBOOK2MAN" != "no"]) + + dnl --------------------------------------------------------------------------- diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb new file mode 100644 index 0000000000..d4055ead63 --- /dev/null +++ b/packages/packagekit/packagekit_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool" +RDEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 opkg" +PV = "0.1+git${SRCREV}" +PR = "r7" + +SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \ + file://disable-docbook2man.patch;patch=1" + +SRCREV = "${AUTOREV}" +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--with-security-framework=dummy --with-default-backend=opkg --enable-opkg" + +do_configure_prepend() { + echo "EXTRA_DIST=" > gtk-doc.make +} +do_stage () { + autotools_stage_all +} + +FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/" -- cgit v1.2.3 From eab8f2d96728a27d8be1dd99ef43f5ca24efa4cf Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 16:54:44 +0000 Subject: assassin: add recipe for assassin * Assassin is a package manager that help users to install, update, and uninstall packages from Openmoko, or Openmoko community. --- conf/distro/include/moko-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + packages/openmoko-projects/assassin_svn.bb | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) create mode 100644 packages/openmoko-projects/assassin_svn.bb diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 56b89ac983..96c37aaad6 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -7,6 +7,7 @@ SRCREV_pn-libmokoui2 ?= "${AUTOREV}" SRCREV_pn-linux-openmoko ?= "${AUTOREV}" SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" +SRCREV_pn-assassin ?= "${AUTOREV}" SRCREV_pn-diversity-daemon ?= "${AUTOREV}" SRCREV_pn-diversity-nav ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0b2b35a9be..4be421deac 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -12,6 +12,7 @@ # you know what that means? like... a, b, c, d, e, f, g... SRCREV_pn-aircrack-ng ?= "802" +SRCREV_pn-assassin ?= "2" SRCREV_pn-bfin-uclibc ?= "1857" SRCREV_pn-contact ?= "1410" SRCREV_pn-dbus-c++-native ?= "13131" diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb new file mode 100644 index 0000000000..83927c1d2a --- /dev/null +++ b/packages/openmoko-projects/assassin_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Action GUI for Installer" +HOMEPAGE = "http://assassin.projects.openmoko.org/" +LICENSE = "GPL" +DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit" +PV = "0.2+svn${SRCREV}" +PR = "r2" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" + +S = "${WORKDIR}/assassin" + +inherit autotools pkgconfig + +EXTRA_OECONF = "" + +FILES_${PN} += "${prefix}/share/*" -- cgit v1.2.3 From aa40825de9384769370499e752acf1d571b28bf5 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 17:59:27 +0000 Subject: intltool: add patch from http://bugzilla.gnome.org/show_bug.cgi?id=462312 we need this to compile the latest version of packagekit. --- .../intltool/files/intltool-0.35.5-polkit.patch | 32 ++++++++++++++++++++++ packages/intltool/intltool_0.35.5.bb | 4 ++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 packages/intltool/files/intltool-0.35.5-polkit.patch diff --git a/packages/intltool/files/intltool-0.35.5-polkit.patch b/packages/intltool/files/intltool-0.35.5-polkit.patch new file mode 100644 index 0000000000..2d89fbe04c --- /dev/null +++ b/packages/intltool/files/intltool-0.35.5-polkit.patch @@ -0,0 +1,32 @@ +diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4 +--- intltool-0.35.5/intltool.m4.polkit 2007-07-31 17:23:52.000000000 -0400 ++++ intltool-0.35.5/intltool.m4 2007-07-31 17:24:20.000000000 -0400 +@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %. + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + + AC_SUBST(INTLTOOL_DESKTOP_RULE) + AC_SUBST(INTLTOOL_DIRECTORY_RULE) +@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE) + AC_SUBST(INTLTOOL_SCHEMAS_RULE) + AC_SUBST(INTLTOOL_THEME_RULE) + AC_SUBST(INTLTOOL_SERVICE_RULE) ++AC_SUBST(INTLTOOL_POLICY_RULE) + + # Use the tools built into the package, not the ones that are installed. + AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract') +diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in +--- intltool-0.35.5/intltool-update.in.in.polkit 2007-07-31 17:10:52.000000000 -0400 ++++ intltool-0.35.5/intltool-update.in.in 2007-07-31 17:21:45.000000000 -0400 +@@ -71,7 +71,8 @@ my $xml_support = + "sheet(?:\\.in)+|". # ? + "schemas(?:\\.in)+|". # GConf specific + "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer. +-"kbd(?:\\.in)+"; # GOK specific. ++"kbd(?:\\.in)+|". # GOK specific. ++"policy(?:\\.in)+"; # PolicyKit files + + my $ini_support = + "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec diff --git a/packages/intltool/intltool_0.35.5.bb b/packages/intltool/intltool_0.35.5.bb index fc713172f9..092689b24b 100644 --- a/packages/intltool/intltool_0.35.5.bb +++ b/packages/intltool/intltool_0.35.5.bb @@ -3,8 +3,10 @@ require intltool.inc DEPENDS = "libxml-parser-perl-native" RDEPENDS = "perl-module-text-wrap perl-module-re" -PR = "r1" +PR = "r2" RRECOMMENDS = "perl-modules" DEFAULT_PREFERENCE = "-1" + +SRC_URI += "file://intltool-0.35.5-polkit.patch;patch=1" -- cgit v1.2.3 From 9c9195280c1f8e65eca3775f456ecc397ec287d6 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 18:01:32 +0000 Subject: preferred-om-2008-versions: use newer intltool --- conf/distro/include/preferred-om-2008-versions.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index aa7d6f27f4..b715b853d3 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -5,6 +5,8 @@ PREFERRED_VERSION_dbus-glib = "0.74" PREFERRED_VERSION_gnash = "0.8.1" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" +PREFERRED_VERSION_intltool = "0.35.5" +PREFERRED_VERSION_intltool-native = "0.35.5" PREFERRED_VERSION_libtool = "1.5.24" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" -- cgit v1.2.3 From 44fb4792e4f4fd8d2c6430af465522ee1a646a32 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 18:03:49 +0000 Subject: u-boot-openmoko: enable autorev * also update pn-u-boot-openmoko in sane-srcrevs.inc * also update patch uboot-20070311-tools_makefile_ln_sf.patch --- conf/distro/include/sane-srcrevs.inc | 2 +- .../u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch | 13 ++++++++++--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 10 +++++----- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 4be421deac..36862bd83b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -151,7 +151,7 @@ SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" SRCREV_pn-tmut ?= "60" -SRCREV_pn-u-boot-openmoko ?= "4100" +SRCREV_pn-u-boot-openmoko ?= "4138" SRCREV_pn-usbpath ?= "3108" SRCREV_pn-usbpath-native ?= "3108" SRCREV_pn-webkit-gtk ?= "30762" diff --git a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch index e90cc0de71..eca50615ad 100644 --- a/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch +++ b/packages/u-boot/files/uboot-20070311-tools_makefile_ln_sf.patch @@ -1,6 +1,8 @@ ---- a/tools/Makefile 2007-03-11 00:55:44.000000000 +0000 -+++ b/tools/Makefile 2007-03-11 00:55:52.000000000 +0000 -@@ -194,14 +194,14 @@ +Index: git/tools/Makefile +=================================================================== +--- git.orig/tools/Makefile 2008-03-03 13:32:32.000000000 +0800 ++++ git/tools/Makefile 2008-03-03 13:40:23.000000000 +0800 +@@ -208,18 +208,18 @@ $(obj)environment.c: @rm -f $(obj)environment.c @@ -15,5 +17,10 @@ - ln -s $(src)../lib_generic/crc32.c $(obj)crc32.c + ln -sf $(src)../lib_generic/crc32.c $(obj)crc32.c + $(obj)sha1.c: + @rm -f $(obj)sha1.c +- ln -s $(src)../lib_generic/sha1.c $(obj)sha1.c ++ ln -sf $(src)../lib_generic/sha1.c $(obj)sha1.c + $(LOGO_H): $(obj)bmp_logo $(LOGO_BMP) $(obj)./bmp_logo $(LOGO_BMP) >$@ 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 index 020fd421c6..1fb9be4f43 100644 --- 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 @@ -5,18 +5,18 @@ SECTION = "bootloader" PRIORITY = "optional" UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e" -UBOOT_OPENMOKO_REV = "4118" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" -LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" -PV = "1.3.1${LOCALVERSION}" +SRCREV_FORMAT = "+gitupstream+svnpatchset" + +PV = "1.3.1${SRCREV}" PR = "r3" 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 \ + 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 \ # file://makefile-no-dirafter.patch;patch=1 \ # file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ -- cgit v1.2.3 From 7a97c29072572bf147bf625b80982441c11b7c01 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 18:08:19 +0000 Subject: e-wm: remove file://Makefile.in.in since it's not there and it's not used anyway. --- packages/e17/e-wm_cvs.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb index 4dbacffe1b..c3a243a675 100644 --- a/packages/e17/e-wm_cvs.bb +++ b/packages/e17/e-wm_cvs.bb @@ -9,7 +9,6 @@ inherit e update-alternatives SRC_URI = "${E_CVS};module=e17/apps/e \ file://Xsession.d/98enlightenment \ file://applications.menu \ - file://Makefile.in.in \ " S = "${WORKDIR}/e" -- cgit v1.2.3 From 6fcdf85424191d742baf654a02e3337d03ee8815 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 18:12:03 +0000 Subject: mono: use monoburg from mono-native instead * the original method is to build monoburg natively during the (crossed) mono build. it will require glib-dev from host. now we use the one from mono-native. * mono-native 1.2.5.1 is updated to stage monoburg --- packages/mono/mono-1.2.5.1/disable-monoburg.patch | 22 ++++++++++++++++++++++ packages/mono/mono-native_1.2.5.1.bb | 8 ++++---- packages/mono/mono_1.2.5.1.bb | 5 +++-- 3 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 packages/mono/mono-1.2.5.1/disable-monoburg.patch diff --git a/packages/mono/mono-1.2.5.1/disable-monoburg.patch b/packages/mono/mono-1.2.5.1/disable-monoburg.patch new file mode 100644 index 0000000000..21c1e30f07 --- /dev/null +++ b/packages/mono/mono-1.2.5.1/disable-monoburg.patch @@ -0,0 +1,22 @@ +Index: mono-1.2.5.1/mono/Makefile.am +=================================================================== +--- mono-1.2.5.1.orig/mono/Makefile.am 2008-03-05 15:52:06.000000000 +0800 ++++ mono-1.2.5.1/mono/Makefile.am 2008-03-05 15:52:23.000000000 +0800 +@@ -1,3 +1,3 @@ + +-SUBDIRS = utils io-layer monoburg os cil metadata \ ++SUBDIRS = utils io-layer os cil metadata \ + arch interpreter mini dis monograph tests benchmark profiler +Index: mono-1.2.5.1/mono/mini/Makefile.am +=================================================================== +--- mono-1.2.5.1.orig/mono/mini/Makefile.am 2008-03-05 16:02:51.000000000 +0800 ++++ mono-1.2.5.1/mono/mini/Makefile.am 2008-03-05 16:02:57.000000000 +0800 +@@ -436,7 +436,7 @@ + $(GENMDESC_PRG) $(srcdir)/cpu-mips.md cpu-mips.h mips_desc + + inssel.c inssel.h: $(BURGSRC) +- $(monodir)/mono/monoburg/monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c ++ monoburg -c 1 -p -e $(BURGSRC) -d inssel.h -s inssel.c + + testi: mono test.exe + $(RUNTIME) -v -v --ncompile 1 --compile Test:$(mtest) test.exe diff --git a/packages/mono/mono-native_1.2.5.1.bb b/packages/mono/mono-native_1.2.5.1.bb index 7ac2246b3a..8506a20867 100644 --- a/packages/mono/mono-native_1.2.5.1.bb +++ b/packages/mono/mono-native_1.2.5.1.bb @@ -1,5 +1,5 @@ require mono_1.2.5.inc -PR = "r1" +PR = "r2" DEPENDS = "glib-2.0-native perl-native" SRC_URI += "file://mono-fix-libdir-path.patch;patch=1" @@ -8,9 +8,9 @@ PARALLEL_MAKE = "" inherit native -#do_stage_prepend() { -# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} -#} +do_stage_prepend() { + install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} +} do_fix_libtool_name() { # inherit native will make that all native tools that are being diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index 55f601bcb7..d073aa7d98 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -2,10 +2,11 @@ require mono_1.2.5.inc DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" -PR = "r3" +PR = "r4" SRC_URI += "file://configure.patch;patch=1 \ - file://genmdesc-cpp.patch;patch=1" + file://genmdesc-cpp.patch;patch=1 \ + file://disable-monoburg.patch;patch=1" # Per http://www.mono-project.com/Mono:ARM EXTRA_OECONF += " --disable-mcs-build " -- cgit v1.2.3 From 448ba3b9531438dc5db5257244d51284b2e797ef Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 18:17:10 +0000 Subject: preferred-om-2008-versions: use midori 0.0.17 --- conf/distro/include/preferred-om-2008-versions.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b715b853d3..0d988b41d7 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -8,6 +8,7 @@ PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_intltool = "0.35.5" PREFERRED_VERSION_intltool-native = "0.35.5" PREFERRED_VERSION_libtool = "1.5.24" +PREFERRED_VERSION_midori = "0.0.17" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.9" -- cgit v1.2.3 From 7753ca545429b90d853992b6207daa4f1db9116d Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 19:04:27 +0000 Subject: gnash: clean up/fix for sysroot --- packages/gnash/gnash.inc | 79 ++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 60 deletions(-) diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 197cea06b6..113422596a 100644 --- a/packages/gnash/gnash.inc +++ b/packages/gnash/gnash.inc @@ -1,67 +1,29 @@ DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" - -LICENSE = "GPL-2" HOMEPAGE = "http://www.gnu.org/software/gnash" +LICENSE = "GPL-2" +DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype" +PR = "r1" -DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl" - -SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \ + " +inherit autotools pkgconfig EXTRA_OECONF = "--enable-gui=gtk \ --enable-renderer=cairo \ - --enable-media=none \ + --enable-media=none \ --disable-klash \ - --enable-z \ - --enable-jpeg \ - --disable-glext \ - --enable-Xft \ - --enable-expat \ - --enable-mad \ - --enable-cairo \ - --disable-plugin \ - --disable-cygnal \ - --with-boost-incl=${STAGING_INCDIR} \ - --with-boost-lib=${STAGING_LIBDIR} \ - --with-libxml-incl=${STAGING_INCDIR}/libxml2 \ - --with-libxml-lib=${STAGING_LIBDIR} \ - --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \ -# --with-glib-lib=${STAGING_LIBDIR} \ - --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \ - --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \ -# --with-pango-lib=${STAGING_LIBDIR} \ - --with-sdl-incl=${STAGING_INCDIR}/SDL \ - --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \ - --with-Xft-incl=${STAGING_INCDIR}/X11 \ - --with-expat-incl=${STAGING_INCDIR} \ - --with-mad-incl=${STAGING_INCDIR} \ - --with-cairo-incl=${STAGING_INCDIR}/cairo \ - --with-curl-incl=${STAGING_INCDIR} \ - --with-curl-lib=${STAGING_LIBDIR} \ - " - -inherit autotools pkgconfig - -LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt " -CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ " - -do_configure_append() { - for i in `find . -name Makefile` ; do - sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i - done -} - - -PARALLEL_MAKE = "" - -do_compile() { - oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \ - 'ZLIB_INCLUDE=${STAGING_INCDIR}' \ - 'ZLIB_LIBS=${STAGING_LIBDIR}' \ - 'PNG_INCLUDE=${STAGING_INCDIR}' \ - 'PNG_LIBS=${STAGING_LIBDIR}' -} - + --enable-z \ + --enable-jpeg \ + --disable-glext \ + --enable-Xft \ + --enable-expat \ + --enable-mad \ + --enable-cairo \ + --disable-plugin \ + --disable-cygnal \ + --with-top-level=${STAGING_DIR_HOST}/usr \ + " PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " @@ -73,7 +35,4 @@ FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" -do_stage() { - autotools_stage_all -} - +PARALLEL_MAKE = "" -- cgit v1.2.3 From ae8af81c1b29c57dccb9fe369ddf2399fc21be2c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 11 Mar 2008 22:17:10 +0000 Subject: package_deb.bbclass: Remove some unneeded lines --- classes/package_deb.bbclass | 4 ---- 1 file changed, 4 deletions(-) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 82a2d53312..e59d194aeb 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -94,10 +94,6 @@ python do_package_deb () { if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK): os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN")) - if packages == []: - bb.debug(1, "No packages; nothing to do") - return - packages = bb.data.getVar('PACKAGES', d, 1) for pkg in packages.split(): localdata = bb.data.createCopy(d) -- cgit v1.2.3 From ec185d92295b475fa4e8ce62da27f37cc4666fcb Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Wed, 12 Mar 2008 00:03:21 +0000 Subject: linux-handhelds-2.6: Use official external interface for initramfs addition. * I.e., CONFIG_INITRAMFS_SOURCE. Instead of neat, but still hack of dropping initramfs where kernel Makefile expects it - this was reported to not work under some unknown circumstances. --- packages/linux/linux-handhelds-2.6.inc | 20 ++++++-------------- packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb | 2 +- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc index a2efdc955a..5970ace054 100644 --- a/packages/linux/linux-handhelds-2.6.inc +++ b/packages/linux/linux-handhelds-2.6.inc @@ -37,6 +37,11 @@ do_configure() { die "No default configuration for ${MACHINE} available." fi + if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then + # Kernel expects non-compressed cpio + gzip -d -c ${KERNEL_INITRAMFS_PATH} >${WORKDIR}/initramfs.cpio + echo "CONFIG_INITRAMFS_SOURCE=\"${WORKDIR}/initramfs.cpio\"" >> ${S}/.config + fi if [ "${TARGET_OS}" == "linux-gnueabi" -o "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then echo "CONFIG_AEABI=y" >> ${S}/.config @@ -48,26 +53,13 @@ do_configure() { sed -e '/CONFIG_AEABI/d' \ -e '/CONFIG_OABI_COMPAT=/d' \ + -e '/CONFIG_INITRAMFS_SOURCE=/d' \ '${WORKDIR}/defconfig' >>'${S}/.config' yes '' | oe_runmake oldconfig } -do_compile_prepend() { - # Clean up any stale initramfs archive - rm -f usr/initramfs_data.cpio.gz - if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" = "glibc" ]; then - if [ ! -f ${KERNEL_INITRAMFS_PATH} ]; then - echo "${KERNEL_INITRAMFS_PATH} does not exist, you may need to bitbake it separately" - exit 1 - fi - cp ${KERNEL_INITRAMFS_PATH} usr/initramfs_data.cpio.gz - # touch is for broken Koen's cp - touch usr/initramfs_data.cpio.gz - fi -} - do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME} diff --git a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb index 4fa2e2bd9b..9d493c3212 100644 --- a/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb +++ b/packages/linux/linux-handhelds-2.6_2.6.21-hh20.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices." LICENSE = "GPL" -PR = "r18" +PR = "r19" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From a96c6408316ec2cf2d8f5aed775654414887ff25 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 12 Mar 2008 06:15:12 +0000 Subject: gnash: add 0.8.2 --- packages/gnash/gnash_0.8.2.bb | 1 + 1 file changed, 1 insertion(+) create mode 100644 packages/gnash/gnash_0.8.2.bb diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb new file mode 100644 index 0000000000..da4b281e94 --- /dev/null +++ b/packages/gnash/gnash_0.8.2.bb @@ -0,0 +1 @@ +require gnash.inc -- cgit v1.2.3 From 1b17a73001b2a7ea133b424e670e1e72bec7c685 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 12 Mar 2008 06:16:19 +0000 Subject: task-openmoko-feed: temporarily disable python-efl because no provider --- packages/tasks/task-openmoko-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 97f24a7624..ee8cdf8e6b 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -24,7 +24,8 @@ RDEPENDS_task-openmoko-feed = "\ nano \ ntpclient ntp \ openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \ - python python-pygtk python-pyserial python-efl \ + python python-pygtk python-pyserial \ +# python-efl \ ruby \ libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \ settingsgui \ -- cgit v1.2.3 From 0dd6c9d399e246ba8681e36e50a3b2df2a20db3d Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 12 Mar 2008 06:17:19 +0000 Subject: preferred-om-2008-versions: change gnash to 0.8.2 --- conf/distro/include/preferred-om-2008-versions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 0d988b41d7..a54cf9174f 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -2,7 +2,7 @@ PREFERRED_VERSION_asterisk = "1.4.17" PREFERRED_VERSION_busybox = "1.9.1" PREFERRED_VERSION_dbus = "1.1.20" PREFERRED_VERSION_dbus-glib = "0.74" -PREFERRED_VERSION_gnash = "0.8.1" +PREFERRED_VERSION_gnash = "0.8.2" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_intltool = "0.35.5" -- cgit v1.2.3 From 0ec9e3f4a0a6e5200c63df418bfa6bb08dc8c093 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 12 Mar 2008 08:11:47 +0000 Subject: espeak: upgrade to 1.35, clean up * replace tab by white space * replace hard coded ${datadir} --- packages/espeak/espeak_1.30.bb | 52 ------------------------------------------ packages/espeak/espeak_1.35.bb | 42 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 52 deletions(-) delete mode 100644 packages/espeak/espeak_1.30.bb create mode 100644 packages/espeak/espeak_1.35.bb diff --git a/packages/espeak/espeak_1.30.bb b/packages/espeak/espeak_1.30.bb deleted file mode 100644 index 523acc77cb..0000000000 --- a/packages/espeak/espeak_1.30.bb +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh -# -# Copyright Matthias Hentges (c) 2008 -# License: MIT (see http://www.opensource.org/licenses/mit-license.php -# for a copy of the license) -# -# Filename: espeak_1.30.bb -# Date: 20080104 (YMD) - -DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" -SECTION = "base" -LICENSE = "GPL" - -DEPENDS = "portaudio-v19" - -###################################################################################### - -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip" - -S = "${WORKDIR}/${PN}-${PV}-source" - -FILES_${PN} += " /usr/share/espeak-data/ " - -do_configure() { - # espeak supports portaudio in APIs V18 and V19 - cp ${S}/src/portaudio19.h ${S}/src/portaudio.h -} - -do_compile() { - cd src - oe_runmake -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${includedir} - install -d ${D}/usr/share/espeak-data - - install -m 0755 ${S}/src/espeak ${D}${bindir} - oe_libinstall -so -C src libespeak ${D}${libdir} - - cp -prf ${S}/espeak-data/* ${D}/usr/share/espeak-data -} - -do_stage() { - install -d ${STAGING_INCDIR}/espeak - install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/ - oe_libinstall -so -C src libespeak ${STAGING_LIBDIR} -} diff --git a/packages/espeak/espeak_1.35.bb b/packages/espeak/espeak_1.35.bb new file mode 100644 index 0000000000..8d7b18a890 --- /dev/null +++ b/packages/espeak/espeak_1.35.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "eSpeak is a compact open source software speech synthesizer" +SECTION = "base" +LICENSE = "GPL" +DEPENDS = "portaudio-v19" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/espeak/espeak-${PV}-source.zip" + +S = "${WORKDIR}/${PN}-${PV}-source" + +FILES_${PN} += "${datadir}/espeak-data" + +do_configure() { + # "speak" binary, a TTS engine, uses portaudio in either APIs V18 or V19 + cp ${S}/src/portaudio19.h ${S}/src/portaudio.h +} + +do_compile() { + cd src + oe_runmake +} + +do_install() { + install -d ${D}${bindir} + install -d ${D}${libdir} + install -d ${D}${includedir} + install -d ${D}${datadir}/espeak-data + + # we do not ship "speak" binary though. + install -m 0755 ${S}/src/espeak ${D}${bindir} + install -m 0644 ${S}/src/speak_lib.h ${D}${includedir} + oe_libinstall -so -C src libespeak ${D}${libdir} + + cp -prf ${S}/espeak-data/* ${D}${datadir}/espeak-data +} + +do_stage() { + install -d ${STAGING_INCDIR}/espeak + install -m 0644 ${S}/src/speak_lib.h ${STAGING_INCDIR}/espeak/ + oe_libinstall -so -C src libespeak ${STAGING_LIBDIR} +} -- cgit v1.2.3 From d274c014ee11521bfb84fb4b2b713a85189b8b9a Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Wed, 12 Mar 2008 08:16:59 +0000 Subject: speech-dispatcher: upgrade to 0.6.6 --- .../speech-dispatcher/speech-dispatcher_0.6.5.bb | 57 ---------------------- .../speech-dispatcher/speech-dispatcher_0.6.6.bb | 57 ++++++++++++++++++++++ 2 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 packages/speech-dispatcher/speech-dispatcher_0.6.5.bb create mode 100644 packages/speech-dispatcher/speech-dispatcher_0.6.6.bb diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb deleted file mode 100644 index 7b8ba73750..0000000000 --- a/packages/speech-dispatcher/speech-dispatcher_0.6.5.bb +++ /dev/null @@ -1,57 +0,0 @@ -DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \ -for speech synthesis through a simple, stable and well documented interface." -HOMEPAGE = "http://www.freebsoft.org/speechd/" -LICENSE = "GPLv2" -DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0" -RPROVIDES_${PN} += "speechd" - -PR = "r8" - -inherit autotools update-rc.d - -SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \ - file://speech-dispatcher.init \ - file://srcMakefile.am.patch;patch=1 \ - file://configure_fix.patch;patch=1 \ - file://configSpeechd.conf.in_00.patch;patch=1" - -LEAD_SONAME = "libspeechd.so" -EXTRA_OECONF = " --with-espeak=yes --with-flite=yes --with-ibmtts=no --with-nas=no --with-alsa=yes --with-pulse=yes " - -INITSCRIPT_NAME = "speech-dispatcher" -INITSCRIPT_PARAMS = "defaults 45" - -do_install() { - install -d ${D}${bindir} - install -d ${D}${includedir} - install -d ${D}${libdir}/${PN}-modules - install -d ${D}${sysconfdir} - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/speech-dispatcher - install -d ${D}${sysconfdir}/speech-dispatcher/modules - - oe_libinstall -so -C src/audio libsdaudio ${D}${libdir} - oe_libinstall -so -C src/c/api libspeechd ${D}${libdir} - - install -m 0644 ${S}/src/c/api/libspeechd.h ${D}${includedir} - install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir} - install -m 0755 ${S}/src/server/.libs/speech-dispatcher ${D}${bindir} - install -m 0755 ${S}/src/modules/.libs/sd_* ${D}${libdir}/${PN}-modules/ - - install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher - install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules - install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher -} - -do_stage() { - install -m 0644 ${S}/src/c/api/libspeechd.h ${STAGING_INCDIR} - oe_libinstall -so -C src/c/api libspeechd ${STAGING_LIBDIR} -} - -PACKAGES =+ "libspeechd-dbg libspeechd libspeechd-dev" - -FILES_${PN} += "${libdir}/${PN}-modules/*" -FILES_${PN}-dbg += "${libdir}/${PN}-modules/.debug" -FILES_libspeechd += "${libdir}/libspeechd.so.*" -FILES_libspeechd-dev += "${libdir}/libspeechd* ${includedir}" -FILES_libspeechd-dbg += "${libdir}/.debug/libspeechd*" diff --git a/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb new file mode 100644 index 0000000000..302f642d67 --- /dev/null +++ b/packages/speech-dispatcher/speech-dispatcher_0.6.6.bb @@ -0,0 +1,57 @@ +DESCRIPTION = "Speech Dispatcher is a high-level device independent layer \ +for speech synthesis through a simple, stable and well documented interface." +HOMEPAGE = "http://www.freebsoft.org/speechd/" +LICENSE = "GPLv2" +DEPENDS = "espeak flite pulseaudio libdotconf glib-2.0" +RPROVIDES_${PN} += "speechd" + +PR = "r0" + +inherit autotools update-rc.d + +SRC_URI = "http://www.freebsoft.org/pub/projects/speechd/${PN}-${PV}.tar.gz \ + file://speech-dispatcher.init \ + file://srcMakefile.am.patch;patch=1 \ + file://configure_fix.patch;patch=1 \ + file://configSpeechd.conf.in_00.patch;patch=1" + +LEAD_SONAME = "libspeechd.so" +EXTRA_OECONF = " --with-espeak --with-flite --without-ibmtts --without-nas --with-alsa --with-pulse " + +INITSCRIPT_NAME = "speech-dispatcher" +INITSCRIPT_PARAMS = "defaults 45" + +do_install() { + install -d ${D}${bindir} + install -d ${D}${includedir} + install -d ${D}${libdir}/${PN}-modules + install -d ${D}${sysconfdir} + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/speech-dispatcher + install -d ${D}${sysconfdir}/speech-dispatcher/modules + + oe_libinstall -so -C src/audio libsdaudio ${D}${libdir} + oe_libinstall -so -C src/c/api libspeechd ${D}${libdir} + + install -m 0644 ${S}/src/c/api/libspeechd.h ${D}${includedir} + install -m 0755 ${S}/src/c/clients/say/.libs/spd-say ${D}${bindir} + install -m 0755 ${S}/src/server/.libs/speech-dispatcher ${D}${bindir} + install -m 0755 ${S}/src/modules/.libs/sd_* ${D}${libdir}/${PN}-modules/ + + install -m 0644 ${S}/config/speechd.conf ${D}${sysconfdir}/speech-dispatcher + install -m 0644 ${S}/config/modules/*.conf ${D}${sysconfdir}/speech-dispatcher/modules + install -m 0755 ${WORKDIR}/speech-dispatcher.init ${D}${sysconfdir}/init.d/speech-dispatcher +} + +do_stage() { + install -m 0644 ${S}/src/c/api/libspeechd.h ${STAGING_INCDIR} + oe_libinstall -so -C src/c/api libspeechd ${STAGING_LIBDIR} +} + +PACKAGES =+ "libspeechd-dbg libspeechd libspeechd-dev" + +FILES_${PN} += "${libdir}/${PN}-modules/*" +FILES_${PN}-dbg += "${libdir}/${PN}-modules/.debug" +FILES_libspeechd += "${libdir}/libspeechd.so.*" +FILES_libspeechd-dev += "${libdir}/libspeechd* ${includedir}" +FILES_libspeechd-dbg += "${libdir}/.debug/libspeechd*" -- cgit v1.2.3 From 093d01d708c2f09213f1667ca45cd165c282e435 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 12 Mar 2008 10:35:31 +0000 Subject: directfb: Remove potential dangerous sed invocation. Add a -I in front and replace it with nothing It is still compiling and packaging. --- packages/directfb/++dfb_1.0.0.bb | 2 +- packages/directfb/directfb-examples_1.0.0.bb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb index f440e117ff..020cbfe3eb 100644 --- a/packages/directfb/++dfb_1.0.0.bb +++ b/packages/directfb/++dfb_1.0.0.bb @@ -11,7 +11,7 @@ RV = "0.9-25" inherit autotools pkgconfig do_configure_append() { - find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -type f | xargs sed -i 's:-I/usr/include::g' } do_stage() { diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb index 064a808273..e59e4ecf2e 100644 --- a/packages/directfb/directfb-examples_1.0.0.bb +++ b/packages/directfb/directfb-examples_1.0.0.bb @@ -11,8 +11,8 @@ S = "${WORKDIR}/DirectFB-examples-${PV}" inherit autotools do_configure_append() { -# find ${S} -type f | xargs sed -i 's:/usr/lib:${STAGING_LIBDIR}:' - find ${S} -type f | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +# find ${S} -type f | xargs sed -i 's:-L/usr/lib::g' + find ${S} -type f | xargs sed -i 's:-I/usr/include::g' } do_stage() { -- cgit v1.2.3 From 72bbade2b07c4701d0b35f0b3a21d81201302c1c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 12 Mar 2008 12:32:45 +0000 Subject: directfb: This magic is not needed for directfb It compiles and the packages look fine --- packages/directfb/++dfb_1.0.0.bb | 4 ---- packages/directfb/directfb-examples_1.0.0.bb | 5 ----- 2 files changed, 9 deletions(-) diff --git a/packages/directfb/++dfb_1.0.0.bb b/packages/directfb/++dfb_1.0.0.bb index 020cbfe3eb..7c4aea3920 100644 --- a/packages/directfb/++dfb_1.0.0.bb +++ b/packages/directfb/++dfb_1.0.0.bb @@ -10,10 +10,6 @@ RV = "0.9-25" inherit autotools pkgconfig -do_configure_append() { - find ${S} -type f | xargs sed -i 's:-I/usr/include::g' -} - do_stage() { autotools_stage_all } diff --git a/packages/directfb/directfb-examples_1.0.0.bb b/packages/directfb/directfb-examples_1.0.0.bb index e59e4ecf2e..7fd3f38848 100644 --- a/packages/directfb/directfb-examples_1.0.0.bb +++ b/packages/directfb/directfb-examples_1.0.0.bb @@ -10,11 +10,6 @@ S = "${WORKDIR}/DirectFB-examples-${PV}" inherit autotools -do_configure_append() { -# find ${S} -