From d190d03547f17df923ef4c1efabb5e863b635df9 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 19 Dec 2007 15:01:24 +0000 Subject: remove epdf from task-openmoko-feed for now. --- packages/tasks/task-openmoko-feed.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index e1fbbabfde..1853f6a181 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -9,7 +9,7 @@ RDEPENDS_task-openmoko-feed = "\ aspell enchant \ bluez-hcidump \ bootchart \ - eet evas ecore embryo epsilon edje efreet emotion epdf \ + eet evas ecore embryo epsilon edje efreet emotion \ exhibit edje-viewer \ free42-vga \ gpe-filemanager gpe-gallery gpe-timesheet gpe-todo \ -- cgit v1.2.3 From 446b31cf615d573a24a851a944872e03f3e00d40 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Dec 2007 18:43:53 +0000 Subject: disapproval of revision '9784df253c04df1dfcc620c6bf064869215598f6' fix Bug 3502 --- packages/ipkg/files/ipkg_bugfix.patch | 44 ----------------------------------- packages/ipkg/ipkg-native_0.99.163.bb | 3 +-- 2 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 packages/ipkg/files/ipkg_bugfix.patch diff --git a/packages/ipkg/files/ipkg_bugfix.patch b/packages/ipkg/files/ipkg_bugfix.patch deleted file mode 100644 index 51eccbb2bd..0000000000 --- a/packages/ipkg/files/ipkg_bugfix.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: C/ipkg_conf.c -=================================================================== ---- C.orig/ipkg_conf.c 2005-06-21 13:59:32.000000000 +0000 -+++ C/ipkg_conf.c 2007-11-27 01:11:17.000000000 +0000 -@@ -423,6 +423,7 @@ - nv_pair_t *nv_pair; - pkg_dest_t *dest; - char *root_dir; -+ char *list_dir2; - - for (iter = nv_pair_list->head; iter; iter = iter->next) { - nv_pair = iter->data; -@@ -432,8 +433,14 @@ - } else { - root_dir = strdup(nv_pair->value); - } -- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir); -+ if (conf->offline_root) { -+ sprintf_alloc(&list_dir2, "%s%s", conf->offline_root, lists_dir); -+ } else { -+ list_dir2 = strdup(lists_dir); -+ } -+ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, list_dir2); - free(root_dir); -+ free(list_dir2); - if (dest == NULL) { - continue; - } -@@ -562,13 +569,13 @@ - } else if (strcmp(type, "dest") == 0) { - nv_pair_list_append(tmp_dest_nv_pair_list, name, value); - } else if (strcmp(type, "lists_dir") == 0) { -- *lists_dir = realloc(*lists_dir,strlen(value)+1); -+ *lists_dir = realloc(*lists_dir,strlen(name)+1); - if (*lists_dir == NULL) { - ipkg_message(conf, IPKG_ERROR, "ERROR: Not enough memory\n"); - free(options); - return EINVAL; - } -- sprintf (*lists_dir,"%s",value); -+ sprintf (*lists_dir,"%s", name); - } else if (strcmp(type, "arch") == 0) { - ipkg_message(conf, IPKG_INFO, "supported arch %s priority (%s)\n", name, value); - if (!value) { diff --git a/packages/ipkg/ipkg-native_0.99.163.bb b/packages/ipkg/ipkg-native_0.99.163.bb index c8e7d08588..13609c9037 100644 --- a/packages/ipkg/ipkg-native_0.99.163.bb +++ b/packages/ipkg/ipkg-native_0.99.163.bb @@ -2,7 +2,7 @@ S = "${WORKDIR}/ipkg-${PV}" #require ipkg_${PV}.bb require ipkg-native.inc -PR = "r3" +PR = "r2" inherit autotools pkgconfig native @@ -10,6 +10,5 @@ SRC_URI = "http://www.handhelds.org/pub/packages/ipkg/ipkg-${PV}.tar.gz \ file://is-processing.patch;patch=1 \ file://1-pkg-parse--Optimize-inefficient-parsing.patch;patch=1 \ file://2-pkg-vec--Optimize-gross-inefficiency.patch;patch=1 \ - file://ipkg_bugfix.patch;patch=1 \ " -- cgit v1.2.3 From c06a4f63a7ee2ee6b4e1a8bbab0b0e86f2205d34 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Dec 2007 18:52:06 +0000 Subject: Add fbset by Dodji's request. --- packages/tasks/task-openmoko-debug.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/tasks/task-openmoko-debug.bb b/packages/tasks/task-openmoko-debug.bb index 8486aa01cf..a6a17b3c5a 100644 --- a/packages/tasks/task-openmoko-debug.bb +++ b/packages/tasks/task-openmoko-debug.bb @@ -15,6 +15,7 @@ RDEPENDS_task-openmoko-debug = "\ cu \ dbench \ fbgrab \ + fbset \ fstests \ gdb \ gdbserver \ -- cgit v1.2.3 From 805ce343e2802308a42920d4c9d2757c45e2bcaf Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Dec 2007 18:53:57 +0000 Subject: Remove ipkg-list-fields because already in ipkg-utils --- packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb index 23d73ebae6..3101ecb3be 100644 --- a/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb +++ b/packages/ipkg-utils/ipkg-utils-native_1.6+cvs20050404.bb @@ -8,7 +8,7 @@ inherit native # Avoid circular dependencies from package_ipk.bbclass PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ipkg-utils" -INSTALL += "ipkg-list-fields arfile.py" +INSTALL += "arfile.py" do_stage() { for i in ${INSTALL}; do -- cgit v1.2.3 From 66a6ef82a48cb5ca976f3686b75ee150563bc1d5 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Dec 2007 20:03:01 +0000 Subject: Add ability to find the directory of parent package if the child package is of different arch. --- packages/meta/meta-toolchain.bb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb index 91467e5140..4a8edb9c32 100644 --- a/packages/meta/meta-toolchain.bb +++ b/packages/meta/meta-toolchain.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native" +PR = "r1" inherit sdk meta @@ -59,8 +60,8 @@ do_populate_sdk() { echo 'GROUP ( libc.so.6 libc_nonshared.a )' > ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/libc.so # remove unwanted housekeeping files - mv ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status - rm -Rf ${SDK_OUTPUT}${prefix}/${TARGET_SYS}/lib/ipkg + mv ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status + rm -Rf ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}/lib/ipkg mv ${SDK_OUTPUT}/usr/lib/ipkg/status ${SDK_OUTPUT}/${prefix}/package-status-host rm -Rf ${SDK_OUTPUT}/usr/lib @@ -73,10 +74,17 @@ do_populate_sdk() { for arch in $revipkgarchs; do pkgnames=${DEPLOY_DIR_IPK}/$arch/${pkg}_*_$arch.ipk if [ -e $pkgnames ]; then - echo "Found $pkgnames" + oenote "Found $pkgnames" cp $pkgnames ${SDK_OUTPUT}/${prefix}/ipk/ orig_pkg=`ipkg-list-fields $pkgnames | grep OE: | cut -d ' ' -f2` - pkg_subdir=$arch${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + pkg_subdir_postfix=${TARGET_VENDOR}${@['-' + bb.data.getVar('TARGET_OS', d, 1), ''][bb.data.getVar('TARGET_OS', d, 1) == ('' or 'custom')]} + for aarch in $revipkgarchs; do + if [ -e "${STAGING_DIR}/pkgdata/${aarch}${pkg_subdir_postfix}/${orig_pkg}" ]; then + pkg_subdir="${aarch}${pkg_subdir_postfix}" + break + fi + done + oenote "Original package in ${pkg_subdir}" mkdir -p ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/runtime cp ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg ${SDK_OUTPUT}/${prefix}/pkgdata/$pkg_subdir/ subpkgs=`cat ${STAGING_DIR}/pkgdata/$pkg_subdir/$orig_pkg | grep PACKAGES: | cut -b 10-` -- cgit v1.2.3 From 788b612af08a1db3e28dbf5ae21bcd039b29ef50 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Dec 2007 20:20:00 +0000 Subject: Integrate mainstream to build meta-toolchain-openmoko packages/meta/meta-toolchain-openmoko.bb: will install task-openmoko-toolchain-{target,host} task-openmoko-toolchain-target: specific to target arch. task-openmoko-toolchain-host: for host and all, such as openmoko-sample2-src moko-autorev.inc, sane-srcrevs.inc: add SRCREV_pn-openmoko-toolchain-scripts openmoko-toolchain-scripts_svn.bb: will not install sample code now. openmoko-sample2_svn.bb: update PACKAGE_ARCH_${PN}-src to be used by ipkg-sdk.conf --- conf/distro/include/moko-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + packages/meta/meta-toolchain-openmoko.bb | 6 +++-- .../openmoko-toolchain-scripts_svn.bb | 13 +++++---- packages/openmoko2/openmoko-sample2_svn.bb | 2 +- packages/tasks/task-openmoko-toolchain-host.bb | 13 +++++++++ packages/tasks/task-openmoko-toolchain-target.bb | 30 +++++++++++++++++++++ packages/tasks/task-toolchain-openmoko-sdk.bb | 31 ---------------------- 8 files changed, 56 insertions(+), 41 deletions(-) create mode 100644 packages/tasks/task-openmoko-toolchain-host.bb create mode 100644 packages/tasks/task-openmoko-toolchain-target.bb delete mode 100644 packages/tasks/task-toolchain-openmoko-sdk.bb diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 74b930781b..1193fa463c 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -39,6 +39,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}" +SRCREV_pn-openmoko-toolchain-scripts ?= "${AUTOREV}" SRCREV_pn-openmoko-worldclock2 ?= "${AUTOREV}" SRCREV_pn-openocd ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 6e7910cf10..fd2423e08e 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -112,6 +112,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3609" SRCREV_pn-openmoko-today2-folders ?= "3414" +SRCREV_pn-openmoko-toolchain-scripts ?= "3683" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" diff --git a/packages/meta/meta-toolchain-openmoko.bb b/packages/meta/meta-toolchain-openmoko.bb index 90eff20259..6ee3e0472a 100644 --- a/packages/meta/meta-toolchain-openmoko.bb +++ b/packages/meta/meta-toolchain-openmoko.bb @@ -1,4 +1,6 @@ -TOOLCHAIN_TARGET_TASK = "task-toolchain-openmoko-sdk" +PR = "r1" -require meta-toolchain.bb +TOOLCHAIN_TARGET_TASK = "task-openmoko-toolchain-target" +TOOLCHAIN_HOST_TASK = "task-openmoko-toolchain-host" +require meta-toolchain.bb diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb index 1526cbab55..7533f81958 100644 --- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb +++ b/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb @@ -1,15 +1,14 @@ DESCRIPTION = "Convenient scripts to be used with openmoko toolchain." -PACKAGE_ARCH = "all" +PR = "r1" SRC_URI = "svn://svn.openmoko.org/developers/john_lee;module=toolkit;proto=http" -SRC_URI += "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/applications;module=openmoko-sample2;proto=http" -SRCREV="3630" +S = "${WORKDIR}/toolkit" + FILES_${PN} = "/" do_install () { - (find ${WORKDIR} -type d -name ".svn" | xargs rm -rf) || true - install -m 755 -d ${D}/share - cp -dr ${WORKDIR}/toolkit/* ${D} - cp -dr ${WORKDIR}/openmoko-sample2 ${D}/share + cp -dr ${S}/* ${D} + find ${D} -name ".svn" | xargs rm -rf + rm -r ${D}/patches } diff --git a/packages/openmoko2/openmoko-sample2_svn.bb b/packages/openmoko2/openmoko-sample2_svn.bb index c05b6d3618..8c808ffd03 100644 --- a/packages/openmoko2/openmoko-sample2_svn.bb +++ b/packages/openmoko2/openmoko-sample2_svn.bb @@ -9,7 +9,7 @@ inherit openmoko2 PACKAGES += "${PN}-src" # path should match the toolchain path FILES_${PN}-src = "/usr/local/openmoko" -PACKAGE_ARCH_${PN}-src = "all" +PACKAGE_ARCH_${PN}-src = "${BUILD_ARCH}-all-sdk" do_configure_prepend() { install -d ${WORKDIR}/source diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb new file mode 100644 index 0000000000..788152c6ca --- /dev/null +++ b/packages/tasks/task-openmoko-toolchain-host.bb @@ -0,0 +1,13 @@ +require task-sdk-host.bb + +DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PR = "r0" + +PACKAGES = "${PN}" + +RDEPENDS_${PN} += "\ + openmoko-sample2-src \ +" diff --git a/packages/tasks/task-openmoko-toolchain-target.bb b/packages/tasks/task-openmoko-toolchain-target.bb new file mode 100644 index 0000000000..281884d051 --- /dev/null +++ b/packages/tasks/task-openmoko-toolchain-target.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" +LICENSE = "MIT" +ALLOW_EMPTY = "1" + +PR = "r2" + +PACKAGES = "${PN}" + +RDEPENDS_${PN} = "\ + glibc \ + glibc-dbg \ + glibc-dev \ + glibc-utils \ + libsegfault \ + glibc-thread-db \ + glibc-localedata-i18n \ + glibc-gconv-ibm850 \ + glibc-gconv-cp1252 \ + glibc-gconv-iso8859-1 \ + glibc-gconv-iso8859-15 \ + locale-base-en-gb \ + libgcc \ + libstdc++ \ + \ + libmokogsmd2-dev \ + libmokoui2-dev \ + libmokopanelui2-dev \ + libmokojournal2-dev \ + openmoko-toolchain-scripts \ +" diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb deleted file mode 100644 index bcb2d370a6..0000000000 --- a/packages/tasks/task-toolchain-openmoko-sdk.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PR = "r2" - -PACKAGES = "${PN}" - -RDEPENDS_${PN} = "\ - glibc \ - glibc-dbg \ - glibc-dev \ - glibc-utils \ - libsegfault \ - glibc-thread-db \ - glibc-localedata-i18n \ - glibc-gconv-ibm850 \ - glibc-gconv-cp1252 \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ - locale-base-en-gb \ - libgcc \ - libstdc++ \ - \ - libmokogsmd2-dev \ - libmokoui2-dev \ - libmokopanelui2-dev \ - libmokojournal2-dev \ - openmoko-sample2-src \ - openmoko-toolchain-scripts \ -" -- cgit v1.2.3 From 674ca4bf9908f7ea2324ce4c6ebc7770c652da5b Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 21 Dec 2007 10:38:42 +0000 Subject: Comment out the RPROVIDES line as a workaround of Bug 3509 --- packages/meta/external-toolchain.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index c483ea26a6..4e830435c4 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -15,7 +15,7 @@ PROVIDES = "\ virtual/linux-libc-headers \ " -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" PR = "r1" -- cgit v1.2.3 From 76a69ddbfb3b9490e7a7fb45b77d00a3f559bc3c Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 26 Dec 2007 12:53:31 +0000 Subject: make it possible to INHERIT += 'sourcepkg' during OM build by: * bypass most of the sourcepkg.bbclass errors * update packages/linux/linux-openmoko_2.6.22.5.bb to make it work with sourcepkg. --- classes/sourcepkg.bbclass | 43 ++++++++++++++++++++++--------- packages/linux/linux-openmoko_2.6.22.5.bb | 22 ++++++++++------ 2 files changed, 45 insertions(+), 20 deletions(-) diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index bbc9f187ec..f7daa9f46c 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -18,14 +18,20 @@ def get_src_tree(d): bb.error("S not defined, unable to find source tree.") return - s_tree_raw = s.split('/')[1] + try: + s_tree_raw = s.split('/')[1] + except IndexError: + return + s_tree = bb.data.expand(s_tree_raw, d) src_tree_path = os.path.join(workdir, s_tree) try: os.listdir(src_tree_path) except OSError: - bb.fatal("Expected to find source tree in '%s' which doesn't exist." % src_tree_path) + bb.error("Expected to find source tree in '%s' which doesn't exist." % src_tree_path, s) + return + bb.debug("Assuming source tree is '%s'" % src_tree_path) return s_tree @@ -39,11 +45,14 @@ sourcepkg_do_create_orig_tgz(){ done src_tree=${@get_src_tree(d)} - - echo $src_tree + if test x${src_tree} = x; then + oenote "Skipping empty source tree" + return + fi + oenote "Creating .orig.tar.gz in ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz" tar cvzf ${DEPLOY_DIR_SRC}/${P}.orig.tar.gz --exclude-from temp/exclude-from-file $src_tree - cp -pPR $src_tree $src_tree.orig + cp -av $src_tree $src_tree.orig } sourcepkg_do_archive_bb() { @@ -74,7 +83,14 @@ python sourcepkg_do_dumpdata() { bb.note("Dumping metadata into '%s'" % dumpfile) f = open(dumpfile, "w") # emit variables and shell functions - bb.data.emit_env(f, d, True) + + # FIXME: if we emit all, bitbake will get error while + # evaluating AUTOREV since we have AUTOREV = + # "${@bb.fetch.get_srcrev(d)}" in bitbake.conf, but get_srcrev + # without a valid SRC_URI will cause problem. + + bb.data.emit_env(f, d, True) + # emit the metadata which isnt valid shell for e in d.keys(): if bb.data.getVarFlag(e, 'python', d): @@ -89,8 +105,11 @@ sourcepkg_do_create_diff_gz(){ echo $i >> temp/exclude-from-file done - src_tree=${@get_src_tree(d)} + if test x${src_tree} = x; then + oenote "Skipping empty source tree" + return + fi for i in `find . -maxdepth 1 -type f`; do mkdir -p $src_tree/${DISTRO}/files @@ -102,10 +121,10 @@ sourcepkg_do_create_diff_gz(){ rm -rf $src_tree.orig } -EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz +#EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_dumpdata do_create_diff_gz +EXPORT_FUNCTIONS do_create_orig_tgz do_archive_bb do_create_diff_gz addtask create_orig_tgz after do_unpack before do_patch -addtask archive_bb after do_patch before do_dumpdata -addtask dumpdata after do_archive_bb before do_create_diff_gz -addtask create_diff_gz after do_dump_data before do_configure - +addtask archive_bb after do_patch before do_configure +#addtask dumpdata after do_archive_bb before do_configure +addtask create_diff_gz after do_archive_bb before do_configure diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index d1b3c5ef1e..2dd535725b 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -61,12 +61,18 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss" # sd/mmc module_autoload_s3cmci = "s3cmci" -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig +python do_patch_prepend() { + def runcmd(cmd): + import commands + (status, output) = commands.getstatusoutput(cmd) + if status != 0: + raise Exception, "Status %i: %s" % (status >> 8, output) + return output + runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && ' + 'quilt push -av && mv patches patches.openmoko && ' + 'mv .pc .pc.old && mv %(WORKDIR)s/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' % + {'WORKDIR': bb.data.getVar('WORKDIR', d, 1), + 'S': bb.data.getVar('S', d, 1), + 'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)}) + del runcmd } - -addtask prepatch after do_unpack before do_patch - -- cgit v1.2.3 From ec9ece86db37e1e071208787c58272371d557082 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 7 Jan 2008 13:28:46 +0000 Subject: disable autorev openmoko-terminal2 for now to recover daily build. --- conf/distro/include/moko-autorev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 1193fa463c..63a4b55dd2 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -34,7 +34,7 @@ SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}" -SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" +#SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" -- cgit v1.2.3 From 2a5a1309888b7e49e5656e8abde6adbff298b451 Mon Sep 17 00:00:00 2001 From: Dojii Seketeli Date: Tue, 8 Jan 2008 09:17:23 +0000 Subject: Get Xglamo from http://cgit.freedesktop.org/~dodji/xglamo --- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index f78bef05ae..cdf74ee821 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -3,9 +3,10 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r21" +PR = "r22" -SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ +#SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ +SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;tag=master \ ${KDRIVE_COMMON_PATCHES} \ file://enable-epson.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ @@ -21,11 +22,12 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://w100-fix-offscreen-bmp.patch;patch=1 \ file://kdrive-1.3-18bpp.patch;patch=1 \ file://gumstix-kmode.patch;patch=1 \ - file://smedia-glamo.patch;patch=1 \ - file://build-glamo.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" +#S = "${WORKDIR}/git" + +#CFLAGS=-g W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" -- cgit v1.2.3 From fc6f8419e5eed8f16a9fefd193c94c08c26024fd Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 9 Jan 2008 12:31:53 +0000 Subject: remove glamo-report-vram-size-to-userspace.patch to reflect OM svn change. --- packages/linux/linux-openmoko_2.6.22.5.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index 2dd535725b..7cf8e0ac9f 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -29,7 +29,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.ta file://iis-suspend.patch;patch=1 \ file://s3c24xx-pcm-suspend.patch;patch=1 \ file://gta-vibro-pwm-suspend.patch;patch=1 \ - file://glamo-report-vram-size-to-userspace.patch;patch=1 \ file://defconfig-${KERNEL_RELEASE}" S = "${WORKDIR}/linux-${VANILLA_VERSION}" -- cgit v1.2.3 From 5f85023a55c3e444f6e53dd77de449f8c2f3ef34 Mon Sep 17 00:00:00 2001 From: Dojii Seketeli Date: Wed, 9 Jan 2008 19:50:00 +0000 Subject: [xserver-kdrive-kdrive] properly set the S variable. Now that xserver is taken from http://cgit.freedesktop.org/~dodji/xglamo the S variable has to be updated. Cleaned up the recipe file as well. --- packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb index 86af843d7b..e3bb271ef2 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb @@ -24,11 +24,8 @@ SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;tag=master \ file://gumstix-kmode.patch;patch=1 \ " -S = "${WORKDIR}/xorg-server-${PV}" - -#S = "${WORKDIR}/git" - -#CFLAGS=-g +#S = "${WORKDIR}/xorg-server-${PV}" +S = "${WORKDIR}/git" W100_OECONF = "--disable-w100" W100_OECONF_arm = "--enable-w100" -- cgit v1.2.3 From 7a0aae1895e7e3f857b3ce44a8da1fc7fb2ca30a Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 17 Jan 2008 11:26:51 +0000 Subject: enable openmoko-terminal2 AUTOREV --- conf/distro/include/moko-autorev.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 671babe1af..eb0a403fb3 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -34,7 +34,7 @@ SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-tasks2 ?= "${AUTOREV}" -#SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" +SRCREV_pn-openmoko-terminal2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-theme-standard2-qvga ?= "${AUTOREV}" SRCREV_pn-openmoko-today2 ?= "${AUTOREV}" -- cgit v1.2.3 From 9f058b138073ef753c5094e3927c963c7a655f97 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 17 Jan 2008 11:29:23 +0000 Subject: update SRCREV_pn-openmoko-toolchain-scripts ?= "3767" --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index f8516d2fc6..aa13d4b255 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -112,7 +112,7 @@ SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425" SRCREV_pn-openmoko-today ?= "3056" SRCREV_pn-openmoko-today2 ?= "3609" SRCREV_pn-openmoko-today2-folders ?= "3414" -SRCREV_pn-openmoko-toolchain-scripts ?= "3683" +SRCREV_pn-openmoko-toolchain-scripts ?= "3767" SRCREV_pn-openmoko-worldclock2 ?= "3365" SRCREV_pn-openocd ?= "206" SRCREV_pn-openocd-native ?= "206" -- cgit v1.2.3 From c935f9d9549680e950ad5e66d8661ce4e9584ae3 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 17 Jan 2008 11:32:09 +0000 Subject: stage geoclue and gypsy for later usage. --- packages/geoclue/geoclue_git.bb | 4 ++++ packages/gypsy/gypsy.inc | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/packages/geoclue/geoclue_git.bb b/packages/geoclue/geoclue_git.bb index bd6778213a..b4a0cbda3a 100644 --- a/packages/geoclue/geoclue_git.bb +++ b/packages/geoclue/geoclue_git.bb @@ -20,6 +20,10 @@ EXTRA_OECONF = " --enable-applet=no \ --enable-gpsd \ --enable-system-bus" +do_stage() { + autotools_stage_all +} + do_install_append() { mkdir -p ${D}/usr/share/ cp -pPr ${D}${STAGING_DATADIR}/* ${D}/usr/share diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc index 6d78943bd5..77797151ff 100644 --- a/packages/gypsy/gypsy.inc +++ b/packages/gypsy/gypsy.inc @@ -5,6 +5,10 @@ DEPENDS = "glib-2.0 dbus bluez-libs" inherit autotools pkgconfig +do_stage () { + autotools_stage_all +} + do_configure_prepend () { touch ${S}/gtk-doc.make } -- cgit v1.2.3 From d47eb6e254cea2207027b75b2ec071f0d3dc7d61 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 22 Jan 2008 03:48:03 +0000 Subject: task-openmoko-toolchain-host.bb: remove it to resolve conflict a250ef0b1707ead866fe051ca88c56e538d51bfb --- packages/tasks/task-openmoko-toolchain-host.bb | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 packages/tasks/task-openmoko-toolchain-host.bb diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb deleted file mode 100644 index 788152c6ca..0000000000 --- a/packages/tasks/task-openmoko-toolchain-host.bb +++ /dev/null @@ -1,13 +0,0 @@ -require task-sdk-host.bb - -DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PR = "r0" - -PACKAGES = "${PN}" - -RDEPENDS_${PN} += "\ - openmoko-sample2-src \ -" -- cgit v1.2.3 From 197a36f6add53d65332aa4dd33bc013270b6c927 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 22 Jan 2008 04:02:59 +0000 Subject: task-openmoko-toolchain-host: fix duplicated text. * duplicated text due to brain damaged patch usage. --- packages/tasks/task-openmoko-toolchain-host.bb | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb index 31ac3bb746..788152c6ca 100644 --- a/packages/tasks/task-openmoko-toolchain-host.bb +++ b/packages/tasks/task-openmoko-toolchain-host.bb @@ -11,16 +11,3 @@ PACKAGES = "${PN}" RDEPENDS_${PN} += "\ openmoko-sample2-src \ " -require task-sdk-host.bb - -DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PR = "r0" - -PACKAGES = "${PN}" - -RDEPENDS_${PN} += "\ - openmoko-sample2-src \ -" -- cgit v1.2.3 From 75c94213fe3bce68b3e787842eb65a8ff004c9ce Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 23 Jan 2008 10:31:22 +0000 Subject: swt-gtk: fix dependency and possible cross compiling badness * need classpath to build * remove -I${JAVA_HOME}/include and -I${JAVA_HOME}/include/linux because it might cause error with or without JAVA_HOME set and no extra include files are required anyway. --- packages/swt/files/make_linux-fix.patch | 22 ++++++++++++++++++++++ packages/swt/swt-gtk.inc | 2 +- packages/swt/swt3.4-gtk_3.3+3.4M3.bb | 3 ++- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 packages/swt/files/make_linux-fix.patch diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch new file mode 100644 index 0000000000..1c98f5cad2 --- /dev/null +++ b/packages/swt/files/make_linux-fix.patch @@ -0,0 +1,22 @@ +Index: swt-source/make_linux.mak +=================================================================== +--- swt-source.orig/make_linux.mak 2008-01-23 15:08:02.000000000 +0800 ++++ swt-source/make_linux.mak 2008-01-23 15:08:21.000000000 +0800 +@@ -74,8 +74,6 @@ + -Wno-non-virtual-dtor \ + -fPIC \ + -I. \ +- -I$(JAVA_HOME)/include \ +- -I$(JAVA_HOME)/include/linux \ + ${SWT_PTR_CFLAGS} + MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic + MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup +@@ -96,8 +94,6 @@ + -DSWT_VERSION=$(SWT_VERSION) \ + $(NATIVE_STATS) \ + -DLINUX -DGTK \ +- -I$(JAVA_HOME)/include \ +- -I$(JAVA_HOME)/include/linux \ + -fPIC \ + ${SWT_PTR_CFLAGS} + LIBS = -shared -fPIC diff --git a/packages/swt/swt-gtk.inc b/packages/swt/swt-gtk.inc index 6afadf1cab..4522e57503 100644 --- a/packages/swt/swt-gtk.inc +++ b/packages/swt/swt-gtk.inc @@ -3,7 +3,7 @@ LICENSE = "CPL MPL LGPL" inherit java-library -DEPENDS = "cairo gtk+ atk libxtst" +DEPENDS = "cairo gtk+ atk libxtst classpath" S = "${WORKDIR}/swt-source" diff --git a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb index 5d411f1be6..701339d374 100644 --- a/packages/swt/swt3.4-gtk_3.3+3.4M3.bb +++ b/packages/swt/swt3.4-gtk_3.3+3.4M3.bb @@ -1,7 +1,8 @@ require swt-gtk.inc SRC_URI = "http://ftp.wh2.tu-dresden.de/pub/mirrors/eclipse/eclipse/downloads/drops/S-3.4M3-200711012000/swt-3.4M3-gtk-linux-x86.zip \ - file://Makefile" + file://Makefile \ + file://make_linux-fix.patch;patch=1" # A number which is used by SWT to mark the shared libraries. SWTVERSION = "3416" -- cgit v1.2.3 From 23aab076251c65c283cb8d98fa1183179c3333ba Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 23 Jan 2008 10:34:54 +0000 Subject: task-openmoko-feed: add swt and cacao * swt3.4-gtk * cacao openmoko.conf: set preferred provider to avoid bitbake confusion building swt3.4-gtk. --- conf/distro/openmoko.conf | 5 ++++- packages/tasks/task-openmoko-feed.bb | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index dd6c2e0b7e..a1250afcb3 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -64,7 +64,10 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" +# for jalimo +PREFERRED_PROVIDER_classpath = "classpath" +PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" + # deploy gta01 and gta02 in ${MACHINE_CLASS} directory DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" - diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 97f24a7624..1e52beaa42 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -34,5 +34,6 @@ RDEPENDS_task-openmoko-feed = "\ vnc \ wxwidgets \ x11vnc \ + swt3.4-gtk \ + cacao \ " - -- cgit v1.2.3 From 2cd6d66602fd923fe15eea56bf7f4383790fbfce Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 23 Jan 2008 11:47:55 +0000 Subject: gpsdrive: update download URI * http://bugs.openembedded.net/show_bug.cgi?id=3494 * update checksums.ini accordingly --- conf/checksums.ini | 2 +- packages/gpsdrive/gpsdrive_2.10pre2.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index d9c9b5080c..5053d9e5d1 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -4218,7 +4218,7 @@ sha256=e6a055689ad05f6adba7dbb9490891a18a240d1a30e34424b3a034f4152f2c28 md5=1ad07e10f34e46ffdaf10688743f2f43 sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8 -[http://www.gpsdrive.cc/gpsdrive-2.10pre2.tar.gz] +[http://www.gpsdrive.de/packages/gpsdrive-2.10pre2.tar.gz] md5=28b13b7253c8f019433be68686070558 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227 diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb index 675c556b6f..f44c5925d2 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre2.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre2.bb @@ -9,7 +9,7 @@ SECTION = "x11" PRIORITY = "optional" LICENSE = "GPL" -SRC_URI = "http://www.gpsdrive.de/${PN}-${PV}.tar.gz \ +SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ file://gpsdrive.desktop" CFLAGS += "-D_GNU_SOURCE" -- cgit v1.2.3 From d6402b5e506137618aeeb37016bdd9db4c3eb65b Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 24 Jan 2008 06:33:02 +0000 Subject: external-toolchain: enable RPROVIDES again * the external-toolchain RPROVIDES problem is gone with bitbake 1.8.10 * see Bug#3509 --- packages/meta/external-toolchain.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index 69f16b10df..47d9a93a15 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -15,7 +15,7 @@ PROVIDES = "\ virtual/linux-libc-headers \ " -#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" PR = "r1" -- cgit v1.2.3 From 404f0f79366aaf13b3f518e8db9d9192cdc74287 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 24 Jan 2008 06:34:54 +0000 Subject: openmoko.conf: add PREFERRED_PROVIDER_swt3.4-gtk --- conf/distro/openmoko.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index a1250afcb3..d7b3cf753a 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -67,6 +67,7 @@ PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" # for jalimo PREFERRED_PROVIDER_classpath = "classpath" PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" +PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" # deploy gta01 and gta02 in ${MACHINE_CLASS} directory DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" -- cgit v1.2.3 From f65ddd6270f70779f3edc4e82d1d14814b3fb8ce Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 24 Jan 2008 06:41:40 +0000 Subject: task-openmoko-feed: fix incorrect RDEPENDS * from swt3.4-gtk to libswt3.4-gtk-java * increase PR --- packages/tasks/task-openmoko-feed.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 1e52beaa42..8e09b3f215 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r20" +PR = "r21" inherit task @@ -34,6 +34,6 @@ RDEPENDS_task-openmoko-feed = "\ vnc \ wxwidgets \ x11vnc \ - swt3.4-gtk \ + libswt3.4-gtk-java \ cacao \ " -- cgit v1.2.3 From c7647ffd1065e46540c2d945515057c75283cad7 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 08:40:12 +0000 Subject: openmoko-panel-memory: shows an out-of-memory warning in the OpenMoko panel * add entry in moko-autorev.inc * add entry in sane-srcrevs.inc --- conf/distro/include/moko-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index c5390811c6..ad3202ea36 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -30,6 +30,7 @@ SRCREV_pn-openmoko-panel-clock ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gps ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-gsm ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-mainmenu ?= "${AUTOREV}" +SRCREV_pn-openmoko-panel-memory ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-usb ?= "${AUTOREV}" SRCREV_pn-openmoko-sample2 ?= "${AUTOREV}" SRCREV_pn-openmoko-sound-theme-standard2 ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fd081635e0..7a76297256 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -95,6 +95,7 @@ SRCREV_pn-openmoko-panel-demo-simple ?= "1328" SRCREV_pn-openmoko-panel-gps ?= "2900" SRCREV_pn-openmoko-panel-gsm ?= "3664" SRCREV_pn-openmoko-panel-mainmenu ?= "2567" +SRCREV_pn-openmoko-panel-memory ?= "3903" SRCREV_pn-openmoko-panel-usb ?= "3360" SRCREV_pn-openmoko-sample2 ?= "3528" SRCREV_pn-openmoko-session ?= "152" diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb new file mode 100644 index 0000000000..8e8af7a086 --- /dev/null +++ b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel" +DEPENDS = "libnotify" +RDEPENDS = "openmoko-dialer2" +PV = "0.0.0+svn${SVNREV}" +PR = "r0" + +inherit openmoko-panel-plugin -- cgit v1.2.3 From 3302b455a6bb18c031bff85eed8b71d99e07a81c Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 08:42:51 +0000 Subject: openmoko-launcher: add a slim application launcher * add entry in moko-autorev.inc * add entry in sane-srcrevs.inc --- conf/distro/include/moko-autorev.inc | 1 + conf/distro/include/sane-srcrevs.inc | 1 + packages/openmoko2/openmoko-launcher_svn.bb | 7 +++++++ 3 files changed, 9 insertions(+) create mode 100644 packages/openmoko2/openmoko-launcher_svn.bb diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index ad3202ea36..91b83506e6 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -22,6 +22,7 @@ SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}" SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}" +SRCREV_pn-openmoko-launcher ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 7a76297256..0cdbc2fe44 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -83,6 +83,7 @@ SRCREV_pn-openmoko-icon-theme-standard ?= "2232" SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" +SRCREV_pn-openmoko-launcher ?= "3942" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "3583" SRCREV_pn-openmoko-messages ?= "2276" diff --git a/packages/openmoko2/openmoko-launcher_svn.bb b/packages/openmoko2/openmoko-launcher_svn.bb new file mode 100644 index 0000000000..5f97e3e65f --- /dev/null +++ b/packages/openmoko2/openmoko-launcher_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "The OpenMoko Application Launcher (simple)" +SECTION = "openmoko/pim" +DEPENDS = "libmokoui2 startup-notification libice libsm" +PV = "0.0.0+svnr${SRCREV}" +PR = "r0" + +inherit openmoko2 gtk-icon-cache -- cgit v1.2.3 From 8522a5179c40803bbdc4a8ded8a6e3c635de2242 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 08:45:10 +0000 Subject: openmoko-session2: add openmoko-panel-memory * also add openmoko-panel-memory into task-openmoko-phone --- packages/openmoko2/openmoko-session2.bb | 2 +- packages/openmoko2/openmoko-session2/etc/matchbox/session | 2 +- packages/tasks/task-openmoko-phone.bb | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 3d8c9109e1..02489f5621 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r63" +PR = "r64" SRC_URI = "\ file://etc \ diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index 9eea32a45d..f4d1ee9b11 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -7,6 +7,6 @@ phone-kit & matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ & matchbox-panel-2 --start-applets systray,startup \ - --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,keyboard --titlebar & + --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-memory,keyboard --titlebar & exec neod diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb index 49e4e66859..474efff79d 100644 --- a/packages/tasks/task-openmoko-phone.bb +++ b/packages/tasks/task-openmoko-phone.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r72" +PR = "r73" inherit task @@ -14,5 +14,6 @@ RDEPENDS_task-openmoko-phone = "\ libgsmd-tools \ openmoko-dialer2 \ openmoko-panel-gsm \ + openmoko-panel-memory \ # ppp \ " -- cgit v1.2.3 From bb5a2f9f2aecb2c088eece5ceeef3228eee943dd Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 08:54:31 +0000 Subject: multitap-pad: multi-tap input method for GTK * update moko-autorev and sane-srcrevs accordingly. --- conf/distro/include/moko-autorev.inc | 2 ++ conf/distro/include/sane-srcrevs.inc | 1 + packages/multitap-pad/.mtn2git_empty | 0 packages/multitap-pad/files/.mtn2git_empty | 0 packages/multitap-pad/files/80multitappad | 20 +++++++++++++ packages/multitap-pad/multitap-pad_svn.bb | 47 ++++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+) create mode 100644 packages/multitap-pad/.mtn2git_empty create mode 100644 packages/multitap-pad/files/.mtn2git_empty create mode 100644 packages/multitap-pad/files/80multitappad create mode 100644 packages/multitap-pad/multitap-pad_svn.bb diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 91b83506e6..e65008be02 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -10,6 +10,8 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" +SRCREV_pn-multitap-pad ?= "${AUTOREV}" + SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}" SRCREV_pn-openmoko-appearance ?= "${AUTOREV}" SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0cdbc2fe44..ae1fb8e4dc 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -55,6 +55,7 @@ SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739" SRCREV_pn-matchbox-panel-2 ?= "1626" SRCREV_pn-moko-gtk-engine ?= "3405" SRCREV_pn-mpd-alsa ?= "6952" +SRCREV_pn-multitap-pad ?= "337" SRCREV_pn-neod ?= "3421" SRCREV_pn-oh-puzzles ?= "22" SRCREV_pn-osb-browser ?= "125" diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad new file mode 100644 index 0000000000..d2b12ea7cc --- /dev/null +++ b/packages/multitap-pad/files/80multitappad @@ -0,0 +1,20 @@ +#!/bin/sh + +CMD="" + +if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then + if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then + CMD="multitap-pad -d -o landscape" + elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then + CMD="multitap-pad -d -o portrait" + fi +else + CMD="multitap-pad -d" +fi + + +# Delay to make sure the window manager is active + +if [ "$CMD" ]; then + (sleep 2 && $CMD) & +fi diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb new file mode 100644 index 0000000000..7543a44d72 --- /dev/null +++ b/packages/multitap-pad/multitap-pad_svn.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "Multi-tap input method for GTK" +LICENSE = "GPL" +DEPENDS = "libfakekey gtk+ matchbox-panel-2" +RCONFLICTS = matchbox-keyboard-inputmethod +SECTION = "x11" +PV = "0.0+svnr${SRCREV}" + +SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \ + file://80multitappad" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}" + +FILES_${PN} = "${bindir}/* \ + ${libdir} \ + ${sysconfdir} \ + ${datadir}" + +FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \ + ${libdir}/matchbox-panel/.debug" + +FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \ + ${libdir}/gtk-2.0/2.10.0/immodules/*.la \ + ${libdir}/matchbox-panel/*.a \ + ${libdir}/matchbox-panel/*.la" + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d/ + install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/ +} + +pkg_postinst_multitap-pad () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} + +pkg_postrm_multitap-pad () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} -- cgit v1.2.3 From f095a17f30e2cdf4e03e99944296e7b6ed8bd86d Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 08:57:22 +0000 Subject: task-openmoko-base: replace matchbox-keyboard-inputmethod with multitap-pad --- packages/tasks/task-openmoko-base.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb index a5d13e7e08..07e6a474bb 100644 --- a/packages/tasks/task-openmoko-base.bb +++ b/packages/tasks/task-openmoko-base.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r71" +PR = "r72" inherit task @@ -12,10 +12,11 @@ DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, App RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ - matchbox-keyboard-inputmethod \ +# matchbox-keyboard-inputmethod \ matchbox-keyboard-im \ matchbox-keyboard-applet \ matchbox-stroke \ + multitap-pad \ openmoko-terminal2 \ # openmoko-keyboard \ openmoko-panel-battery \ -- cgit v1.2.3 From 2e1c8e059c2c3879d61f13741987dc1bb066aa26 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 09:03:27 +0000 Subject: libwww-perl: add libwww-perl and native --- packages/perl/libwww-perl-native_5.808.bb | 5 +++++ packages/perl/libwww-perl_5.808.bb | 12 ++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 packages/perl/libwww-perl-native_5.808.bb create mode 100644 packages/perl/libwww-perl_5.808.bb diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb new file mode 100644 index 0000000000..68fdcbbbe5 --- /dev/null +++ b/packages/perl/libwww-perl-native_5.808.bb @@ -0,0 +1,5 @@ +SECTION = "libs" + +inherit native + +require libwww-perl_${PV}.bb diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb new file mode 100644 index 0000000000..2bea48a2d0 --- /dev/null +++ b/packages/perl/libwww-perl_5.808.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web" +SECTION = "libs" +LICENSE = "Artistic" +DEPENDS = "liburi-perl-native" +RDEPENDS = "liburi-perl" +PR = "r1" + +SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz" + +S = "${WORKDIR}/libwww-perl-${PV}" + +inherit cpan -- cgit v1.2.3 From 5d79ce882fd10ea123db5681f4a1af9ae7de8f69 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 10:53:04 +0000 Subject: gpsdrive: add 2.10pre4 * http://bugs.openembedded.org/show_bug.cgi?id=3670 * plus some polishment --- packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty | 0 .../gpsdrive-2.10pre4-openstreetmap-download.patch | 128 +++++++++++++++++++++ .../gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch | 18 +++ .../gpsdrive-remove-hardcoded-paths.patch | 96 ++++++++++++++++ .../gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop | 10 ++ packages/gpsdrive/gpsdrive_2.10pre4.bb | 42 +++++++ 6 files changed, 294 insertions(+) create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch create mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop create mode 100644 packages/gpsdrive/gpsdrive_2.10pre4.bb diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch new file mode 100644 index 0000000000..878cb1dba9 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch @@ -0,0 +1,128 @@ +diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl +--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100 +@@ -35,6 +35,7 @@ + modified (Jul 2005) by Jaroslaw Zachwieja + modified (Dec 2005) by David Pollard + modified (Jul 2007) by Maciek Kaliszewski ++modified (Jan 2008) by Gernot Hillier (added Openstreetmap support) + Version svn-$Version + "; + +@@ -176,6 +177,25 @@ + 15812 => 3 , + 7906 => 2, + 3953 => 1 ++ }, ++ openstreetmap_tah => { ++ 256*576000 => 1, ++ 128*576000 => 2, ++ 64*576000 => 3, ++ 32*576000 => 4, ++ 16*576000 => 5, ++ 8*576000 => 6, ++ 4*576000 => 7, ++ 2*576000 => 8, ++ 576000 => 9, ++ 288000 => 10, ++ 144000 => 11, ++ 72000 => 12, ++ 36000 => 13, ++ 18000 => 14, ++ 9000 => 15, ++ 4500 => 16, ++ 2250 => 17 + } + }; + +@@ -331,7 +351,6 @@ + exit(); + } + +- + # Verify that we have the options that we need + pod2usage(1) if (&error_check); + +@@ -417,6 +436,13 @@ + print "+-----------------------------------------------------------+\n"; + print "| Landsat Maps are Copyright, ..... |\n"; + print "| They are free for non commercial use. |\n"; ++}elsif ( $mapserver eq 'openstreetmap_tah' ){ ++ print "+-----------------------------------------------------------+\n"; ++ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n"; ++ print "| project. |\n"; ++ print "| They are free for use under the terms of the |\n"; ++ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; ++ print "| license. See http://www.openstreetmap.org for details. |\n"; + } elsif ( ! $force) { + print "You are violating the map servers copyright!\n"; + print "Are you sure you want to continue? [y|n] "; +@@ -700,6 +726,11 @@ + { + ($url,$mapscale)=googlemap_url($lati,$long,$scale); + } ++ elsif ( $mapserver eq 'openstreetmap_tah') ++ { ++ $filename=~s/\.gif/.png/; ++ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale); ++ } + else + { + print "Unknown map sever :", $mapserver, "\n"; +@@ -935,6 +966,37 @@ + return ($url,$mapscale); + } + ++############################################################################# ++sub openstreetmap_tah_url($$$){ ++ my $lati = shift; ++ my $long = shift; ++ my $scale = shift; ++ ++ my $mapscale = $scale; ++ my $zoom = undef; ++ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { ++ next unless $s == $scale; ++ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; ++ $mapscale = $s; ++ last; ++ } ++ ++ unless ( $zoom ) { ++ print "Error calculating Zoomlevel for Scale: $scale\n"; ++ return (undef,undef); ++ } ++ ++ if ($debug) { ++ print "\n"; ++ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; ++ print "lat: $lati\n"; ++ print "lon: $long\n"; ++ } ++ ++ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; ++# print "$url\n"; ++ return ($url,$mapscale); ++} + + ############################################################################# + sub eniro_url($$$){ +@@ -2284,7 +2346,7 @@ + =item B<--mapserver > + + Mapserver to download from. Default: 'expedia'. +-Currently can use: landsat or expedia. ++Currently usable: landsat, expedia or openstreetmap_tah. + + geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, + but they are !!!NOT!!!! in the right scale. +@@ -2294,6 +2356,9 @@ + + landsat covers the whole world with satelite Photos + ++openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see ++ http://www.openstreetmap.org and http://tah.openstreetmap.org. ++ + gov_au is for Australia + + incrementp for japanese Maps diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch new file mode 100644 index 0000000000..c51c80931c --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch @@ -0,0 +1,18 @@ +Index: src/map_handler.c +=================================================================== +--- aa/src/map_handler.c (Revision 1699) ++++ aa/src/map_handler.c (Revision 1700) +@@ -660,9 +660,12 @@ + if (maploaded) + gdk_pixbuf_unref (image); + ++#ifdef MAPNIK + if ( !strcmp (filename,"mapnik") ) { + limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); +- } else { ++ } else ++#endif ++ { + limage = gdk_pixbuf_new_from_file (filename, NULL); + if (limage == NULL) + { diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch new file mode 100644 index 0000000000..c8c0fe9c6a --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch @@ -0,0 +1,96 @@ +diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am +--- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100 +@@ -14,14 +14,14 @@ + -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \ + -DLIBDIR=\"${libdir}\" \ + -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \ +- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\ +- -I/usr/include/ \ +- -I/usr/local/include \ +- -I/opt/boost_1_35/include/boost-1_35 \ +- -I/usr/local/include/freetype2 \ +- -I/usr/include/freetype2 \ ++ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK} ++# -I/usr/include/ \ ++# -I/usr/local/include \ ++# -I/opt/boost_1_35/include/boost-1_35 \ ++# -I/usr/local/include/freetype2 \ ++# -I/usr/include/freetype2 \ + -I. \ +- -L/usr/local/lib ++# -L/usr/local/lib + + # -I/usr/include/dbus-1.0/ + +diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure +--- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100 +@@ -35950,10 +35950,13 @@ + # Yep, its ebil, but I does not know better... + #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` + # default on debian should be: /usr/share/perl5/ +-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` ++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` + #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` +-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` + ++# hard code path for OpenEmbedded environment as I don't know a way ++# to detect it automatically ++PERL_PACKAGE_DIR="/usr/share/perl5" + + ac_perl_modules="File::Basename " + # Make sure we have perl +@@ -37840,11 +37843,11 @@ + # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') + #fi + +-if test -f /usr/include/mysql/mysql.h; then +- CFLAGS="$CFLAGS -I/usr/include/mysql" +-else +- CFLAGS="$CFLAGS -Imysql" +-fi ++#if test -f /usr/include/mysql/mysql.h; then ++# CFLAGS="$CFLAGS -I/usr/include/mysql" ++#else ++# CFLAGS="$CFLAGS -Imysql" ++#fi + + CFLAGS="$CFLAGS $OPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" +diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac +--- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100 ++++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100 +@@ -662,9 +662,12 @@ + # Yep, its ebil, but I does not know better... + #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` + # default on debian should be: /usr/share/perl5/ +-PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` ++#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` + #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` +-PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` ++# hard code path for OpenEmbedded environment as I don't know a way ++# to detect it automatically ++PERL_PACKAGE_DIR="/usr/share/perl5" + AC_SUBST(PERL_PACKAGE_DIR) + + AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) +@@ -719,11 +722,11 @@ + # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') + #fi + +-if test -f /usr/include/mysql/mysql.h; then +- CFLAGS="$CFLAGS -I/usr/include/mysql" +-else +- CFLAGS="$CFLAGS -Imysql" +-fi ++#if test -f /usr/include/mysql/mysql.h; then ++# CFLAGS="$CFLAGS -I/usr/include/mysql" ++#else ++# CFLAGS="$CFLAGS -Imysql" ++#fi + + CFLAGS="$CFLAGS $OPT_CFLAGS" + CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop new file mode 100644 index 0000000000..96e8155861 --- /dev/null +++ b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=GPSDrive +Comment=GPS map software +Exec=gpsdrive -M pda -1 +Icon=gpsicon +Terminal=false +Type=Application +Categories=Graphics;Network;Geography;Application;Other +StartupNotify=true diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb new file mode 100644 index 0000000000..071a5691e3 --- /dev/null +++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "GPS navigation/map display software" +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql" +RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl" +PR = "r1" + +SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ + file://gpsdrive_2.10pre4.desktop \ + file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \ + file://gpsdrive-ifdef-mapnik.patch;patch=1 \ + file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-garmin" + +do_install_append () { + mkdir -p ${D}${datadir}/applications + install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop + mkdir -p ${D}${datadir}/pixmaps + cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps + # remove stuff we don't want to package + rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one + rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux + rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo +} + +PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons" + +FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml" +FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi" +FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils" +FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" +FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" +FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" +FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" + +CFLAGS += "-D_GNU_SOURCE" + +DEFAULT_PREFERENCE = "1" -- cgit v1.2.3 From 08bc05f4f3ea64fabde1312da41d1ccdba09dc7a Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 25 Jan 2008 11:42:33 +0000 Subject: task-openmoko-base: remove unnecessary RDEPENDS * matchbox-keyboard-im and matchbox-keyboard-applet no longer necessary with multitap-pad --- packages/tasks/task-openmoko-base.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb index 07e6a474bb..310d3f07c3 100644 --- a/packages/tasks/task-openmoko-base.bb +++ b/packages/tasks/task-openmoko-base.bb @@ -13,8 +13,8 @@ RDEPENDS_task-openmoko-base = "\ matchbox-panel-2 \ matchbox-panel-2-applets \ # matchbox-keyboard-inputmethod \ - matchbox-keyboard-im \ - matchbox-keyboard-applet \ +# matchbox-keyboard-im \ +# matchbox-keyboard-applet \ matchbox-stroke \ multitap-pad \ openmoko-terminal2 \ -- cgit v1.2.3 From 103977595e30d15cf3ac3cd7f818ee4abe9e4cc3 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 29 Jan 2008 12:19:02 +0000 Subject: asterisk: add unset RANLIB to make the build success. --- packages/asterisk/asterisk_1.4.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/asterisk/asterisk_1.4.17.bb b/packages/asterisk/asterisk_1.4.17.bb index fb64581364..0ea808af7f 100644 --- a/packages/asterisk/asterisk_1.4.17.bb +++ b/packages/asterisk/asterisk_1.4.17.bb @@ -78,7 +78,7 @@ do_configure () { do_compile() { ( #make sure that menuselect gets build using host toolchain - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS RANLIB cd menuselect ./configure oe_runmake -- cgit v1.2.3 From b3120335c8d5e2fffb643ebefe63a0ccefcdf61f Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 30 Jan 2008 08:55:37 +0000 Subject: openmoko-launcher: no longer exists. remove from include files. --- conf/distro/include/moko-autorev.inc | 1 - conf/distro/include/sane-srcrevs.inc | 1 - 2 files changed, 2 deletions(-) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index e65008be02..0c88b48940 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -24,7 +24,6 @@ SRCREV_pn-openmoko-feedreader2 ?= "${AUTOREV}" SRCREV_pn-openmoko-firststart2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2 ?= "${AUTOREV}" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "${AUTOREV}" -SRCREV_pn-openmoko-launcher ?= "${AUTOREV}" SRCREV_pn-openmoko-mediaplayer2 ?= "${AUTOREV}" SRCREV_pn-openmoko-messages2 ?= "${AUTOREV}" SRCREV_pn-openmoko-panel-battery ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index ae1fb8e4dc..a2f1ba375b 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -84,7 +84,6 @@ SRCREV_pn-openmoko-icon-theme-standard ?= "2232" SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" -SRCREV_pn-openmoko-launcher ?= "3942" SRCREV_pn-openmoko-libs ?= "2367" SRCREV_pn-openmoko-mediaplayer2 ?= "3583" SRCREV_pn-openmoko-messages ?= "2276" -- cgit v1.2.3 From d3cb6d42ae9ed6dc2fd723d2bfa7cb24d3c43558 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 31 Jan 2008 09:37:11 +0000 Subject: openmoko-launcher: remove this recipe because it no longer exists. --- packages/openmoko2/openmoko-launcher_svn.bb | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 packages/openmoko2/openmoko-launcher_svn.bb diff --git a/packages/openmoko2/openmoko-launcher_svn.bb b/packages/openmoko2/openmoko-launcher_svn.bb deleted file mode 100644 index 5f97e3e65f..0000000000 --- a/packages/openmoko2/openmoko-launcher_svn.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "The OpenMoko Application Launcher (simple)" -SECTION = "openmoko/pim" -DEPENDS = "libmokoui2 startup-notification libice libsm" -PV = "0.0.0+svnr${SRCREV}" -PR = "r0" - -inherit openmoko2 gtk-icon-cache -- cgit v1.2.3 From 00a92fbec68fe00e27647ef93a5449dbb2f75d38 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 31 Jan 2008 10:11:49 +0000 Subject: checksums.ini: add gpsdrive-2.10pre4.tar.gz and libwww-perl-5.808.tar.gz --- conf/checksums.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/conf/checksums.ini b/conf/checksums.ini index 5053d9e5d1..8ff6bd69fc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -282,6 +282,10 @@ sha256=5194ae0f07aaf274e46712cd3f2be553ca75970d2124ac388ce444adee5e2878 md5=b014170483cf85a93d08ee59196c53f9 sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b +[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz] +md5=72120d9195ab1649c2d787eb1102a90c +sha256=22e0778a16bb9ac0526efc99f7e03265e19ca5844aee7540f3f47a643ad5b9e4 + [http://downloads.sourceforge.net/plone/Plone-2.1.2.tar.gz] md5=863311e29550f9b4bf6c2502fdbed1fa sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2 @@ -4222,6 +4226,10 @@ sha256=39e8d629da469d2032ad3554ff502d270e1037490707d7ae0e8a2de7b06263d8 md5=28b13b7253c8f019433be68686070558 sha256=5f53807375473b00f3748456fc8de33e7af300686032d74557fe5f0a931b3227 +[http://www.gpsdrive.de/packages/gpsdrive-2.10pre4.tar.gz] +md5=5d0c7dc9163b2fd9a92ddd886ed7cfab +sha256=ebefe385ec41e3ff26fa55c0fcecbed75d4cd5581ae5ae39038aac796af126c6 + [http://downloads.sourceforge.net/gpstk/gpstk-1.2-src.tar.gz] md5=541ec5a5b86cf9e56f0b23cf6c80dd6e sha256=c1378384b1737b2fa330f8d63d7777db311c976bb20e0c0e0fcd5dac0e78672a -- cgit v1.2.3 From f0992ce7b0a5f9ae7e4ae3ae945e2aa66e09c059 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 31 Jan 2008 10:27:05 +0000 Subject: linux-openmoko-devel: add 2.6.24 --- packages/linux/linux-openmoko-devel_2.6.24.bb | 57 +++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 packages/linux/linux-openmoko-devel_2.6.24.bb diff --git a/packages/linux/linux-openmoko-devel_2.6.24.bb b/packages/linux/linux-openmoko-devel_2.6.24.bb new file mode 100644 index 0000000000..5df2c5c49e --- /dev/null +++ b/packages/linux/linux-openmoko-devel_2.6.24.bb @@ -0,0 +1,57 @@ +require linux.inc +require linux-openmoko.inc + +DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" +VANILLA_VERSION = "2.6.24" +KERNEL_RELEASE = "2.6.24" + +PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PR = "r0" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "30008000" + +############################################################## +# source and patches +# +SRCREV_FORMAT = "patches-rconfig" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ +# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ + svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " + +S = "${WORKDIR}/linux-${VANILLA_VERSION}" + +############################################################## +# kernel image resides on a seperate flash partition (for now) +# +FILES_kernel-image = "" +ALLOW_EMPTY = "1" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' + +CMDLINE = "unused -- bootloader passes ATAG list" + +############################################################### +# module configs specific to this kernel +# + +# usb +module_autoload_ohci-hcd = "ohci-hcd" +module_autoload_hci_usb = "hci_usb" +module_autoload_g_ether = "g_ether" +# audio +module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +# sd/mmc +module_autoload_s3cmci = "s3cmci" + +do_prepatch() { + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + mv patches patches.openmoko + mv .pc .pc.old + mv ${WORKDIR}/config/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig +} + +addtask prepatch after do_unpack before do_patch -- cgit v1.2.3 From d73bf2f660a301245858ff3559844b53e3ed24eb Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 31 Jan 2008 10:34:47 +0000 Subject: qtopia-phone_4.3.0.bb : import qtopia phone into OM mtn, not for mergeing into OE yet. --- packages/qtopia-phone/.mtn2git_empty | 0 packages/qtopia-phone/files/.mtn2git_empty | 0 .../qtopia-phone/files/fic-gta01/.mtn2git_empty | 0 packages/qtopia-phone/files/fic-gta01/device-conf | 46 +++++++ .../qtopia-phone/files/fic-gta01/device-conf.old | 48 +++++++ .../qtopia-phone/files/fic-gta01/qplatformdefs.h | 146 +++++++++++++++++++++ .../qtopia-phone/files/fic-gta02/.mtn2git_empty | 0 packages/qtopia-phone/files/fic-gta02/device-conf | 46 +++++++ .../qtopia-phone/files/fic-gta02/device-conf.old | 48 +++++++ .../qtopia-phone/files/fic-gta02/qplatformdefs.h | 146 +++++++++++++++++++++ packages/qtopia-phone/qtopia-phone_4.3.0.bb | 114 ++++++++++++++++ packages/qtopia-phone/qtopia-phone_arch.inc | 23 ++++ 12 files changed, 617 insertions(+) create mode 100644 packages/qtopia-phone/.mtn2git_empty create mode 100644 packages/qtopia-phone/files/.mtn2git_empty create mode 100644 packages/qtopia-phone/files/fic-gta01/.mtn2git_empty create mode 100644 packages/qtopia-phone/files/fic-gta01/device-conf create mode 100644 packages/qtopia-phone/files/fic-gta01/device-conf.old create mode 100644 packages/qtopia-phone/files/fic-gta01/qplatformdefs.h create mode 100644 packages/qtopia-phone/files/fic-gta02/.mtn2git_empty create mode 100644 packages/qtopia-phone/files/fic-gta02/device-conf create mode 100644 packages/qtopia-phone/files/fic-gta02/device-conf.old create mode 100644 packages/qtopia-phone/files/fic-gta02/qplatformdefs.h create mode 100644 packages/qtopia-phone/qtopia-phone_4.3.0.bb create mode 100644 packages/qtopia-phone/qtopia-phone_arch.inc diff --git a/packages/qtopia-phone/.mtn2git_empty b/packages/qtopia-phone/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/files/.mtn2git_empty b/packages/qtopia-phone/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf b/packages/qtopia-phone/files/fic-gta01/device-conf new file mode 100644 index 0000000000..f1c3b21f24 --- /dev/null +++ b/packages/qtopia-phone/files/fic-gta01/device-conf @@ -0,0 +1,46 @@ +-arch OE_QT_ARCH +-xplatform OE_QT_XPLATFORM +-verbose +-qtopiamedia +-mediaengines gstreamer +-extra-qtopiacore-config "-qt-mouse-linuxtp" +-extra-qtopiacore-config "-depths 16" +-no-infrared +-dbus +-dbuspath OE_QT_DBUSPATH +-iconsize 22 +-displaysize 480x640 +-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" +-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES" +-extra-qtopiacore-config "-fast" +-extra-qtopiacore-config "-no-accessibility" +-extra-qtopiacore-config "-no-cups" +-extra-qtopiacore-config "-no-freetype" +-extra-qtopiacore-config "-nomake demos" +-extra-qtopiacore-config "-nomake examples" +-extra-qtopiacore-config "-qt-gfx-linuxfb" +-extra-qtopiacore-config "-qt-libjpeg" +-extra-qtopiacore-config "-qt-libmng" +-extra-qtopiacore-config "-qt-libpng" +-extra-qtopiacore-config "-qt-mouse-tslib" +-extra-qtopiacore-config "-qt-zlib" +-extra-qtopiacore-config "-release" +-extra-qtopiacore-config "OE_QT_ENDIAN" +-extra-qt-config "-nomake examples" +-extra-qt-config "-nomake demos" +-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 +-image OE_QT_RPREFIX +-launch-method quicklaunch +-force-quicklaunch +-no-clean +-no-drm +-no-qvfb +-no-vpn +-no-sxe +-no-silent +-prefix OE_QT_RPREFIX +-reduce-exports=yes +-release +-confirm-license +OE_QT_EXTRACONFIG + diff --git a/packages/qtopia-phone/files/fic-gta01/device-conf.old b/packages/qtopia-phone/files/fic-gta01/device-conf.old new file mode 100644 index 0000000000..37a9d1e7de --- /dev/null +++ b/packages/qtopia-phone/files/fic-gta01/device-conf.old @@ -0,0 +1,48 @@ +-arch OE_QT_ARCH +-xplatform OE_QT_XPLATFORM +-verbose +-qtopiamedia +-mediaengines gstreamer +-extra-qtopiacore-config "-qt-mouse-linuxtp" +-extra-qtopiacore-config "-depths OE_QT_DEPTHS" +-no-infrared +-dbus +-dbuspath OE_QT_DBUSPATH +-iconsize OT_QT_ICONSIZE +-displaysize OE_QT_DISPLAYSIZE +-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" +-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES" +-extra-qtopiacore-config "-fast" +-extra-qtopiacore-config "-no-accessibility" +-extra-qtopiacore-config "-no-cups" +-extra-qtopiacore-config "-no-freetype" +-extra-qtopiacore-config "-nomake demos" +-extra-qtopiacore-config "-nomake examples" +-extra-qtopiacore-config "-qt-gfx-linuxfb" +-extra-qtopiacore-config "-qt-libjpeg" +-extra-qtopiacore-config "-qt-libmng" +-extra-qtopiacore-config "-qt-libpng" +-extra-qtopiacore-config "-qt-mouse-tslib" +-extra-qtopiacore-config "-qt-zlib" +-extra-qtopiacore-config "-release" +#-extra-qtopiacore-config "-LOE_QT_LIBDIR" +#-extra-qtopiacore-config "-IOE_QT_INCDIR" +-extra-qtopiacore-config "OE_QT_ENDIAN" +-extra-qt-config "-nomake examples" +-extra-qt-config "-nomake demos" +-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 +-image OE_QT_RPREFEX +-launch-method quicklaunch +-force-quicklaunch +-no-clean +-no-drm +-no-qvfb +-no-vpn +-no-sxe +-no-silent +-prefix OE_QT_RPREFIX +-reduce-exports=yes +-release +-confirm-license +OE_QT_EXTRACONFIG + diff --git a/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h b/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h new file mode 100644 index 0000000000..c216578d97 --- /dev/null +++ b/packages/qtopia-phone/files/fic-gta01/qplatformdefs.h @@ -0,0 +1,146 @@ +/**************************************************************************** +** +** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved. +** +** This file is part of the Opensource Edition of the Qtopia Toolkit. +** +** This software is licensed under the terms of the GNU General Public +** License (GPL) version 2. +** +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact info@trolltech.com if any conditions of this licensing are +** not clear to you. +** +** +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ + +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +// Get Qt defines/settings + +#include "qglobal.h" + +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs + +// 1) need to reset default environment if _BSD_SOURCE is defined +// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 +// 3) it seems older glibc need this to include the X/Open stuff +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif + +#include + + +// We are hot - unistd.h should have turned on the specific APIs we requested + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef QT_NO_IPV6IFNAME +#include +#endif + +#ifdef QT_LARGEFILE_SUPPORT +#define QT_STATBUF struct stat64 +#define QT_STATBUF4TSTAT struct stat64 +#define QT_STAT ::stat64 +#define QT_FSTAT ::fstat64 +#define QT_LSTAT ::lstat64 +#define QT_OPEN ::open64 +#define QT_TRUNCATE ::truncate64 +#define QT_FTRUNCATE ::ftruncate64 +#define QT_LSEEK ::lseek64 +#else +#define QT_STATBUF struct stat +#define QT_STATBUF4TSTAT struct stat +#define QT_STAT ::stat +#define QT_FSTAT ::fstat +#define QT_LSTAT ::lstat +#define QT_OPEN ::open +#define QT_TRUNCATE ::truncate +#define QT_FTRUNCATE ::ftruncate +#define QT_LSEEK ::lseek +#endif + +#ifdef QT_LARGEFILE_SUPPORT +#define QT_FOPEN ::fopen64 +#define QT_FSEEK ::fseeko64 +#define QT_FTELL ::ftello64 +#define QT_FGETPOS ::fgetpos64 +#define QT_FSETPOS ::fsetpos64 +#define QT_FPOS_T fpos64_t +#define QT_OFF_T off64_t +#else +#define QT_FOPEN ::fopen +#define QT_FSEEK ::fseek +#define QT_FTELL ::ftell +#define QT_FGETPOS ::fgetpos +#define QT_FSETPOS ::fsetpos +#define QT_FPOS_T fpos_t +#define QT_OFF_T long +#endif + +#define QT_STAT_REG S_IFREG +#define QT_STAT_DIR S_IFDIR +#define QT_STAT_MASK S_IFMT +#define QT_STAT_LNK S_IFLNK +#define QT_SOCKET_CONNECT ::connect +#define QT_SOCKET_BIND ::bind +#define QT_SOCKET_BIND ::bind +#define QT_FILENO fileno +#define QT_CLOSE ::close +#define QT_READ ::read +#define QT_WRITE ::write +#define QT_ACCESS ::access +#define QT_GETCWD ::getcwd +#define QT_CHDIR ::chdir +#define QT_MKDIR ::mkdir +#define QT_RMDIR ::rmdir +#define QT_OPEN_LARGEFILE O_LARGEFILE +#define QT_OPEN_RDONLY O_RDONLY +#define QT_OPEN_WRONLY O_WRONLY +#define QT_OPEN_RDWR O_RDWR +#define QT_OPEN_CREAT O_CREAT +#define QT_OPEN_TRUNC O_TRUNC +#define QT_OPEN_APPEND O_APPEND + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE SIG_IGN + +#if defined(__GLIBC__) && (__GLIBC__ >= 2) +#define QT_SOCKLEN_T socklen_t +#else +#define QT_SOCKLEN_T int +#endif + +#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf +#endif + +#define QT_QLOCALE_USES_FCVT + +#endif // QPLATFORMDEFS_H diff --git a/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty b/packages/qtopia-phone/files/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf b/packages/qtopia-phone/files/fic-gta02/device-conf new file mode 100644 index 0000000000..f1c3b21f24 --- /dev/null +++ b/packages/qtopia-phone/files/fic-gta02/device-conf @@ -0,0 +1,46 @@ +-arch OE_QT_ARCH +-xplatform OE_QT_XPLATFORM +-verbose +-qtopiamedia +-mediaengines gstreamer +-extra-qtopiacore-config "-qt-mouse-linuxtp" +-extra-qtopiacore-config "-depths 16" +-no-infrared +-dbus +-dbuspath OE_QT_DBUSPATH +-iconsize 22 +-displaysize 480x640 +-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" +-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES" +-extra-qtopiacore-config "-fast" +-extra-qtopiacore-config "-no-accessibility" +-extra-qtopiacore-config "-no-cups" +-extra-qtopiacore-config "-no-freetype" +-extra-qtopiacore-config "-nomake demos" +-extra-qtopiacore-config "-nomake examples" +-extra-qtopiacore-config "-qt-gfx-linuxfb" +-extra-qtopiacore-config "-qt-libjpeg" +-extra-qtopiacore-config "-qt-libmng" +-extra-qtopiacore-config "-qt-libpng" +-extra-qtopiacore-config "-qt-mouse-tslib" +-extra-qtopiacore-config "-qt-zlib" +-extra-qtopiacore-config "-release" +-extra-qtopiacore-config "OE_QT_ENDIAN" +-extra-qt-config "-nomake examples" +-extra-qt-config "-nomake demos" +-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 +-image OE_QT_RPREFIX +-launch-method quicklaunch +-force-quicklaunch +-no-clean +-no-drm +-no-qvfb +-no-vpn +-no-sxe +-no-silent +-prefix OE_QT_RPREFIX +-reduce-exports=yes +-release +-confirm-license +OE_QT_EXTRACONFIG + diff --git a/packages/qtopia-phone/files/fic-gta02/device-conf.old b/packages/qtopia-phone/files/fic-gta02/device-conf.old new file mode 100644 index 0000000000..37a9d1e7de --- /dev/null +++ b/packages/qtopia-phone/files/fic-gta02/device-conf.old @@ -0,0 +1,48 @@ +-arch OE_QT_ARCH +-xplatform OE_QT_XPLATFORM +-verbose +-qtopiamedia +-mediaengines gstreamer +-extra-qtopiacore-config "-qt-mouse-linuxtp" +-extra-qtopiacore-config "-depths OE_QT_DEPTHS" +-no-infrared +-dbus +-dbuspath OE_QT_DBUSPATH +-iconsize OT_QT_ICONSIZE +-displaysize OE_QT_DISPLAYSIZE +-extra-qtopiacore-config "-D QT_QWS_SCREENCORDS" +-extra-qtopiacore-config "-D QT_QWS_SCREEN_COORDINATES" +-extra-qtopiacore-config "-fast" +-extra-qtopiacore-config "-no-accessibility" +-extra-qtopiacore-config "-no-cups" +-extra-qtopiacore-config "-no-freetype" +-extra-qtopiacore-config "-nomake demos" +-extra-qtopiacore-config "-nomake examples" +-extra-qtopiacore-config "-qt-gfx-linuxfb" +-extra-qtopiacore-config "-qt-libjpeg" +-extra-qtopiacore-config "-qt-libmng" +-extra-qtopiacore-config "-qt-libpng" +-extra-qtopiacore-config "-qt-mouse-tslib" +-extra-qtopiacore-config "-qt-zlib" +-extra-qtopiacore-config "-release" +#-extra-qtopiacore-config "-LOE_QT_LIBDIR" +#-extra-qtopiacore-config "-IOE_QT_INCDIR" +-extra-qtopiacore-config "OE_QT_ENDIAN" +-extra-qt-config "-nomake examples" +-extra-qt-config "-nomake demos" +-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 +-image OE_QT_RPREFEX +-launch-method quicklaunch +-force-quicklaunch +-no-clean +-no-drm +-no-qvfb +-no-vpn +-no-sxe +-no-silent +-prefix OE_QT_RPREFIX +-reduce-exports=yes +-release +-confirm-license +OE_QT_EXTRACONFIG + diff --git a/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h new file mode 100644 index 0000000000..c216578d97 --- /dev/null +++ b/packages/qtopia-phone/files/fic-gta02/qplatformdefs.h @@ -0,0 +1,146 @@ +/**************************************************************************** +** +** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved. +** +** This file is part of the Opensource Edition of the Qtopia Toolkit. +** +** This software is licensed under the terms of the GNU General Public +** License (GPL) version 2. +** +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact info@trolltech.com if any conditions of this licensing are +** not clear to you. +** +** +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ + +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +// Get Qt defines/settings + +#include "qglobal.h" + +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs + +// 1) need to reset default environment if _BSD_SOURCE is defined +// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 +// 3) it seems older glibc need this to include the X/Open stuff +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif + +#include + + +// We are hot - unistd.h should have turned on the specific APIs we requested + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef QT_NO_IPV6IFNAME +#include +#endif + +#ifdef QT_LARGEFILE_SUPPORT +#define QT_STATBUF struct stat64 +#define QT_STATBUF4TSTAT struct stat64 +#define QT_STAT ::stat64 +#define QT_FSTAT ::fstat64 +#define QT_LSTAT ::lstat64 +#define QT_OPEN ::open64 +#define QT_TRUNCATE ::truncate64 +#define QT_FTRUNCATE ::ftruncate64 +#define QT_LSEEK ::lseek64 +#else +#define QT_STATBUF struct stat +#define QT_STATBUF4TSTAT struct stat +#define QT_STAT ::stat +#define QT_FSTAT ::fstat +#define QT_LSTAT ::lstat +#define QT_OPEN ::open +#define QT_TRUNCATE ::truncate +#define QT_FTRUNCATE ::ftruncate +#define QT_LSEEK ::lseek +#endif + +#ifdef QT_LARGEFILE_SUPPORT +#define QT_FOPEN ::fopen64 +#define QT_FSEEK ::fseeko64 +#define QT_FTELL ::ftello64 +#define QT_FGETPOS ::fgetpos64 +#define QT_FSETPOS ::fsetpos64 +#define QT_FPOS_T fpos64_t +#define QT_OFF_T off64_t +#else +#define QT_FOPEN ::fopen +#define QT_FSEEK ::fseek +#define QT_FTELL ::ftell +#define QT_FGETPOS ::fgetpos +#define QT_FSETPOS ::fsetpos +#define QT_FPOS_T fpos_t +#define QT_OFF_T long +#endif + +#define QT_STAT_REG S_IFREG +#define QT_STAT_DIR S_IFDIR +#define QT_STAT_MASK S_IFMT +#define QT_STAT_LNK S_IFLNK +#define QT_SOCKET_CONNECT ::connect +#define QT_SOCKET_BIND ::bind +#define QT_SOCKET_BIND ::bind +#define QT_FILENO fileno +#define QT_CLOSE ::close +#define QT_READ ::read +#define QT_WRITE ::write +#define QT_ACCESS ::access +#define QT_GETCWD ::getcwd +#define QT_CHDIR ::chdir +#define QT_MKDIR ::mkdir +#define QT_RMDIR ::rmdir +#define QT_OPEN_LARGEFILE O_LARGEFILE +#define QT_OPEN_RDONLY O_RDONLY +#define QT_OPEN_WRONLY O_WRONLY +#define QT_OPEN_RDWR O_RDWR +#define QT_OPEN_CREAT O_CREAT +#define QT_OPEN_TRUNC O_TRUNC +#define QT_OPEN_APPEND O_APPEND + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE SIG_IGN + +#if defined(__GLIBC__) && (__GLIBC__ >= 2) +#define QT_SOCKLEN_T socklen_t +#else +#define QT_SOCKLEN_T int +#endif + +#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf +#endif + +#define QT_QLOCALE_USES_FCVT + +#endif // QPLATFORMDEFS_H diff --git a/packages/qtopia-phone/qtopia-phone_4.3.0.bb b/packages/qtopia-phone/qtopia-phone_4.3.0.bb new file mode 100644 index 0000000000..ed6e153559 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone_4.3.0.bb @@ -0,0 +1,114 @@ +# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone +# distribution. +# +# Please DO NOT merge this file into OE, it is not suitable for that yet as +# it compiles both native and target binaries. This requires stuff to be +# installed on the host which is against the aim of OE. + +DESCRIPTION = "Qtopia OpenSource" +SECTION = "qtopia-phone" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS = "glib-2.0 dbus tslib gstreamer" +PROVIDES = "qtopia-phone" +PR = "r1" +SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \ + file://device-conf \ + file://qplatformdefs.h" + +S = "${WORKDIR}/qtopia-opensource-${PV}" + +inherit pkgconfig update-rc.d + +TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" + +INITSCRIPT_NAME = "qpe" +INITSCRIPT_PARAMS = "defaults 98" + +export QTOPIA_DEPOT_PATH = "${S}" + +require qtopia-phone_arch.inc + +QT_ARCH = "${@qtopia_arch(d)}" +QT_ENDIAN = "${@qtopia_endian(d)}" +PLATFORM = "${BUILD_OS}-g++" +XPLATFORM = "linux-oe-g++" +BUILDDIR = "${WORKDIR}/build" + +OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" +OE_QT_ARCH = "${QT_ARCH}" +OE_QT_XPLATFORM = "${XPLATFORM}" +OE_QT_LIBDIR = "${STAGING_LIBDIR}" +OE_QT_INCDIR = "${STAGING_INCDIR}" +OE_QT_RPREFIX = "/opt/Qtopia" +OE_QT_ENDIAN = "${QT_ENDIAN}" +OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" + +do_configure() { + +unset CC +unset CXX +unset CFLAGS +unset CXXFLAGS +unset LDFLAGS + +mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \ + ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +install -m 644 ${WORKDIR}/qplatformdefs.h \ + ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf +sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf + +# sed the dynamic config into the file +sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf + +rm -f ${S}/devices/${TARGET-DEVICE}/configure +cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure +rm -f ${S}/devices/${TARGET-DEVICE}/environment +echo "" > ${S}/devices/${TARGET-DEVICE}/environment + +mkdir -p ${BUILDDIR} +cd ${BUILDDIR} +echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} + +} + +do_compile() { + cd ${BUILDDIR} + oe_runmake +} + +do_stage() { +} + + +do_install() { + cd ${BUILDDIR} + oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe + +} + +FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ + ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \ + ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \ + ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \ + ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \ + ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts" + +FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so" + diff --git a/packages/qtopia-phone/qtopia-phone_arch.inc b/packages/qtopia-phone/qtopia-phone_arch.inc new file mode 100644 index 0000000000..84f0e51d01 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone_arch.inc @@ -0,0 +1,23 @@ +inherit siteinfo + +def qtopia_arch(d): + import bb, re + arch = bb.data.getVar('TARGET_ARCH', d, 1) + if re.match("^i.86$", arch): + arch = "i386" + elif re.match("^arm.*", arch): + arch = "arm" + elif arch == "x86_64": + arch = "x86" + elif arch == "mipsel": + arch = "mips" + return arch + +def qtopia_endian(d): + import bb + if bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "le": + return "-little-endian" + elif bb.data.getVar('SITEINFO_ENDIANESS', d, True) == "be": + return "-big-endian" + else: + assert False -- cgit v1.2.3 From 5f9b51814f7d5cb37bda7c079fa5a109c4b2086a Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 31 Jan 2008 10:37:47 +0000 Subject: openmoko-qtopia-image.bb, task-openmoko-qtopia.bb : image and tasks for the openmoko qtopia --- packages/images/openmoko-qtopia-image.bb | 26 ++++++++++++++++++++++++++ packages/tasks/task-openmoko-qtopia.bb | 22 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 packages/images/openmoko-qtopia-image.bb create mode 100644 packages/tasks/task-openmoko-qtopia.bb diff --git a/packages/images/openmoko-qtopia-image.bb b/packages/images/openmoko-qtopia-image.bb new file mode 100644 index 0000000000..ab88262443 --- /dev/null +++ b/packages/images/openmoko-qtopia-image.bb @@ -0,0 +1,26 @@ +#------------------------------------------------------ +# OpenMoko Image Recipe +#------------------------------------------------------ + +export IMAGE_BASENAME = "${PN}" +export IMAGE_LINGUAS = "" + +IMAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + task-openmoko-linux \ + alsa-state \ + bluez-hcidump \ + bluez-utils \ + task-openmoko-qtopia \ +" +DEPENDS = "\ + ${MACHINE_TASK_PROVIDER} \ + task-openmoko-qtopia \ +" + +RDEPENDS = "${PACKAGE_INSTALL}" + +inherit image + +LICENSE = MIT + diff --git a/packages/tasks/task-openmoko-qtopia.bb b/packages/tasks/task-openmoko-qtopia.bb new file mode 100644 index 0000000000..6179bae8e6 --- /dev/null +++ b/packages/tasks/task-openmoko-qtopia.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +ALLOW_EMPTY = "1" +PACKAGE_ARCH = "all" +LICENSE = "MIT" +PR = "r45" + +PACKAGES = "task-openmoko-qtopia" + +# +# task-openmoko-qtopia +# +DESCRIPTION_task-openmoko-qtopia = "OpenMoko: The Qtopia based native User Interface" +RDEPENDS_task-openmoko-qtopia = "\ + alsa-state \ + bluez-hcidump \ + readline \ + gstreamer \ + bootchart \ + qtopia-phone \ +" + -- cgit v1.2.3 From eacf03d9b08bdb3a66f5d6860703ba7856e8f0f2 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 31 Jan 2008 10:45:12 +0000 Subject: alsa-state: update for fic-gta02 --- packages/alsa/alsa-state.bb | 2 +- packages/alsa/alsa-state/fic-gta02/asound.state | 24 +- .../alsa/alsa-state/fic-gta02/gsmhandset.state | 859 +++++++++++++++++++++ packages/alsa/alsa-state/fic-gta02/stereoout.state | 24 +- 4 files changed, 868 insertions(+), 41 deletions(-) create mode 100644 packages/alsa/alsa-state/fic-gta02/gsmhandset.state diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 02957aebe9..769b427cd5 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r9" +PR = "r10" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state index df824b66b6..c138749631 100644 --- a/packages/alsa/alsa-state/fic-gta02/asound.state +++ b/packages/alsa/alsa-state/fic-gta02/asound.state @@ -26,8 +26,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.4 { comment.access 'read write' @@ -36,8 +36,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 0 + value.1 0 } control.5 { comment.access 'read write' @@ -854,22 +854,6 @@ state.neo1973gta02 { comment.count 1 iface MIXER name 'DAPM Handset Spk Switch' - value false - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' value true } } diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state new file mode 100644 index 0000000000..348b109d8d --- /dev/null +++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state @@ -0,0 +1,859 @@ +state.neo1973gta02 { + control.1 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'PCM Volume' + value.0 255 + value.1 255 + } + control.2 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 255' + iface MIXER + name 'ADC Capture Volume' + value.0 195 + value.1 195 + } + control.3 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + iface MIXER + name 'Headphone Playback Volume' + value.0 121 + value.1 121 + } + control.4 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 127' + iface MIXER + name 'Speaker Playback Volume' + value.0 127 + value.1 127 + } + control.5 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 127' + iface MIXER + name 'Mono Playback Volume' + value 115 + } + control.6 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Bypass Playback Volume' + value.0 2 + value.1 2 + } + control.7 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Sidetone Playback Volume' + value.0 2 + value.1 2 + } + control.8 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Voice Playback Volume' + value.0 2 + value.1 2 + } + control.9 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Headphone Playback ZC Switch' + value.0 false + value.1 true + } + control.10 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Speaker Playback ZC Switch' + value.0 false + value.1 true + } + control.11 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mono Bypass Playback Volume' + value 3 + } + control.12 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mono Sidetone Playback Volume' + value 1 + } + control.13 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Mono Voice Playback Volume' + value 1 + } + control.14 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Playback ZC Switch' + value false + } + control.15 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Linear Control' + comment.item.1 'Adaptive Boost' + iface MIXER + name 'Bass Boost' + value 'Linear Control' + } + control.16 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '130Hz @ 48kHz' + comment.item.1 '200Hz @ 48kHz' + comment.item.2 '100Hz @ 16kHz' + comment.item.3 '400Hz @ 48kHz' + comment.item.4 '100Hz @ 8kHz' + comment.item.5 '200Hz @ 8kHz' + iface MIXER + name 'Bass Filter' + value '130Hz @ 48kHz' + } + control.17 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Bass Volume' + value 0 + } + control.18 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'Treble Volume' + value 7 + } + control.19 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '8kHz' + comment.item.1 '4kHz' + iface MIXER + name 'Treble Cut-off' + value '8kHz' + } + control.20 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 7' + iface MIXER + name 'Sidetone Capture Volume' + value.0 2 + value.1 2 + } + control.21 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'Voice Sidetone Capture Volume' + value 2 + } + control.22 { + comment.access 'read write' + comment.type INTEGER + comment.count 2 + comment.range '0 - 63' + iface MIXER + name 'Capture Volume' + value.0 24 + value.1 24 + } + control.23 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture ZC Switch' + value.0 false + value.1 false + } + control.24 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 2 + iface MIXER + name 'Capture Switch' + value.0 true + value.1 true + } + control.25 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '3.4Hz @ 48kHz' + comment.item.1 '82Hz @ 16k' + comment.item.2 '82Hz @ 8kHz' + comment.item.3 '170Hz @ 8kHz' + iface MIXER + name 'Capture Filter Select' + value '3.4Hz @ 48kHz' + } + control.26 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 HiFi + comment.item.1 Voice + iface MIXER + name 'Capture Filter Cut-off' + value HiFi + } + control.27 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Capture Filter Switch' + value false + } + control.28 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'ALC Capture Target Volume' + value 3 + } + control.29 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 7' + iface MIXER + name 'ALC Capture Max Volume' + value 1 + } + control.30 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Off + comment.item.1 Right + comment.item.2 Left + comment.item.3 Stereo + iface MIXER + name 'ALC Capture Function' + value Stereo + } + control.31 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Capture ZC Switch' + value false + } + control.32 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Hold Time' + value 7 + } + control.33 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Decay Time' + value 12 + } + control.34 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name 'ALC Capture Attack Time' + value 2 + } + control.35 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 31' + iface MIXER + name 'ALC Capture NG Threshold' + value 0 + } + control.36 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Constant PGA Gain' + comment.item.1 'Mute ADC Output' + iface MIXER + name 'ALC Capture NG Type' + value 'Constant PGA Gain' + } + control.37 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Capture NG Switch' + value false + } + control.38 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Capture + comment.item.1 Playback + iface MIXER + name '3D Function' + value Capture + } + control.39 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '2.2kHz' + comment.item.1 '1.5kHz' + iface MIXER + name '3D Upper Cut-off' + value '2.2kHz' + } + control.40 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 '200Hz' + comment.item.1 '500Hz' + iface MIXER + name '3D Lower Cut-off' + value '200Hz' + } + control.41 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 15' + iface MIXER + name '3D Volume' + value 0 + } + control.42 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name '3D Switch' + value false + } + control.43 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Capture 6dB Attenuate' + value false + } + control.44 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback 6dB Attenuate' + value false + } + control.45 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 None + comment.item.1 '32kHz' + comment.item.2 '44.1kHz' + comment.item.3 '48kHz' + iface MIXER + name De-emphasis + value None + } + control.46 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 Left + comment.item.2 Right + comment.item.3 Mono + iface MIXER + name 'Playback Mono Mix' + value Stereo + } + control.47 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'Playback Phase' + value 'Non Inverted' + } + control.48 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + iface MIXER + name 'Mic2 Capture Volume' + value 0 + } + control.49 { + comment.access 'read write' + comment.type INTEGER + comment.count 1 + comment.range '0 - 3' + iface MIXER + name 'Mic1 Capture Volume' + value 0 + } + control.50 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'DAI 0' + comment.item.1 'DAI 1' + comment.item.2 'DAI 2' + comment.item.3 'DAI 3' + iface MIXER + name 'DAI Mode' + value 'DAI 0' + } + control.51 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 'Left ADC' + comment.item.2 'Right ADC' + comment.item.3 'Channel Swap' + iface MIXER + name 'ADC Data Select' + value Stereo + } + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Mic 1' + comment.item.1 'Mic 2' + comment.item.2 'Mic 3' + iface MIXER + name 'Mic Selection Mux' + value 'Mic 1' + } + control.53 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'RXP - RXN' + comment.item.1 'RXP + RXN' + comment.item.2 RXP + comment.item.3 RXN + iface MIXER + name 'Rx Mixer' + value 'RXP - RXN' + } + control.54 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line 1 + 2' + comment.item.1 'Line 1 - 2' + comment.item.2 'Line 1' + comment.item.3 'Line 2' + iface MIXER + name 'Line Mixer' + value 'Line 1 + 2' + } + control.55 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line Mix' + comment.item.1 'Rx Mix' + iface MIXER + name 'Line Mono Mux' + value 'Line Mix' + } + control.56 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line 2' + comment.item.1 'Rx Mix' + iface MIXER + name 'Line Right Mux' + value 'Rx Mix' + } + control.57 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Line 1' + comment.item.1 'Rx Mix' + iface MIXER + name 'Line Left Mux' + value 'Rx Mix' + } + control.58 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Line Capture Switch' + value false + } + control.59 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Mic2 Capture Switch' + value true + } + control.60 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Mic1 Capture Switch' + value false + } + control.61 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'ALC Mixer Rx Capture Switch' + value false + } + control.62 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Left PGA' + comment.item.1 'Mic 1' + comment.item.2 'Mic 2' + comment.item.3 'Right PGA' + iface MIXER + name 'Mic Sidetone Mux' + value 'Left PGA' + } + control.63 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 PGA + comment.item.1 'Line or RXP-RXN' + comment.item.2 Sidetone + iface MIXER + name 'Capture Right Mux' + value PGA + } + control.64 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 PGA + comment.item.1 'Line or RXP-RXN' + comment.item.2 Line + iface MIXER + name 'Capture Left Mux' + value PGA + } + control.65 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 'Analogue Mix Left' + comment.item.2 'Analogue Mix Right' + comment.item.3 'Digital Mono Mix' + iface MIXER + name 'Capture Right Mixer' + value Stereo + } + control.66 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 Stereo + comment.item.1 'Analogue Mix Left' + comment.item.2 'Analogue Mix Right' + comment.item.3 'Digital Mono Mix' + iface MIXER + name 'Capture Left Mixer' + value Stereo + } + control.67 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback Mixer Voice Capture Sw' + value false + } + control.68 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback Mixer Left Capture Swi' + value false + } + control.69 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Playback Mixer Right Capture Sw' + value false + } + control.70 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 VREF + comment.item.1 'Capture ST' + comment.item.2 LOUT2 + iface MIXER + name 'Out4 Mux' + value VREF + } + control.71 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 VREF + comment.item.1 ROUT2 + comment.item.2 'Left + Right' + iface MIXER + name 'Out3 Mux' + value VREF + } + control.72 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Inverted Mono 1' + comment.item.1 Left + comment.item.2 Right + comment.item.3 'Left + Right' + iface MIXER + name 'Mono 2 Mux' + value 'Inverted Mono 1' + } + control.73 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Left Playback Switch' + value false + } + control.74 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Right Playback Switc' + value false + } + control.75 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Voice Playback Switc' + value false + } + control.76 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Sidetone Playback Sw' + value true + } + control.77 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Mono Mixer Bypass Playback Swit' + value false + } + control.78 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Voice Playback Swit' + value false + } + control.79 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Sidetone Playback S' + value true + } + control.80 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Right Playback Swit' + value false + } + control.81 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Right Mixer Bypass Playback Swi' + value false + } + control.82 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Voice Playback Switc' + value false + } + control.83 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Sidetone Playback Sw' + value false + } + control.84 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Left Playback Switch' + value false + } + control.85 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Left Mixer Bypass Playback Swit' + value true + } + control.86 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Stereo Out Switch' + value true + } + control.87 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM GSM Line Out Switch' + value true + } + control.88 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM GSM Line In Switch' + value false + } + control.89 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Headset Mic Switch' + value false + } + control.90 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Handset Mic Switch' + value true + } + control.91 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'DAPM Handset Spk Switch' + value true + } +} diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state index df824b66b6..c138749631 100644 --- a/packages/alsa/alsa-state/fic-gta02/stereoout.state +++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state @@ -26,8 +26,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 127 + value.1 127 } control.4 { comment.access 'read write' @@ -36,8 +36,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Speaker Playback Volume' - value.0 121 - value.1 121 + value.0 0 + value.1 0 } control.5 { comment.access 'read write' @@ -854,22 +854,6 @@ state.neo1973gta02 { comment.count 1 iface MIXER name 'DAPM Handset Spk Switch' - value false - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' value true } } -- cgit v1.2.3 From b05a622f6c8c3160467cd89c67f05f029aa9f0c7 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 31 Jan 2008 10:56:21 +0000 Subject: libgsmd: add support for fic-gta02 --- packages/gsm/files/fic-gta02/.mtn2git_empty | 0 packages/gsm/files/fic-gta02/default | 49 +++++++++++++++++++++++++++++ packages/gsm/files/fic-gta02/gsmd | 48 ++++++++++++++++++++++++++++ packages/gsm/gsmd.inc | 2 +- 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 packages/gsm/files/fic-gta02/.mtn2git_empty create mode 100644 packages/gsm/files/fic-gta02/default create mode 100644 packages/gsm/files/fic-gta02/gsmd diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gsm/files/fic-gta02/default b/packages/gsm/files/fic-gta02/default new file mode 100644 index 0000000000..ffff4399cc --- /dev/null +++ b/packages/gsm/files/fic-gta02/default @@ -0,0 +1,49 @@ +# gsmd This shell script configures for the gsmd init script. + +. /etc/init.d/functions + +case `machine_id` in + "gta01"|"gta02") + GSMD_OPTS="-s 115200 -F" + GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on" + GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" + GSM_DL="/sys/bus/platform/devices/neo1973-pm-gsm.0/download" + GSM_DEV="/dev/ttySAC0" + ;; + "htc_apache"|"htc_blueangel"|"htc_universal") + GSMD_OPTS="-s 115200 -F" + GSM_DEV="/dev/ttyS0" + ;; + "htc_himalaya") + GSMD_OPTS="-s 115200 -F" + GSM_DEV="/dev/ttyS2" + ;; + "htc_magician") + GSMD_OPTS="-s 115200 -F" + GSM_DEV="/dev/ttyS1" + ;; + "palm_treo_650") + GSMD_OPTS="-s 460800 -F -w 1" + GSM_DEV="/dev/ttyS0" + ;; + "motorola_ezx_platform") + GSMD_OPTS="-s 115200 -F -v ti" + GSM_DEV="/dev/mux0" + ;; + *) + # Unknown board + + # If you must specify special options, uncomment and modify the next line + #GSMD_OPTS="-s 115200 -F" + + # If your GSM device needs to be powered up, uncomment and modify the next line + #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + + # If your GSM device then needs to be reset, uncomment and modify the next line + #GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" + + # This should be in a common /etc/default/serial, together with + # BT_DEV and IR_DEV for devices that have those on a serial port + #GSM_DEV="/dev/ttyS1" + ;; +esac diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd new file mode 100644 index 0000000000..fadae76aee --- /dev/null +++ b/packages/gsm/files/fic-gta02/gsmd @@ -0,0 +1,48 @@ +#! /bin/sh +# +# gsmd This shell script starts and stops gsmd. +# +# chkconfig: 345 90 40 +# description: Gsmd manages access to a serial- or USB-connected GSM +# processname: gsmd + +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +[ -f /etc/default/rcS ] && . /etc/default/rcS +[ -f /etc/default/gsmd ] && . /etc/default/gsmd + +case "$1" in + start) + [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 ) + [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) + [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) + [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) + [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) + + echo -n "Starting GSM daemon: " + start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & + + if [ $? = 0 ]; then + echo "gsmd." + else + echo "(failed.)" + fi + ;; + stop) + [ -n "$GSM_POW" ] && echo "0" >$GSM_POW + + echo -n "Stopping GSM daemon: " + start-stop-daemon -K -x /usr/sbin/gsmd + echo "gsmd." + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index f7d609e2c9..a6b6fb7a6a 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r40" +PR = "r41" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 84821df6d7ea32309ace6906891501dcd61a588e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 31 Jan 2008 14:17:20 +0000 Subject: linux-openmoko-devel_2.6.24.bb : dont make kernel-image be empty if kernel upgrades are to work. --- packages/linux/linux-openmoko-devel_2.6.24.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/linux/linux-openmoko-devel_2.6.24.bb b/packages/linux/linux-openmoko-devel_2.6.24.bb index 5df2c5c49e..4d4b6d0f5e 100644 --- a/packages/linux/linux-openmoko-devel_2.6.24.bb +++ b/packages/linux/linux-openmoko-devel_2.6.24.bb @@ -26,7 +26,6 @@ S = "${WORKDIR}/linux-${VANILLA_VERSION}" ############################################################## # kernel image resides on a seperate flash partition (for now) # -FILES_kernel-image = "" ALLOW_EMPTY = "1" COMPATIBLE_HOST = "arm.*-linux" -- cgit v1.2.3 From 5ac3def01734d994b589af1d8669a33ae53a188a Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 1 Feb 2008 11:52:09 +0000 Subject: openmoko.conf: add preferred version of gpsdrive. --- conf/distro/openmoko.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index d7b3cf753a..1135c4be8d 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -63,6 +63,7 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" # Select package versions we want to use. PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" +PREFERRED_VERSION_gpsdrive = "2.10pre4" # for jalimo PREFERRED_PROVIDER_classpath = "classpath" -- cgit v1.2.3 From b60c8843a151ee5f3896824eb2684020cd627035 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 1 Feb 2008 11:53:41 +0000 Subject: openmoko.conf: add preferred version of asterisk --- conf/distro/openmoko.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 1135c4be8d..e16cb14729 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -64,6 +64,7 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" PREFERRED_VERSION_gpsdrive = "2.10pre4" +PREFERRED_VERSION_asterisk = "1.4.7" # for jalimo PREFERRED_PROVIDER_classpath = "classpath" -- cgit v1.2.3 From 27b7f39c37021b10c927cc5d29b0dfd22b7ef61f Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 1 Feb 2008 12:02:54 +0000 Subject: task-openmoko-feed: add gpsdrive and asterisk. --- packages/tasks/task-openmoko-feed.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 8e09b3f215..a6cc82ab75 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r21" +PR = "r22" inherit task @@ -36,4 +36,6 @@ RDEPENDS_task-openmoko-feed = "\ x11vnc \ libswt3.4-gtk-java \ cacao \ + gpsdrive \ + asterisk \ " -- cgit v1.2.3 From 27962f88f5dc05c9326024629aeb9c0255ff42bc Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 1 Feb 2008 12:05:20 +0000 Subject: openmoko.conf: preferred version of asterisk should be 1.4.17 instead of 1.4.7 --- conf/distro/openmoko.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index e16cb14729..dcd755e7c8 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -64,7 +64,7 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" PREFERRED_VERSION_gpsdrive = "2.10pre4" -PREFERRED_VERSION_asterisk = "1.4.7" +PREFERRED_VERSION_asterisk = "1.4.17" # for jalimo PREFERRED_PROVIDER_classpath = "classpath" -- cgit v1.2.3 From a3b597a5a82305988f9d6628ad99b393d84fbceb Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 11 Feb 2008 15:54:53 +0000 Subject: alsa-state: add gsmhandset.state for fic-gta02 --- packages/alsa/alsa-state.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 769b427cd5..d4da2c16d4 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -28,6 +28,7 @@ SRC_URI_append_fic-gta01 = " \ SRC_URI_append_fic-gta02 = "\ file://stereoout.state \ + file://gsmhandset.state \ " inherit update-rc.d -- cgit v1.2.3 From dcba63200d9cfed9a31208f395c84cade4a143b8 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 11 Feb 2008 16:36:34 +0000 Subject: alsa-state: forgot to increase PR in the last commit --- packages/alsa/alsa-state.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index d4da2c16d4..7a95b55f34 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r10" +PR = "r11" SRC_URI = " \ file://asoundrc \ -- cgit v1.2.3 From 2a18017828d5f1d1175307818e5d57cf7e5fb422 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 12 Feb 2008 06:38:00 +0000 Subject: task-openmoko-feed: add qtopia-phone --- 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 a6cc82ab75..2f08ae83e8 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r22" +PR = "r23" inherit task @@ -38,4 +38,5 @@ RDEPENDS_task-openmoko-feed = "\ cacao \ gpsdrive \ asterisk \ + qtopia-phone \ " -- cgit v1.2.3 From b78b37d642adf1a16d13ca76fe6fa0997a39644a Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 12 Feb 2008 09:22:35 +0000 Subject: qtopia-phone: move contents to qtopia-phone.inc * add 4.3.1 --- packages/qtopia-phone/qtopia-phone.inc | 114 +++++++++++++++++++++++++++ packages/qtopia-phone/qtopia-phone_4.3.0.bb | 115 +--------------------------- packages/qtopia-phone/qtopia-phone_4.3.1.bb | 1 + 3 files changed, 116 insertions(+), 114 deletions(-) create mode 100644 packages/qtopia-phone/qtopia-phone.inc create mode 100644 packages/qtopia-phone/qtopia-phone_4.3.1.bb diff --git a/packages/qtopia-phone/qtopia-phone.inc b/packages/qtopia-phone/qtopia-phone.inc new file mode 100644 index 0000000000..ed6e153559 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone.inc @@ -0,0 +1,114 @@ +# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone +# distribution. +# +# Please DO NOT merge this file into OE, it is not suitable for that yet as +# it compiles both native and target binaries. This requires stuff to be +# installed on the host which is against the aim of OE. + +DESCRIPTION = "Qtopia OpenSource" +SECTION = "qtopia-phone" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS = "glib-2.0 dbus tslib gstreamer" +PROVIDES = "qtopia-phone" +PR = "r1" +SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \ + file://device-conf \ + file://qplatformdefs.h" + +S = "${WORKDIR}/qtopia-opensource-${PV}" + +inherit pkgconfig update-rc.d + +TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" + +INITSCRIPT_NAME = "qpe" +INITSCRIPT_PARAMS = "defaults 98" + +export QTOPIA_DEPOT_PATH = "${S}" + +require qtopia-phone_arch.inc + +QT_ARCH = "${@qtopia_arch(d)}" +QT_ENDIAN = "${@qtopia_endian(d)}" +PLATFORM = "${BUILD_OS}-g++" +XPLATFORM = "linux-oe-g++" +BUILDDIR = "${WORKDIR}/build" + +OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" +OE_QT_ARCH = "${QT_ARCH}" +OE_QT_XPLATFORM = "${XPLATFORM}" +OE_QT_LIBDIR = "${STAGING_LIBDIR}" +OE_QT_INCDIR = "${STAGING_INCDIR}" +OE_QT_RPREFIX = "/opt/Qtopia" +OE_QT_ENDIAN = "${QT_ENDIAN}" +OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" + +do_configure() { + +unset CC +unset CXX +unset CFLAGS +unset CXXFLAGS +unset LDFLAGS + +mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \ + ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +install -m 644 ${WORKDIR}/qplatformdefs.h \ + ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf +sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf + +# sed the dynamic config into the file +sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf + +rm -f ${S}/devices/${TARGET-DEVICE}/configure +cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure +rm -f ${S}/devices/${TARGET-DEVICE}/environment +echo "" > ${S}/devices/${TARGET-DEVICE}/environment + +mkdir -p ${BUILDDIR} +cd ${BUILDDIR} +echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} + +} + +do_compile() { + cd ${BUILDDIR} + oe_runmake +} + +do_stage() { +} + + +do_install() { + cd ${BUILDDIR} + oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe + +} + +FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ + ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \ + ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \ + ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \ + ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \ + ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts" + +FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so" + diff --git a/packages/qtopia-phone/qtopia-phone_4.3.0.bb b/packages/qtopia-phone/qtopia-phone_4.3.0.bb index ed6e153559..ca6978b952 100644 --- a/packages/qtopia-phone/qtopia-phone_4.3.0.bb +++ b/packages/qtopia-phone/qtopia-phone_4.3.0.bb @@ -1,114 +1 @@ -# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone -# distribution. -# -# Please DO NOT merge this file into OE, it is not suitable for that yet as -# it compiles both native and target binaries. This requires stuff to be -# installed on the host which is against the aim of OE. - -DESCRIPTION = "Qtopia OpenSource" -SECTION = "qtopia-phone" -LICENSE = "GPL" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 dbus tslib gstreamer" -PROVIDES = "qtopia-phone" -PR = "r1" -SRC_URI = "ftp://ftp.trolltech.com/qtopia/source/qtopia-opensource-src-${PV}.tar.gz \ - file://device-conf \ - file://qplatformdefs.h" - -S = "${WORKDIR}/qtopia-opensource-${PV}" - -inherit pkgconfig update-rc.d - -TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}" -TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}" -TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}" -TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" -TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" - -INITSCRIPT_NAME = "qpe" -INITSCRIPT_PARAMS = "defaults 98" - -export QTOPIA_DEPOT_PATH = "${S}" - -require qtopia-phone_arch.inc - -QT_ARCH = "${@qtopia_arch(d)}" -QT_ENDIAN = "${@qtopia_endian(d)}" -PLATFORM = "${BUILD_OS}-g++" -XPLATFORM = "linux-oe-g++" -BUILDDIR = "${WORKDIR}/build" - -OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" -OE_QT_ARCH = "${QT_ARCH}" -OE_QT_XPLATFORM = "${XPLATFORM}" -OE_QT_LIBDIR = "${STAGING_LIBDIR}" -OE_QT_INCDIR = "${STAGING_INCDIR}" -OE_QT_RPREFIX = "/opt/Qtopia" -OE_QT_ENDIAN = "${QT_ENDIAN}" -OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" - -do_configure() { - -unset CC -unset CXX -unset CFLAGS -unset CXXFLAGS -unset LDFLAGS - -mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \ - ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -install -m 644 ${WORKDIR}/qplatformdefs.h \ - ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf -sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf - -# sed the dynamic config into the file -sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf - -rm -f ${S}/devices/${TARGET-DEVICE}/configure -cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure -rm -f ${S}/devices/${TARGET-DEVICE}/environment -echo "" > ${S}/devices/${TARGET-DEVICE}/environment - -mkdir -p ${BUILDDIR} -cd ${BUILDDIR} -echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} - -} - -do_compile() { - cd ${BUILDDIR} - oe_runmake -} - -do_stage() { -} - - -do_install() { - cd ${BUILDDIR} - oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe - -} - -FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ - ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \ - ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \ - ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \ - ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \ - ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts" - -FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so" - +require qtopia-phone.inc diff --git a/packages/qtopia-phone/qtopia-phone_4.3.1.bb b/packages/qtopia-phone/qtopia-phone_4.3.1.bb new file mode 100644 index 0000000000..ca6978b952 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone_4.3.1.bb @@ -0,0 +1 @@ +require qtopia-phone.inc -- cgit v1.2.3 From 9d6b4f60334afcc2c146032a728739590c71f2df Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 12 Feb 2008 09:31:22 +0000 Subject: gnash: create gnash.inc * add gnash 0.8.1 --- packages/gnash/gnash.inc | 79 ++++++++++++++++++++++++++++++++++++++++++ packages/gnash/gnash_0.8.0.bb | 80 +------------------------------------------ packages/gnash/gnash_0.8.1.bb | 1 + 3 files changed, 81 insertions(+), 79 deletions(-) create mode 100644 packages/gnash/gnash.inc create mode 100644 packages/gnash/gnash_0.8.1.bb diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc new file mode 100644 index 0000000000..2168de48c2 --- /dev/null +++ b/packages/gnash/gnash.inc @@ -0,0 +1,79 @@ +DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" + +LICENSE = "GPL-2" +HOMEPAGE = "http://www.gnu.org/software/gnash" + +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" + + +EXTRA_OECONF = "--enable-gui=gtk \ + --enable-renderer=cairo \ + --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}' +} + + +PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " + +FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" +FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" +FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" +FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" +FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" +FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" +FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" + +#do_stage() { +# autotools_stage_all +#} + diff --git a/packages/gnash/gnash_0.8.0.bb b/packages/gnash/gnash_0.8.0.bb index 197cea06b6..da4b281e94 100644 --- a/packages/gnash/gnash_0.8.0.bb +++ b/packages/gnash/gnash_0.8.0.bb @@ -1,79 +1 @@ -DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" - -LICENSE = "GPL-2" -HOMEPAGE = "http://www.gnu.org/software/gnash" - -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" - - -EXTRA_OECONF = "--enable-gui=gtk \ - --enable-renderer=cairo \ - --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}' -} - - -PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " - -FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" -FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" -FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" -FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" -FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" -FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" -FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" - -do_stage() { - autotools_stage_all -} - +require gnash.inc diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb new file mode 100644 index 0000000000..da4b281e94 --- /dev/null +++ b/packages/gnash/gnash_0.8.1.bb @@ -0,0 +1 @@ +require gnash.inc -- cgit v1.2.3 From 51da6e306ab39e64631547efd5e32c45f7347606 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 12 Feb 2008 09:38:28 +0000 Subject: openmoko: set preferred version of gnash to 0.8.1 --- conf/distro/openmoko.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index dcd755e7c8..0976aaf276 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -65,6 +65,7 @@ PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_asterisk = "1.4.17" +PREFERRED_VERSION_gnash = "0.8.1" # for jalimo PREFERRED_PROVIDER_classpath = "classpath" -- cgit v1.2.3 From 257b8147ce33d634e27d912cd27ec78e9aed0e1a Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 12 Feb 2008 09:38:55 +0000 Subject: task-openmoko-feed: add gnash --- 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 2f08ae83e8..c6b09ec65d 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r23" +PR = "r24" inherit task @@ -39,4 +39,5 @@ RDEPENDS_task-openmoko-feed = "\ gpsdrive \ asterisk \ qtopia-phone \ + gnash \ " -- cgit v1.2.3 From 206784fedf6a3ab3c82489ceaf9655e1026c2b34 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 14 Feb 2008 10:28:10 +0000 Subject: linux-openmoko: move 2.6.24 from linux-openmoko-devel to linux-openmoko * make it work with sourcepkg.bbclass by using do_patch_prepend --- packages/linux/linux-openmoko-devel_2.6.24.bb | 56 ------------------------ packages/linux/linux-openmoko_2.6.24.bb | 63 +++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 56 deletions(-) delete mode 100644 packages/linux/linux-openmoko-devel_2.6.24.bb create mode 100644 packages/linux/linux-openmoko_2.6.24.bb diff --git a/packages/linux/linux-openmoko-devel_2.6.24.bb b/packages/linux/linux-openmoko-devel_2.6.24.bb deleted file mode 100644 index 4d4b6d0f5e..0000000000 --- a/packages/linux/linux-openmoko-devel_2.6.24.bb +++ /dev/null @@ -1,56 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.24" -KERNEL_RELEASE = "2.6.24" - -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches-rconfig" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ -# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " - -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/config/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb new file mode 100644 index 0000000000..19c0119f2f --- /dev/null +++ b/packages/linux/linux-openmoko_2.6.24.bb @@ -0,0 +1,63 @@ +require linux.inc +require linux-openmoko.inc + +DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" +VANILLA_VERSION = "2.6.24" +KERNEL_RELEASE = "2.6.24" + +PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PR = "r0" + +KERNEL_IMAGETYPE = "uImage" +UBOOT_ENTRYPOINT = "30008000" + +############################################################## +# source and patches +# +SRCREV_FORMAT = "patches-rconfig" + +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ +# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ + svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ + svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " + +S = "${WORKDIR}/linux-${VANILLA_VERSION}" + +############################################################## +# kernel image resides on a seperate flash partition (for now) +# +ALLOW_EMPTY = "1" + +COMPATIBLE_HOST = "arm.*-linux" +COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' + +CMDLINE = "unused -- bootloader passes ATAG list" + +############################################################### +# module configs specific to this kernel +# + +# usb +module_autoload_ohci-hcd = "ohci-hcd" +module_autoload_hci_usb = "hci_usb" +module_autoload_g_ether = "g_ether" +# audio +module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +# sd/mmc +module_autoload_s3cmci = "s3cmci" + +python do_patch_prepend() { + def runcmd(cmd): + import commands + (status, output) = commands.getstatusoutput(cmd) + if status != 0: + raise Exception, "Status %i: %s" % (status >> 8, output) + return output + runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && ' + 'quilt push -av && mv patches patches.openmoko && ' + 'mv .pc .pc.old && mv %(WORKDIR)s/config/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' % + {'WORKDIR': bb.data.getVar('WORKDIR', d, 1), + 'S': bb.data.getVar('S', d, 1), + 'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)}) + del runcmd +} -- cgit v1.2.3 From d24c535335cbff07ce5039fffce0cc5867b301c3 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 14 Feb 2008 10:30:27 +0000 Subject: gsm: remove machine specific settings for gta01 and gta02 * use the same default and gsmd for gta01 and gta02 * this only works with kernel 2.6.24 --- packages/gsm/files/default | 5 +-- packages/gsm/files/fic-gta01/.mtn2git_empty | 0 packages/gsm/files/fic-gta01/gsmd | 49 ----------------------------- packages/gsm/files/fic-gta02/.mtn2git_empty | 0 packages/gsm/files/fic-gta02/default | 49 ----------------------------- packages/gsm/files/fic-gta02/gsmd | 48 ---------------------------- packages/gsm/files/gsmd | 1 + packages/gsm/gsmd.inc | 2 +- 8 files changed, 5 insertions(+), 149 deletions(-) delete mode 100644 packages/gsm/files/fic-gta01/.mtn2git_empty delete mode 100644 packages/gsm/files/fic-gta01/gsmd delete mode 100644 packages/gsm/files/fic-gta02/.mtn2git_empty delete mode 100644 packages/gsm/files/fic-gta02/default delete mode 100644 packages/gsm/files/fic-gta02/gsmd diff --git a/packages/gsm/files/default b/packages/gsm/files/default index f113d8bab0..ffff4399cc 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -5,8 +5,9 @@ case `machine_id` in "gta01"|"gta02") GSMD_OPTS="-s 115200 -F" - GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" - GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" + GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on" + GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" + GSM_DL="/sys/bus/platform/devices/neo1973-pm-gsm.0/download" GSM_DEV="/dev/ttySAC0" ;; "htc_apache"|"htc_blueangel"|"htc_universal") diff --git a/packages/gsm/files/fic-gta01/.mtn2git_empty b/packages/gsm/files/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd deleted file mode 100644 index d8323e202c..0000000000 --- a/packages/gsm/files/fic-gta01/gsmd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/gsmd ] && . /etc/default/gsmd - -case "$1" in - start) - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) - stty -F "$GSM_DEV" -echo - [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) - - echo -n "Starting GSM daemon: " - start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & - - if [ $? = 0 ]; then - echo "gsmd." - else - echo "(failed.)" - fi - ;; - stop) - echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/sbin/gsmd - stty -F "$GSM_DEV" -crtscts - [ -n "$GSM_POW" ] && echo "0" >$GSM_POW - echo "gsmd." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/gsm/files/fic-gta02/.mtn2git_empty b/packages/gsm/files/fic-gta02/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gsm/files/fic-gta02/default b/packages/gsm/files/fic-gta02/default deleted file mode 100644 index ffff4399cc..0000000000 --- a/packages/gsm/files/fic-gta02/default +++ /dev/null @@ -1,49 +0,0 @@ -# gsmd This shell script configures for the gsmd init script. - -. /etc/init.d/functions - -case `machine_id` in - "gta01"|"gta02") - GSMD_OPTS="-s 115200 -F" - GSM_POW="/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on" - GSM_RES="/sys/bus/platform/devices/neo1973-pm-gsm.0/reset" - GSM_DL="/sys/bus/platform/devices/neo1973-pm-gsm.0/download" - GSM_DEV="/dev/ttySAC0" - ;; - "htc_apache"|"htc_blueangel"|"htc_universal") - GSMD_OPTS="-s 115200 -F" - GSM_DEV="/dev/ttyS0" - ;; - "htc_himalaya") - GSMD_OPTS="-s 115200 -F" - GSM_DEV="/dev/ttyS2" - ;; - "htc_magician") - GSMD_OPTS="-s 115200 -F" - GSM_DEV="/dev/ttyS1" - ;; - "palm_treo_650") - GSMD_OPTS="-s 460800 -F -w 1" - GSM_DEV="/dev/ttyS0" - ;; - "motorola_ezx_platform") - GSMD_OPTS="-s 115200 -F -v ti" - GSM_DEV="/dev/mux0" - ;; - *) - # Unknown board - - # If you must specify special options, uncomment and modify the next line - #GSMD_OPTS="-s 115200 -F" - - # If your GSM device needs to be powered up, uncomment and modify the next line - #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" - - # If your GSM device then needs to be reset, uncomment and modify the next line - #GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset" - - # This should be in a common /etc/default/serial, together with - # BT_DEV and IR_DEV for devices that have those on a serial port - #GSM_DEV="/dev/ttyS1" - ;; -esac diff --git a/packages/gsm/files/fic-gta02/gsmd b/packages/gsm/files/fic-gta02/gsmd deleted file mode 100644 index fadae76aee..0000000000 --- a/packages/gsm/files/fic-gta02/gsmd +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -PATH=/bin:/usr/bin:/sbin:/usr/sbin - -[ -f /etc/default/rcS ] && . /etc/default/rcS -[ -f /etc/default/gsmd ] && . /etc/default/gsmd - -case "$1" in - start) - [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 ) - [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) - [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) - [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 ) - - echo -n "Starting GSM daemon: " - start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 & - - if [ $? = 0 ]; then - echo "gsmd." - else - echo "(failed.)" - fi - ;; - stop) - [ -n "$GSM_POW" ] && echo "0" >$GSM_POW - - echo -n "Stopping GSM daemon: " - start-stop-daemon -K -x /usr/sbin/gsmd - echo "gsmd." - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/gsmd {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 9257b901ad..fadae76aee 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -13,6 +13,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin case "$1" in start) + [ -n "$GSM_DL" ] && ( echo "1" >$GSM_DL; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 ) [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 ) [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 ) diff --git a/packages/gsm/gsmd.inc b/packages/gsm/gsmd.inc index a6b6fb7a6a..5e47847d74 100644 --- a/packages/gsm/gsmd.inc +++ b/packages/gsm/gsmd.inc @@ -5,7 +5,7 @@ SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" PV = "0.1+svnr${SRCREV}" -PR = "r41" +PR = "r42" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 08bb2e329bbebb2116e9674e2bf0d2dc408ca8ad Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 14 Feb 2008 10:36:24 +0000 Subject: openmoko-dialer2: add machine specific patch for backlight and vibrator * this should be done in external config but for now we use patch * gta01 and gta02 use different names for backlight and vibrator under /sys * this only works with kernel 2.6.24 --- .../openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty | 0 .../openmoko-dialer2/fic-gta01/kernel-2.6.24.patch | 13 +++++++++++++ .../openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty | 0 .../openmoko-dialer2/fic-gta02/kernel-2.6.24.patch | 15 +++++++++++++++ packages/openmoko2/openmoko-dialer2_svn.bb | 5 ++++- 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty create mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch new file mode 100644 index 0000000000..c6f34f4131 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch @@ -0,0 +1,13 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 ++++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 +@@ -38,7 +38,7 @@ + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" + #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch new file mode 100644 index 0000000000..72c516f5d6 --- /dev/null +++ b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch @@ -0,0 +1,15 @@ +Index: openmoko-dialer2/src/phone-kit/moko-notify.c +=================================================================== +--- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) ++++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) +@@ -37,8 +37,8 @@ + MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) + + #define DEFAULT_RINGTONE "/default_ringtone.ogg" +-#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" +-#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" ++#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" ++#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" + + struct _MokoNotifyPrivate + { diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb index 3378e43503..4f15ac07dc 100644 --- a/packages/openmoko2/openmoko-dialer2_svn.bb +++ b/packages/openmoko2/openmoko-dialer2_svn.bb @@ -2,11 +2,14 @@ DESCRIPTION = "The OpenMoko Dialer" SECTION = "openmoko/pim" DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" PV = "0.1.0+svnr${SRCREV}" -PR = "r6" +PR = "r7" PE = "1" inherit openmoko2 +SRC_URI_append_fic-gta01 = " file://kernel-2.6.24.patch;patch=1" +SRC_URI_append_fic-gta02 = " file://kernel-2.6.24.patch;patch=1" + EXTRA_OECONF = "--with-dbusbindir=${STAGING_BINDIR_NATIVE}" FILES_${PN} += "${datadir}/openmoko-dialer/ ${datadir}/dbus-1/services/" -- cgit v1.2.3 From 0cfb62fe4e447ffeba8da0168414c84928804035 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 14 Feb 2008 10:45:50 +0000 Subject: u-boot-openmoko: update to newer version of upstream and OM patchset * add machine gta02v5 * remove do_configure_prepend because it's no longer necessary * not applying makefile-no-dirafter.patch for now * not applying fix-data-abort-from-sd-ombug799.patch for now --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) 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 7a9800f94a..b3e420fd06 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 @@ -4,12 +4,12 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -UBOOT_UPSTREAM_REV = "0ec595243dc99edcd248bbcfbfd5a1dc860bde89" -UBOOT_OPENMOKO_REV = "3817" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4" +UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e" +UBOOT_OPENMOKO_REV = "4047" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" LOCALVERSION = "+git${UBOOT_UPSTREAM_REV}+svn${UBOOT_OPENMOKO_REV}" PV = "1.3.1${LOCALVERSION}" -PR = "r1" +PR = "r2" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" @@ -18,11 +18,11 @@ 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-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 \ +# file://makefile-no-dirafter.patch;patch=1 \ +# file://fix-data-abort-from-sd-ombug799.patch;patch=1 \ " -EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +EXTRA_OEMAKE = "ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" do_quilt() { @@ -35,12 +35,6 @@ do_svnrev() { 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} -- cgit v1.2.3 From d43c8fac177b09560b483f6030fac634a6a80dcf Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 14 Feb 2008 10:56:00 +0000 Subject: linux-openmoko: sync 2.6.24 upstream --- packages/linux/linux-openmoko_2.6.24.bb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb index 19c0119f2f..2fef712b57 100644 --- a/packages/linux/linux-openmoko_2.6.24.bb +++ b/packages/linux/linux-openmoko_2.6.24.bb @@ -5,8 +5,11 @@ DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ VANILLA_VERSION = "2.6.24" KERNEL_RELEASE = "2.6.24" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" +# need to synchronize with LOCALVERSION, if set +KERNEL_VERSION = "${KERNEL_RELEASE}" + +PV = "${VANILLA_VERSION}+svnr${SRCREV}" +PR = "r3" KERNEL_IMAGETYPE = "uImage" UBOOT_ENTRYPOINT = "30008000" @@ -17,7 +20,6 @@ UBOOT_ENTRYPOINT = "30008000" SRCREV_FORMAT = "patches-rconfig" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ -# ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1 \ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " @@ -43,6 +45,9 @@ module_autoload_hci_usb = "hci_usb" module_autoload_g_ether = "g_ether" # audio module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" +module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" +module_autoload_snd-pcm-oss = "snd-pcm-oss" +module_autoload_snd-mixer-oss = "snd-mixer-oss" # sd/mmc module_autoload_s3cmci = "s3cmci" -- cgit v1.2.3 From d0483e8ec2a1400fea6ba62908865e43e3f60c15 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 14 Feb 2008 15:59:16 +0000 Subject: linux-openmoko-devel: drop linux-openmoko-devel_2.6.23+2.6.24-rc7.bb --- .../linux-openmoko-devel_2.6.23+2.6.24-rc7.bb | 59 ---------------------- 1 file changed, 59 deletions(-) delete mode 100644 packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb diff --git a/packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb b/packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb deleted file mode 100644 index 4543979eb3..0000000000 --- a/packages/linux/linux-openmoko-devel_2.6.23+2.6.24-rc7.bb +++ /dev/null @@ -1,59 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.23" -KERNEL_RELEASE = "2.6.24-rc7" - -KERNEL_VERSION = "${KERNEL_RELEASE}" - -# If you use a rc, you will need to use this: -PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r0" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches-rconfig" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;tag=v2.6.24-rc7 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " - -S = "${WORKDIR}/git" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -FILES_kernel-image = "" -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/config/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch -- cgit v1.2.3 From 0033bbdf7d0c78f80da70f22cb207b8956e0c671 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 15 Feb 2008 10:49:42 +0000 Subject: dbus: use 1.1.1 instead of 1.0.2 * gconf-dbus: update to newer version to match with dbus --- conf/distro/include/sane-srcrevs.inc | 2 +- conf/distro/openmoko.conf | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a2f1ba375b..0fe80081ce 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -23,7 +23,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" -SRCREV_pn-gconf-dbus ?= "606" +SRCREV_pn-gconf-dbus ?= "638" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "42" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 0976aaf276..a14ad0c618 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -61,6 +61,7 @@ PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" # Select package versions we want to use. +PREFERRED_VERSION_dbus = "1.1.1" PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" PREFERRED_VERSION_gpsdrive = "2.10pre4" -- cgit v1.2.3 From 347ca31547cb4f6f4ea19d85319caad9129db956 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 20 Feb 2008 09:23:46 +0000 Subject: linux-openmoko: update SRCREV to 4082 --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 0fe80081ce..46c90976c8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -45,7 +45,7 @@ SRCREV_pn-libxosd ?= "627" SRCREV_pn-linux-bfin ?= "3758" SRCREV_pn-linux-hackndev-2.6 ?= "1308" SRCREV_pn-linux-ixp4xx ?= "983" -SRCREV_pn-linux-openmoko ?= "3801" +SRCREV_pn-linux-openmoko ?= "4082" SRCREV_pn-llvm-gcc4 ?= "374" SRCREV_pn-llvm-gcc4-cross ?= "374" SRCREV_pn-maemo-mapper ?= "118" -- cgit v1.2.3 From 2900fab04d7d26cbb3b1205fd6a4bb4e36f3a85e Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 21 Feb 2008 07:42:35 +0000 Subject: openmoko: move preferred versions from openmoko.conf to preferred-om-2008-versions.inc, where they should belong. * also changed the preferred version of mono from 1.2.5.1 to 1.2.6. --- conf/distro/include/preferred-om-2008-versions.inc | 6 ++++++ conf/distro/openmoko.conf | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 2c2e0acb03..d7209be624 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1 +1,7 @@ PREFERRED_VERSION_vte = "0.16.10" +PREFERRED_VERSION_dbus = "1.1.1" +PREFERRED_VERSION_gpsdrive = "2.10pre4" +PREFERRED_VERSION_asterisk = "1.4.17" +PREFERRED_VERSION_gnash = "0.8.1" +PREFERRED_VERSION_mono = "1.2.6" +PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index a14ad0c618..d7b3cf753a 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -61,12 +61,8 @@ PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" # Select package versions we want to use. -PREFERRED_VERSION_dbus = "1.1.1" PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" -PREFERRED_VERSION_gpsdrive = "2.10pre4" -PREFERRED_VERSION_asterisk = "1.4.17" -PREFERRED_VERSION_gnash = "0.8.1" # for jalimo PREFERRED_PROVIDER_classpath = "classpath" -- cgit v1.2.3 From bcfeac1803f50b545a019a19555f7c7e925a76c5 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 21 Feb 2008 09:08:47 +0000 Subject: openmoko-feed: add mono --- 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 c6b09ec65d..ce76d6e3f4 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r24" +PR = "r25" inherit task @@ -40,4 +40,5 @@ RDEPENDS_task-openmoko-feed = "\ asterisk \ qtopia-phone \ gnash \ + mono \ " -- cgit v1.2.3 From b14906e8fa695a85b9ddf27838c959be1c8a5fad Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 27 Feb 2008 07:26:33 +0000 Subject: linux-openmoko: remove 2.6.24 to solve merge conflict from upstream --- packages/linux/linux-openmoko_2.6.24.bb | 68 --------------------------------- 1 file changed, 68 deletions(-) delete mode 100644 packages/linux/linux-openmoko_2.6.24.bb diff --git a/packages/linux/linux-openmoko_2.6.24.bb b/packages/linux/linux-openmoko_2.6.24.bb deleted file mode 100644 index 2fef712b57..0000000000 --- a/packages/linux/linux-openmoko_2.6.24.bb +++ /dev/null @@ -1,68 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.24" -KERNEL_RELEASE = "2.6.24" - -# need to synchronize with LOCALVERSION, if set -KERNEL_VERSION = "${KERNEL_RELEASE}" - -PV = "${VANILLA_VERSION}+svnr${SRCREV}" -PR = "r3" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches-rconfig" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=config;proto=http;name=config " - -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753" -module_autoload_snd-pcm-oss = "snd-pcm-oss" -module_autoload_snd-mixer-oss = "snd-mixer-oss" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -python do_patch_prepend() { - def runcmd(cmd): - import commands - (status, output) = commands.getstatusoutput(cmd) - if status != 0: - raise Exception, "Status %i: %s" % (status >> 8, output) - return output - runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && ' - 'quilt push -av && mv patches patches.openmoko && ' - 'mv .pc .pc.old && mv %(WORKDIR)s/config/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' % - {'WORKDIR': bb.data.getVar('WORKDIR', d, 1), - 'S': bb.data.getVar('S', d, 1), - 'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)}) - del runcmd -} -- cgit v1.2.3 From 1e293a850acf953f204eb0458ed94a37e5ff4c9a Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 03:55:02 +0000 Subject: busybox: 1.9.1 add cmp into openmoko distribution --- .../busybox/busybox-1.9.1/openmoko/.mtn2git_empty | 0 packages/busybox/busybox-1.9.1/openmoko/defconfig | 777 +++++++++++++++++++++ packages/busybox/busybox_1.9.1.bb | 2 +- 3 files changed, 778 insertions(+), 1 deletion(-) create mode 100644 packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.9.1/openmoko/defconfig diff --git a/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty b/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.9.1/openmoko/defconfig b/packages/busybox/busybox-1.9.1/openmoko/defconfig new file mode 100644 index 0000000000..d0505e4481 --- /dev/null +++ b/packages/busybox/busybox-1.9.1/openmoko/defconfig @@ -0,0 +1,777 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.9.1 +# Thu Feb 14 11:54:00 2008 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_NITPICK is not set +# CONFIG_DESKTOP is not set +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +# CONFIG_FEATURE_VERBOSE_USAGE is not set +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +CONFIG_FEATURE_SUID_CONFIG_QUIET=y +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +# CONFIG_INCLUDE_SUSv2 is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=2 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +CONFIG_FEATURE_EDITING_FANCY_KEYS=y +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +# CONFIG_FEATURE_AR_LONG_FILENAMES is not set +CONFIG_BUNZIP2=y +# CONFIG_BZIP2 is not set +CONFIG_CPIO=y +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_FEATURE_RPM_BZ2 is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_BZIP2=y +# CONFIG_FEATURE_TAR_LZMA is not set +CONFIG_FEATURE_TAR_FROM=y +CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNLZMA is not set +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +# CONFIG_FEATURE_DATE_ISOFMT is not set +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +# CONFIG_FEATURE_DD_IBS_OBS is not set +CONFIG_DF=y +# CONFIG_FEATURE_DF_INODE is not set +CONFIG_DIRNAME=y +# CONFIG_DOS2UNIX is not set +# CONFIG_UNIX2DOS is not set +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +# CONFIG_FEATURE_FANCY_HEAD is not set +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +# CONFIG_FEATURE_MV_LONG_OPTIONS is not set +# CONFIG_NICE is not set +CONFIG_NOHUP=y +CONFIG_OD=y +# CONFIG_PRINTENV is not set +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_SEQ=y +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +# CONFIG_SPLIT is not set +# CONFIG_FEATURE_SPLIT_FANCY is not set +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +# CONFIG_SUM is not set +CONFIG_SYNC=y +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +# CONFIG_FEATURE_TR_EQUIV is not set +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +# CONFIG_KBD_MODE is not set +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +# CONFIG_RESIZE is not set +# CONFIG_FEATURE_RESIZE_PRINT is not set +CONFIG_SETCONSOLE=y +# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set +# CONFIG_SETKEYCODES is not set +# CONFIG_SETLOGCONS is not set + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +# CONFIG_FEATURE_RUN_PARTS_FANCY is not set +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +# CONFIG_FEATURE_DIFF_MINIMAL is not set +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +# CONFIG_FEATURE_FIND_DELETE is not set +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +# CONFIG_USE_BB_SHADOW is not set +# CONFIG_USE_BB_PWD_GRP is not set +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +# CONFIG_LOGIN_SCRIPTS is not set +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +# CONFIG_CRYPTPW is not set +# CONFIG_CHPASSWD is not set +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +# CONFIG_SULOGIN is not set +CONFIG_VLOCK=y + +# +# Linux Ext2 FS Progs +# +CONFIG_CHATTR=y +CONFIG_FSCK=y +# CONFIG_LSATTR is not set + +# +# Linux Module Utilities +# +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +CONFIG_FBSET=y +CONFIG_FEATURE_FBSET_FANCY=y +CONFIG_FEATURE_FBSET_READMODE=y +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +# CONFIG_FEATURE_FDISK_ADVANCED is not set +# CONFIG_FREERAMDISK is not set +CONFIG_FSCK_MINIX=y +CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# +CONFIG_FEATURE_MINIX2=y +# CONFIG_GETOPT is not set +CONFIG_HEXDUMP=y +# CONFIG_HD is not set +# CONFIG_FEATURE_HEXDUMP_REVERSE is not set +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +# CONFIG_MDEV is not set +# CONFIG_FEATURE_MDEV_CONF is not set +# CONFIG_FEATURE_MDEV_EXEC is not set +# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_MOUNT=y +# CONFIG_FEATURE_MOUNT_HELPERS is not set +CONFIG_FEATURE_MOUNT_NFS=y +# CONFIG_FEATURE_MOUNT_CIFS is not set +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +# CONFIG_FEATURE_UMOUNT_ALL is not set + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_BBCONFIG is not set +# CONFIG_CHRT is not set +# CONFIG_CROND is not set +# CONFIG_DEBUG_CROND_OPTION is not set +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +# CONFIG_CRONTAB is not set +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_LAST is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_FLAGCS is not set +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_HDPARM is not set +# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set +# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set +# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set +# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +# CONFIG_FEATURE_MAKEDEVS_TABLE is not set +# CONFIG_MICROCOM is not set +# CONFIG_MOUNTPOINT is not set +# CONFIG_MT is not set +# CONFIG_RAIDAUTORUN is not set +# CONFIG_READAHEAD is not set +# CONFIG_RUNLEVEL is not set +# CONFIG_RX is not set +CONFIG_STRINGS=y +# CONFIG_SETSID is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +# CONFIG_TTYSIZE is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set +# CONFIG_ARP is not set +# CONFIG_ARPING is not set +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +# CONFIG_HTTPD is not set +# CONFIG_FEATURE_HTTPD_RANGES is not set +# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set +# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set +# CONFIG_FEATURE_HTTPD_SETUID is not set +# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set +# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set +# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set +# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set +# CONFIG_FEATURE_HTTPD_PROXY is not set +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +CONFIG_FEATURE_IFUPDOWN_MAPPING=y +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +# CONFIG_FEATURE_IP_RULE is not set +# CONFIG_FEATURE_IP_SHORT_FORMS is not set +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set +# CONFIG_IPRULE is not set +# CONFIG_IPCALC is not set +# CONFIG_FEATURE_IPCALC_FANCY is not set +# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NC=y +# CONFIG_NC_SERVER is not set +# CONFIG_NC_EXTRA is not set +CONFIG_NETSTAT=y +# CONFIG_FEATURE_NETSTAT_WIDE is not set +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_PING6=y +# CONFIG_PSCAN is not set +CONFIG_FEATURE_FANCY_PING=y +CONFIG_ROUTE=y +# CONFIG_SLATTACH is not set +CONFIG_TELNET=y +# CONFIG_FEATURE_TELNET_TTYPE is not set +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +# CONFIG_TELNETD is not set +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_TFTP=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set +# CONFIG_DEBUG_TFTP is not set +CONFIG_TRACEROUTE=y +# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set +# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +CONFIG_APP_UDHCPD=y +# CONFIG_APP_DHCPRELAY is not set +CONFIG_APP_DUMPLEASES=y +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_APP_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 +# CONFIG_VCONFIG is not set +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +# CONFIG_NMETER is not set +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +# CONFIG_FEATURE_PIDOF_SINGLE is not set +# CONFIG_FEATURE_PIDOF_OMIT is not set +# CONFIG_PKILL is not set +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOPMEM is not set +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +# CONFIG_ASH_BUILTIN_ECHO is not set +CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_ASH_RANDOM_SUPPORT is not set +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_CTTYHACK is not set + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# ipsvd utilities +# +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set diff --git a/packages/busybox/busybox_1.9.1.bb b/packages/busybox/busybox_1.9.1.bb index 3f8184fcc0..84cb7f421b 100644 --- a/packages/busybox/busybox_1.9.1.bb +++ b/packages/busybox/busybox_1.9.1.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r2" +PR = "r3" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch;patch=1 \ -- cgit v1.2.3 From 8350e6e20860a0f0cddd87d69a78321867c7770b Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 03:58:14 +0000 Subject: moko-autorev: add opkg and native --- conf/distro/include/moko-autorev.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/moko-autorev.inc b/conf/distro/include/moko-autorev.inc index 0c88b48940..aa2d39f3db 100644 --- a/conf/distro/include/moko-autorev.inc +++ b/conf/distro/include/moko-autorev.inc @@ -9,6 +9,8 @@ SRCREV_pn-linux-openmoko-devel ?= "${AUTOREV}" SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}" SRCREV_pn-neod ?= "${AUTOREV}" +SRCREV_pn-opkg ?= "${AUTOREV}" +SRCREV_pn-opkg-native ?= "${AUTOREV}" SRCREV_pn-multitap-pad ?= "${AUTOREV}" -- cgit v1.2.3 From 1520b07a7e2e82ce2409dfefebd7c6a65e68052d Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 03:59:08 +0000 Subject: preferred-om-2008-versions.inc: use default mono version from angstrom --- conf/distro/include/preferred-om-2008-versions.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index b801536586..3c0027d050 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -5,9 +5,6 @@ PREFERRED_VERSION_gnash = "0.8.1" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" PREFERRED_VERSION_libtool = "1.5.24" -PREFERRED_VERSION_mono = "1.2.6" -PREFERRED_VERSION_mono-mcs-intermediate = "1.2.6" -PREFERRED_VERSION_mono-native = "1.2.6" PREFERRED_VERSION_pulseaudio = "0.9.9" PREFERRED_VERSION_udev = "118" PREFERRED_VERSION_vte = "0.16.10" -- cgit v1.2.3 From 7adea29c94bb740b4ea80551f6d87158e5c1b135 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 04:06:07 +0000 Subject: openmoko: add DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat" --- conf/distro/openmoko.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 470dbf0de2..8fab5e5058 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -14,6 +14,7 @@ DISTRO_NAME = "OpenMoko" DISTRO_VERSION = "P1-Snapshot-${DATE}" #DISTRO_TYPE = "release" DISTRO_TYPE = "debug" +DISTRO_EXTRA_RDEPENDS += "opkg-ipkg-compat" OVERRIDES = "local:${MACHINE}:openmoko:angstrom:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" -- cgit v1.2.3 From fe6f8c336429aa31e9b3a74ecd9f1e8a320a8a07 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 29 Feb 2008 09:00:25 +0000 Subject: task-base: increase PR to reflect changes in distro openmoko.conf. Big big mistake. :( --- packages/tasks/task-base.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 77aa07de00..15835508aa 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r62" +PR = "r63" inherit task -- cgit v1.2.3 From 99832d8b8a08179ad188c24ff7547adb0c8cb273 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 3 Mar 2008 05:56:42 +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 c524c71fb5..f49c89eae7 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -146,7 +146,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 ?= "28656" 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 3ae48fc4467733a36822523132e30fc6f7a14eff Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 3 Mar 2008 07:00:02 +0000 Subject: alsa-state: merge upstream * reduce PCM volume for gta02 to prevent distortion (77baa0a58d42ad16d78eb1888a660e95b9112bda) * merge state files with openmoko versions (20657a67dd3d46190016de2069fb77e48b12f0b9) --- packages/alsa/alsa-state.bb | 2 +- packages/alsa/alsa-state/fic-gta02/asound.state | 20 ++++++++++++++++++-- packages/alsa/alsa-state/fic-gta02/gsmhandset.state | 4 ++-- packages/alsa/alsa-state/fic-gta02/stereoout.state | 20 ++++++++++++++++++-- 4 files changed, 39 insertions(+), 7 deletions(-) diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 7a95b55f34..3d12b5d3cd 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r11" +PR = "r12" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-state/fic-gta02/asound.state b/packages/alsa/alsa-state/fic-gta02/asound.state index c138749631..04e6f60da9 100644 --- a/packages/alsa/alsa-state/fic-gta02/asound.state +++ b/packages/alsa/alsa-state/fic-gta02/asound.state @@ -6,8 +6,8 @@ state.neo1973gta02 { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 235 + value.1 235 } control.2 { comment.access 'read write' @@ -854,6 +854,22 @@ state.neo1973gta02 { comment.count 1 iface MIXER name 'DAPM Handset Spk Switch' + value false + } + control.92 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp State Switch' + value true + } + control.93 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp Spk Switch' value true } } diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state index 348b109d8d..cc0d32a7c7 100644 --- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state +++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state @@ -6,8 +6,8 @@ state.neo1973gta02 { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 235 + value.1 235 } control.2 { comment.access 'read write' diff --git a/packages/alsa/alsa-state/fic-gta02/stereoout.state b/packages/alsa/alsa-state/fic-gta02/stereoout.state index c138749631..04e6f60da9 100644 --- a/packages/alsa/alsa-state/fic-gta02/stereoout.state +++ b/packages/alsa/alsa-state/fic-gta02/stereoout.state @@ -6,8 +6,8 @@ state.neo1973gta02 { comment.range '0 - 255' iface MIXER name 'PCM Volume' - value.0 255 - value.1 255 + value.0 235 + value.1 235 } control.2 { comment.access 'read write' @@ -854,6 +854,22 @@ state.neo1973gta02 { comment.count 1 iface MIXER name 'DAPM Handset Spk Switch' + value false + } + control.92 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp State Switch' + value true + } + control.93 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp Spk Switch' value true } } -- cgit v1.2.3 From 485905b859c4a40b62ff27c323523adfd87838e1 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 3 Mar 2008 07:01:58 +0000 Subject: task-openmoko-feed: 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 ce76d6e3f4..3f1604c4cb 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 b648390a8403ba0cc4ac1619c504e2fa2c4cc251 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 3 Mar 2008 09:56:16 +0000 Subject: mono: replace STAGING_DATADIR by STAGING_DATADIR_NATIVE since it's where mono-mcs-intermediate installed. --- packages/mono/mono_1.2.5.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mono/mono_1.2.5.1.bb b/packages/mono/mono_1.2.5.1.bb index a9bf2f8e1e..55f601bcb7 100644 --- a/packages/mono/mono_1.2.5.1.bb +++ b/packages/mono/mono_1.2.5.1.bb @@ -14,7 +14,7 @@ EXTRA_OECONF += " --disable-mcs-build " do_install_prepend() { install -d ${D} pushd ${D} - tar -xzf ${STAGING_DATADIR}/mono-mcs/mono-mcs-${PV}.tar.gz + tar -xzf ${STAGING_DATADIR_NATIVE}/mono-mcs/mono-mcs-${PV}.tar.gz popd } -- cgit v1.2.3 From 5aed28e87e155aa5b4712a6b9ffe5ff6ede9b211 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 3 Mar 2008 12:24:01 +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 030bd3d6cbce2c7592c0ba1090230a37198ba5cb Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 4 Mar 2008 08:08:08 +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. * also set preferred version for openmoko to use the newer version --- conf/distro/include/preferred-om-2008-versions.inc | 3 +- .../intltool/files/intltool-0.35.5-polkit.patch | 32 ++++++++++++++++++++++ packages/intltool/intltool_0.35.5.bb | 4 ++- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 packages/intltool/files/intltool-0.35.5-polkit.patch diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 10af8675e8..28934a7233 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -5,8 +5,9 @@ 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" PREFERRED_VERSION_vte = "0.16.10" - 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 46eed3d80df4a535a333813f54cae6a251287bca Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 5 Mar 2008 08:34:05 +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 3012f415d3bb6edaf543e7ec34d4ed3ef2ed7531 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 5 Mar 2008 10:15:57 +0000 Subject: openmoko-minimal-image: add this package to be the base of all openmoko images. * update openmoko-image to require it. * update openmoko-qtopia-image to require it. --- packages/images/openmoko-image.bb | 16 ++++------------ packages/images/openmoko-minimal-image.bb | 21 +++++++++++++++++++++ packages/images/openmoko-qtopia-image.bb | 16 ++++++---------- 3 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 packages/images/openmoko-minimal-image.bb diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 1e8b36318c..9dd849608d 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -2,11 +2,9 @@ # OpenMoko Image Recipe #------------------------------------------------------ -IMAGE_LINGUAS = "" +require openmoko-minimal-image.bb -IMAGE_INSTALL = "\ - ${MACHINE_TASK_PROVIDER} \ - task-openmoko-linux \ +IMAGE_INSTALL += "\ task-openmoko-net \ task-openmoko-ui \ task-openmoko-base \ @@ -15,12 +13,6 @@ IMAGE_INSTALL = "\ task-openmoko-pim \ " -DEPENDS = "\ - ${MACHINE_TASK_PROVIDER} \ +DEPENDS += "\ task-openmoko \ -" - - -inherit image - -ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' + " diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb new file mode 100644 index 0000000000..15506c42e3 --- /dev/null +++ b/packages/images/openmoko-minimal-image.bb @@ -0,0 +1,21 @@ +#------------------------------------------------------ +# OpenMoko Minimal Image Recipe +# other openmoko images should include this. +# ----------------------------------------------------- + +IMAGE_LINGUAS = "" + +IMAGE_INSTALL = "\ + ${MACHINE_TASK_PROVIDER} \ + task-openmoko-linux \ + " + +DEPENDS = "\ + ${MACHINE_TASK_PROVIDER} \ + task-openmoko-linux \ + " + + +inherit image + +ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/images/openmoko-qtopia-image.bb b/packages/images/openmoko-qtopia-image.bb index ab88262443..351e17e1d8 100644 --- a/packages/images/openmoko-qtopia-image.bb +++ b/packages/images/openmoko-qtopia-image.bb @@ -1,26 +1,22 @@ #------------------------------------------------------ -# OpenMoko Image Recipe +# OpenMoko Qtopia Image Recipe #------------------------------------------------------ +require openmoko-minimal-image.bb + export IMAGE_BASENAME = "${PN}" -export IMAGE_LINGUAS = "" -IMAGE_INSTALL = "\ - ${MACHINE_TASK_PROVIDER} \ - task-openmoko-linux \ +IMAGE_INSTALL += "\ alsa-state \ bluez-hcidump \ bluez-utils \ task-openmoko-qtopia \ " -DEPENDS = "\ - ${MACHINE_TASK_PROVIDER} \ + +DEPENDS += "\ task-openmoko-qtopia \ " RDEPENDS = "${PACKAGE_INSTALL}" -inherit image - LICENSE = MIT - -- cgit v1.2.3 From 0a9c6ac8a098cdbaf5d702096a197fea3fe67b99 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 7 Mar 2008 09:43:25 +0000 Subject: Qtopia-Phone/X11: Add qtopia-phone based on Qt/X11. --- .../qtopia-phone/qtopia-phone-x11/.mtn2git_empty | 0 .../qtopia-phone-x11/fic-gta02/.mtn2git_empty | 0 .../qtopia-phone-x11/fic-gta02/device-conf | 42 ++++++ .../qtopia-phone-x11/fic-gta02/qplatformdefs.h | 146 +++++++++++++++++++++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 116 ++++++++++++++++ 5 files changed, 304 insertions(+) create mode 100644 packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h create mode 100644 packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb diff --git a/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf new file mode 100644 index 0000000000..b2f7fd0410 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf @@ -0,0 +1,42 @@ +-arch OE_QT_ARCH +-xplatform OE_QT_XPLATFORM +-verbose +-qtopiamedia +-mediaengines gstreamer +-no-infrared +-dbus +-dbuspath OE_QT_DBUSPATH +-iconsize 22 +-displaysize 480x640 +-extra-qtopiacore-config "-fast" +-extra-qtopiacore-config "-no-accessibility" +-extra-qtopiacore-config "-no-cups" +-extra-qtopiacore-config "-nomake demos" +-extra-qtopiacore-config "-nomake examples" +-extra-qtopiacore-config "-qt-libjpeg" +-extra-qtopiacore-config "-qt-libmng" +-extra-qtopiacore-config "-qt-libpng" +-extra-qtopiacore-config "-qt-zlib" +-extra-qtopiacore-config "-release" +-extra-qtopiacore-config "-no-sm" +-extra-qtopiacore-config "OE_QT_ENDIAN" +-extra-qt-config "-nomake examples" +-extra-qt-config "-nomake demos" +-extra-qt-config "-no-sm" +-extra-qtopiacore-config "OE_QT_ENDIAN" +-font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 +-image OE_QT_RPREFIX +-launch-method quicklaunch +-force-quicklaunch +-no-clean +-no-drm +-no-qvfb +-no-vpn +-no-sxe +-no-silent +-prefix OE_QT_RPREFIX +-reduce-exports=yes +-release +-confirm-license +OE_QT_EXTRACONFIG + diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h new file mode 100644 index 0000000000..c216578d97 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h @@ -0,0 +1,146 @@ +/**************************************************************************** +** +** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved. +** +** This file is part of the Opensource Edition of the Qtopia Toolkit. +** +** This software is licensed under the terms of the GNU General Public +** License (GPL) version 2. +** +** See http://www.trolltech.com/gpl/ for GPL licensing information. +** +** Contact info@trolltech.com if any conditions of this licensing are +** not clear to you. +** +** +** +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +** +****************************************************************************/ + +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +// Get Qt defines/settings + +#include "qglobal.h" + +// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs + +// 1) need to reset default environment if _BSD_SOURCE is defined +// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 +// 3) it seems older glibc need this to include the X/Open stuff +#ifndef _GNU_SOURCE +# define _GNU_SOURCE +#endif + +#include + + +// We are hot - unistd.h should have turned on the specific APIs we requested + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifndef QT_NO_IPV6IFNAME +#include +#endif + +#ifdef QT_LARGEFILE_SUPPORT +#define QT_STATBUF struct stat64 +#define QT_STATBUF4TSTAT struct stat64 +#define QT_STAT ::stat64 +#define QT_FSTAT ::fstat64 +#define QT_LSTAT ::lstat64 +#define QT_OPEN ::open64 +#define QT_TRUNCATE ::truncate64 +#define QT_FTRUNCATE ::ftruncate64 +#define QT_LSEEK ::lseek64 +#else +#define QT_STATBUF struct stat +#define QT_STATBUF4TSTAT struct stat +#define QT_STAT ::stat +#define QT_FSTAT ::fstat +#define QT_LSTAT ::lstat +#define QT_OPEN ::open +#define QT_TRUNCATE ::truncate +#define QT_FTRUNCATE ::ftruncate +#define QT_LSEEK ::lseek +#endif + +#ifdef QT_LARGEFILE_SUPPORT +#define QT_FOPEN ::fopen64 +#define QT_FSEEK ::fseeko64 +#define QT_FTELL ::ftello64 +#define QT_FGETPOS ::fgetpos64 +#define QT_FSETPOS ::fsetpos64 +#define QT_FPOS_T fpos64_t +#define QT_OFF_T off64_t +#else +#define QT_FOPEN ::fopen +#define QT_FSEEK ::fseek +#define QT_FTELL ::ftell +#define QT_FGETPOS ::fgetpos +#define QT_FSETPOS ::fsetpos +#define QT_FPOS_T fpos_t +#define QT_OFF_T long +#endif + +#define QT_STAT_REG S_IFREG +#define QT_STAT_DIR S_IFDIR +#define QT_STAT_MASK S_IFMT +#define QT_STAT_LNK S_IFLNK +#define QT_SOCKET_CONNECT ::connect +#define QT_SOCKET_BIND ::bind +#define QT_SOCKET_BIND ::bind +#define QT_FILENO fileno +#define QT_CLOSE ::close +#define QT_READ ::read +#define QT_WRITE ::write +#define QT_ACCESS ::access +#define QT_GETCWD ::getcwd +#define QT_CHDIR ::chdir +#define QT_MKDIR ::mkdir +#define QT_RMDIR ::rmdir +#define QT_OPEN_LARGEFILE O_LARGEFILE +#define QT_OPEN_RDONLY O_RDONLY +#define QT_OPEN_WRONLY O_WRONLY +#define QT_OPEN_RDWR O_RDWR +#define QT_OPEN_CREAT O_CREAT +#define QT_OPEN_TRUNC O_TRUNC +#define QT_OPEN_APPEND O_APPEND + +#define QT_SIGNAL_RETTYPE void +#define QT_SIGNAL_ARGS int +#define QT_SIGNAL_IGNORE SIG_IGN + +#if defined(__GLIBC__) && (__GLIBC__ >= 2) +#define QT_SOCKLEN_T socklen_t +#else +#define QT_SOCKLEN_T int +#endif + +#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) +#define QT_SNPRINTF ::snprintf +#define QT_VSNPRINTF ::vsnprintf +#endif + +#define QT_QLOCALE_USES_FCVT + +#endif // QPLATFORMDEFS_H diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb new file mode 100644 index 0000000000..f9cc9b62bc --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -0,0 +1,116 @@ +# This is qtopia-phone recipe heavilly based off the one in the qtopia-phone +# distribution. +# +# Please DO NOT merge this file into OE, it is not suitable for that yet as +# it compiles both native and target binaries. This requires stuff to be +# installed on the host which is against the aim of OE. + +DESCRIPTION = "Qtopia OpenSource" +SECTION = "qtopia-phone" +LICENSE = "GPL" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +DEPENDS = "glib-2.0 dbus tslib gstreamer freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" +PROVIDES = "qtopia-phone" +PR = "r1" +SRCREV = "${AUTOREV}" +SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ + file://device-conf \ + file://qplatformdefs.h" + +S = "${WORKDIR}/git" + +inherit pkgconfig update-rc.d + +TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'spitz', ' c3200', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" +TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}" + +INITSCRIPT_NAME = "qpe" +INITSCRIPT_PARAMS = "defaults 98" + +export QTOPIA_DEPOT_PATH = "${S}" + +require qtopia-phone_arch.inc + +QT_ARCH = "${@qtopia_arch(d)}" +QT_ENDIAN = "${@qtopia_endian(d)}" +PLATFORM = "${BUILD_OS}-g++" +XPLATFORM = "linux-oe-g++" +BUILDDIR = "${WORKDIR}/build" + +OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" +OE_QT_ARCH = "${QT_ARCH}" +OE_QT_XPLATFORM = "${XPLATFORM}" +OE_QT_LIBDIR = "${STAGING_LIBDIR}" +OE_QT_INCDIR = "${STAGING_INCDIR}" +OE_QT_RPREFIX = "/opt/Qtopia" +OE_QT_ENDIAN = "${QT_ENDIAN}" +OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" + +do_configure() { + +unset CC +unset CXX +unset CFLAGS +unset CXXFLAGS +unset LDFLAGS + +mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \ + ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +install -m 644 ${WORKDIR}/qplatformdefs.h \ + ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} +sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf +sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf + +# sed the dynamic config into the file +sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf +sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf + +rm -f ${S}/devices/${TARGET-DEVICE}/configure +cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure +rm -f ${S}/devices/${TARGET-DEVICE}/environment +echo "" > ${S}/devices/${TARGET-DEVICE}/environment + +mkdir -p ${BUILDDIR} +cd ${BUILDDIR} +echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} + +} + +do_compile() { + cd ${BUILDDIR} + oe_runmake +} + +do_stage() { +} + + +do_install() { + cd ${BUILDDIR} + oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe + +} + +FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ + ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \ + ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \ + ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \ + ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \ + ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts" + +FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so" + -- cgit v1.2.3 From bd4028cfd4a24a0c5875e7445bb115619830b947 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 7 Mar 2008 10:59:29 +0000 Subject: qtopia-phone-x11: Fix depends gstvideosink.h is provided by gst-plugins-base --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index f9cc9b62bc..4373dffb41 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -10,7 +10,7 @@ SECTION = "qtopia-phone" LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 dbus tslib gstreamer freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" +DEPENDS = "glib-2.0 dbus tslib gst-plugins-base freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" PR = "r1" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From d7136ff4c2bdb1e7a68189e2023afe19ed16343d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 7 Mar 2008 12:20:41 +0000 Subject: qtopia-phone-x11: Disable gstreamer for now. We have different multimedia solutions anyway --- packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf | 1 - packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf index b2f7fd0410..fa44869e4a 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf @@ -2,7 +2,6 @@ -xplatform OE_QT_XPLATFORM -verbose -qtopiamedia --mediaengines gstreamer -no-infrared -dbus -dbuspath OE_QT_DBUSPATH diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 4373dffb41..dbc985dc06 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -10,7 +10,7 @@ SECTION = "qtopia-phone" LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 dbus tslib gst-plugins-base freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" +DEPENDS = "glib-2.0 dbus tslib freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" PR = "r1" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From e906546390539db91733531aa8007a59fcc3b60f Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 7 Mar 2008 12:39:27 +0000 Subject: solving merge conflict --- .../alsa/alsa-state/fic-gta02/gsmhandset.state | 885 --------------------- packages/gnash/gnash.inc | 79 -- packages/gnash/gnash_0.8.1.bb | 1 - packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty | 0 .../gpsdrive-2.10pre4-openstreetmap-download.patch | 128 --- .../gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch | 18 - .../gpsdrive-remove-hardcoded-paths.patch | 96 --- .../gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop | 10 - packages/gpsdrive/gpsdrive_2.10pre4.bb | 42 - packages/multitap-pad/.mtn2git_empty | 0 packages/multitap-pad/files/.mtn2git_empty | 0 packages/multitap-pad/files/80multitappad | 20 - packages/multitap-pad/multitap-pad_svn.bb | 47 -- .../openmoko-panel-memory_svn.bb | 7 - .../openmoko-dialer2/fic-gta01/.mtn2git_empty | 0 .../openmoko-dialer2/fic-gta01/kernel-2.6.24.patch | 13 - .../openmoko-dialer2/fic-gta02/.mtn2git_empty | 0 .../openmoko-dialer2/fic-gta02/kernel-2.6.24.patch | 15 - packages/perl/libwww-perl-native_5.808.bb | 5 - packages/perl/libwww-perl_5.808.bb | 12 - 20 files changed, 1378 deletions(-) delete mode 100644 packages/alsa/alsa-state/fic-gta02/gsmhandset.state delete mode 100644 packages/gnash/gnash.inc delete mode 100644 packages/gnash/gnash_0.8.1.bb delete mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty delete mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch delete mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch delete mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch delete mode 100644 packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop delete mode 100644 packages/gpsdrive/gpsdrive_2.10pre4.bb delete mode 100644 packages/multitap-pad/.mtn2git_empty delete mode 100644 packages/multitap-pad/files/.mtn2git_empty delete mode 100644 packages/multitap-pad/files/80multitappad delete mode 100644 packages/multitap-pad/multitap-pad_svn.bb delete mode 100644 packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb delete mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty delete mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch delete mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty delete mode 100644 packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch delete mode 100644 packages/perl/libwww-perl-native_5.808.bb delete mode 100644 packages/perl/libwww-perl_5.808.bb diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state deleted file mode 100644 index 722ce88425..0000000000 --- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state +++ /dev/null @@ -1,885 +0,0 @@ -state.neo1973gta02 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 235 - value.1 235 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 0 - value.1 0 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 127 - value.1 127 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 0 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value false - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Left - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value true - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Stereo Out Switch' - value false - } - control.88 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line Out Switch' - value true - } - control.89 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line In Switch' - value false - } - control.90 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Headset Mic Switch' - value false - } - control.91 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Mic Switch' - value true - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Spk Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' - value false - } -} diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc deleted file mode 100644 index 197cea06b6..0000000000 --- a/packages/gnash/gnash.inc +++ /dev/null @@ -1,79 +0,0 @@ -DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features" - -LICENSE = "GPL-2" -HOMEPAGE = "http://www.gnu.org/software/gnash" - -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" - - -EXTRA_OECONF = "--enable-gui=gtk \ - --enable-renderer=cairo \ - --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}' -} - - -PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver " - -FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so" -FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so" -FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so" -FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so" -FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so" -FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so" -FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so" - -do_stage() { - autotools_stage_all -} - diff --git a/packages/gnash/gnash_0.8.1.bb b/packages/gnash/gnash_0.8.1.bb deleted file mode 100644 index da4b281e94..0000000000 --- a/packages/gnash/gnash_0.8.1.bb +++ /dev/null @@ -1 +0,0 @@ -require gnash.inc diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty b/packages/gpsdrive/gpsdrive-2.10pre4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch deleted file mode 100644 index 878cb1dba9..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl ---- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl 2008-01-04 19:01:35.000000000 +0100 -@@ -35,6 +35,7 @@ - modified (Jul 2005) by Jaroslaw Zachwieja - modified (Dec 2005) by David Pollard - modified (Jul 2007) by Maciek Kaliszewski -+modified (Jan 2008) by Gernot Hillier (added Openstreetmap support) - Version svn-$Version - "; - -@@ -176,6 +177,25 @@ - 15812 => 3 , - 7906 => 2, - 3953 => 1 -+ }, -+ openstreetmap_tah => { -+ 256*576000 => 1, -+ 128*576000 => 2, -+ 64*576000 => 3, -+ 32*576000 => 4, -+ 16*576000 => 5, -+ 8*576000 => 6, -+ 4*576000 => 7, -+ 2*576000 => 8, -+ 576000 => 9, -+ 288000 => 10, -+ 144000 => 11, -+ 72000 => 12, -+ 36000 => 13, -+ 18000 => 14, -+ 9000 => 15, -+ 4500 => 16, -+ 2250 => 17 - } - }; - -@@ -331,7 +351,6 @@ - exit(); - } - -- - # Verify that we have the options that we need - pod2usage(1) if (&error_check); - -@@ -417,6 +436,13 @@ - print "+-----------------------------------------------------------+\n"; - print "| Landsat Maps are Copyright, ..... |\n"; - print "| They are free for non commercial use. |\n"; -+}elsif ( $mapserver eq 'openstreetmap_tah' ){ -+ print "+-----------------------------------------------------------+\n"; -+ print "| OpenStreetmap Maps are Copyright by the OpenStreetmap |\n"; -+ print "| project. |\n"; -+ print "| They are free for use under the terms of the |\n"; -+ print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\" |\n"; -+ print "| license. See http://www.openstreetmap.org for details. |\n"; - } elsif ( ! $force) { - print "You are violating the map servers copyright!\n"; - print "Are you sure you want to continue? [y|n] "; -@@ -700,6 +726,11 @@ - { - ($url,$mapscale)=googlemap_url($lati,$long,$scale); - } -+ elsif ( $mapserver eq 'openstreetmap_tah') -+ { -+ $filename=~s/\.gif/.png/; -+ ($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale); -+ } - else - { - print "Unknown map sever :", $mapserver, "\n"; -@@ -935,6 +966,37 @@ - return ($url,$mapscale); - } - -+############################################################################# -+sub openstreetmap_tah_url($$$){ -+ my $lati = shift; -+ my $long = shift; -+ my $scale = shift; -+ -+ my $mapscale = $scale; -+ my $zoom = undef; -+ for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) { -+ next unless $s == $scale; -+ $zoom = $Scale2Zoom->{openstreetmap_tah}->{$s}; -+ $mapscale = $s; -+ last; -+ } -+ -+ unless ( $zoom ) { -+ print "Error calculating Zoomlevel for Scale: $scale\n"; -+ return (undef,undef); -+ } -+ -+ if ($debug) { -+ print "\n"; -+ print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n"; -+ print "lat: $lati\n"; -+ print "lon: $long\n"; -+ } -+ -+ my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png"; -+# print "$url\n"; -+ return ($url,$mapscale); -+} - - ############################################################################# - sub eniro_url($$$){ -@@ -2284,7 +2346,7 @@ - =item B<--mapserver > - - Mapserver to download from. Default: 'expedia'. --Currently can use: landsat or expedia. -+Currently usable: landsat, expedia or openstreetmap_tah. - - geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, - but they are !!!NOT!!!! in the right scale. -@@ -2294,6 +2356,9 @@ - - landsat covers the whole world with satelite Photos - -+openstreetmap_tah: Free maps from the OpenStreetmap Tiles@Home project, see -+ http://www.openstreetmap.org and http://tah.openstreetmap.org. -+ - gov_au is for Australia - - incrementp for japanese Maps diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch deleted file mode 100644 index c51c80931c..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: src/map_handler.c -=================================================================== ---- aa/src/map_handler.c (Revision 1699) -+++ aa/src/map_handler.c (Revision 1700) -@@ -660,9 +660,12 @@ - if (maploaded) - gdk_pixbuf_unref (image); - -+#ifdef MAPNIK - if ( !strcmp (filename,"mapnik") ) { - limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL); -- } else { -+ } else -+#endif -+ { - limage = gdk_pixbuf_new_from_file (filename, NULL); - if (limage == NULL) - { diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch deleted file mode 100644 index c8c0fe9c6a..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am ---- gpsdrive-2.10pre4.orig/src/Makefile.am 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/src/Makefile.am 2007-12-28 18:50:29.000000000 +0100 -@@ -14,14 +14,14 @@ - -DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \ - -DLIBDIR=\"${libdir}\" \ - -DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \ -- ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\ -- -I/usr/include/ \ -- -I/usr/local/include \ -- -I/opt/boost_1_35/include/boost-1_35 \ -- -I/usr/local/include/freetype2 \ -- -I/usr/include/freetype2 \ -+ ${NOGARMIN} ${NOPLUGINS} ${AMAPNIK} -+# -I/usr/include/ \ -+# -I/usr/local/include \ -+# -I/opt/boost_1_35/include/boost-1_35 \ -+# -I/usr/local/include/freetype2 \ -+# -I/usr/include/freetype2 \ - -I. \ -- -L/usr/local/lib -+# -L/usr/local/lib - - # -I/usr/include/dbus-1.0/ - -diff -ur gpsdrive-2.10pre4.orig/configure gpsdrive-2.10pre4/configure ---- gpsdrive-2.10pre4.orig/configure 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/configure 2008-01-06 14:49:11.000000000 +0100 -@@ -35950,10 +35950,13 @@ - # Yep, its ebil, but I does not know better... - #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` - # default on debian should be: /usr/share/perl5/ --PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` -+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` - #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` --PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` - -+# hard code path for OpenEmbedded environment as I don't know a way -+# to detect it automatically -+PERL_PACKAGE_DIR="/usr/share/perl5" - - ac_perl_modules="File::Basename " - # Make sure we have perl -@@ -37840,11 +37843,11 @@ - # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') - #fi - --if test -f /usr/include/mysql/mysql.h; then -- CFLAGS="$CFLAGS -I/usr/include/mysql" --else -- CFLAGS="$CFLAGS -Imysql" --fi -+#if test -f /usr/include/mysql/mysql.h; then -+# CFLAGS="$CFLAGS -I/usr/include/mysql" -+#else -+# CFLAGS="$CFLAGS -Imysql" -+#fi - - CFLAGS="$CFLAGS $OPT_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" -diff -ur gpsdrive-2.10pre4.orig/configure.ac gpsdrive-2.10pre4/configure.ac ---- gpsdrive-2.10pre4.orig/configure.ac 2007-12-28 18:49:44.000000000 +0100 -+++ gpsdrive-2.10pre4/configure.ac 2008-01-06 14:48:50.000000000 +0100 -@@ -662,9 +662,12 @@ - # Yep, its ebil, but I does not know better... - #PERL_PACKAGE_DIR=`perl -V:installsitearch | sed "s/installsitearch='//" | sed "s/';//"` - # default on debian should be: /usr/share/perl5/ --PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` -+#PERL_VENDORLIB=`perl -V:vendorlib | sed "s,vendorlib=',," | sed "s/';//"` - #PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr,-${prefix}-,"` --PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+#PERL_PACKAGE_DIR=`echo ${PERL_VENDORLIB} | sed "s,/usr/share,${datadir},"` -+# hard code path for OpenEmbedded environment as I don't know a way -+# to detect it automatically -+PERL_PACKAGE_DIR="/usr/share/perl5" - AC_SUBST(PERL_PACKAGE_DIR) - - AC_PROG_PERL_MODULES(File::Basename , , AC_MSG_ERROR(Need Perl module File::Basename)) -@@ -719,11 +722,11 @@ - # AC_SUBST(DLSYM_CFLAGS,'-Ddlsym=dlsym_prepend_underscore') - #fi - --if test -f /usr/include/mysql/mysql.h; then -- CFLAGS="$CFLAGS -I/usr/include/mysql" --else -- CFLAGS="$CFLAGS -Imysql" --fi -+#if test -f /usr/include/mysql/mysql.h; then -+# CFLAGS="$CFLAGS -I/usr/include/mysql" -+#else -+# CFLAGS="$CFLAGS -Imysql" -+#fi - - CFLAGS="$CFLAGS $OPT_CFLAGS" - CXXFLAGS="$CXXFLAGS $OPT_CFLAGS" diff --git a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop b/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop deleted file mode 100644 index 96e8155861..0000000000 --- a/packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=GPSDrive -Comment=GPS map software -Exec=gpsdrive -M pda -1 -Icon=gpsicon -Terminal=false -Type=Application -Categories=Graphics;Network;Geography;Application;Other -StartupNotify=true diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb deleted file mode 100644 index 071a5691e3..0000000000 --- a/packages/gpsdrive/gpsdrive_2.10pre4.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "GPS navigation/map display software" -SECTION = "x11" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql" -RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl" -PR = "r1" - -SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ - file://gpsdrive_2.10pre4.desktop \ - file://gpsdrive-remove-hardcoded-paths.patch;patch=1 \ - file://gpsdrive-ifdef-mapnik.patch;patch=1 \ - file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-garmin" - -do_install_append () { - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop - mkdir -p ${D}${datadir}/pixmaps - cp ${D}${datadir}/${PN}/pixmaps/gpsicon.png ${D}${datadir}/pixmaps - # remove stuff we don't want to package - rm ${D}${datadir}/${PN}/gpsdrive.desktop # we have our own one - rm -rf ${D}${datadir}/${PN}/DSL # for Damn Small Linux - rm -rf ${D}${datadir}/${PN}/gentoo # for Gentoo -} - -PACKAGES += "gpsdrive-maps gpsdrive-map-icons-classic gpsdrive-map-icons-other gpsdrive-addons" - -FILES_${PN} = "${bindir}/gpsdrive ${datadir}/applications ${datadir}/map-icons/icons.xml" -FILES_${PN} += "${datadir}/pixmaps ${datadir}/${PN}/pixmaps ${datadir}/${PN}/poi" -FILES_${PN}-addons = "${bindir}/*.pl ${bindir}/friendsd2 ${bindir}/geo* ${bindir}/*.sh ${bindir}/*.py ${bindir}/gpsreplay ${bindir}/gpssmswatch ${bindir}/wp* ${datadir}/mapnik ${datadir}/perl*/Geo ${datadir}/perl*/Utils" -FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" -FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" -FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" -FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" - -CFLAGS += "-D_GNU_SOURCE" - -DEFAULT_PREFERENCE = "1" diff --git a/packages/multitap-pad/.mtn2git_empty b/packages/multitap-pad/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/multitap-pad/files/.mtn2git_empty b/packages/multitap-pad/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/multitap-pad/files/80multitappad b/packages/multitap-pad/files/80multitappad deleted file mode 100644 index d2b12ea7cc..0000000000 --- a/packages/multitap-pad/files/80multitappad +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -CMD="" - -if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then - if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then - CMD="multitap-pad -d -o landscape" - elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then - CMD="multitap-pad -d -o portrait" - fi -else - CMD="multitap-pad -d" -fi - - -# Delay to make sure the window manager is active - -if [ "$CMD" ]; then - (sleep 2 && $CMD) & -fi diff --git a/packages/multitap-pad/multitap-pad_svn.bb b/packages/multitap-pad/multitap-pad_svn.bb deleted file mode 100644 index 7543a44d72..0000000000 --- a/packages/multitap-pad/multitap-pad_svn.bb +++ /dev/null @@ -1,47 +0,0 @@ -DESCRIPTION = "Multi-tap input method for GTK" -LICENSE = "GPL" -DEPENDS = "libfakekey gtk+ matchbox-panel-2" -RCONFLICTS = matchbox-keyboard-inputmethod -SECTION = "x11" -PV = "0.0+svnr${SRCREV}" - -SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \ - file://80multitappad" - -inherit autotools pkgconfig - -S = "${WORKDIR}/${PN}" - -FILES_${PN} = "${bindir}/* \ - ${libdir} \ - ${sysconfdir} \ - ${datadir}" - -FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \ - ${libdir}/matchbox-panel/.debug" - -FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \ - ${libdir}/gtk-2.0/2.10.0/immodules/*.la \ - ${libdir}/matchbox-panel/*.a \ - ${libdir}/matchbox-panel/*.la" - -do_install_append () { - install -d ${D}/${sysconfdir}/X11/Xsession.d/ - install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/ -} - -pkg_postinst_multitap-pad () { -if [ "x$D" != "x" ]; then - exit 1 -fi - -gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} - -pkg_postrm_multitap-pad () { -if [ "x$D" != "x" ]; then - exit 1 -fi - -gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules -} diff --git a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb deleted file mode 100644 index 8e8af7a086..0000000000 --- a/packages/openmoko-panel-plugins/openmoko-panel-memory_svn.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Shows an out-of-memory warning in the OpenMoko panel" -DEPENDS = "libnotify" -RDEPENDS = "openmoko-dialer2" -PV = "0.0.0+svn${SVNREV}" -PR = "r0" - -inherit openmoko-panel-plugin diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta01/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch deleted file mode 100644 index c6f34f4131..0000000000 --- a/packages/openmoko2/openmoko-dialer2/fic-gta01/kernel-2.6.24.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: openmoko-dialer2/src/phone-kit/moko-notify.c -=================================================================== ---- openmoko-dialer2/src/phone-kit/moko-notify.c.orig 2008-02-14 17:47:23.000000000 +0800 -+++ openmoko-dialer2/src/phone-kit/moko-notify.c 2008-02-14 17:48:19.000000000 +0800 -@@ -38,7 +38,7 @@ - - #define DEFAULT_RINGTONE "/default_ringtone.ogg" - #define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" --#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" -+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" - - struct _MokoNotifyPrivate - { diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty b/packages/openmoko2/openmoko-dialer2/fic-gta02/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch b/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch deleted file mode 100644 index 72c516f5d6..0000000000 --- a/packages/openmoko2/openmoko-dialer2/fic-gta02/kernel-2.6.24.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: openmoko-dialer2/src/phone-kit/moko-notify.c -=================================================================== ---- openmoko-dialer2/src/phone-kit/moko-notify.c (revision 4051) -+++ openmoko-dialer2/src/phone-kit/moko-notify.c (working copy) -@@ -37,8 +37,8 @@ - MOKO_TYPE_NOTIFY, MokoNotifyPrivate)) - - #define DEFAULT_RINGTONE "/default_ringtone.ogg" --#define SYS_BRIGHTNESS "/sys/class/backlight/gta01-bl" --#define SYS_VIBRATE "/sys/class/leds/gta01:vibrator" -+#define SYS_BRIGHTNESS "/sys/class/backlight/pcf50633-bl" -+#define SYS_VIBRATE "/sys/class/leds/neo1973:vibrator" - - struct _MokoNotifyPrivate - { diff --git a/packages/perl/libwww-perl-native_5.808.bb b/packages/perl/libwww-perl-native_5.808.bb deleted file mode 100644 index 68fdcbbbe5..0000000000 --- a/packages/perl/libwww-perl-native_5.808.bb +++ /dev/null @@ -1,5 +0,0 @@ -SECTION = "libs" - -inherit native - -require libwww-perl_${PV}.bb diff --git a/packages/perl/libwww-perl_5.808.bb b/packages/perl/libwww-perl_5.808.bb deleted file mode 100644 index 2bea48a2d0..0000000000 --- a/packages/perl/libwww-perl_5.808.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "libwww-perl provides a simple and consistent API to the World Wide Web" -SECTION = "libs" -LICENSE = "Artistic" -DEPENDS = "liburi-perl-native" -RDEPENDS = "liburi-perl" -PR = "r1" - -SRC_URI = "http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-${PV}.tar.gz" - -S = "${WORKDIR}/libwww-perl-${PV}" - -inherit cpan -- cgit v1.2.3 From 8cfff4c6f28a7a7996ab40d2b2d83b889ea60ec9 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 10 Mar 2008 05:38:24 +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 ea1b5199f84b0a2ff71652b055804af3b53142fa Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 10 Mar 2008 06:25:00 +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. --- packages/diversity/.mtn2git_empty | 0 packages/diversity/diversity-daemon_svn.bb | 19 +++++++++++++++++++ packages/diversity/diversity-nav_svn.bb | 16 ++++++++++++++++ 3 files changed, 35 insertions(+) create mode 100644 packages/diversity/.mtn2git_empty create mode 100644 packages/diversity/diversity-daemon_svn.bb create mode 100644 packages/diversity/diversity-nav_svn.bb diff --git a/packages/diversity/.mtn2git_empty b/packages/diversity/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/diversity/diversity-daemon_svn.bb b/packages/diversity/diversity-daemon_svn.bb new file mode 100644 index 0000000000..bcce953cc5 --- /dev/null +++ b/packages/diversity/diversity-daemon_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Diveristy Daemon" +SECTION = "net/misc" +LICENSE = "GPL" +HOMEPAGE = "http://www.openmoko.org/" +DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl" +RDEPENDS = "eds-dbus gypsy openmoko-dialer2" +SRCREV = "${AUTOREV}" +PV = "0.0+svnr${SRCREV}" + +PR = "r1" + +inherit autotools pkgconfig + +EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus" +SRC_URI = "svn://svn.internal.openmoko.org/trunk/diversity;module=backends;proto=https" + +S = "${WORKDIR}/backends" +FILES_${PN} += "${datadir}/dbus-1/" +FILES_${PN} += "${sysconfdir}/dbus-1/" diff --git a/packages/diversity/diversity-nav_svn.bb b/packages/diversity/diversity-nav_svn.bb new file mode 100644 index 0000000000..750a636af3 --- /dev/null +++ b/packages/diversity/diversity-nav_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Diversity_nav - a GPS location based communicative application" +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" +SECTION = "openmoko/applications" + +SRCREV = "${AUTOREV}" +PV = "0.0.1+svnr${SRCREV}" +PR = "r1" + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" +SRC_URI = "svn://svn.internal.openmoko.org/trunk/diversity/ui/modules;module=diversity_nav;proto=https" + +S = "${WORKDIR}/diversity_nav" + +inherit autotools pkgconfig -- cgit v1.2.3 From d1ec815bd710500392389fc8b249db3dfa058278 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 10 Mar 2008 07:42:09 +0000 Subject: diversity: update to SRC_URI in projects.openmoko.org * update sane-srcrevs.inc and moko-autorev.inc accordingly --- conf/distro/include/moko-autorev.inc | 2 ++ conf/distro/include/sane-srcrevs.inc | 2 ++ packages/diversity/diversity-daemon_svn.bb | 10 +++++----- packages/diversity/diversity-nav_svn.bb | 12 ++++++------ 4 files changed, 15 insertions(+), 11 deletions(-) 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 b0c41bedbf..e4e4e95360 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/diversity/diversity-daemon_svn.bb b/packages/diversity/diversity-daemon_svn.bb index bcce953cc5..6ea4f54a92 100644 --- a/packages/diversity/diversity-daemon_svn.bb +++ b/packages/diversity/diversity-daemon_svn.bb @@ -1,19 +1,19 @@ DESCRIPTION = "Diveristy Daemon" +HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "net/misc" LICENSE = "GPL" -HOMEPAGE = "http://www.openmoko.org/" DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus gypsy libjana curl" RDEPENDS = "eds-dbus gypsy openmoko-dialer2" -SRCREV = "${AUTOREV}" 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" -SRC_URI = "svn://svn.internal.openmoko.org/trunk/diversity;module=backends;proto=https" -S = "${WORKDIR}/backends" FILES_${PN} += "${datadir}/dbus-1/" FILES_${PN} += "${sysconfdir}/dbus-1/" diff --git a/packages/diversity/diversity-nav_svn.bb b/packages/diversity/diversity-nav_svn.bb index 750a636af3..58090e9baf 100644 --- a/packages/diversity/diversity-nav_svn.bb +++ b/packages/diversity/diversity-nav_svn.bb @@ -1,16 +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" -SECTION = "openmoko/applications" - -SRCREV = "${AUTOREV}" PV = "0.0.1+svnr${SRCREV}" PR = "r1" -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" -SRC_URI = "svn://svn.internal.openmoko.org/trunk/diversity/ui/modules;module=diversity_nav;proto=https" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" -S = "${WORKDIR}/diversity_nav" +S = "${WORKDIR}/diversity-nav" inherit autotools pkgconfig + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" -- cgit v1.2.3 From 8a5c4a43744c834f3522783c9ad5908bbb2ec890 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 10 Mar 2008 08:19:11 +0000 Subject: packagekit: add recipe for 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 b58dba3953f430d00042bfd1d3c2e5e600a34519 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 10 Mar 2008 08:26:20 +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/assassin/.mtn2git_empty | 0 packages/assassin/assassin_svn.bb | 16 ++++++++++++++++ 4 files changed, 18 insertions(+) create mode 100644 packages/assassin/.mtn2git_empty create mode 100644 packages/assassin/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 e4e4e95360..36862bd83b 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/assassin/.mtn2git_empty b/packages/assassin/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/assassin/assassin_svn.bb b/packages/assassin/assassin_svn.bb new file mode 100644 index 0000000000..83927c1d2a --- /dev/null +++ b/packages/assassin/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 a5ca5c75185f07fa13f3300f9706a362cc38daeb Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 10 Mar 2008 10:33:28 +0000 Subject: midori: update to 0.0.17 and add patch to go with the new webkit * also updated preferred version. --- conf/distro/include/preferred-om-2008-versions.inc | 1 + .../midori-0.0.17/webkit-pkgconfig.patch | 72 ++++++++++++++++++++++ packages/gtk-webcore/midori_0.0.17.bb | 10 +++ 3 files changed, 83 insertions(+) create mode 100644 packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch create mode 100644 packages/gtk-webcore/midori_0.0.17.bb diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index 28934a7233..c2ca9e0145 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.10" diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch new file mode 100644 index 0000000000..61c6c8ad04 --- /dev/null +++ b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch @@ -0,0 +1,72 @@ +Index: midori-0.0.17/configure.in +=================================================================== +--- midori-0.0.17.orig/configure.in 2008-03-10 18:08:54.000000000 +0800 ++++ midori-0.0.17/configure.in 2008-03-10 18:10:04.000000000 +0800 +@@ -53,13 +53,13 @@ + AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) + + # Checks for WebKitGtk +-PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false) ++PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) + if test "x${have_webkit}" = "xfalse" ; then + AC_MSG_ERROR([No WebKitGtk package information found]) + fi + AC_SUBST(WEBKIT_CFLAGS) + AC_SUBST(WEBKIT_LIBS) +-WEBKIT_VER=`pkg-config --modversion WebKitGtk` ++WEBKIT_VER=`pkg-config --modversion webkit-1.0` + AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version]) + + # Checks for libsexy +Index: midori-0.0.17/src/global.h +=================================================================== +--- midori-0.0.17.orig/src/global.h 2008-03-10 18:12:25.000000000 +0800 ++++ midori-0.0.17/src/global.h 2008-03-10 18:12:29.000000000 +0800 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include +-#include ++#include + + // -- globals + +Index: midori-0.0.17/src/helpers.c +=================================================================== +--- midori-0.0.17.orig/src/helpers.c 2008-03-10 18:14:43.000000000 +0800 ++++ midori-0.0.17/src/helpers.c 2008-03-10 18:14:59.000000000 +0800 +@@ -16,7 +16,7 @@ + #include "../katze/katze.h" + + #include +-#include ++#include + + GtkIconTheme* get_icon_theme(GtkWidget* widget) + { +Index: midori-0.0.17/src/webSearch.h +=================================================================== +--- midori-0.0.17.orig/src/webSearch.h 2008-03-10 18:14:38.000000000 +0800 ++++ midori-0.0.17/src/webSearch.h 2008-03-10 18:14:48.000000000 +0800 +@@ -16,7 +16,7 @@ + + #include + #include +-#include ++#include + + // -- Types + +Index: midori-0.0.17/src/webView.h +=================================================================== +--- midori-0.0.17.orig/src/webView.h 2008-03-10 18:14:15.000000000 +0800 ++++ midori-0.0.17/src/webView.h 2008-03-10 18:14:18.000000000 +0800 +@@ -16,7 +16,7 @@ + #include "browser.h" + #include "debug.h" + +-#include ++#include + + WebKitNavigationResponse + on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb new file mode 100644 index 0000000000..533d4ddca0 --- /dev/null +++ b/packages/gtk-webcore/midori_0.0.17.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Midori is a lightweight web browser." +LICENSE = "GPLv2" + +DEPENDS = "webkit-gtk libsexy" + +inherit autotools pkgconfig + +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + file://webkit-pkgconfig.patch;patch=1 \ + " -- cgit v1.2.3 From 2a6d514d909d5fa5538143108a9ff3b4a37315ab Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 07:17:53 +0000 Subject: efl: Illume and Qtopia needs a recent version of ecore to get along. Update to todays copy. --- conf/distro/include/sane-srcdates.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 5a1e8f2758..deac4e9225 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080216" +EFL_SRCDATE = "20080311" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" -- cgit v1.2.3 From 9ead5a5eb3655f305669473ddd452e8b14cdaa3d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 07:22:25 +0000 Subject: qtopia-phone-x11: We do not install this start script, no need to --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index dbc985dc06..4c38d2db2c 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -100,9 +100,6 @@ do_stage() { do_install() { cd ${BUILDDIR} oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${S}/devices/${TARGET-DEVICE}/src/devtools/startup/qpe.sh ${D}${sysconfdir}/init.d/qpe - } FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ -- cgit v1.2.3 From 3146b24df819e494d3fc2f5964c5409d60c18f15 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 07:24:23 +0000 Subject: openmoko: Avoid using the top level directories. This is a OpenMoko Project move it into the projects dir --- packages/assassin/.mtn2git_empty | 0 packages/assassin/assassin_svn.bb | 16 ---------------- packages/openmoko-projects/.mtn2git_empty | 0 packages/openmoko-projects/assassin_svn.bb | 16 ++++++++++++++++ 4 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 packages/assassin/.mtn2git_empty delete mode 100644 packages/assassin/assassin_svn.bb create mode 100644 packages/openmoko-projects/.mtn2git_empty create mode 100644 packages/openmoko-projects/assassin_svn.bb diff --git a/packages/assassin/.mtn2git_empty b/packages/assassin/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/assassin/assassin_svn.bb b/packages/assassin/assassin_svn.bb deleted file mode 100644 index 83927c1d2a..0000000000 --- a/packages/assassin/assassin_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -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/*" 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/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 26d244e964417ede2d6177a515be5dc429af0e89 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 07:25:47 +0000 Subject: openmoko: Avoid using the top level directories. This is a OpenMoko Project move it into the projects dir --- packages/diversity/.mtn2git_empty | 0 packages/diversity/diversity-daemon_svn.bb | 19 ------------------- packages/diversity/diversity-nav_svn.bb | 16 ---------------- packages/openmoko-projects/diversity-daemon_svn.bb | 19 +++++++++++++++++++ packages/openmoko-projects/diversity-nav_svn.bb | 16 ++++++++++++++++ 5 files changed, 35 insertions(+), 35 deletions(-) delete mode 100644 packages/diversity/.mtn2git_empty delete mode 100644 packages/diversity/diversity-daemon_svn.bb delete mode 100644 packages/diversity/diversity-nav_svn.bb create mode 100644 packages/openmoko-projects/diversity-daemon_svn.bb create mode 100644 packages/openmoko-projects/diversity-nav_svn.bb diff --git a/packages/diversity/.mtn2git_empty b/packages/diversity/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/diversity/diversity-daemon_svn.bb b/packages/diversity/diversity-daemon_svn.bb deleted file mode 100644 index 6ea4f54a92..0000000000 --- a/packages/diversity/diversity-daemon_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -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/diversity/diversity-nav_svn.bb b/packages/diversity/diversity-nav_svn.bb deleted file mode 100644 index 58090e9baf..0000000000 --- a/packages/diversity/diversity-nav_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -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" 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 b05d9759af8e5b6001d596a73164e766701b30ec Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 10:51:14 +0000 Subject: illume: Add raster's illume module. This is based on his recipe but removed the sed in do_compile and some depends fixes --- packages/openmoko-projects/illume/.mtn2git_empty | 0 .../openmoko-projects/illume/include-path.diff | 16 +++++++++++++ packages/openmoko-projects/illume_svn.bb | 26 ++++++++++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 packages/openmoko-projects/illume/.mtn2git_empty create mode 100644 packages/openmoko-projects/illume/include-path.diff create mode 100644 packages/openmoko-projects/illume_svn.bb diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-projects/illume/include-path.diff b/packages/openmoko-projects/illume/include-path.diff new file mode 100644 index 0000000000..0b5ed8add8 --- /dev/null +++ b/packages/openmoko-projects/illume/include-path.diff @@ -0,0 +1,16 @@ +Include path fixes for Illume: + +$(includedir) is pointing to /usr/include, we do not want to have this when compiling + +Index: src/Makefile.am +=================================================================== +--- a/src/Makefile.am (Revision 12) ++++ b/src/Makefile.am (Arbeitskopie) +@@ -3,7 +3,6 @@ + + INCLUDES = -I. \ + -I$(top_srcdir) \ +- -I$(includedir) \ + @e_cflags@ + + pkgdir = $(datadir)/$(MODULE_ARCH) diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb new file mode 100644 index 0000000000..f7dec16890 --- /dev/null +++ b/packages/openmoko-projects/illume_svn.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Illume - Mobile UI module for Enlightenment" +DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" +LICENSE = "MIT BSD" +PV = "svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \ + file://include-path.diff;patch=1" +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + +FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" + +do_install_append() { + for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done +} -- cgit v1.2.3 From 17f56895828f355b8ba53d89a19b437836c5437a Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 13:44:18 +0000 Subject: gnash: add 0.8.2 and clean up/fix for sysroot --- packages/gnash/gnash.inc | 79 +++++++++++-------------------------------- packages/gnash/gnash_0.8.2.bb | 1 + 2 files changed, 20 insertions(+), 60 deletions(-) create mode 100644 packages/gnash/gnash_0.8.2.bb diff --git a/packages/gnash/gnash.inc b/packages/gnash/gnash.inc index 2168de48c2..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 = "" 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 e64c72ec95ad1fe74738cd0051f31613581c3d37 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 13:47:33 +0000 Subject: preferred-om-2008-versions: prefer gnash 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 c2ca9e0145..7fb0bc28e0 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 c698ac8aab7671ef3ce7bda9f39b02db37cb40a1 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 13:48:32 +0000 Subject: python-pygtk: sync fix upstream --- packages/python/python-pygtk_2.10.4.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/python/python-pygtk_2.10.4.bb b/packages/python/python-pygtk_2.10.4.bb index 1af2093556..57dc48aa77 100644 --- a/packages/python/python-pygtk_2.10.4.bb +++ b/packages/python/python-pygtk_2.10.4.bb @@ -6,10 +6,11 @@ RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml5" +PR = "ml6" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.10/${SRCNAME}-${PV}.tar.bz2 \ file://fix-gtkunixprint.patch;patch=1 \ + file://nodocs.patch;patch=1 \ file://acinclude.m4" S = "${WORKDIR}/${SRCNAME}-${PV}" -- cgit v1.2.3 From fa386e2e84e3b196d16aea78a70ba204961f9dec Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 14:28:08 +0000 Subject: Qtopia Phone X11: Attempt to install the fdo .desktop files and a Xsession start script Not tested as Qtopia is still building. --- .../qtopia-phone-x11/Xsession.d/.mtn2git_empty | 0 .../qtopia-phone-x11/Xsession.d/99qtopia | 33 ++++++++++++++++++++++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 26 +++++++++++++---- 3 files changed, 54 insertions(+), 5 deletions(-) create mode 100644 packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty create mode 100644 packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia new file mode 100644 index 0000000000..3eca6bba91 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia @@ -0,0 +1,33 @@ +#!/bin/sh + +# path setup +export QPEDIR=/opt/Qtopia +export PATH=$QPEDIR/bin:$PATH + +#tell how to inform illume on incoming phone calls +#export ILLUME_PHONE_CALL= + + +# xmodmap to allow the soft-menu to work +xmodmap -e "keycode 223 = 0x11000601" +xmodmap -e "keycode 224 = 0x11000602" +xmodmap -e "keycode 225 = 0x11000603" +xmodmap -e "keycode 226 = 0x11000604" +xmodmap -e "keycode 227 = 0x11000605" +xmodmap -e "keycode 228 = 0x11000606" +xmodmap -e "keycode 229 = 0x11000607" +xmodmap -e "keycode 230 = 0x11000608" +xmodmap -e "keycode 231 = 0x11000609" +xmodmap -e "keycode 232 = 0x1100060A" +xmodmap -e "keycode 232 = 0x1100060B" +xmodmap -e "keycode 233 = 0x1100060B" +xmodmap -e "keycode 232 = 0x1100060A" +xmodmap -e "keycode 234 = 0x1100060C" +xmodmap -e "keycode 235 = 0x1100060D" +xmodmap -e "keycode 236 = 0x1100060E" +xmodmap -e "keycode 237 = 0x1100060F" +xmodmap -e "keycode 238 = 0x11000610" +xmodmap -e "keycode 239 = 0x1008ff26" + +# Now start Qtopia +exec qpe diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 4c38d2db2c..0636409b35 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -16,11 +16,12 @@ PR = "r1" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://device-conf \ - file://qplatformdefs.h" + file://qplatformdefs.h \ + file://Xsession.d/99qtopia" S = "${WORKDIR}/git" -inherit pkgconfig update-rc.d +inherit pkgconfig TARGET-DEVICE="${@base_contains('MACHINE', 'nokia770', ' nokia770', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'nokia800', ' nokia770', '',d)}" @@ -29,9 +30,6 @@ TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}" -INITSCRIPT_NAME = "qpe" -INITSCRIPT_PARAMS = "defaults 98" - export QTOPIA_DEPOT_PATH = "${S}" require qtopia-phone_arch.inc @@ -100,6 +98,24 @@ do_stage() { do_install() { cd ${BUILDDIR} oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} + + # Install freedesktop.org .desktop files for enlightenment + install -d ${D}${datadir}/applications + for app in "${S}/apps-fdo"*; do + for file in "$app"/*.desktop; do + install -m 0644 $file ${D}${datadir}/applications/ + done + done + + # Install good icons for the desktop files + + # Make sure qpe gets launched by X + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 0755 ${WORKDIR}/Xsession.d/99qpe ${D}${sysconfdir}/X11/Xsession.d/ + + # Install some scripts + install -d ${D}${bindir} + install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir} } FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ -- cgit v1.2.3 From 010801ea8f8b51e49a9474012d932b244566cfdd Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 11 Mar 2008 16:01:42 +0000 Subject: Qtopia Phone X11: Fix packaging, install the .desktop files and the launcher script OE is complaining about the desktop files, on some parts it is right, on some wrong we will fix that tomorrow. --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 0636409b35..21945c5011 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -101,7 +101,7 @@ do_install() { # Install freedesktop.org .desktop files for enlightenment install -d ${D}${datadir}/applications - for app in "${S}/apps-fdo"*; do + for app in "${S}/apps-fdo/"*; do for file in "$app"/*.desktop; do install -m 0644 $file ${D}${datadir}/applications/ done @@ -111,7 +111,7 @@ do_install() { # Make sure qpe gets launched by X install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 0755 ${WORKDIR}/Xsession.d/99qpe ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${WORKDIR}/Xsession.d/99qtopia ${D}${sysconfdir}/X11/Xsession.d/ # Install some scripts install -d ${D}${bindir} -- cgit v1.2.3 From fc63d0df3b864727a2f723d6cb0449af64b87856 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 17:19:46 +0000 Subject: python-pygtk: add missing patch --- packages/python/python-pygtk/nodocs.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/python/python-pygtk/nodocs.patch diff --git a/packages/python/python-pygtk/nodocs.patch b/packages/python/python-pygtk/nodocs.patch new file mode 100644 index 0000000000..9b2387e959 --- /dev/null +++ b/packages/python/python-pygtk/nodocs.patch @@ -0,0 +1,13 @@ +Index: pygtk-2.10.4/Makefile.am +=================================================================== +--- pygtk-2.10.4.orig/Makefile.am ++++ pygtk-2.10.4/Makefile.am +@@ -4,7 +4,7 @@ if BUILD_GTK + GTK_SUBDIR = gtk + endif + +-SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs ++SUBDIRS = codegen . $(GTK_SUBDIR) examples tests + + PLATFORM_VERSION = 2.0 + -- cgit v1.2.3 From 77665f6ed52bddfdb4602fc232b3ed939da5b3ae Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 17:24:39 +0000 Subject: midori: use upstream patch --- .../midori-0.0.17/webkit-pkgconfig.patch | 72 ---------------------- packages/gtk-webcore/midori_0.0.17.bb | 7 ++- 2 files changed, 4 insertions(+), 75 deletions(-) delete mode 100644 packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch diff --git a/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch b/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch deleted file mode 100644 index 61c6c8ad04..0000000000 --- a/packages/gtk-webcore/midori-0.0.17/webkit-pkgconfig.patch +++ /dev/null @@ -1,72 +0,0 @@ -Index: midori-0.0.17/configure.in -=================================================================== ---- midori-0.0.17.orig/configure.in 2008-03-10 18:08:54.000000000 +0800 -+++ midori-0.0.17/configure.in 2008-03-10 18:10:04.000000000 +0800 -@@ -53,13 +53,13 @@ - AC_DEFINE_UNQUOTED([GTK_VER], "$GTK_VER", [GTK+ version]) - - # Checks for WebKitGtk --PKG_CHECK_MODULES(WEBKIT, WebKitGtk, have_webkit=true, have_webkit=false) -+PKG_CHECK_MODULES(WEBKIT, webkit-1.0, have_webkit=true, have_webkit=false) - if test "x${have_webkit}" = "xfalse" ; then - AC_MSG_ERROR([No WebKitGtk package information found]) - fi - AC_SUBST(WEBKIT_CFLAGS) - AC_SUBST(WEBKIT_LIBS) --WEBKIT_VER=`pkg-config --modversion WebKitGtk` -+WEBKIT_VER=`pkg-config --modversion webkit-1.0` - AC_DEFINE_UNQUOTED([WEBKIT_VER], "$WEBKITGTK_VER", [WebKitGtk version]) - - # Checks for libsexy -Index: midori-0.0.17/src/global.h -=================================================================== ---- midori-0.0.17.orig/src/global.h 2008-03-10 18:12:25.000000000 +0800 -+++ midori-0.0.17/src/global.h 2008-03-10 18:12:29.000000000 +0800 -@@ -16,7 +16,7 @@ - #include "../katze/katze.h" - - #include --#include -+#include - - // -- globals - -Index: midori-0.0.17/src/helpers.c -=================================================================== ---- midori-0.0.17.orig/src/helpers.c 2008-03-10 18:14:43.000000000 +0800 -+++ midori-0.0.17/src/helpers.c 2008-03-10 18:14:59.000000000 +0800 -@@ -16,7 +16,7 @@ - #include "../katze/katze.h" - - #include --#include -+#include - - GtkIconTheme* get_icon_theme(GtkWidget* widget) - { -Index: midori-0.0.17/src/webSearch.h -=================================================================== ---- midori-0.0.17.orig/src/webSearch.h 2008-03-10 18:14:38.000000000 +0800 -+++ midori-0.0.17/src/webSearch.h 2008-03-10 18:14:48.000000000 +0800 -@@ -16,7 +16,7 @@ - - #include - #include --#include -+#include - - // -- Types - -Index: midori-0.0.17/src/webView.h -=================================================================== ---- midori-0.0.17.orig/src/webView.h 2008-03-10 18:14:15.000000000 +0800 -+++ midori-0.0.17/src/webView.h 2008-03-10 18:14:18.000000000 +0800 -@@ -16,7 +16,7 @@ - #include "browser.h" - #include "debug.h" - --#include -+#include - - WebKitNavigationResponse - on_webView_navigation_requested(GtkWidget* webView, WebKitWebFrame* frame diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb index 533d4ddca0..19cc686566 100644 --- a/packages/gtk-webcore/midori_0.0.17.bb +++ b/packages/gtk-webcore/midori_0.0.17.bb @@ -5,6 +5,7 @@ DEPENDS = "webkit-gtk libsexy" inherit autotools pkgconfig -SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ - file://webkit-pkgconfig.patch;patch=1 \ - " +SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ + file://webkit-update.patch;patch=1" + + -- cgit v1.2.3 From 11a927c21ec3e58d33a71bb3a4ed7788a3faf54c Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 11 Mar 2008 19:43:30 +0000 Subject: gypsy: remove duplicate do_stage from merge --- packages/gypsy/gypsy.inc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/gypsy/gypsy.inc b/packages/gypsy/gypsy.inc index e3a682bae4..57f88dc3bd 100644 --- a/packages/gypsy/gypsy.inc +++ b/packages/gypsy/gypsy.inc @@ -5,10 +5,6 @@ DEPENDS = "glib-2.0 dbus bluez-libs" inherit autotools pkgconfig -do_stage () { - autotools_stage_all -} - do_configure_prepend () { touch ${S}/gtk-doc.make } -- cgit v1.2.3 From 77b4afc360d84af02638eeb39ff2c2e31eed2fc0 Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 12 Mar 2008 06:09:54 +0000 Subject: alsa-state: sync upstream from XorA --- packages/alsa/alsa-state.bb | 2 +- .../alsa/alsa-state/fic-gta02/gsmhandset.state | 142 ++++++++++++--------- 2 files changed, 85 insertions(+), 59 deletions(-) diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 3d12b5d3cd..16fee583d4 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r12" +PR = "r13" SRC_URI = " \ file://asoundrc \ diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state index cc0d32a7c7..722ce88425 100644 --- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state +++ b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state @@ -26,8 +26,8 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Headphone Playback Volume' - value.0 121 - value.1 121 + value.0 0 + value.1 0 } control.4 { comment.access 'read write' @@ -46,7 +46,7 @@ state.neo1973gta02 { comment.range '0 - 127' iface MIXER name 'Mono Playback Volume' - value 115 + value 121 } control.6 { comment.access 'read write' @@ -85,7 +85,7 @@ state.neo1973gta02 { iface MIXER name 'Headphone Playback ZC Switch' value.0 false - value.1 true + value.1 false } control.10 { comment.access 'read write' @@ -94,7 +94,7 @@ state.neo1973gta02 { iface MIXER name 'Speaker Playback ZC Switch' value.0 false - value.1 true + value.1 false } control.11 { comment.access 'read write' @@ -103,7 +103,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'Mono Bypass Playback Volume' - value 3 + value 2 } control.12 { comment.access 'read write' @@ -112,7 +112,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'Mono Sidetone Playback Volume' - value 1 + value 2 } control.13 { comment.access 'read write' @@ -121,7 +121,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'Mono Voice Playback Volume' - value 1 + value 2 } control.14 { comment.access 'read write' @@ -171,7 +171,7 @@ state.neo1973gta02 { comment.range '0 - 15' iface MIXER name 'Treble Volume' - value 7 + value 0 } control.19 { comment.access 'read write' @@ -209,8 +209,8 @@ state.neo1973gta02 { comment.range '0 - 63' iface MIXER name 'Capture Volume' - value.0 24 - value.1 24 + value.0 23 + value.1 23 } control.23 { comment.access 'read write' @@ -276,7 +276,7 @@ state.neo1973gta02 { comment.range '0 - 7' iface MIXER name 'ALC Capture Max Volume' - value 1 + value 7 } control.30 { comment.access 'read write' @@ -288,7 +288,7 @@ state.neo1973gta02 { comment.item.3 Stereo iface MIXER name 'ALC Capture Function' - value Stereo + value Left } control.31 { comment.access 'read write' @@ -305,7 +305,7 @@ state.neo1973gta02 { comment.range '0 - 15' iface MIXER name 'ALC Capture Hold Time' - value 7 + value 15 } control.33 { comment.access 'read write' @@ -492,6 +492,16 @@ state.neo1973gta02 { value Stereo } control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973gta02 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973gta02 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973gta02 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973gta02 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973gta02 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973gta02 { name 'Line Left Mux' value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973gta02 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic2 Capture Switch' value true } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973gta02 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973gta02 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973gta02 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973gta02 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973gta02 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973gta02 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973gta02 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973gta02 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973gta02 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973gta02 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973gta02 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973gta02 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973gta02 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973gta02 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973gta02 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973gta02 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973gta02 { name 'Mono Mixer Sidetone Playback Sw' value true } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973gta02 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,31 +762,31 @@ state.neo1973gta02 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Right Mixer Sidetone Playback S' - value true + value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Right Mixer Right Playback Swit' - value false + value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Right Mixer Bypass Playback Swi' - value false + value true } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973gta02 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,15 +802,15 @@ state.neo1973gta02 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'Left Mixer Left Playback Switch' - value false + value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,15 +818,15 @@ state.neo1973gta02 { name 'Left Mixer Bypass Playback Swit' value true } - control.86 { + control.87 { comment.access 'read write' comment.type BOOLEAN comment.count 1 iface MIXER name 'DAPM Stereo Out Switch' - value true + value false } - control.87 { + control.88 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -824,7 +834,7 @@ state.neo1973gta02 { name 'DAPM GSM Line Out Switch' value true } - control.88 { + control.89 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -832,7 +842,7 @@ state.neo1973gta02 { name 'DAPM GSM Line In Switch' value false } - control.89 { + control.90 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -840,7 +850,7 @@ state.neo1973gta02 { name 'DAPM Headset Mic Switch' value false } - control.90 { + control.91 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -848,7 +858,7 @@ state.neo1973gta02 { name 'DAPM Handset Mic Switch' value true } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -856,4 +866,20 @@ state.neo1973gta02 { name 'DAPM Handset Spk Switch' value true } + control.93 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp State Switch' + value false + } + control.94 { + comment.access 'read write' + comment.type BOOLEAN + comment.count 1 + iface MIXER + name 'Amp Spk Switch' + value false + } } -- cgit v1.2.3 From d6aa69cc80b27e63f4f77420532b4ed83af7c2a3 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 12 Mar 2008 06:32:13 +0000 Subject: Qtopia Phone X11: Set LD_LIBRARY_PATH bump the PR due the package content change --- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia | 1 + packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia index 3eca6bba91..0496deff86 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia +++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia @@ -3,6 +3,7 @@ # path setup export QPEDIR=/opt/Qtopia export PATH=$QPEDIR/bin:$PATH +export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH #tell how to inform illume on incoming phone calls #export ILLUME_PHONE_CALL= diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 21945c5011..e4be0e7246 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -10,9 +10,9 @@ SECTION = "qtopia-phone" LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" -DEPENDS = "glib-2.0 dbus tslib freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" +DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" -PR = "r1" +PR = "r2" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://device-conf \ -- cgit v1.2.3 From 387daf5ea29f7a0d0b44681b5d488ddc24f99144 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 12 Mar 2008 07:52:43 +0000 Subject: Qtopia X11: Add a task and image for Qtopia/X11 This installs e-wm, illume and Qtopia/X11 It has some stuff copied from task-openmoko-ui but we do not want to have Gtk+ in this image so can't depend on task-openmoko-ui. Cleaning this up is left for some one else. --- packages/images/openmoko-qtopia-x11-image.bb | 7 ++++++ packages/tasks/task-openmoko-qtopia-x11.bb | 35 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 packages/images/openmoko-qtopia-x11-image.bb create mode 100644 packages/tasks/task-openmoko-qtopia-x11.bb diff --git a/packages/images/openmoko-qtopia-x11-image.bb b/packages/images/openmoko-qtopia-x11-image.bb new file mode 100644 index 0000000000..3291c53369 --- /dev/null +++ b/packages/images/openmoko-qtopia-x11-image.bb @@ -0,0 +1,7 @@ +#------------------------------------------------------ +# OpenMoko Qtopia/X11 Image Recipe +#------------------------------------------------------ + +require openmoko-minimal-image.bb + +IMAGE_INSTALL += "task-openmoko-qtopia-x11" diff --git a/packages/tasks/task-openmoko-qtopia-x11.bb b/packages/tasks/task-openmoko-qtopia-x11.bb new file mode 100644 index 0000000000..801e0e4ea5 --- /dev/null +++ b/packages/tasks/task-openmoko-qtopia-x11.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" +SECTION = "openmoko/base" +ALLOW_EMPTY = "1" +PACKAGE_ARCH = "${MACHINE_ARCH}" +LICENSE = "MIT" +PR = "r46" + +inherit task + +XSERVER ?= "xserver-kdrive-fbdev" + +PACKAGES = "task-openmoko-qtopia-x11" + +# +# task-openmoko-qtopia-x11 +# +DESCRIPTION_task-openmoko-qtopia-x11 = "OpenMoko: The Qtopia/X11 based User Interface" +RDEPENDS_task-openmoko-qtopia-x11 = "\ + alsa-state \ + bluez-hcidump \ + readline \ + qtopia-phone-x11 \ + e-wm \ + illume \ + ${XSERVER} \ + xserver-kdrive-common \ + xserver-nodm-init \ + xauth \ + xhost \ + xset \ + xrandr \ + neod \ + libnotify \ +" + -- cgit v1.2.3 From 32392a17cfeb75b81d5e38d29888819bc21cf055 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 12 Mar 2008 08:45:47 +0000 Subject: Qtopia X11: Build the Qt codecs instead of iconv --- packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf index fa44869e4a..e8e6c2ec3a 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf @@ -10,6 +10,7 @@ -extra-qtopiacore-config "-fast" -extra-qtopiacore-config "-no-accessibility" -extra-qtopiacore-config "-no-cups" +-extra-qtopiacore-config "-no-iconv" -extra-qtopiacore-config "-nomake demos" -extra-qtopiacore-config "-nomake examples" -extra-qtopiacore-config "-qt-libjpeg" -- cgit v1.2.3 From 7b10995373f19ff40e51f1ea5021d6182fae243f Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 12 Mar 2008 13:14:43 +0000 Subject: edbus and exml deserve a proper PV otherwise bad things will happen on install Make sure edbus and exml have a proper version number otherwise e-wm and other ipkg will not make sure they get installed --- packages/efl1/edbus_cvs.bb | 1 + packages/efl1/exml_cvs.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb index 28bcbb1816..d9c2b83b79 100644 --- a/packages/efl1/edbus_cvs.bb +++ b/packages/efl1/edbus_cvs.bb @@ -1,6 +1,7 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore" LICENSE = "MIT BSD" +PV = "0.1.0.042+cvs${SRCDATE}" PR = "r2" inherit efl_library diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb index add3053a02..b94af05833 100644 --- a/packages/efl1/exml_cvs.bb +++ b/packages/efl1/exml_cvs.bb @@ -1,6 +1,7 @@ DESCRIPTION = "Exml is a generic XML parser wrapper." LICENSE = "MIT" DEPENDS = "libxml2 libxslt ecore" +PV = "0.1.1+cvs${SRCDATE}" inherit efl_library -- cgit v1.2.3 From 31decf688aa5f40a3c9f03191f9998b302ae3e61 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Mar 2008 06:38:07 +0000 Subject: tangogps: map and position on Openmoko / Neo1973 --- packages/openmoko-projects/tangogps/.mtn2git_empty | 0 .../tangogps/global-config-h.patch | 30 ++++++++++++++++++++++ packages/openmoko-projects/tangogps_0.7.bb | 15 +++++++++++ 3 files changed, 45 insertions(+) create mode 100644 packages/openmoko-projects/tangogps/.mtn2git_empty create mode 100644 packages/openmoko-projects/tangogps/global-config-h.patch create 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 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-projects/tangogps/global-config-h.patch b/packages/openmoko-projects/tangogps/global-config-h.patch new file mode 100644 index 0000000000..973710c942 --- /dev/null +++ b/packages/openmoko-projects/tangogps/global-config-h.patch @@ -0,0 +1,30 @@ +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 new file mode 100644 index 0000000000..4376156fc5 --- /dev/null +++ b/packages/openmoko-projects/tangogps_0.7.bb @@ -0,0 +1,15 @@ +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 -- cgit v1.2.3 From 276f37e4bcf80ee007f3941821e6b54bf01d1a0d Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Mar 2008 09:30:47 +0000 Subject: diversity-daemon: update DEPENDS, RDEPENDS and EXTRA_OECONF --- packages/openmoko-projects/diversity-daemon_svn.bb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb index 6ea4f54a92..02e1ea29bb 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -2,10 +2,10 @@ 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" +DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" +RDEPENDS = "eds-dbus openmoko-dialer2" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https" @@ -13,7 +13,7 @@ S = "${WORKDIR}/diversity-daemon" inherit autotools pkgconfig -EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus" +EXTRA_OECONF = "--disable-nm --disable-xmpp --enable-session-bus" FILES_${PN} += "${datadir}/dbus-1/" FILES_${PN} += "${sysconfdir}/dbus-1/" -- cgit v1.2.3 From 931e4f237157166d516c85658266a8ea629ebc53 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Mar 2008 09:31:25 +0000 Subject: diversity-nav: update RDEPENDS --- packages/openmoko-projects/diversity-nav_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb index 58090e9baf..23d6b4daf6 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -3,9 +3,9 @@ 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" +RDEPENDS = "diversity-daemon" PV = "0.0.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" -- cgit v1.2.3 From 7769c451c2a6f83bac3cd225b2e1590b810ba6c2 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Mar 2008 09:31:55 +0000 Subject: packagekit: update RDEPENDS --- packages/packagekit/packagekit_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index d4055ead63..5d43c5a1e5 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -3,9 +3,9 @@ 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" +RDEPENDS = "opkg" PV = "0.1+git${SRCREV}" -PR = "r7" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \ file://disable-docbook2man.patch;patch=1" -- cgit v1.2.3 From 1345aed3f119c6fce15b815b89ac7dfad0c79cf4 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 13 Mar 2008 09:33:24 +0000 Subject: task-openmoko-feed: add diversity-daemon/nav, assassin and tangogps --- packages/tasks/task-openmoko-feed.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index 3f1604c4cb..beb72cd4b0 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,7 +1,7 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r25" +PR = "r26" inherit task @@ -42,4 +42,8 @@ RDEPENDS_task-openmoko-feed = "\ qtopia-phone \ gnash \ mono \ + diversity-daemon \ + diversity-nav \ + assassin \ + tangogps \ " -- cgit v1.2.3 From ac31db3aa881b9af9bad762aa21972e0e6f0516d Mon Sep 17 00:00:00 2001 From: Dojii Seketeli Date: Thu, 13 Mar 2008 23:44:13 +0000 Subject: update to fix "off-by-one" bug when scrolling with xglamo --- packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb index 9f38760234..8310db18df 100644 --- a/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb +++ b/packages/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb @@ -9,9 +9,9 @@ DEPENDS += "libxkbfile libxcalibrate" RDEPENDS_${PN} = "xserver-kdrive" PROVIDES = "virtual/xserver" PE = "1" -PR = "r0" +PR = "r1" -XGLAMO_GIT_REV = "d96175a2db993ef4bc7d9d910e0b47ec7ff20561" +XGLAMO_GIT_REV = "0d2605edeb50a4b118ac00ae1f00abd085477323" SRC_URI = "git://people.freedesktop.org/~dodji/xglamo;protocol=git;rev=${XGLAMO_GIT_REV} \ file://kmode.patch;patch=1 \ -- cgit v1.2.3 From 94cb90e09f2608595cec88d3e1497bf7b3cf5d78 Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 14 Mar 2008 05:52:45 +0000 Subject: tangogps: fix hardcoded include path problem in src/Makefile.am --- packages/openmoko-projects/tangogps_0.7.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/openmoko-projects/tangogps_0.7.bb b/packages/openmoko-projects/tangogps_0.7.bb index 4376156fc5..63513ffe00 100644 --- a/packages/openmoko-projects/tangogps_0.7.bb +++ b/packages/openmoko-projects/tangogps_0.7.bb @@ -13,3 +13,5 @@ SRC_URI = "http://tangogps.org/tangoGPS-0.7.tar.gz \ S = "${WORKDIR}/tangoGPS-0.7" inherit autotools + +CPPFLAGS += "-I${STAGING_INCDIR}/gconf/2/" -- cgit v1.2.3 From 2347ce4a3fbe9a4bef175a1e06d7b7297c1c2d7d Mon Sep 17 00:00:00 2001 From: John Lee Date: Fri, 14 Mar 2008 13:02:22 +0000 Subject: openmoko-session2: remove matchbox-applet-startup-monitor because it's duplicated with startup applet. --- packages/openmoko2/openmoko-session2.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 02489f5621..a031c91af4 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,10 +1,10 @@ DESCRIPTION = "Custom Matchbox session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" +RDEPENDS = "matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r64" +PR = "r65" SRC_URI = "\ file://etc \ -- cgit v1.2.3 From 725a308369696af4afa29db22b164f98e7a34ba0 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Mar 2008 16:56:05 +0000 Subject: alsa/alsa-state/fic-gta01/ : update the state files from svn --- packages/alsa/alsa-state/fic-gta01/asound.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/capturehandset.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/captureheadset.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/gsmbluetooth.state | 86 +++++++++---------- .../alsa/alsa-state/fic-gta01/gsmhandset.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/gsmheadset.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/gsmspeakerout.state | 96 ++++++++++++---------- packages/alsa/alsa-state/fic-gta01/stereoout.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/voip-handset.state | 96 ++++++++++++---------- .../alsa/alsa-state/fic-gta01/voip-headset.state | 96 ++++++++++++---------- 10 files changed, 520 insertions(+), 430 deletions(-) diff --git a/packages/alsa/alsa-state/fic-gta01/asound.state b/packages/alsa/alsa-state/fic-gta01/asound.state index 42ff0ed7ad..26db3cf311 100644 --- a/packages/alsa/alsa-state/fic-gta01/asound.state +++ b/packages/alsa/alsa-state/fic-gta01/asound.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Line 2' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 22 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 22 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 0 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value 'Stereo Speakers + Headphones' } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value Headphones } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/capturehandset.state b/packages/alsa/alsa-state/fic-gta01/capturehandset.state index 4a55f09035..54bf01e945 100644 --- a/packages/alsa/alsa-state/fic-gta01/capturehandset.state +++ b/packages/alsa/alsa-state/fic-gta01/capturehandset.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Line 2' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value true } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value 'Analogue Mix Left' } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value 'Analogue Mix Left' } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value false } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value false } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 0 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 0 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 0 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value Off } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'Capture Handset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/captureheadset.state b/packages/alsa/alsa-state/fic-gta01/captureheadset.state index 3a27323b25..2a174d80ab 100644 --- a/packages/alsa/alsa-state/fic-gta01/captureheadset.state +++ b/packages/alsa/alsa-state/fic-gta01/captureheadset.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Line 2' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value true } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value 'Analogue Mix Left' } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value 'Analogue Mix Left' } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value false } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value false } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 0 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 0 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 0 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value Off } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'Capture Headset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state index a0c0c95ea6..8569474a0e 100644 --- a/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state +++ b/packages/alsa/alsa-state/fic-gta01/gsmbluetooth.state @@ -491,7 +491,7 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +502,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +514,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +526,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +536,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +546,7 @@ state.neo1973 { name 'Line Right Mux' value 'Line 2' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +556,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +564,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +572,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +580,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +588,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value true } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +600,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +611,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +622,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +634,7 @@ state.neo1973 { name 'Capture Right Mixer' value 'Analogue Mix Left' } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +646,7 @@ state.neo1973 { name 'Capture Left Mixer' value 'Analogue Mix Left' } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +654,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +662,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +670,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +681,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +692,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +704,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +712,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +720,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +728,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value true } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +736,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +744,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +752,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +760,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +768,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value false } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +776,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +784,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +792,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +800,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value false } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +808,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +817,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 0 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +826,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 0 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +835,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 0 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +848,7 @@ state.neo1973 { name 'Amp Mode' value Off } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +865,7 @@ state.neo1973 { name 'Neo Mode' value 'GSM Bluetooth' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +873,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +881,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +889,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state index f7fb55ccd1..999f71253c 100644 --- a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state +++ b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Mic 2' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value true } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value false } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value true } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value false } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value true } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 26 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 0 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 9 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value 'Call Speaker' } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'GSM Handset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state index e732b77db8..e81bfc8306 100644 --- a/packages/alsa/alsa-state/fic-gta01/gsmheadset.state +++ b/packages/alsa/alsa-state/fic-gta01/gsmheadset.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value true } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Mic 1' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value true } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value false } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value true } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value false } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value true } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 30 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 15 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 0 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value Headphones } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'GSM Headset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state b/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state index 950f7e1379..5e3ed93179 100644 --- a/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state +++ b/packages/alsa/alsa-state/fic-gta01/gsmspeakerout.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Rx Mix' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Mic 1' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value true } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value false } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value true } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value false } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value true } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 31 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 31 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 9 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value 'Stereo Speakers' } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'GSM Handset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/stereoout.state b/packages/alsa/alsa-state/fic-gta01/stereoout.state index 42ff0ed7ad..26db3cf311 100644 --- a/packages/alsa/alsa-state/fic-gta01/stereoout.state +++ b/packages/alsa/alsa-state/fic-gta01/stereoout.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value Stereo } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Line Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Line 2' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Left PGA' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value Stereo } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value Stereo } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 22 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 22 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 0 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value 'Stereo Speakers + Headphones' } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value Headphones } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value false } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/voip-handset.state b/packages/alsa/alsa-state/fic-gta01/voip-handset.state index e4892afc5b..420a4eb79d 100644 --- a/packages/alsa/alsa-state/fic-gta01/voip-handset.state +++ b/packages/alsa/alsa-state/fic-gta01/voip-handset.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value 'Channel Swap' } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 2' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Rx Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value true } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value false } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Mic 1' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value 'Analogue Mix Left' } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value 'Analogue Mix Left' } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 16 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 29 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 18 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value 'Call Speaker' } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'GSM Handset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value true } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 diff --git a/packages/alsa/alsa-state/fic-gta01/voip-headset.state b/packages/alsa/alsa-state/fic-gta01/voip-headset.state index cccaa99c9a..df22f5b7d5 100644 --- a/packages/alsa/alsa-state/fic-gta01/voip-headset.state +++ b/packages/alsa/alsa-state/fic-gta01/voip-headset.state @@ -491,7 +491,17 @@ state.neo1973 { name 'ADC Data Select' value 'Channel Swap' } - control.52 { + control.52 { + comment.access 'read write' + comment.type ENUMERATED + comment.count 1 + comment.item.0 'Non Inverted' + comment.item.1 Inverted + iface MIXER + name 'ROUT2 Phase' + value Inverted + } + control.53 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -502,7 +512,7 @@ state.neo1973 { name 'Mic Selection Mux' value 'Mic 1' } - control.53 { + control.54 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -514,7 +524,7 @@ state.neo1973 { name 'Rx Mixer' value 'RXP - RXN' } - control.54 { + control.55 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -526,7 +536,7 @@ state.neo1973 { name 'Line Mixer' value 'Line 1 + 2' } - control.55 { + control.56 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -536,7 +546,7 @@ state.neo1973 { name 'Line Mono Mux' value 'Rx Mix' } - control.56 { + control.57 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -546,7 +556,7 @@ state.neo1973 { name 'Line Right Mux' value 'Rx Mix' } - control.57 { + control.58 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -556,7 +566,7 @@ state.neo1973 { name 'Line Left Mux' value 'Line 1' } - control.58 { + control.59 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -564,7 +574,7 @@ state.neo1973 { name 'ALC Mixer Line Capture Switch' value false } - control.59 { + control.60 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -572,7 +582,7 @@ state.neo1973 { name 'ALC Mixer Mic2 Capture Switch' value false } - control.60 { + control.61 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -580,7 +590,7 @@ state.neo1973 { name 'ALC Mixer Mic1 Capture Switch' value true } - control.61 { + control.62 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -588,7 +598,7 @@ state.neo1973 { name 'ALC Mixer Rx Capture Switch' value false } - control.62 { + control.63 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -600,7 +610,7 @@ state.neo1973 { name 'Mic Sidetone Mux' value 'Mic 1' } - control.63 { + control.64 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -611,7 +621,7 @@ state.neo1973 { name 'Capture Right Mux' value PGA } - control.64 { + control.65 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -622,7 +632,7 @@ state.neo1973 { name 'Capture Left Mux' value PGA } - control.65 { + control.66 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -634,7 +644,7 @@ state.neo1973 { name 'Capture Right Mixer' value 'Analogue Mix Left' } - control.66 { + control.67 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -646,7 +656,7 @@ state.neo1973 { name 'Capture Left Mixer' value 'Analogue Mix Left' } - control.67 { + control.68 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -654,7 +664,7 @@ state.neo1973 { name 'Playback Mixer Voice Capture Sw' value false } - control.68 { + control.69 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -662,7 +672,7 @@ state.neo1973 { name 'Playback Mixer Left Capture Swi' value false } - control.69 { + control.70 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -670,7 +680,7 @@ state.neo1973 { name 'Playback Mixer Right Capture Sw' value false } - control.70 { + control.71 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -681,7 +691,7 @@ state.neo1973 { name 'Out4 Mux' value VREF } - control.71 { + control.72 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -692,7 +702,7 @@ state.neo1973 { name 'Out3 Mux' value VREF } - control.72 { + control.73 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -704,7 +714,7 @@ state.neo1973 { name 'Mono 2 Mux' value 'Inverted Mono 1' } - control.73 { + control.74 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -712,7 +722,7 @@ state.neo1973 { name 'Mono Mixer Left Playback Switch' value false } - control.74 { + control.75 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -720,7 +730,7 @@ state.neo1973 { name 'Mono Mixer Right Playback Switc' value false } - control.75 { + control.76 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -728,7 +738,7 @@ state.neo1973 { name 'Mono Mixer Voice Playback Switc' value false } - control.76 { + control.77 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -736,7 +746,7 @@ state.neo1973 { name 'Mono Mixer Sidetone Playback Sw' value false } - control.77 { + control.78 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -744,7 +754,7 @@ state.neo1973 { name 'Mono Mixer Bypass Playback Swit' value false } - control.78 { + control.79 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -752,7 +762,7 @@ state.neo1973 { name 'Right Mixer Voice Playback Swit' value false } - control.79 { + control.80 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -760,7 +770,7 @@ state.neo1973 { name 'Right Mixer Sidetone Playback S' value false } - control.80 { + control.81 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -768,7 +778,7 @@ state.neo1973 { name 'Right Mixer Right Playback Swit' value true } - control.81 { + control.82 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -776,7 +786,7 @@ state.neo1973 { name 'Right Mixer Bypass Playback Swi' value false } - control.82 { + control.83 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -784,7 +794,7 @@ state.neo1973 { name 'Left Mixer Voice Playback Switc' value false } - control.83 { + control.84 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -792,7 +802,7 @@ state.neo1973 { name 'Left Mixer Sidetone Playback Sw' value false } - control.84 { + control.85 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -800,7 +810,7 @@ state.neo1973 { name 'Left Mixer Left Playback Switch' value true } - control.85 { + control.86 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -808,7 +818,7 @@ state.neo1973 { name 'Left Mixer Bypass Playback Swit' value false } - control.86 { + control.87 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -817,7 +827,7 @@ state.neo1973 { name 'Amp Left Playback Volume' value 16 } - control.87 { + control.88 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -826,7 +836,7 @@ state.neo1973 { name 'Amp Right Playback Volume' value 29 } - control.88 { + control.89 { comment.access 'read write' comment.type INTEGER comment.count 1 @@ -835,7 +845,7 @@ state.neo1973 { name 'Amp Mono Playback Volume' value 18 } - control.89 { + control.90 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -848,7 +858,7 @@ state.neo1973 { name 'Amp Mode' value Headphones } - control.90 { + control.91 { comment.access 'read write' comment.type ENUMERATED comment.count 1 @@ -865,7 +875,7 @@ state.neo1973 { name 'Neo Mode' value 'GSM Headset' } - control.91 { + control.92 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -873,7 +883,7 @@ state.neo1973 { name 'Amp Spk 3D Playback Switch' value true } - control.92 { + control.93 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -881,7 +891,7 @@ state.neo1973 { name 'Amp HP 3d Playback Switch' value false } - control.93 { + control.94 { comment.access 'read write' comment.type BOOLEAN comment.count 1 @@ -889,7 +899,7 @@ state.neo1973 { name 'Amp Fast Wakeup Playback Switch' value false } - control.94 { + control.95 { comment.access 'read write' comment.type BOOLEAN comment.count 1 -- cgit v1.2.3 From 7ae19771c6dc0f98120a0e30e4fb43bfe2ccfcbd Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 15 Mar 2008 19:48:51 +0000 Subject: Qtopia/X11: Use keycodes that exist on our target --- .../qtopia-phone-x11/Xsession.d/99qtopia | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia index 0496deff86..88be2061dc 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia +++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia @@ -1,34 +1,34 @@ #!/bin/sh +# xmodmap to allow the soft-menu to work +xmodmap -e "keycode 180 = 0x11000601" +xmodmap -e "keycode 181 = 0x11000602" +xmodmap -e "keycode 182 = 0x11000603" +xmodmap -e "keycode 183 = 0x11000604" +xmodmap -e "keycode 184 = 0x11000605" +xmodmap -e "keycode 185 = 0x11000606" +xmodmap -e "keycode 186 = 0x11000607" +xmodmap -e "keycode 187 = 0x11000608" +xmodmap -e "keycode 188 = 0x11000609" +xmodmap -e "keycode 189 = 0x1100060A" +xmodmap -e "keycode 190 = 0x1100060B" +xmodmap -e "keycode 191 = 0x1100060B" +xmodmap -e "keycode 192 = 0x1100060A" +xmodmap -e "keycode 193 = 0x1100060C" +xmodmap -e "keycode 194 = 0x1100060D" +xmodmap -e "keycode 195 = 0x1100060E" +xmodmap -e "keycode 196 = 0x1100060F" +xmodmap -e "keycode 197 = 0x11000610" +xmodmap -e "keycode 198 = 0x1008ff26" + # path setup export QPEDIR=/opt/Qtopia export PATH=$QPEDIR/bin:$PATH export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH -#tell how to inform illume on incoming phone calls +#tell Qtopia how to inform illume on incoming phone calls #export ILLUME_PHONE_CALL= -# xmodmap to allow the soft-menu to work -xmodmap -e "keycode 223 = 0x11000601" -xmodmap -e "keycode 224 = 0x11000602" -xmodmap -e "keycode 225 = 0x11000603" -xmodmap -e "keycode 226 = 0x11000604" -xmodmap -e "keycode 227 = 0x11000605" -xmodmap -e "keycode 228 = 0x11000606" -xmodmap -e "keycode 229 = 0x11000607" -xmodmap -e "keycode 230 = 0x11000608" -xmodmap -e "keycode 231 = 0x11000609" -xmodmap -e "keycode 232 = 0x1100060A" -xmodmap -e "keycode 232 = 0x1100060B" -xmodmap -e "keycode 233 = 0x1100060B" -xmodmap -e "keycode 232 = 0x1100060A" -xmodmap -e "keycode 234 = 0x1100060C" -xmodmap -e "keycode 235 = 0x1100060D" -xmodmap -e "keycode 236 = 0x1100060E" -xmodmap -e "keycode 237 = 0x1100060F" -xmodmap -e "keycode 238 = 0x11000610" -xmodmap -e "keycode 239 = 0x1008ff26" - # Now start Qtopia exec qpe -- cgit v1.2.3 From 15583248362ff2562d5fcb02c1462864dd00e349 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 15 Mar 2008 20:18:24 +0000 Subject: Qtopia/X11: Install a qtopia.sh into the profile.d to set PATH, QPEDIR and LD_LIBRARY_PATH --- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh | 4 ++++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 packages/qtopia-phone/qtopia-phone-x11/qtopia.sh diff --git a/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh b/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh new file mode 100644 index 0000000000..823d27dc93 --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export QPEDIR=/opt/Qtopia +export PATH=$PATH=$QPEDIR/bin +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index e4be0e7246..89984bf5ef 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -12,12 +12,13 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" -PR = "r2" +PR = "r4" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://device-conf \ file://qplatformdefs.h \ - file://Xsession.d/99qtopia" + file://Xsession.d/99qtopia \ + file://qtopia.sh" S = "${WORKDIR}/git" @@ -116,6 +117,9 @@ do_install() { # Install some scripts install -d ${D}${bindir} install -m 0755 ${S}/bin/qcop-x11-launch ${D}${bindir} + + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/ } FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ -- cgit v1.2.3 From e65f254f961e7dcc820e8a75f44ec8b8de107321 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 15 Mar 2008 21:24:17 +0000 Subject: Qtopia/X11: We need fontconfig to display any fonts, xrandr and xrender should be there as well --- packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf index e8e6c2ec3a..7c8a59ff29 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf @@ -19,6 +19,9 @@ -extra-qtopiacore-config "-qt-zlib" -extra-qtopiacore-config "-release" -extra-qtopiacore-config "-no-sm" +-extra-qtopiacore-config "-fontconfig" +-extra-qtopiacore-config "-xrandr" +-extra-qtopiacore-config "-xrender" -extra-qtopiacore-config "OE_QT_ENDIAN" -extra-qt-config "-nomake examples" -extra-qt-config "-nomake demos" -- cgit v1.2.3 From 0fb3403491af5743dd7a704db74003b164cfa30d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 15 Mar 2008 21:41:42 +0000 Subject: Qtopia/X11: Both _INCDIR and _LIBDIR are not used --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 89984bf5ef..9a498451d6 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -44,8 +44,6 @@ BUILDDIR = "${WORKDIR}/build" OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" OE_QT_ARCH = "${QT_ARCH}" OE_QT_XPLATFORM = "${XPLATFORM}" -OE_QT_LIBDIR = "${STAGING_LIBDIR}" -OE_QT_INCDIR = "${STAGING_INCDIR}" OE_QT_RPREFIX = "/opt/Qtopia" OE_QT_ENDIAN = "${QT_ENDIAN}" OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" @@ -70,8 +68,6 @@ sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_LIBDIR|${OE_QT_LIBDIR}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_INCDIR|${OE_QT_INCDIR}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf -- cgit v1.2.3 From ff7b3adf6c161c7d75ea50870803ccc47a038f76 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 15 Mar 2008 21:55:14 +0000 Subject: Qtopia/X11: Assist the Qt/Qtopia buildsystem in finding the freetype2/fontconfig headers --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 9a498451d6..3a08e86d66 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -79,7 +79,7 @@ echo "" > ${S}/devices/${TARGET-DEVICE}/environment mkdir -p ${BUILDDIR} cd ${BUILDDIR} -echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} +echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig } -- cgit v1.2.3 From 71a43ce3393df9b1380d47d36335a920a5c41461 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 16 Mar 2008 11:56:58 +0000 Subject: Qtopia/X11: Fix the export of the PATH --- packages/qtopia-phone/qtopia-phone-x11/qtopia.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh b/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh index 823d27dc93..b28001d016 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh +++ b/packages/qtopia-phone/qtopia-phone-x11/qtopia.sh @@ -1,4 +1,4 @@ #!/bin/sh export QPEDIR=/opt/Qtopia -export PATH=$PATH=$QPEDIR/bin +export PATH=$PATH:$QPEDIR/bin export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$QPEDIR/lib -- cgit v1.2.3 From 58b33ba0fee9c0a7a44934a5e5e944239618c22d Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 17 Mar 2008 13:40:01 +0000 Subject: assassin: add new depends 'etk' --- packages/openmoko-projects/assassin_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb index 83927c1d2a..ec3b8c12bb 100644 --- a/packages/openmoko-projects/assassin_svn.bb +++ b/packages/openmoko-projects/assassin_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Action GUI for Installer" HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit" +DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk" PV = "0.2+svn${SRCREV}" -PR = "r2" +PR = "r3" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" -- cgit v1.2.3 From a39deb9f381a529332a328ee617d1160e35db5c2 Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 17 Mar 2008 14:00:19 +0000 Subject: assassin: add depends edbus --- packages/openmoko-projects/assassin_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb index ec3b8c12bb..987d44070d 100644 --- a/packages/openmoko-projects/assassin_svn.bb +++ b/packages/openmoko-projects/assassin_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Action GUI for Installer" HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk" +DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus" PV = "0.2+svn${SRCREV}" -PR = "r3" +PR = "r4" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" -- cgit v1.2.3 From 7e7eec1c599c0b906ffe0eb0906f9babcddbf559 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 17 Mar 2008 14:48:57 +0000 Subject: sane-srcrevs.inc: Start with 12 for illume --- conf/distro/include/sane-srcrevs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 36862bd83b..5e4f7175c6 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -38,6 +38,7 @@ SRCREV_pn-gsm0710muxd ?= "90" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" +SRCREV_pn-illume ?= "12" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" -- cgit v1.2.3 From c02b22a9f338ecd2ac1615d61fabdccc00f7b71e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 17 Mar 2008 14:53:04 +0000 Subject: intltool: Add 0.37.1 to have a version that knows about INTLTOOL_POLICY_RULE needed for packagekit Make sure we have a intltool version with INTLTOOL_POLICY_RULE. This is from http://bugzilla.gnome.org/show_bug.cgi?id=462312 included in 0.37.1 and needed by packagekit. --- conf/checksums.ini | 4 ++++ packages/intltool/intltool-native_0.37.1.bb | 7 +++++++ packages/intltool/intltool_0.37.1.bb | 1 + 3 files changed, 12 insertions(+) create mode 100644 packages/intltool/intltool-native_0.37.1.bb create mode 100644 packages/intltool/intltool_0.37.1.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 307d473844..8ad4f9b537 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -5210,6 +5210,10 @@ sha256=38bd74418bbac5a34884221e2b710a81876d445d8acfc7d22bde67fe882f96d8 md5=1822943ce6745596b2510d2b425cb90d sha256=b27763c368ceb6744bf687ba371566697a2828d11b576cd4ac853f0a582b0845 +[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.37/intltool-0.37.1.tar.bz2] +md5=860d392f04299c2740d0752501639c3b +sha256=76cceaaaf188dfac032b21eb5dc4c7d231efe7ff180dee85dbf5e18bc5d27fe7 + [http://www.iozone.org/src/current/iozone3_263.tar] md5=44fd88df361ec4508e10c8d6615245fa sha256=920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461 diff --git a/packages/intltool/intltool-native_0.37.1.bb b/packages/intltool/intltool-native_0.37.1.bb new file mode 100644 index 0000000000..bac5378113 --- /dev/null +++ b/packages/intltool/intltool-native_0.37.1.bb @@ -0,0 +1,7 @@ +require intltool_${PV}.bb + +inherit native +DEPENDS = "libxml-parser-perl-native" + +export PERL = "/usr/bin/env perl" +SRC_URI_append = " file://intltool-nowarn.patch;patch=1" diff --git a/packages/intltool/intltool_0.37.1.bb b/packages/intltool/intltool_0.37.1.bb new file mode 100644 index 0000000000..e48262574b --- /dev/null +++ b/packages/intltool/intltool_0.37.1.bb @@ -0,0 +1 @@ +require intltool.inc -- cgit v1.2.3 From 7c68de091f004e093a4bc9682882e275d8d38aeb Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 17 Mar 2008 14:55:09 +0000 Subject: packagekit: We need a specific version of intltool-native to have INTLTOOL_POLICY_RULE If we don't have a intltool version that knows about INTLTOOL_POLICY_RULE we will get compile errors because the Makefile contains @INTLTOOL_POLICY_RULE@ --- packages/packagekit/packagekit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index 5d43c5a1e5..5b67ac1b9c 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "PackageKit package management abstraction" SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool" +DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" RDEPENDS = "opkg" PV = "0.1+git${SRCREV}" PR = "r8" -- cgit v1.2.3 From 8f3ab9deabfec95eae9d7a19b1ad974e98a0b710 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 17 Mar 2008 14:59:14 +0000 Subject: packagekit: Package the debug symbols of the backends as well --- packages/packagekit/packagekit_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index 5b67ac1b9c..6f3419a60a 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -25,3 +25,4 @@ do_stage () { } FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so " -- cgit v1.2.3 From 9a4113fa26927867f33b35579de32f72b0728218 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 17 Mar 2008 16:00:48 +0000 Subject: Add my tools to forward the Serial from the Neo to my PC and provide a PTY on the PC --- conf/distro/include/sane-srcrevs.inc | 2 ++ packages/openmoko-tools/pty-forward-native.bb | 24 ++++++++++++++++++++++++ packages/openmoko-tools/serial-forward.bb | 15 +++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 packages/openmoko-tools/pty-forward-native.bb create mode 100644 packages/openmoko-tools/serial-forward.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 5e4f7175c6..dc5961c620 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -141,6 +141,7 @@ SRCREV_pn-opkg ?= "4142" SRCREV_pn-opkg-native ?= "4142" SRCREV_pn-oprofileui ?= "160" SRCREV_pn-psplash ?= "249" +SRCREV_pn-pty-forward-native ?= "4214" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "88" SRCREV_pn-pyneog ?= "88" @@ -148,6 +149,7 @@ SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "127" SRCREV_pn-python-lightmediascanner = "68" SRCREV_pn-s3c24xx-gpio ?= "4130" +SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "1755" SRCREV_pn-sjf2410-linux-native ?= "933" SRCREV_pn-sphyrna ?= "45" diff --git a/packages/openmoko-tools/pty-forward-native.bb b/packages/openmoko-tools/pty-forward-native.bb new file mode 100644 index 0000000000..972070d6b6 --- /dev/null +++ b/packages/openmoko-tools/pty-forward-native.bb @@ -0,0 +1,24 @@ +LICENSE="GPL" +SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY" + +SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S = "${WORKDIR}/serial_forward" + +inherit native + +do_compile() { + cd ${S} + oe_runmake +} + +do_stage() { + : +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward +} + +addtask deploy before do_package after do_install + diff --git a/packages/openmoko-tools/serial-forward.bb b/packages/openmoko-tools/serial-forward.bb new file mode 100644 index 0000000000..3cc33770d6 --- /dev/null +++ b/packages/openmoko-tools/serial-forward.bb @@ -0,0 +1,15 @@ +LICENSE="GPL" +SUMMARY="Forward a serial using TCP/IP" + +SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S="${WORKDIR}/serial_forward" + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/forward ${D}/${bindir}/${PN} +} -- cgit v1.2.3 From 3107952488a1a8c07c9218966eb0958c1f3a931d Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 18 Mar 2008 04:43:50 +0000 Subject: alsa-state: increase PR to reflect changes in fic-gta01 --- packages/alsa/alsa-state.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb index 16fee583d4..fa9dbe0fb8 100644 --- a/packages/alsa/alsa-state.bb +++ b/packages/alsa/alsa-state.bb @@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration" LICENSE = "GPL" RRECOMMENDS_alsa-state = "alsa-states" PV = "0.1.0" -PR = "r13" +PR = "r14" SRC_URI = " \ file://asoundrc \ -- cgit v1.2.3 From a39447305a6bfec0b4fd057f495cf253e31bb61a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 12:05:39 +0000 Subject: Next attempt to get a non segfaulting qpe/Qtopia. -edition phone might be the key but this should be set by .configureoptions.. --- .../qtopia-phone-x11/fic-gta02/device-conf | 47 +++++----------------- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 12 +----- 2 files changed, 13 insertions(+), 46 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf index 7c8a59ff29..0ec27eb773 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf @@ -1,45 +1,20 @@ --arch OE_QT_ARCH +-arch arm -xplatform OE_QT_XPLATFORM --verbose --qtopiamedia --no-infrared +-little-endian +-edition phone -dbus --dbuspath OE_QT_DBUSPATH --iconsize 22 -displaysize 480x640 --extra-qtopiacore-config "-fast" --extra-qtopiacore-config "-no-accessibility" --extra-qtopiacore-config "-no-cups" --extra-qtopiacore-config "-no-iconv" --extra-qtopiacore-config "-nomake demos" --extra-qtopiacore-config "-nomake examples" --extra-qtopiacore-config "-qt-libjpeg" --extra-qtopiacore-config "-qt-libmng" --extra-qtopiacore-config "-qt-libpng" --extra-qtopiacore-config "-qt-zlib" --extra-qtopiacore-config "-release" --extra-qtopiacore-config "-no-sm" --extra-qtopiacore-config "-fontconfig" --extra-qtopiacore-config "-xrandr" --extra-qtopiacore-config "-xrender" --extra-qtopiacore-config "OE_QT_ENDIAN" --extra-qt-config "-nomake examples" --extra-qt-config "-nomake demos" --extra-qt-config "-no-sm" --extra-qtopiacore-config "OE_QT_ENDIAN" --font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 --image OE_QT_RPREFIX --launch-method quicklaunch --force-quicklaunch --no-clean +-voip +-sound-system alsa +-bluetooth -no-drm --no-qvfb --no-vpn -no-sxe --no-silent +-no-infrared +-extra-qtopiacore-config "-no-cups -no-iconv -no-sm -fontconfig -xrender -xrandr" +-extra-qt-config "-nomake examples -nomake demos -no-sm" +-image OE_QT_RPREFIX +-launch-method normal -prefix OE_QT_RPREFIX --reduce-exports=yes -release -confirm-license -OE_QT_EXTRACONFIG diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 3a08e86d66..6f2f2023d9 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -12,7 +12,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" -PR = "r4" +PR = "r6" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://device-conf \ @@ -35,18 +35,13 @@ export QTOPIA_DEPOT_PATH = "${S}" require qtopia-phone_arch.inc -QT_ARCH = "${@qtopia_arch(d)}" -QT_ENDIAN = "${@qtopia_endian(d)}" PLATFORM = "${BUILD_OS}-g++" XPLATFORM = "linux-oe-g++" BUILDDIR = "${WORKDIR}/build" OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" -OE_QT_ARCH = "${QT_ARCH}" OE_QT_XPLATFORM = "${XPLATFORM}" OE_QT_RPREFIX = "/opt/Qtopia" -OE_QT_ENDIAN = "${QT_ENDIAN}" -OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" do_configure() { @@ -66,11 +61,8 @@ sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs # sed the dynamic config into the file sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf rm -f ${S}/devices/${TARGET-DEVICE}/configure cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure @@ -79,7 +71,7 @@ echo "" > ${S}/devices/${TARGET-DEVICE}/environment mkdir -p ${BUILDDIR} cd ${BUILDDIR} -echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig +echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0 } -- cgit v1.2.3 From 2c8b4228ac297fb42b71608fd1419a9d79b24135 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 12:11:49 +0000 Subject: Qtopia/X11: Use the muxer and phone vendor for the TI calypso module --- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia index 88be2061dc..a85e9aa5fe 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia +++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia @@ -28,6 +28,8 @@ export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH #tell Qtopia how to inform illume on incoming phone calls #export ILLUME_PHONE_CALL= +export QTOPIA_PHONE_VENDOR=ficgta01 +export QTOPIA_PHONE_MUX=ficgta01 # Now start Qtopia -- cgit v1.2.3 From 8bd23683ad73c1ec1a677fa3dba0172de94f432a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 18:42:51 +0000 Subject: Qtopia/X11: Rework configuration, compilation of Qtopia with the hope to make the segfaults go away --- .../qtopia-phone-x11/Xsession.d/.mtn2git_empty | 0 .../qtopia-phone-x11/Xsession.d/99qtopia | 36 ----- .../fic-gta02/Xsession.d/.mtn2git_empty | 0 .../qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia | 36 +++++ .../qtopia-phone-x11/fic-gta02/device-conf | 20 --- .../qtopia-phone-x11/fic-gta02/qplatformdefs.h | 146 --------------------- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 71 +++++----- 7 files changed, 72 insertions(+), 237 deletions(-) delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia deleted file mode 100644 index a85e9aa5fe..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# xmodmap to allow the soft-menu to work -xmodmap -e "keycode 180 = 0x11000601" -xmodmap -e "keycode 181 = 0x11000602" -xmodmap -e "keycode 182 = 0x11000603" -xmodmap -e "keycode 183 = 0x11000604" -xmodmap -e "keycode 184 = 0x11000605" -xmodmap -e "keycode 185 = 0x11000606" -xmodmap -e "keycode 186 = 0x11000607" -xmodmap -e "keycode 187 = 0x11000608" -xmodmap -e "keycode 188 = 0x11000609" -xmodmap -e "keycode 189 = 0x1100060A" -xmodmap -e "keycode 190 = 0x1100060B" -xmodmap -e "keycode 191 = 0x1100060B" -xmodmap -e "keycode 192 = 0x1100060A" -xmodmap -e "keycode 193 = 0x1100060C" -xmodmap -e "keycode 194 = 0x1100060D" -xmodmap -e "keycode 195 = 0x1100060E" -xmodmap -e "keycode 196 = 0x1100060F" -xmodmap -e "keycode 197 = 0x11000610" -xmodmap -e "keycode 198 = 0x1008ff26" - -# path setup -export QPEDIR=/opt/Qtopia -export PATH=$QPEDIR/bin:$PATH -export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH - -#tell Qtopia how to inform illume on incoming phone calls -#export ILLUME_PHONE_CALL= -export QTOPIA_PHONE_VENDOR=ficgta01 -export QTOPIA_PHONE_MUX=ficgta01 - - -# Now start Qtopia -exec qpe diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia new file mode 100644 index 0000000000..a85e9aa5fe --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia @@ -0,0 +1,36 @@ +#!/bin/sh + +# xmodmap to allow the soft-menu to work +xmodmap -e "keycode 180 = 0x11000601" +xmodmap -e "keycode 181 = 0x11000602" +xmodmap -e "keycode 182 = 0x11000603" +xmodmap -e "keycode 183 = 0x11000604" +xmodmap -e "keycode 184 = 0x11000605" +xmodmap -e "keycode 185 = 0x11000606" +xmodmap -e "keycode 186 = 0x11000607" +xmodmap -e "keycode 187 = 0x11000608" +xmodmap -e "keycode 188 = 0x11000609" +xmodmap -e "keycode 189 = 0x1100060A" +xmodmap -e "keycode 190 = 0x1100060B" +xmodmap -e "keycode 191 = 0x1100060B" +xmodmap -e "keycode 192 = 0x1100060A" +xmodmap -e "keycode 193 = 0x1100060C" +xmodmap -e "keycode 194 = 0x1100060D" +xmodmap -e "keycode 195 = 0x1100060E" +xmodmap -e "keycode 196 = 0x1100060F" +xmodmap -e "keycode 197 = 0x11000610" +xmodmap -e "keycode 198 = 0x1008ff26" + +# path setup +export QPEDIR=/opt/Qtopia +export PATH=$QPEDIR/bin:$PATH +export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH + +#tell Qtopia how to inform illume on incoming phone calls +#export ILLUME_PHONE_CALL= +export QTOPIA_PHONE_VENDOR=ficgta01 +export QTOPIA_PHONE_MUX=ficgta01 + + +# Now start Qtopia +exec qpe diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf deleted file mode 100644 index 0ec27eb773..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ /dev/null @@ -1,20 +0,0 @@ --arch arm --xplatform OE_QT_XPLATFORM --little-endian --edition phone --dbus --displaysize 480x640 --voip --sound-system alsa --bluetooth --no-drm --no-sxe --no-infrared --extra-qtopiacore-config "-no-cups -no-iconv -no-sm -fontconfig -xrender -xrandr" --extra-qt-config "-nomake examples -nomake demos -no-sm" --image OE_QT_RPREFIX --launch-method normal --prefix OE_QT_RPREFIX --release --confirm-license - diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h deleted file mode 100644 index c216578d97..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved. -** -** This file is part of the Opensource Edition of the Qtopia Toolkit. -** -** This software is licensed under the terms of the GNU General Public -** License (GPL) version 2. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -** -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// 1) need to reset default environment if _BSD_SOURCE is defined -// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -// 3) it seems older glibc need this to include the X/Open stuff -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct stat64 -#define QT_STATBUF4TSTAT struct stat64 -#define QT_STAT ::stat64 -#define QT_FSTAT ::fstat64 -#define QT_LSTAT ::lstat64 -#define QT_OPEN ::open64 -#define QT_TRUNCATE ::truncate64 -#define QT_FTRUNCATE ::ftruncate64 -#define QT_LSEEK ::lseek64 -#else -#define QT_STATBUF struct stat -#define QT_STATBUF4TSTAT struct stat -#define QT_STAT ::stat -#define QT_FSTAT ::fstat -#define QT_LSTAT ::lstat -#define QT_OPEN ::open -#define QT_TRUNCATE ::truncate -#define QT_FTRUNCATE ::ftruncate -#define QT_LSEEK ::lseek -#endif - -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FOPEN ::fopen64 -#define QT_FSEEK ::fseeko64 -#define QT_FTELL ::ftello64 -#define QT_FGETPOS ::fgetpos64 -#define QT_FSETPOS ::fsetpos64 -#define QT_FPOS_T fpos64_t -#define QT_OFF_T off64_t -#else -#define QT_FOPEN ::fopen -#define QT_FSEEK ::fseek -#define QT_FTELL ::ftell -#define QT_FGETPOS ::fgetpos -#define QT_FSETPOS ::fsetpos -#define QT_FPOS_T fpos_t -#define QT_OFF_T long -#endif - -#define QT_STAT_REG S_IFREG -#define QT_STAT_DIR S_IFDIR -#define QT_STAT_MASK S_IFMT -#define QT_STAT_LNK S_IFLNK -#define QT_SOCKET_CONNECT ::connect -#define QT_SOCKET_BIND ::bind -#define QT_SOCKET_BIND ::bind -#define QT_FILENO fileno -#define QT_CLOSE ::close -#define QT_READ ::read -#define QT_WRITE ::write -#define QT_ACCESS ::access -#define QT_GETCWD ::getcwd -#define QT_CHDIR ::chdir -#define QT_MKDIR ::mkdir -#define QT_RMDIR ::rmdir -#define QT_OPEN_LARGEFILE O_LARGEFILE -#define QT_OPEN_RDONLY O_RDONLY -#define QT_OPEN_WRONLY O_WRONLY -#define QT_OPEN_RDWR O_RDWR -#define QT_OPEN_CREAT O_CREAT -#define QT_OPEN_TRUNC O_TRUNC -#define QT_OPEN_APPEND O_APPEND - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#if defined(__GLIBC__) && (__GLIBC__ >= 2) -#define QT_SOCKLEN_T socklen_t -#else -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - -#define QT_QLOCALE_USES_FCVT - -#endif // QPLATFORMDEFS_H diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 6f2f2023d9..a7a1a2df85 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -12,11 +12,9 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" -PR = "r6" +PR = "r7" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ - file://device-conf \ - file://qplatformdefs.h \ file://Xsession.d/99qtopia \ file://qtopia.sh" @@ -31,47 +29,47 @@ TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}" -export QTOPIA_DEPOT_PATH = "${S}" - require qtopia-phone_arch.inc +QT_ARCH = "${@qtopia_arch(d)}" +QT_ENDIAN = "${@qtopia_endian(d)}" PLATFORM = "${BUILD_OS}-g++" -XPLATFORM = "linux-oe-g++" BUILDDIR = "${WORKDIR}/build" +OE_QT_PREFIX = "/opt/Qtopia" -OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" -OE_QT_XPLATFORM = "${XPLATFORM}" -OE_QT_RPREFIX = "/opt/Qtopia" +export OE_QMAKE_CC="${CC}" +export OE_QMAKE_CFLAGS="${CFLAGS}" +export OE_QMAKE_CXX="${CXX}" +export OE_QMAKE_LDFLAGS="${LDFLAGS}" +export OE_QMAKE_AR="${AR}" +export OE_QMAKE_STRIP="echo" +export OE_QMAKE_RPATH="-Wl,-rpath-link," do_configure() { +# This qmake some how does not honor env var, let us fix it by sed force +sed -i s%$\(OE_QMAKE_CC\)%"${CC}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_CFLAGS\)%"${CFLAGS}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_CXX\)%"${CXX}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_CXXFLAGS\)%"${CXXFLAGS}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_LINK\)%"${CXX}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_LDFLAGS\)%"${LDFLAGS}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_AR\)%"${AR}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_STRIP\)%"echo"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf + + unset CC unset CXX unset CFLAGS unset CXXFLAGS unset LDFLAGS -mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \ - ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -install -m 644 ${WORKDIR}/qplatformdefs.h \ - ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf -sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf - -# sed the dynamic config into the file -sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf - -rm -f ${S}/devices/${TARGET-DEVICE}/configure -cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure -rm -f ${S}/devices/${TARGET-DEVICE}/environment -echo "" > ${S}/devices/${TARGET-DEVICE}/environment mkdir -p ${BUILDDIR} cd ${BUILDDIR} -echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0 +echo yes | ${S}/configure -xplatform linux-oe-g++ -arch ${QT_ARCH} ${QT_ENDIAN} -prefix ${OE_QT_PREFIX} -device ${TARGET-DEVICE} -verbose \ + -no-drm -no-sxe -displaysize 480x640 -dbus -debug -extra-qtopiacore-config "-qt-libjpeg -qt-zlib -qt-libpng -no-iconv -no-sm -fontconfig -xrender -xrandr" \ + -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0 } @@ -86,7 +84,7 @@ do_stage() { do_install() { cd ${BUILDDIR} - oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} + oe_runmake install INSTALL_ROOT=${D}${OE_QT_PREFIX} IMAGE=${D}${OE_QT_PREFIX} # Install freedesktop.org .desktop files for enlightenment install -d ${D}${datadir}/applications @@ -110,12 +108,15 @@ do_install() { install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/ } -FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ - ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \ - ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \ - ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \ - ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \ - ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts" +FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help \ + ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \ + ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \ + ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \ + ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \ + ${OE_QT_PREFIX}/services" + +FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \ + ${OE_QT_PREFIX}/plugins/*/.debug/ ${OE_QT_PREFIX}/qt_plugins/*/.debug/ " -FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so" +FILES_${PN}-dev += "${OE_QT_PREFIX}/lib/*.so" -- cgit v1.2.3 From ac20f2d109f72d8e5f05815398bb98830e0f3291 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 20:18:39 +0000 Subject: Qtopia/X11: The alarm handling of Qtopia needs atd around to make sure we wake up --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index a7a1a2df85..2eea6933a1 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -11,6 +11,7 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" +RDEPENDS = "atd" PROVIDES = "qtopia-phone" PR = "r7" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From 36f7974ce2ee764858a3ed74638e2ae1524a24fe Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 20:37:12 +0000 Subject: Qtopia/X11: Make sure we get started before the window manager. No idea if the xmodmap settings will persist --- .../qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia | 36 ++++++++++++++++++++++ .../qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia | 36 ---------------------- 2 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia new file mode 100644 index 0000000000..c987e2618d --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia @@ -0,0 +1,36 @@ +#!/bin/sh + +# xmodmap to allow the soft-menu to work +xmodmap -e "keycode 180 = 0x11000601" +xmodmap -e "keycode 181 = 0x11000602" +xmodmap -e "keycode 182 = 0x11000603" +xmodmap -e "keycode 183 = 0x11000604" +xmodmap -e "keycode 184 = 0x11000605" +xmodmap -e "keycode 185 = 0x11000606" +xmodmap -e "keycode 186 = 0x11000607" +xmodmap -e "keycode 187 = 0x11000608" +xmodmap -e "keycode 188 = 0x11000609" +xmodmap -e "keycode 189 = 0x1100060A" +xmodmap -e "keycode 190 = 0x1100060B" +xmodmap -e "keycode 191 = 0x1100060B" +xmodmap -e "keycode 192 = 0x1100060A" +xmodmap -e "keycode 193 = 0x1100060C" +xmodmap -e "keycode 194 = 0x1100060D" +xmodmap -e "keycode 195 = 0x1100060E" +xmodmap -e "keycode 196 = 0x1100060F" +xmodmap -e "keycode 197 = 0x11000610" +xmodmap -e "keycode 198 = 0x1008ff26" + +# path setup +export QPEDIR=/opt/Qtopia +export PATH=$QPEDIR/bin:$PATH +export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH + +#tell Qtopia how to inform illume on incoming phone calls +#export ILLUME_PHONE_CALL= +export QTOPIA_PHONE_VENDOR=ficgta01 +export QTOPIA_PHONE_MUX=ficgta01 + + +# Now start Qtopia +qpe & diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia deleted file mode 100644 index a85e9aa5fe..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# xmodmap to allow the soft-menu to work -xmodmap -e "keycode 180 = 0x11000601" -xmodmap -e "keycode 181 = 0x11000602" -xmodmap -e "keycode 182 = 0x11000603" -xmodmap -e "keycode 183 = 0x11000604" -xmodmap -e "keycode 184 = 0x11000605" -xmodmap -e "keycode 185 = 0x11000606" -xmodmap -e "keycode 186 = 0x11000607" -xmodmap -e "keycode 187 = 0x11000608" -xmodmap -e "keycode 188 = 0x11000609" -xmodmap -e "keycode 189 = 0x1100060A" -xmodmap -e "keycode 190 = 0x1100060B" -xmodmap -e "keycode 191 = 0x1100060B" -xmodmap -e "keycode 192 = 0x1100060A" -xmodmap -e "keycode 193 = 0x1100060C" -xmodmap -e "keycode 194 = 0x1100060D" -xmodmap -e "keycode 195 = 0x1100060E" -xmodmap -e "keycode 196 = 0x1100060F" -xmodmap -e "keycode 197 = 0x11000610" -xmodmap -e "keycode 198 = 0x1008ff26" - -# path setup -export QPEDIR=/opt/Qtopia -export PATH=$QPEDIR/bin:$PATH -export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH - -#tell Qtopia how to inform illume on incoming phone calls -#export ILLUME_PHONE_CALL= -export QTOPIA_PHONE_VENDOR=ficgta01 -export QTOPIA_PHONE_MUX=ficgta01 - - -# Now start Qtopia -exec qpe -- cgit v1.2.3 From 94134f56337a6bf00f6c198516897308385df6a3 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 21:16:04 +0000 Subject: Qtopia/X11: For proper operation timezone information is needed --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 2eea6933a1..014d9b8895 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -11,9 +11,9 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" -RDEPENDS = "atd" +RDEPENDS = "atd tzdata" PROVIDES = "qtopia-phone" -PR = "r7" +PR = "r8" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://Xsession.d/99qtopia \ -- cgit v1.2.3 From 5720e8d30a3ebb334540a295eff7c78216759ef8 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 21:37:46 +0000 Subject: Qtopia/X11: Add some more packages to the RDEPENDS --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 014d9b8895..9dfbd8a716 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -11,7 +11,7 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" -RDEPENDS = "atd tzdata" +RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" PROVIDES = "qtopia-phone" PR = "r8" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From 40faec06b8fac7dd87a1dc0ed25d8d9584a375cc Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 22:03:33 +0000 Subject: tzdata: Both tzdata and tzdata-dbg provided tzdata, ipkg picked tzdata-dbg. Kill the -dbg package, try to provide a upgrade path The tzdata-dbg package was empty but provided "tzdata". The tzdata package was not empty and provided "tzdata" as well ipkg picked tzdata-dbg resulting in files like /usr/share/zoneinfo/America/New_York missing from the image. Kill the -dbg package, set RREPLACES on the tzdata package, I don't know how to force the update for people that have tzdata-dbg already deployed. --- packages/tzdata/tzdata_2007k.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb index 2fbe9ac884..fde929de07 100644 --- a/packages/tzdata/tzdata_2007k.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r1" +PR = "r2" PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ @@ -14,6 +14,8 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-australia timezone-europe timezone-indian \ timezone-iso3166.tab timezone-pacific timezone-zone.tab" +RREPLACES_tzdata = "tzdata-dbg" + SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" S = "${WORKDIR}" @@ -42,7 +44,7 @@ do_install () { # Packages primarily organized by directory with a major city # in most time zones in the base package -PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ +PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -- cgit v1.2.3 From 2e18d83a57863775a87b30eba91122fc89e6191a Mon Sep 17 00:00:00 2001 From: John Lee Date: Wed, 19 Mar 2008 12:14:59 +0000 Subject: u-boot-openmoko: update UBOOT_UPSTREAM_REV --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1fb9be4f43..d8a51ea824 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 @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e" +UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8" UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5" SRCREV_FORMAT = "+gitupstream+svnpatchset" -- cgit v1.2.3 From 8232a458a0f13d3e4411edd68e2b2d0842d195c4 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:09:25 +0000 Subject: preferred-om-2008-versions.inc : conflict, removed --- conf/distro/include/preferred-om-2008-versions.inc | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 conf/distro/include/preferred-om-2008-versions.inc diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc deleted file mode 100644 index 7fb0bc28e0..0000000000 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ /dev/null @@ -1,14 +0,0 @@ -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.2" -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_midori = "0.0.17" -PREFERRED_VERSION_pulseaudio = "0.9.9" -PREFERRED_VERSION_udev = "118" -PREFERRED_VERSION_vte = "0.16.10" -- cgit v1.2.3 From d89b16290593c04121485d74ae548a55381de2f5 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:12:31 +0000 Subject: u-boot-openmoko_1.3.1+git+svn.bb : moved to merge --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 79 ---------------------- .../u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge | 79 ++++++++++++++++++++++ 2 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb create mode 100644 packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge 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 d8a51ea824..0000000000 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb +++ /dev/null @@ -1,79 +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 = "+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};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 \ -" - -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_1.3.1+git+svn.bb.merge b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge new file mode 100644 index 0000000000..d8a51ea824 --- /dev/null +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge @@ -0,0 +1,79 @@ +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 = "+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};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 \ +" + +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 -- cgit v1.2.3 From 2ac70b712f904c0cd5bad14711a6e92ffae2c157 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:19:49 +0000 Subject: merge --- packages/gnash/gnash_0.8.2.bb | 1 - packages/gtk-webcore/midori_0.0.17.bb | 11 -------- .../intltool/files/intltool-0.35.5-polkit.patch | 32 ---------------------- packages/mono/mono-1.2.5.1/disable-monoburg.patch | 22 --------------- packages/python/python-pygtk/nodocs.patch | 13 --------- 5 files changed, 79 deletions(-) delete mode 100644 packages/gnash/gnash_0.8.2.bb delete mode 100644 packages/gtk-webcore/midori_0.0.17.bb delete mode 100644 packages/intltool/files/intltool-0.35.5-polkit.patch delete mode 100644 packages/mono/mono-1.2.5.1/disable-monoburg.patch delete mode 100644 packages/python/python-pygtk/nodocs.patch diff --git a/packages/gnash/gnash_0.8.2.bb b/packages/gnash/gnash_0.8.2.bb deleted file mode 100644 index da4b281e94..0000000000 --- a/packages/gnash/gnash_0.8.2.bb +++ /dev/null @@ -1 +0,0 @@ -require gnash.inc diff --git a/packages/gtk-webcore/midori_0.0.17.bb b/packages/gtk-webcore/midori_0.0.17.bb deleted file mode 100644 index 19cc686566..0000000000 --- a/packages/gtk-webcore/midori_0.0.17.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Midori is a lightweight web browser." -LICENSE = "GPLv2" - -DEPENDS = "webkit-gtk libsexy" - -inherit autotools pkgconfig - -SRC_URI = "http://software.twotoasts.de/media/midori/midori-${PV}.tar.gz \ - file://webkit-update.patch;patch=1" - - diff --git a/packages/intltool/files/intltool-0.35.5-polkit.patch b/packages/intltool/files/intltool-0.35.5-polkit.patch deleted file mode 100644 index 2d89fbe04c..0000000000 --- a/packages/intltool/files/intltool-0.35.5-polkit.patch +++ /dev/null @@ -1,32 +0,0 @@ -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/mono/mono-1.2.5.1/disable-monoburg.patch b/packages/mono/mono-1.2.5.1/disable-monoburg.patch deleted file mode 100644 index 21c1e30f07..0000000000 --- a/packages/mono/mono-1.2.5.1/disable-monoburg.patch +++ /dev/null @@ -1,22 +0,0 @@ -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/python/python-pygtk/nodocs.patch b/packages/python/python-pygtk/nodocs.patch deleted file mode 100644 index 9b2387e959..0000000000 --- a/packages/python/python-pygtk/nodocs.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: pygtk-2.10.4/Makefile.am -=================================================================== ---- pygtk-2.10.4.orig/Makefile.am -+++ pygtk-2.10.4/Makefile.am -@@ -4,7 +4,7 @@ if BUILD_GTK - GTK_SUBDIR = gtk - endif - --SUBDIRS = codegen . $(GTK_SUBDIR) examples tests docs -+SUBDIRS = codegen . $(GTK_SUBDIR) examples tests - - PLATFORM_VERSION = 2.0 - -- cgit v1.2.3 From 1008c8c2925767928b47d87b1e4b64004ea3d51b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:21:19 +0000 Subject: merge --- packages/gypsy/files/docs-reference-am.patch | 17 ------------ packages/openmoko-projects.merge/.mtn2git_empty | 0 packages/openmoko-projects.merge/assassin_svn.bb | 16 ++++++++++++ .../diversity-daemon_svn.bb | 19 ++++++++++++++ .../openmoko-projects.merge/diversity-nav_svn.bb | 16 ++++++++++++ .../openmoko-projects.merge/illume/.mtn2git_empty | 0 .../illume/include-path.diff | 16 ++++++++++++ packages/openmoko-projects.merge/illume_svn.bb | 26 +++++++++++++++++++ .../tangogps/.mtn2git_empty | 0 .../tangogps/global-config-h.patch | 30 ++++++++++++++++++++++ packages/openmoko-projects.merge/tangogps_0.7.bb | 17 ++++++++++++ packages/openmoko-projects/.mtn2git_empty | 0 packages/openmoko-projects/assassin_svn.bb | 16 ------------ packages/openmoko-projects/diversity-daemon_svn.bb | 19 -------------- packages/openmoko-projects/diversity-nav_svn.bb | 16 ------------ packages/openmoko-projects/illume/.mtn2git_empty | 0 .../openmoko-projects/illume/include-path.diff | 16 ------------ packages/openmoko-projects/illume_svn.bb | 26 ------------------- packages/openmoko-projects/tangogps/.mtn2git_empty | 0 .../tangogps/global-config-h.patch | 30 ---------------------- packages/openmoko-projects/tangogps_0.7.bb | 17 ------------ packages/packagekit.merge/.mtn2git_empty | 0 packages/packagekit.merge/files/.mtn2git_empty | 0 .../files/disable-docbook2man.patch | 12 +++++++++ packages/packagekit.merge/packagekit_git.bb | 28 ++++++++++++++++++++ packages/packagekit/.mtn2git_empty | 0 packages/packagekit/files/.mtn2git_empty | 0 .../packagekit/files/disable-docbook2man.patch | 12 --------- packages/packagekit/packagekit_git.bb | 28 -------------------- 29 files changed, 180 insertions(+), 197 deletions(-) delete mode 100644 packages/gypsy/files/docs-reference-am.patch create mode 100644 packages/openmoko-projects.merge/.mtn2git_empty create mode 100644 packages/openmoko-projects.merge/assassin_svn.bb create mode 100644 packages/openmoko-projects.merge/diversity-daemon_svn.bb create mode 100644 packages/openmoko-projects.merge/diversity-nav_svn.bb create mode 100644 packages/openmoko-projects.merge/illume/.mtn2git_empty create mode 100644 packages/openmoko-projects.merge/illume/include-path.diff create mode 100644 packages/openmoko-projects.merge/illume_svn.bb create mode 100644 packages/openmoko-projects.merge/tangogps/.mtn2git_empty create mode 100644 packages/openmoko-projects.merge/tangogps/global-config-h.patch create mode 100644 packages/openmoko-projects.merge/tangogps_0.7.bb delete mode 100644 packages/openmoko-projects/.mtn2git_empty delete mode 100644 packages/openmoko-projects/assassin_svn.bb delete mode 100644 packages/openmoko-projects/diversity-daemon_svn.bb delete mode 100644 packages/openmoko-projects/diversity-nav_svn.bb delete mode 100644 packages/openmoko-projects/illume/.mtn2git_empty delete mode 100644 packages/openmoko-projects/illume/include-path.diff delete mode 100644 packages/openmoko-projects/illume_svn.bb 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 create mode 100644 packages/packagekit.merge/.mtn2git_empty create mode 100644 packages/packagekit.merge/files/.mtn2git_empty create mode 100644 packages/packagekit.merge/files/disable-docbook2man.patch create mode 100644 packages/packagekit.merge/packagekit_git.bb delete mode 100644 packages/packagekit/.mtn2git_empty delete mode 100644 packages/packagekit/files/.mtn2git_empty delete mode 100644 packages/packagekit/files/disable-docbook2man.patch delete mode 100644 packages/packagekit/packagekit_git.bb diff --git a/packages/gypsy/files/docs-reference-am.patch b/packages/gypsy/files/docs-reference-am.patch deleted file mode 100644 index 9eb0051d79..0000000000 --- a/packages/gypsy/files/docs-reference-am.patch +++ /dev/null @@ -1,17 +0,0 @@ -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/openmoko-projects.merge/.mtn2git_empty b/packages/openmoko-projects.merge/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-projects.merge/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb new file mode 100644 index 0000000000..987d44070d --- /dev/null +++ b/packages/openmoko-projects.merge/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 etk edbus" +PV = "0.2+svn${SRCREV}" +PR = "r4" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" + +S = "${WORKDIR}/assassin" + +inherit autotools pkgconfig + +EXTRA_OECONF = "" + +FILES_${PN} += "${prefix}/share/*" diff --git a/packages/openmoko-projects.merge/diversity-daemon_svn.bb b/packages/openmoko-projects.merge/diversity-daemon_svn.bb new file mode 100644 index 0000000000..02e1ea29bb --- /dev/null +++ b/packages/openmoko-projects.merge/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 libjana curl" +RDEPENDS = "eds-dbus openmoko-dialer2" +PV = "0.0+svnr${SRCREV}" +PR = "r2" + +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-xmpp --enable-session-bus" + +FILES_${PN} += "${datadir}/dbus-1/" +FILES_${PN} += "${sysconfdir}/dbus-1/" diff --git a/packages/openmoko-projects.merge/diversity-nav_svn.bb b/packages/openmoko-projects.merge/diversity-nav_svn.bb new file mode 100644 index 0000000000..23d6b4daf6 --- /dev/null +++ b/packages/openmoko-projects.merge/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 = "diversity-daemon" +PV = "0.0.1+svnr${SRCREV}" +PR = "r2" + +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" diff --git a/packages/openmoko-projects.merge/illume/.mtn2git_empty b/packages/openmoko-projects.merge/illume/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-projects.merge/illume/include-path.diff b/packages/openmoko-projects.merge/illume/include-path.diff new file mode 100644 index 0000000000..0b5ed8add8 --- /dev/null +++ b/packages/openmoko-projects.merge/illume/include-path.diff @@ -0,0 +1,16 @@ +Include path fixes for Illume: + +$(includedir) is pointing to /usr/include, we do not want to have this when compiling + +Index: src/Makefile.am +=================================================================== +--- a/src/Makefile.am (Revision 12) ++++ b/src/Makefile.am (Arbeitskopie) +@@ -3,7 +3,6 @@ + + INCLUDES = -I. \ + -I$(top_srcdir) \ +- -I$(includedir) \ + @e_cflags@ + + pkgdir = $(datadir)/$(MODULE_ARCH) diff --git a/packages/openmoko-projects.merge/illume_svn.bb b/packages/openmoko-projects.merge/illume_svn.bb new file mode 100644 index 0000000000..f7dec16890 --- /dev/null +++ b/packages/openmoko-projects.merge/illume_svn.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "Illume - Mobile UI module for Enlightenment" +DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" +LICENSE = "MIT BSD" +PV = "svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \ + file://include-path.diff;patch=1" +S = "${WORKDIR}/${PN}" + +EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + +FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" + +do_install_append() { + for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done +} diff --git a/packages/openmoko-projects.merge/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/openmoko-projects.merge/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch new file mode 100644 index 0000000000..973710c942 --- /dev/null +++ b/packages/openmoko-projects.merge/tangogps/global-config-h.patch @@ -0,0 +1,30 @@ +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.merge/tangogps_0.7.bb b/packages/openmoko-projects.merge/tangogps_0.7.bb new file mode 100644 index 0000000000..63513ffe00 --- /dev/null +++ b/packages/openmoko-projects.merge/tangogps_0.7.bb @@ -0,0 +1,17 @@ +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/" diff --git a/packages/openmoko-projects/.mtn2git_empty b/packages/openmoko-projects/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb deleted file mode 100644 index 987d44070d..0000000000 --- a/packages/openmoko-projects/assassin_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Action GUI for Installer" -HOMEPAGE = "http://assassin.projects.openmoko.org/" -LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus" -PV = "0.2+svn${SRCREV}" -PR = "r4" - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" - -S = "${WORKDIR}/assassin" - -inherit autotools pkgconfig - -EXTRA_OECONF = "" - -FILES_${PN} += "${prefix}/share/*" diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb deleted file mode 100644 index 02e1ea29bb..0000000000 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Diveristy Daemon" -HOMEPAGE = "http://diversity.projects.openmoko.org/" -SECTION = "net/misc" -LICENSE = "GPL" -DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" -RDEPENDS = "eds-dbus openmoko-dialer2" -PV = "0.0+svnr${SRCREV}" -PR = "r2" - -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-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 deleted file mode 100644 index 23d6b4daf6..0000000000 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -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 = "diversity-daemon" -PV = "0.0.1+svnr${SRCREV}" -PR = "r2" - -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" 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/include-path.diff b/packages/openmoko-projects/illume/include-path.diff deleted file mode 100644 index 0b5ed8add8..0000000000 --- a/packages/openmoko-projects/illume/include-path.diff +++ /dev/null @@ -1,16 +0,0 @@ -Include path fixes for Illume: - -$(includedir) is pointing to /usr/include, we do not want to have this when compiling - -Index: src/Makefile.am -=================================================================== ---- a/src/Makefile.am (Revision 12) -+++ b/src/Makefile.am (Arbeitskopie) -@@ -3,7 +3,6 @@ - - INCLUDES = -I. \ - -I$(top_srcdir) \ -- -I$(includedir) \ - @e_cflags@ - - pkgdir = $(datadir)/$(MODULE_ARCH) diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb deleted file mode 100644 index f7dec16890..0000000000 --- a/packages/openmoko-projects/illume_svn.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Illume - Mobile UI module for Enlightenment" -DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" -LICENSE = "MIT BSD" -PV = "svnr${SRCREV}" -PR = "r1" - -inherit e - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \ - file://include-path.diff;patch=1" -S = "${WORKDIR}/${PN}" - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" - -do_install_append() { - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done -} 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/" diff --git a/packages/packagekit.merge/.mtn2git_empty b/packages/packagekit.merge/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/packagekit.merge/files/.mtn2git_empty b/packages/packagekit.merge/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/packagekit.merge/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch new file mode 100644 index 0000000000..0c7d4239d4 --- /dev/null +++ b/packages/packagekit.merge/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.merge/packagekit_git.bb b/packages/packagekit.merge/packagekit_git.bb new file mode 100644 index 0000000000..6f3419a60a --- /dev/null +++ b/packages/packagekit.merge/packagekit_git.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "PackageKit package management abstraction" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS = "opkg" +PV = "0.1+git${SRCREV}" +PR = "r8" + +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/" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so " diff --git a/packages/packagekit/.mtn2git_empty b/packages/packagekit/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/packagekit/files/.mtn2git_empty b/packages/packagekit/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/packagekit/files/disable-docbook2man.patch b/packages/packagekit/files/disable-docbook2man.patch deleted file mode 100644 index 0c7d4239d4..0000000000 --- a/packages/packagekit/files/disable-docbook2man.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 6f3419a60a..0000000000 --- a/packages/packagekit/packagekit_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "PackageKit package management abstraction" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" -RDEPENDS = "opkg" -PV = "0.1+git${SRCREV}" -PR = "r8" - -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/" -FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so " -- cgit v1.2.3 From 5a01774a7dabfb14bfeab0d900113c206afef853 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:25:41 +0000 Subject: merge --- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb | 79 ++++++++++++++++++++++ .../u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge | 79 ---------------------- 2 files changed, 79 insertions(+), 79 deletions(-) create mode 100644 packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb delete mode 100644 packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge 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 new file mode 100644 index 0000000000..d8a51ea824 --- /dev/null +++ b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb @@ -0,0 +1,79 @@ +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 = "+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};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 \ +" + +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_1.3.1+git+svn.bb.merge b/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge deleted file mode 100644 index d8a51ea824..0000000000 --- a/packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb.merge +++ /dev/null @@ -1,79 +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 = "+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};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 \ -" - -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 -- cgit v1.2.3 From c12c4abf7c677209325f948bba9022895504971c Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 06:31:25 +0000 Subject: merge --- packages/openmoko-projects.merge/.mtn2git_empty | 0 packages/openmoko-projects.merge/assassin_svn.bb | 16 ------------ .../diversity-daemon_svn.bb | 19 -------------- .../openmoko-projects.merge/diversity-nav_svn.bb | 16 ------------ .../openmoko-projects.merge/illume/.mtn2git_empty | 0 .../illume/include-path.diff | 16 ------------ packages/openmoko-projects.merge/illume_svn.bb | 26 ------------------- .../tangogps/.mtn2git_empty | 0 .../tangogps/global-config-h.patch | 30 ---------------------- packages/openmoko-projects.merge/tangogps_0.7.bb | 17 ------------ packages/openmoko-projects/assassin_svn.bb | 4 +-- packages/openmoko-projects/diversity-daemon_svn.bb | 8 +++--- packages/openmoko-projects/diversity-nav_svn.bb | 4 +-- packages/packagekit.merge/.mtn2git_empty | 0 packages/packagekit.merge/files/.mtn2git_empty | 0 .../files/disable-docbook2man.patch | 12 --------- packages/packagekit.merge/packagekit_git.bb | 28 -------------------- packages/packagekit/packagekit_git.bb | 7 ++--- 18 files changed, 12 insertions(+), 191 deletions(-) delete mode 100644 packages/openmoko-projects.merge/.mtn2git_empty delete mode 100644 packages/openmoko-projects.merge/assassin_svn.bb delete mode 100644 packages/openmoko-projects.merge/diversity-daemon_svn.bb delete mode 100644 packages/openmoko-projects.merge/diversity-nav_svn.bb delete mode 100644 packages/openmoko-projects.merge/illume/.mtn2git_empty delete mode 100644 packages/openmoko-projects.merge/illume/include-path.diff delete mode 100644 packages/openmoko-projects.merge/illume_svn.bb delete mode 100644 packages/openmoko-projects.merge/tangogps/.mtn2git_empty delete mode 100644 packages/openmoko-projects.merge/tangogps/global-config-h.patch delete mode 100644 packages/openmoko-projects.merge/tangogps_0.7.bb delete mode 100644 packages/packagekit.merge/.mtn2git_empty delete mode 100644 packages/packagekit.merge/files/.mtn2git_empty delete mode 100644 packages/packagekit.merge/files/disable-docbook2man.patch delete mode 100644 packages/packagekit.merge/packagekit_git.bb diff --git a/packages/openmoko-projects.merge/.mtn2git_empty b/packages/openmoko-projects.merge/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects.merge/assassin_svn.bb b/packages/openmoko-projects.merge/assassin_svn.bb deleted file mode 100644 index 987d44070d..0000000000 --- a/packages/openmoko-projects.merge/assassin_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Action GUI for Installer" -HOMEPAGE = "http://assassin.projects.openmoko.org/" -LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus" -PV = "0.2+svn${SRCREV}" -PR = "r4" - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" - -S = "${WORKDIR}/assassin" - -inherit autotools pkgconfig - -EXTRA_OECONF = "" - -FILES_${PN} += "${prefix}/share/*" diff --git a/packages/openmoko-projects.merge/diversity-daemon_svn.bb b/packages/openmoko-projects.merge/diversity-daemon_svn.bb deleted file mode 100644 index 02e1ea29bb..0000000000 --- a/packages/openmoko-projects.merge/diversity-daemon_svn.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Diveristy Daemon" -HOMEPAGE = "http://diversity.projects.openmoko.org/" -SECTION = "net/misc" -LICENSE = "GPL" -DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" -RDEPENDS = "eds-dbus openmoko-dialer2" -PV = "0.0+svnr${SRCREV}" -PR = "r2" - -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-xmpp --enable-session-bus" - -FILES_${PN} += "${datadir}/dbus-1/" -FILES_${PN} += "${sysconfdir}/dbus-1/" diff --git a/packages/openmoko-projects.merge/diversity-nav_svn.bb b/packages/openmoko-projects.merge/diversity-nav_svn.bb deleted file mode 100644 index 23d6b4daf6..0000000000 --- a/packages/openmoko-projects.merge/diversity-nav_svn.bb +++ /dev/null @@ -1,16 +0,0 @@ -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 = "diversity-daemon" -PV = "0.0.1+svnr${SRCREV}" -PR = "r2" - -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" diff --git a/packages/openmoko-projects.merge/illume/.mtn2git_empty b/packages/openmoko-projects.merge/illume/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects.merge/illume/include-path.diff b/packages/openmoko-projects.merge/illume/include-path.diff deleted file mode 100644 index 0b5ed8add8..0000000000 --- a/packages/openmoko-projects.merge/illume/include-path.diff +++ /dev/null @@ -1,16 +0,0 @@ -Include path fixes for Illume: - -$(includedir) is pointing to /usr/include, we do not want to have this when compiling - -Index: src/Makefile.am -=================================================================== ---- a/src/Makefile.am (Revision 12) -+++ b/src/Makefile.am (Arbeitskopie) -@@ -3,7 +3,6 @@ - - INCLUDES = -I. \ - -I$(top_srcdir) \ -- -I$(includedir) \ - @e_cflags@ - - pkgdir = $(datadir)/$(MODULE_ARCH) diff --git a/packages/openmoko-projects.merge/illume_svn.bb b/packages/openmoko-projects.merge/illume_svn.bb deleted file mode 100644 index f7dec16890..0000000000 --- a/packages/openmoko-projects.merge/illume_svn.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "Illume - Mobile UI module for Enlightenment" -DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native" -LICENSE = "MIT BSD" -PV = "svnr${SRCREV}" -PR = "r1" - -inherit e - -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=https \ - file://include-path.diff;patch=1" -S = "${WORKDIR}/${PN}" - -EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} = "${libdir}/enlightenment/modules/*/*.edj ${libdir}/enlightenment/modules/*/*.desktop ${libdir}/enlightenment/modules/*/*/*" -FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" - -do_install_append() { - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done -} diff --git a/packages/openmoko-projects.merge/tangogps/.mtn2git_empty b/packages/openmoko-projects.merge/tangogps/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects.merge/tangogps/global-config-h.patch b/packages/openmoko-projects.merge/tangogps/global-config-h.patch deleted file mode 100644 index 973710c942..0000000000 --- a/packages/openmoko-projects.merge/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.merge/tangogps_0.7.bb b/packages/openmoko-projects.merge/tangogps_0.7.bb deleted file mode 100644 index 63513ffe00..0000000000 --- a/packages/openmoko-projects.merge/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/" diff --git a/packages/openmoko-projects/assassin_svn.bb b/packages/openmoko-projects/assassin_svn.bb index 83927c1d2a..987d44070d 100644 --- a/packages/openmoko-projects/assassin_svn.bb +++ b/packages/openmoko-projects/assassin_svn.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Action GUI for Installer" HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit" +DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus" PV = "0.2+svn${SRCREV}" -PR = "r2" +PR = "r4" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=assassin;proto=https" diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb index 6ea4f54a92..02e1ea29bb 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -2,10 +2,10 @@ 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" +DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" +RDEPENDS = "eds-dbus openmoko-dialer2" PV = "0.0+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https" @@ -13,7 +13,7 @@ S = "${WORKDIR}/diversity-daemon" inherit autotools pkgconfig -EXTRA_OECONF = "--disable-nm --disable-geoclue --disable-xmpp --enable-session-bus" +EXTRA_OECONF = "--disable-nm --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 index 58090e9baf..23d6b4daf6 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -3,9 +3,9 @@ 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" +RDEPENDS = "diversity-daemon" PV = "0.0.1+svnr${SRCREV}" -PR = "r1" +PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-nav;proto=https" diff --git a/packages/packagekit.merge/.mtn2git_empty b/packages/packagekit.merge/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/packagekit.merge/files/.mtn2git_empty b/packages/packagekit.merge/files/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/packagekit.merge/files/disable-docbook2man.patch b/packages/packagekit.merge/files/disable-docbook2man.patch deleted file mode 100644 index 0c7d4239d4..0000000000 --- a/packages/packagekit.merge/files/disable-docbook2man.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.merge/packagekit_git.bb b/packages/packagekit.merge/packagekit_git.bb deleted file mode 100644 index 6f3419a60a..0000000000 --- a/packages/packagekit.merge/packagekit_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "PackageKit package management abstraction" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" -RDEPENDS = "opkg" -PV = "0.1+git${SRCREV}" -PR = "r8" - -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/" -FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so " diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index d4055ead63..6f3419a60a 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -2,10 +2,10 @@ 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" +DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" +RDEPENDS = "opkg" PV = "0.1+git${SRCREV}" -PR = "r7" +PR = "r8" SRC_URI = "git://anongit.freedesktop.org/git/packagekit;protocol=git \ file://disable-docbook2man.patch;patch=1" @@ -25,3 +25,4 @@ do_stage () { } FILES_${PN} += "${libdir}/packagekit-backend/*.so ${datadir}/dbus-1/system-services/" +FILES_${PN}-dbg += "${libdir}/packagekit-backend/.debug/*.so " -- cgit v1.2.3 From 4c46ddff726ea0fdaef2783b20615b2e1b13e9a1 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Mar 2008 06:47:34 +0000 Subject: sane-srcrevs.inc: update u-boot-openmoko and openmoko-icon-theme-standard2 --- conf/distro/include/sane-srcrevs.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index dc5961c620..f9d4d8db11 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -98,7 +98,7 @@ SRCREV_pn-openmoko-finger-demo ?= "1671" SRCREV_pn-openmoko-firststart2 ?= "3158" SRCREV_pn-openmoko-footer ?= "2354" SRCREV_pn-openmoko-icon-theme-standard ?= "2232" -SRCREV_pn-openmoko-icon-theme-standard2 ?= "3247" +SRCREV_pn-openmoko-icon-theme-standard2 ?= "3703" SRCREV_pn-openmoko-icon-theme-standard2-qvga ?= "3247" SRCREV_pn-openmoko-keyboard ?= "1631" SRCREV_pn-openmoko-libs ?= "2367" @@ -154,7 +154,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 ?= "4138" +SRCREV_pn-u-boot-openmoko ?= "4223" SRCREV_pn-usbpath ?= "3108" SRCREV_pn-usbpath-native ?= "3108" SRCREV_pn-webkit-gtk ?= "30762" -- cgit v1.2.3 From 4cf150981fd67045fdc1fc3810e25f76b1591cb7 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:49:23 +0000 Subject: busybox-1.9.1/openmoko/ : dropping uneeded directory --- .../busybox/busybox-1.9.1/openmoko/.mtn2git_empty | 0 packages/busybox/busybox-1.9.1/openmoko/defconfig | 777 --------------------- 2 files changed, 777 deletions(-) delete mode 100644 packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.9.1/openmoko/defconfig diff --git a/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty b/packages/busybox/busybox-1.9.1/openmoko/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/busybox/busybox-1.9.1/openmoko/defconfig b/packages/busybox/busybox-1.9.1/openmoko/defconfig deleted file mode 100644 index d0505e4481..0000000000 --- a/packages/busybox/busybox-1.9.1/openmoko/defconfig +++ /dev/null @@ -1,777 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.9.1 -# Thu Feb 14 11:54:00 2008 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# - -# -# General Configuration -# -# CONFIG_NITPICK is not set -# CONFIG_DESKTOP is not set -# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_SHOW_USAGE=y -# CONFIG_FEATURE_VERBOSE_USAGE is not set -CONFIG_FEATURE_COMPRESS_USAGE=y -# CONFIG_FEATURE_INSTALLER is not set -CONFIG_LOCALE_SUPPORT=y -CONFIG_GETOPT_LONG=y -CONFIG_FEATURE_DEVPTS=y -# CONFIG_FEATURE_CLEAN_UP is not set -CONFIG_FEATURE_PIDFILE=y -CONFIG_FEATURE_SUID=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set -# CONFIG_INCLUDE_SUSv2 is not set - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Busybox Library Tuning -# -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=2 -CONFIG_FEATURE_FAST_TOP=y -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_FANCY_KEYS=y -# CONFIG_FEATURE_EDITING_VI is not set -CONFIG_FEATURE_EDITING_HISTORY=15 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -CONFIG_FEATURE_TAB_COMPLETION=y -CONFIG_FEATURE_USERNAME_COMPLETION=y -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y - -# -# Applets -# - -# -# Archival Utilities -# -CONFIG_AR=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -# CONFIG_BZIP2 is not set -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_FEATURE_RPM_BZ2 is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -# CONFIG_FEATURE_TAR_LZMA is not set -CONFIG_FEATURE_TAR_FROM=y -CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_COMPRESS is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_UNLZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set -# CONFIG_FEATURE_DEB_TAR_GZ is not set -# CONFIG_FEATURE_DEB_TAR_BZ2 is not set -# CONFIG_FEATURE_DEB_TAR_LZMA is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -# CONFIG_CATV is not set -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CKSUM is not set -# CONFIG_COMM is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_IBS_OBS is not set -CONFIG_DF=y -# CONFIG_FEATURE_DF_INODE is not set -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -# CONFIG_UNIX2DOS is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -CONFIG_FEATURE_ENV_LONG_OPTIONS=y -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -# CONFIG_EXPR_MATH_SUPPORT_64 is not set -CONFIG_FALSE=y -# CONFIG_FOLD is not set -CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set -# CONFIG_HOSTID is not set -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -# CONFIG_FEATURE_MV_LONG_OPTIONS is not set -# CONFIG_NICE is not set -CONFIG_NOHUP=y -CONFIG_OD=y -# CONFIG_PRINTENV is not set -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -CONFIG_STTY=y -# CONFIG_SUM is not set -CONFIG_SYNC=y -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TEST=y -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -# CONFIG_FEATURE_TR_EQUIV is not set -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_UNIQ=y -CONFIG_USLEEP=y -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=y - -# -# Common options for cp and mv -# -# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Common options for md5sum, sha1sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -# CONFIG_KBD_MODE is not set -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -CONFIG_SETCONSOLE=y -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -CONFIG_CMP=y -CONFIG_DIFF=y -CONFIG_FEATURE_DIFF_BINARY=y -CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_FEATURE_DIFF_MINIMAL is not set -# CONFIG_ED is not set -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=1024 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -CONFIG_GREP=y -CONFIG_FEATURE_GREP_EGREP_ALIAS=y -CONFIG_FEATURE_GREP_FGREP_ALIAS=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set -# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set -# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set - -# -# Init Utilities -# -# CONFIG_INIT is not set -# CONFIG_DEBUG_INIT is not set -# CONFIG_FEATURE_USE_INITTAB is not set -# CONFIG_FEATURE_INIT_SCTTY is not set -# CONFIG_FEATURE_INIT_SYSLOG is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set -# CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_INITRD is not set -# CONFIG_HALT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_FEATURE_SHADOWPASSWDS is not set -# CONFIG_USE_BB_SHADOW is not set -# CONFIG_USE_BB_PWD_GRP is not set -CONFIG_ADDGROUP=y -CONFIG_FEATURE_ADDUSER_TO_GROUP=y -CONFIG_DELGROUP=y -CONFIG_FEATURE_DEL_USER_FROM_GROUP=y -CONFIG_ADDUSER=y -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y -CONFIG_DELUSER=y -CONFIG_GETTY=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -CONFIG_LOGIN=y -# CONFIG_PAM is not set -# CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -# CONFIG_CRYPTPW is not set -# CONFIG_CHPASSWD is not set -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -# CONFIG_SULOGIN is not set -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -# CONFIG_LSATTR is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_RMMOD=y -CONFIG_LSMOD=y -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -CONFIG_MODPROBE=y -CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y -CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y - -# -# Options common to multiple modutils -# -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -# CONFIG_FEATURE_2_4_MODULES is not set -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -# CONFIG_HD is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -CONFIG_LOSETUP=y -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_V0 is not set -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_HELPERS is not set -CONFIG_FEATURE_MOUNT_NFS=y -# CONFIG_FEATURE_MOUNT_CIFS is not set -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -# CONFIG_READPROFILE is not set -# CONFIG_SETARCH is not set -CONFIG_SWAPONOFF=y -CONFIG_SWITCH_ROOT=y -CONFIG_UMOUNT=y -# CONFIG_FEATURE_UMOUNT_ALL is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_CHRT is not set -# CONFIG_CROND is not set -# CONFIG_DEBUG_CROND_OPTION is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -# CONFIG_CRONTAB is not set -CONFIG_DC=y -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_EJECT is not set -# CONFIG_LAST is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_FLAGCS is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_STRINGS=y -# CONFIG_SETSID is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_TIME=y -# CONFIG_TTYSIZE is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set -# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -CONFIG_IFUPDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -# CONFIG_FEATURE_IFUPDOWN_IP is not set -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_SHORT_FORMS is not set -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -# CONFIG_IPADDR is not set -# CONFIG_IPLINK is not set -# CONFIG_IPROUTE is not set -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -CONFIG_NC=y -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_PING6=y -# CONFIG_PSCAN is not set -CONFIG_FEATURE_FANCY_PING=y -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -CONFIG_TFTP=y -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_DEBUG_TFTP is not set -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -CONFIG_APP_UDHCPD=y -# CONFIG_APP_DHCPRELAY is not set -CONFIG_APP_DUMPLEASES=y -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -CONFIG_APP_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set -# CONFIG_FEATURE_RFC3397 is not set -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -# CONFIG_ZCIP is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set -# CONFIG_PGREP is not set -CONFIG_PIDOF=y -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PKILL is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_RENICE=y -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOPMEM is not set -CONFIG_UPTIME=y -CONFIG_WATCH=y - -# -# Shells -# -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_MSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -CONFIG_ASH=y - -# -# Ash Shell Options -# -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_READ_NCHARS=y -CONFIG_ASH_READ_TIMEOUT=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_BUILTIN_ECHO is not set -CONFIG_ASH_BUILTIN_TEST=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -CONFIG_ASH_EXPAND_PRMT=y -# CONFIG_HUSH is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_CTTYHACK is not set - -# -# System Logging Utilities -# -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -CONFIG_FEATURE_IPC_SYSLOG=y -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Runit Utilities -# -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_SV is not set -# CONFIG_SVLOGD is not set -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RESTORECON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_SETSEBOOL is not set -# CONFIG_SESTATUS is not set - -# -# ipsvd utilities -# -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set -- cgit v1.2.3 From 098349e517c87ed81916917dae32ac6bba7ad8d5 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:50:41 +0000 Subject: tzdata_2007k.bb : merge fixes from OE.dev --- packages/tzdata/tzdata_2007k.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb index 7a4e431255..c4a2adee19 100644 --- a/packages/tzdata/tzdata_2007k.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -41,6 +41,7 @@ do_install () { PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" + ALLOW_EMPTY_${PN}-dbg = "1" FILES_tzdata-africa += "${datadir}/zoneinfo/Africa/*" @@ -156,6 +157,3 @@ FILES_${PN} += "${datadir}/zoneinfo/Pacific/Honolulu \ ${datadir}/zoneinfo/WET \ ${datadir}/zoneinfo/Zulu \ ${datadir}/zoneinfo/Etc/*" - ${datadir}/zoneinfo/WET \ - ${datadir}/zoneinfo/Zulu \ - ${datadir}/zoneinfo/Etc/*" -- cgit v1.2.3 From 7458478458b66afe0fd5912d77e79dd98d95157e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:51:30 +0000 Subject: packagekit_git.bb : merge fixes from OE.dev --- packages/packagekit/packagekit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/packagekit/packagekit_git.bb b/packages/packagekit/packagekit_git.bb index 6f3419a60a..8f1644cd25 100644 --- a/packages/packagekit/packagekit_git.bb +++ b/packages/packagekit/packagekit_git.bb @@ -3,7 +3,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "dbus (>= 1.1.1) dbus-glib glib-2.0 sqlite3 opkg intltool intltool-native (>= 0.37.1)" -RDEPENDS = "opkg" +RDEPENDS_${PN} = "opkg" PV = "0.1+git${SRCREV}" PR = "r8" -- cgit v1.2.3 From 3e7dd8cafc4512e1faf84722de6326ccd1716a40 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:52:06 +0000 Subject: openmoko-session2.bb : merge fixes from OE.dev --- packages/openmoko2/openmoko-session2.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index a031c91af4..f9db990e83 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,8 +1,7 @@ DESCRIPTION = "Custom Matchbox session files for OpenMoko" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-panel-2" -RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" +RDEPENDS_${PN} = "matchbox-panel-2 openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS_${PN} = "openmoko-session matchbox-common" PR = "r65" -- cgit v1.2.3 From c82293d6f06dc0a5dc1504c36e7953ef8c63ce6e Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:53:11 +0000 Subject: gpsdrive_2.10pre4.bb : merge fixes from OE.dev --- packages/gpsdrive/gpsdrive_2.10pre4.bb | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/packages/gpsdrive/gpsdrive_2.10pre4.bb b/packages/gpsdrive/gpsdrive_2.10pre4.bb index 071a5691e3..102a917c1f 100644 --- a/packages/gpsdrive/gpsdrive_2.10pre4.bb +++ b/packages/gpsdrive/gpsdrive_2.10pre4.bb @@ -1,10 +1,9 @@ -DESCRIPTION = "GPS navigation/map display software" -SECTION = "x11" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "virtual/libc gtk+ libpcre gpsd libwww-perl-native mysql" -RDEPENDS_${PN} = "gdk-pixbuf-loader-gif gpsd libwww-perl" -PR = "r1" +require gpsdrive.inc + +DEPENDS += "libwww-perl-native libart-lgpl libxml2 cairo mysql" +RDEPENDS_${PN} += "libwww-perl" + +PR = "r2" SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ file://gpsdrive_2.10pre4.desktop \ @@ -12,10 +11,6 @@ SRC_URI = "http://www.gpsdrive.de/packages/${PN}-${PV}.tar.gz \ file://gpsdrive-ifdef-mapnik.patch;patch=1 \ file://gpsdrive-2.10pre4-openstreetmap-download.patch;patch=1" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-garmin" - do_install_append () { mkdir -p ${D}${datadir}/applications install -m 0644 ${WORKDIR}/gpsdrive_2.10pre4.desktop ${D}${datadir}/applications/gpsdrive.desktop @@ -36,7 +31,3 @@ FILES_${PN}-map-icons-classic = "${datadir}/map-icons/classic.small" FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg" FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt" FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation" - -CFLAGS += "-D_GNU_SOURCE" - -DEFAULT_PREFERENCE = "1" -- cgit v1.2.3 From d114517b9bf61b1d22386aba8a40cddc9257f508 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:53:41 +0000 Subject: diversity-nav_svn.bb : merge fixes from OE.dev --- packages/openmoko-projects/diversity-nav_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko-projects/diversity-nav_svn.bb b/packages/openmoko-projects/diversity-nav_svn.bb index 23d6b4daf6..4e8dbdbceb 100644 --- a/packages/openmoko-projects/diversity-nav_svn.bb +++ b/packages/openmoko-projects/diversity-nav_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "evas edje ecore edbus" -RDEPENDS = "diversity-daemon" +RDEPENDS_${PN} = "diversity-daemon" PV = "0.0.1+svnr${SRCREV}" PR = "r2" -- cgit v1.2.3 From 444615fe5798759c717fa1c07ac0048d0f858ac7 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:54:07 +0000 Subject: diversity-daemon_svn.bb : merge fixes from OE.dev --- packages/openmoko-projects/diversity-daemon_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko-projects/diversity-daemon_svn.bb b/packages/openmoko-projects/diversity-daemon_svn.bb index 02e1ea29bb..dd582490fb 100644 --- a/packages/openmoko-projects/diversity-daemon_svn.bb +++ b/packages/openmoko-projects/diversity-daemon_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://diversity.projects.openmoko.org/" SECTION = "net/misc" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" -RDEPENDS = "eds-dbus openmoko-dialer2" +RDEPENDS_${PN} = "eds-dbus openmoko-dialer2" PV = "0.0+svnr${SRCREV}" PR = "r2" -- cgit v1.2.3 From 7c803df5196c27262ca4c1438269bf14f32612a6 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:54:38 +0000 Subject: linux-openmoko_2.6.22.5.bb : merge fixes from OE.dev --- packages/linux/linux-openmoko_2.6.22.5.bb | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/packages/linux/linux-openmoko_2.6.22.5.bb b/packages/linux/linux-openmoko_2.6.22.5.bb index fc702c8719..fe46c59a58 100644 --- a/packages/linux/linux-openmoko_2.6.22.5.bb +++ b/packages/linux/linux-openmoko_2.6.22.5.bb @@ -60,18 +60,12 @@ module_autoload_snd-mixer-oss = "snd-mixer-oss" # sd/mmc module_autoload_s3cmci = "s3cmci" -python do_patch_prepend() { - def runcmd(cmd): - import commands - (status, output) = commands.getstatusoutput(cmd) - if status != 0: - raise Exception, "Status %i: %s" % (status >> 8, output) - return output - runcmd('mv %(WORKDIR)s/patches %(S)s/patches && cd %(S)s && ' - 'quilt push -av && mv patches patches.openmoko && ' - 'mv .pc .pc.old && mv %(WORKDIR)s/defconfig-%(KERNEL_RELEASE)s %(WORKDIR)s/defconfig' % - {'WORKDIR': bb.data.getVar('WORKDIR', d, 1), - 'S': bb.data.getVar('S', d, 1), - 'KERNEL_RELEASE': bb.data.getVar('KERNEL_RELEASE', d, 1)}) - del runcmd +do_prepatch() { + mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av + mv patches patches.openmoko + mv .pc .pc.old + mv ${WORKDIR}/defconfig-${KERNEL_RELEASE} ${WORKDIR}/defconfig } + +addtask prepatch after do_unpack before do_patch + -- cgit v1.2.3 From e27e757bf1062e8be6691a622893f97695772707 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:55:17 +0000 Subject: openmoko-image.bb : merge fixes from OE.dev --- packages/images/openmoko-image.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/images/openmoko-image.bb b/packages/images/openmoko-image.bb index 9dd849608d..6600d8436c 100644 --- a/packages/images/openmoko-image.bb +++ b/packages/images/openmoko-image.bb @@ -16,3 +16,6 @@ IMAGE_INSTALL += "\ DEPENDS += "\ task-openmoko \ " + +inherit image + -- cgit v1.2.3 From 393fd0ff7b74d92b1754dffcdf8769936365d183 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 07:58:48 +0000 Subject: merge --- packages/images/openmoko-minimal-image.bb | 21 --------------------- packages/intltool/intltool-native_0.37.1.bb | 7 ------- packages/intltool/intltool_0.37.1.bb | 1 - packages/swt/files/make_linux-fix.patch | 22 ---------------------- 4 files changed, 51 deletions(-) delete mode 100644 packages/images/openmoko-minimal-image.bb delete mode 100644 packages/intltool/intltool-native_0.37.1.bb delete mode 100644 packages/intltool/intltool_0.37.1.bb delete mode 100644 packages/swt/files/make_linux-fix.patch diff --git a/packages/images/openmoko-minimal-image.bb b/packages/images/openmoko-minimal-image.bb deleted file mode 100644 index 15506c42e3..0000000000 --- a/packages/images/openmoko-minimal-image.bb +++ /dev/null @@ -1,21 +0,0 @@ -#------------------------------------------------------ -# OpenMoko Minimal Image Recipe -# other openmoko images should include this. -# ----------------------------------------------------- - -IMAGE_LINGUAS = "" - -IMAGE_INSTALL = "\ - ${MACHINE_TASK_PROVIDER} \ - task-openmoko-linux \ - " - -DEPENDS = "\ - ${MACHINE_TASK_PROVIDER} \ - task-openmoko-linux \ - " - - -inherit image - -ROOTFS_POSTPROCESS_COMMAND += 'date "+%m%d%H%M%Y" >${IMAGE_ROOTFS}/etc/timestamp' diff --git a/packages/intltool/intltool-native_0.37.1.bb b/packages/intltool/intltool-native_0.37.1.bb deleted file mode 100644 index bac5378113..0000000000 --- a/packages/intltool/intltool-native_0.37.1.bb +++ /dev/null @@ -1,7 +0,0 @@ -require intltool_${PV}.bb - -inherit native -DEPENDS = "libxml-parser-perl-native" - -export PERL = "/usr/bin/env perl" -SRC_URI_append = " file://intltool-nowarn.patch;patch=1" diff --git a/packages/intltool/intltool_0.37.1.bb b/packages/intltool/intltool_0.37.1.bb deleted file mode 100644 index e48262574b..0000000000 --- a/packages/intltool/intltool_0.37.1.bb +++ /dev/null @@ -1 +0,0 @@ -require intltool.inc diff --git a/packages/swt/files/make_linux-fix.patch b/packages/swt/files/make_linux-fix.patch deleted file mode 100644 index 1c98f5cad2..0000000000 --- a/packages/swt/files/make_linux-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: swt-source/make_linux.mak -=================================================================== ---- swt-source.orig/make_linux.mak 2008-01-23 15:08:02.000000000 +0800 -+++ swt-source/make_linux.mak 2008-01-23 15:08:21.000000000 +0800 -@@ -74,8 +74,6 @@ - -Wno-non-virtual-dtor \ - -fPIC \ - -I. \ -- -I$(JAVA_HOME)/include \ -- -I$(JAVA_HOME)/include/linux \ - ${SWT_PTR_CFLAGS} - MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic - MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup -@@ -96,8 +94,6 @@ - -DSWT_VERSION=$(SWT_VERSION) \ - $(NATIVE_STATS) \ - -DLINUX -DGTK \ -- -I$(JAVA_HOME)/include \ -- -I$(JAVA_HOME)/include/linux \ - -fPIC \ - ${SWT_PTR_CFLAGS} - LIBS = -shared -fPIC -- cgit v1.2.3 From 9c644c69de2a38f7f308b84ca40f634a04705c8b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 20 Mar 2008 08:15:56 +0000 Subject: preferred-om-2008-versions.inc : add file from OE.dev --- conf/distro/include/preferred-om-2008-versions.inc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 conf/distro/include/preferred-om-2008-versions.inc diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc new file mode 100644 index 0000000000..a54cf9174f --- /dev/null +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -0,0 +1,15 @@ +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.2" +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_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 ac92e9f40ef1289af27e9322b78dd3b37d162bb7 Mon Sep 17 00:00:00 2001 From: John Lee Date: Thu, 20 Mar 2008 08:23:29 +0000 Subject: openmoko-session2: add RDEPENDS openmoko-panel-memory and oe-stylize --- packages/openmoko2/openmoko-session2.bb | 38 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index a031c91af4..b7d4128eac 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,40 +1,37 @@ DESCRIPTION = "Custom Matchbox session files for OpenMoko" -LICENSE = "GPL" SECTION = "x11" +LICENSE = "GPL" RDEPENDS = "matchbox-panel-2" -RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" +RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2 openmoko-panel-memory" RCONFLICTS_${PN} = "openmoko-session matchbox-common" -PR = "r65" +PR = "r66" SRC_URI = "\ file://etc \ file://matchbox-session \ " -S = ${WORKDIR} -inherit update-alternatives +S = "${WORKDIR}" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PATH = "${bindir}/matchbox-session" -ALTERNATIVE_PRIORITY = "11" +inherit update-alternatives do_install() { - install -d ${D}${bindir} - install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir} - install -d ${D}${sysconfdir} - cp -R ${S}/etc/* ${D}${sysconfdir} - rm -fR ${D}${sysconfdir}/.svn - rm -fR ${D}${sysconfdir}/matchbox/.svn - chmod -R 755 ${D}${sysconfdir}/ + install -d ${D}${bindir} + install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir} + install -d ${D}${sysconfdir} + cp -R ${S}/etc/* ${D}${sysconfdir} + rm -fR ${D}${sysconfdir}/.svn + rm -fR ${D}${sysconfdir}/matchbox/.svn + chmod -R 755 ${D}${sysconfdir}/ } +PACKAGE_ARCH = "all" + pkg_postinst_openmoko-session2 () { #!/bin/sh -e if [ "x$D" != "x" ]; then exit 1 fi - gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme openmoko-standard-2 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/icon_theme openmoko-standard gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/font_name "Sans 5" @@ -45,10 +42,11 @@ gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --dire # gstreamer audio settings gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc - } -PACKAGE_ARCH = "all" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_PATH = "${bindir}/matchbox-session" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "11" CONFFILES_${PN} = "${sysconfdir}/matchbox/session" - -- cgit v1.2.3 From 2f8d9c7a57e00b9acd7f7ac445b3ee6cd4eba886 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 22 Mar 2008 00:32:06 +0000 Subject: qtopia-phone-x11: Fix the SRC_URI after the rename, spotted by Stefan Schmidt --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 2eea6933a1..45f3297212 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -16,7 +16,7 @@ PROVIDES = "qtopia-phone" PR = "r7" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ - file://Xsession.d/99qtopia \ + file://Xsession.d/89qtopia \ file://qtopia.sh" S = "${WORKDIR}/git" -- cgit v1.2.3 From 81f0f31a5d9bb1d2f9231b96485765db8b1860f8 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 22 Mar 2008 23:07:06 +0000 Subject: Qtopia/X11: Install the right Qtopia XSession start script as well --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index a7a1a2df85..a3d00caf58 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -98,7 +98,7 @@ do_install() { # Make sure qpe gets launched by X install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 0755 ${WORKDIR}/Xsession.d/99qtopia ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${WORKDIR}/Xsession.d/89qtopia ${D}${sysconfdir}/X11/Xsession.d/ # Install some scripts install -d ${D}${bindir} -- cgit v1.2.3 From 89f42eccf285d02c3abf815dfa7b1b9a379fd2e5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 23 Mar 2008 00:55:08 +0000 Subject: neod: neod uses apm.h which is staged by apmd, so put apmd into the DEPENDS --- packages/openmoko2/neod_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb index e627e60bd2..49683db9e6 100644 --- a/packages/openmoko2/neod_svn.bb +++ b/packages/openmoko2/neod_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" SECTION = "openmoko/daemons" -DEPENDS = "gtk+ pulseaudio" +DEPENDS = "gtk+ pulseaudio apmd" RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus" PV = "0.1.0+svnr${SRCREV}" PR = "r5" -- cgit v1.2.3 From df3bf31812adfe853cdb582058f9209a17c7af84 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Fri, 25 Apr 2008 15:01:22 +0000 Subject: Mess with the tree in a unknown way due the limitations of a tool. No idea which gsmhandset.state to delete (see the below output of mtn), drop both... mtn: 2 heads on branch 'org.openembedded.dev' mtn: [left] 3e22c6ee5af012d09e9027c2ade50920300fb0f2 mtn: [right] 74f4e875283dd639a1a426c4ce2930b205f84ac1 mtn: warning: orphaned node conflict on node 24181, dead parent 22904, name gsmhandset.state mtn: warning: resolve non-content conflicts and then try again. mtn: error: merge failed due to unresolved conflicts --- .../alsa/alsa-state/fic-gta01/gsmhandset.state | 910 --------------------- .../alsa/alsa-state/fic-gta02/gsmhandset.state | 885 -------------------- 2 files changed, 1795 deletions(-) delete mode 100644 packages/alsa/alsa-state/fic-gta01/gsmhandset.state delete mode 100644 packages/alsa/alsa-state/fic-gta02/gsmhandset.state diff --git a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state b/packages/alsa/alsa-state/fic-gta01/gsmhandset.state deleted file mode 100644 index 999f71253c..0000000000 --- a/packages/alsa/alsa-state/fic-gta01/gsmhandset.state +++ /dev/null @@ -1,910 +0,0 @@ -state.neo1973 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 255 - value.1 255 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 0 - value.1 0 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 121 - value.1 121 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 121 - value.1 121 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 111 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 5 - value.1 5 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 1 - value.1 1 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 5 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 6 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 6 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 7 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 0 - value.1 0 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 0 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 0 - value.1 0 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 false - value.1 false - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value Voice - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value true - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 5 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Off - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 5 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value Inverted - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value false - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Mic 2' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value false - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value false - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Left Playback Volume' - value 26 - } - control.88 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Right Playback Volume' - value 0 - } - control.89 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'Amp Mono Playback Volume' - value 9 - } - control.90 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'Call Speaker' - comment.item.2 'Stereo Speakers' - comment.item.3 'Stereo Speakers + Headphones' - comment.item.4 Headphones - iface MIXER - name 'Amp Mode' - value 'Call Speaker' - } - control.91 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 'GSM Handset' - comment.item.2 'GSM Headset' - comment.item.3 'GSM Bluetooth' - comment.item.4 Speakers - comment.item.5 Headphones - comment.item.6 'Capture Handset' - comment.item.7 'Capture Headset' - comment.item.8 'Capture Bluetooth' - iface MIXER - name 'Neo Mode' - value 'GSM Handset' - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk 3D Playback Switch' - value false - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp HP 3d Playback Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Fast Wakeup Playback Switch' - value false - } - control.95 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Earpiece 6dB Playback Switch' - value false - } -} diff --git a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state b/packages/alsa/alsa-state/fic-gta02/gsmhandset.state deleted file mode 100644 index 722ce88425..0000000000 --- a/packages/alsa/alsa-state/fic-gta02/gsmhandset.state +++ /dev/null @@ -1,885 +0,0 @@ -state.neo1973gta02 { - control.1 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'PCM Volume' - value.0 235 - value.1 235 - } - control.2 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 255' - iface MIXER - name 'ADC Capture Volume' - value.0 195 - value.1 195 - } - control.3 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Headphone Playback Volume' - value.0 0 - value.1 0 - } - control.4 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 127' - iface MIXER - name 'Speaker Playback Volume' - value.0 127 - value.1 127 - } - control.5 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 127' - iface MIXER - name 'Mono Playback Volume' - value 121 - } - control.6 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Bypass Playback Volume' - value.0 2 - value.1 2 - } - control.7 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Playback Volume' - value.0 2 - value.1 2 - } - control.8 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Voice Playback Volume' - value.0 2 - value.1 2 - } - control.9 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Headphone Playback ZC Switch' - value.0 false - value.1 false - } - control.10 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Speaker Playback ZC Switch' - value.0 false - value.1 false - } - control.11 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Bypass Playback Volume' - value 2 - } - control.12 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Sidetone Playback Volume' - value 2 - } - control.13 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Mono Voice Playback Volume' - value 2 - } - control.14 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Playback ZC Switch' - value false - } - control.15 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Linear Control' - comment.item.1 'Adaptive Boost' - iface MIXER - name 'Bass Boost' - value 'Linear Control' - } - control.16 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '130Hz @ 48kHz' - comment.item.1 '200Hz @ 48kHz' - comment.item.2 '100Hz @ 16kHz' - comment.item.3 '400Hz @ 48kHz' - comment.item.4 '100Hz @ 8kHz' - comment.item.5 '200Hz @ 8kHz' - iface MIXER - name 'Bass Filter' - value '130Hz @ 48kHz' - } - control.17 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Bass Volume' - value 0 - } - control.18 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'Treble Volume' - value 0 - } - control.19 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '8kHz' - comment.item.1 '4kHz' - iface MIXER - name 'Treble Cut-off' - value '8kHz' - } - control.20 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 7' - iface MIXER - name 'Sidetone Capture Volume' - value.0 2 - value.1 2 - } - control.21 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'Voice Sidetone Capture Volume' - value 2 - } - control.22 { - comment.access 'read write' - comment.type INTEGER - comment.count 2 - comment.range '0 - 63' - iface MIXER - name 'Capture Volume' - value.0 23 - value.1 23 - } - control.23 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture ZC Switch' - value.0 false - value.1 false - } - control.24 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 2 - iface MIXER - name 'Capture Switch' - value.0 true - value.1 true - } - control.25 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '3.4Hz @ 48kHz' - comment.item.1 '82Hz @ 16k' - comment.item.2 '82Hz @ 8kHz' - comment.item.3 '170Hz @ 8kHz' - iface MIXER - name 'Capture Filter Select' - value '3.4Hz @ 48kHz' - } - control.26 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 HiFi - comment.item.1 Voice - iface MIXER - name 'Capture Filter Cut-off' - value HiFi - } - control.27 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture Filter Switch' - value false - } - control.28 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Target Volume' - value 3 - } - control.29 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 7' - iface MIXER - name 'ALC Capture Max Volume' - value 7 - } - control.30 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Off - comment.item.1 Right - comment.item.2 Left - comment.item.3 Stereo - iface MIXER - name 'ALC Capture Function' - value Left - } - control.31 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture ZC Switch' - value false - } - control.32 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Hold Time' - value 15 - } - control.33 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Decay Time' - value 12 - } - control.34 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name 'ALC Capture Attack Time' - value 2 - } - control.35 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 31' - iface MIXER - name 'ALC Capture NG Threshold' - value 0 - } - control.36 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Constant PGA Gain' - comment.item.1 'Mute ADC Output' - iface MIXER - name 'ALC Capture NG Type' - value 'Constant PGA Gain' - } - control.37 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Capture NG Switch' - value false - } - control.38 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Capture - comment.item.1 Playback - iface MIXER - name '3D Function' - value Capture - } - control.39 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '2.2kHz' - comment.item.1 '1.5kHz' - iface MIXER - name '3D Upper Cut-off' - value '2.2kHz' - } - control.40 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 '200Hz' - comment.item.1 '500Hz' - iface MIXER - name '3D Lower Cut-off' - value '200Hz' - } - control.41 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 15' - iface MIXER - name '3D Volume' - value 0 - } - control.42 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name '3D Switch' - value false - } - control.43 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Capture 6dB Attenuate' - value false - } - control.44 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback 6dB Attenuate' - value false - } - control.45 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 None - comment.item.1 '32kHz' - comment.item.2 '44.1kHz' - comment.item.3 '48kHz' - iface MIXER - name De-emphasis - value None - } - control.46 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 Left - comment.item.2 Right - comment.item.3 Mono - iface MIXER - name 'Playback Mono Mix' - value Stereo - } - control.47 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'Playback Phase' - value 'Non Inverted' - } - control.48 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic2 Capture Volume' - value 0 - } - control.49 { - comment.access 'read write' - comment.type INTEGER - comment.count 1 - comment.range '0 - 3' - iface MIXER - name 'Mic1 Capture Volume' - value 0 - } - control.50 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'DAI 0' - comment.item.1 'DAI 1' - comment.item.2 'DAI 2' - comment.item.3 'DAI 3' - iface MIXER - name 'DAI Mode' - value 'DAI 0' - } - control.51 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Left ADC' - comment.item.2 'Right ADC' - comment.item.3 'Channel Swap' - iface MIXER - name 'ADC Data Select' - value Stereo - } - control.52 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Non Inverted' - comment.item.1 Inverted - iface MIXER - name 'ROUT2 Phase' - value Inverted - } - control.53 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Mic 1' - comment.item.1 'Mic 2' - comment.item.2 'Mic 3' - iface MIXER - name 'Mic Selection Mux' - value 'Mic 1' - } - control.54 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'RXP - RXN' - comment.item.1 'RXP + RXN' - comment.item.2 RXP - comment.item.3 RXN - iface MIXER - name 'Rx Mixer' - value 'RXP - RXN' - } - control.55 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1 + 2' - comment.item.1 'Line 1 - 2' - comment.item.2 'Line 1' - comment.item.3 'Line 2' - iface MIXER - name 'Line Mixer' - value 'Line 1 + 2' - } - control.56 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line Mix' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Mono Mux' - value 'Line Mix' - } - control.57 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 2' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Right Mux' - value 'Rx Mix' - } - control.58 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Line 1' - comment.item.1 'Rx Mix' - iface MIXER - name 'Line Left Mux' - value 'Rx Mix' - } - control.59 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Line Capture Switch' - value false - } - control.60 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic2 Capture Switch' - value true - } - control.61 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Mic1 Capture Switch' - value false - } - control.62 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'ALC Mixer Rx Capture Switch' - value false - } - control.63 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Left PGA' - comment.item.1 'Mic 1' - comment.item.2 'Mic 2' - comment.item.3 'Right PGA' - iface MIXER - name 'Mic Sidetone Mux' - value 'Left PGA' - } - control.64 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Sidetone - iface MIXER - name 'Capture Right Mux' - value PGA - } - control.65 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 PGA - comment.item.1 'Line or RXP-RXN' - comment.item.2 Line - iface MIXER - name 'Capture Left Mux' - value PGA - } - control.66 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Right Mixer' - value Stereo - } - control.67 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 Stereo - comment.item.1 'Analogue Mix Left' - comment.item.2 'Analogue Mix Right' - comment.item.3 'Digital Mono Mix' - iface MIXER - name 'Capture Left Mixer' - value Stereo - } - control.68 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Voice Capture Sw' - value false - } - control.69 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Left Capture Swi' - value false - } - control.70 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Playback Mixer Right Capture Sw' - value false - } - control.71 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 'Capture ST' - comment.item.2 LOUT2 - iface MIXER - name 'Out4 Mux' - value VREF - } - control.72 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 VREF - comment.item.1 ROUT2 - comment.item.2 'Left + Right' - iface MIXER - name 'Out3 Mux' - value VREF - } - control.73 { - comment.access 'read write' - comment.type ENUMERATED - comment.count 1 - comment.item.0 'Inverted Mono 1' - comment.item.1 Left - comment.item.2 Right - comment.item.3 'Left + Right' - iface MIXER - name 'Mono 2 Mux' - value 'Inverted Mono 1' - } - control.74 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Left Playback Switch' - value false - } - control.75 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Right Playback Switc' - value false - } - control.76 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Voice Playback Switc' - value false - } - control.77 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Sidetone Playback Sw' - value true - } - control.78 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Mono Mixer Bypass Playback Swit' - value false - } - control.79 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Voice Playback Swit' - value false - } - control.80 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Sidetone Playback S' - value false - } - control.81 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Right Playback Swit' - value true - } - control.82 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Right Mixer Bypass Playback Swi' - value true - } - control.83 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Voice Playback Switc' - value false - } - control.84 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Sidetone Playback Sw' - value false - } - control.85 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Left Playback Switch' - value true - } - control.86 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Left Mixer Bypass Playback Swit' - value true - } - control.87 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Stereo Out Switch' - value false - } - control.88 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line Out Switch' - value true - } - control.89 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM GSM Line In Switch' - value false - } - control.90 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Headset Mic Switch' - value false - } - control.91 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Mic Switch' - value true - } - control.92 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'DAPM Handset Spk Switch' - value true - } - control.93 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp State Switch' - value false - } - control.94 { - comment.access 'read write' - comment.type BOOLEAN - comment.count 1 - iface MIXER - name 'Amp Spk Switch' - value false - } -} -- cgit v1.2.3 From bf8f22e2cc633abde505318b896ce4b9a7495731 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 27 Apr 2008 12:48:10 +0000 Subject: openocd: Added build dependency on libftdi --- packages/openocd/openocd_svn.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index 2815324521..d5c5ba05cd 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Bounda HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" PV = "0.0+r${SRCREV}" -PR = "r1" +PR = "r2" inherit autotools @@ -10,4 +10,5 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ file://openocd-link-static.patch;patch=1" S = "${WORKDIR}/trunk" +DEPENDS = "libftdi" EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" -- cgit v1.2.3 From ae5bab2d7bcbcab7bd62ece55214658b60108a57 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 27 Apr 2008 12:48:41 +0000 Subject: slugos-packages: Promoted openocd and task-mokogateway now that openocd builds --- packages/meta/slugos-packages.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 5401237c49..526f49bd13 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r50" +PR = "r51" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\ openobex-apps \ openntpd \ openobex \ + openocd \ openssh \ openvpn \ patch \ @@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\ sudo \ sysfsutils \ tar \ + task-mokogateway-everything \ tcpdump \ thttpd \ tiff \ @@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\ pwc \ qc-usb-messenger \ syslog-ng \ - openocd task-mokogateway-everything \ task-native-sdk \ unionfs-modules unionfs-utils \ wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \ -- cgit v1.2.3 From e7c54bef16e24248e31170b1de7c88db457d97bc Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 27 Apr 2008 12:55:46 +0000 Subject: unslung-image: Enable 16mb image creation --- packages/images/unslung-image.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb index cb2a20b75e..9ac4140a14 100644 --- a/packages/images/unslung-image.bb +++ b/packages/images/unslung-image.bb @@ -100,4 +100,12 @@ nslu2_pack_image () { -m ${STAGING_FIRMWARE_DIR}/NPE-B \ -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin + slugimage -F -p \ + -b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \ + -s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + -k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \ + -r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \ + -m ${STAGING_FIRMWARE_DIR}/NPE-B \ + -t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin } -- cgit v1.2.3 From 3ce1b56feb2e99d27bcf7911880dda6950136936 Mon Sep 17 00:00:00 2001 From: Leon Woestenberg Date: Sun, 27 Apr 2008 17:22:39 +0000 Subject: Specify UBOOT_MACHINE for at32stk1000. Move to PREFERRED_VERSION_u-boot 1.3.2. --- conf/machine/at32stk1000.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf index 15e3c85ec5..13523ee1e5 100644 --- a/conf/machine/at32stk1000.conf +++ b/conf/machine/at32stk1000.conf @@ -22,8 +22,9 @@ ROOT_FLASH_SIZE = "8" EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536" KERNEL_IMAGETYPE = "uImage" -PREFERRED_VERSION_u-boot = "1.1.4" +PREFERRED_VERSION_u-boot = "1.3.2" +UBOOT_MACHINE = "atstk1002_config" UBOOT_ENTRYPOINT = "0x90000000" UBOOT_LOADADDRESS = "0x10000000" -- cgit v1.2.3 From d0b1a237477786a0fcd292513a8cf855de16bc7a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 27 Apr 2008 22:25:57 +0000 Subject: rsync all fix SRC_URI --- packages/rsync/rsync.inc | 2 ++ packages/rsync/rsync_2.6.9.bb | 3 +-- packages/rsync/rsync_3.0.0.bb | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/rsync/rsync.inc b/packages/rsync/rsync.inc index bc24f4daac..7ec83293ff 100644 --- a/packages/rsync/rsync.inc +++ b/packages/rsync/rsync.inc @@ -7,6 +7,8 @@ DEPENDS += "popt" inherit autotools +SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz" + EXTRA_OEMAKE='STRIP=""' do_install_append() { diff --git a/packages/rsync/rsync_2.6.9.bb b/packages/rsync/rsync_2.6.9.bb index 075dfa7b09..067df4f2f3 100644 --- a/packages/rsync/rsync_2.6.9.bb +++ b/packages/rsync/rsync_2.6.9.bb @@ -2,5 +2,4 @@ require rsync.inc PR = "r2" -SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \ - file://rsyncd.conf" +SRC_URI += "file://rsyncd.conf" diff --git a/packages/rsync/rsync_3.0.0.bb b/packages/rsync/rsync_3.0.0.bb index 720ef04521..99bec628d3 100644 --- a/packages/rsync/rsync_3.0.0.bb +++ b/packages/rsync/rsync_3.0.0.bb @@ -2,9 +2,10 @@ require rsync.inc PR = "r0" -SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \ - file://m4.patch;patch=1 \ - file://rsyncd.conf" +SRC_URI += "\ + file://m4.patch;patch=1 \ + file://rsyncd.conf \ +" do_compile_prepend() { sed -i "s/conf_stop make_stop//" Makefile -- cgit v1.2.3 From d9f4486ad1252346ab30aa1b80f61c7e3479cb47 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 28 Apr 2008 10:12:16 +0000 Subject: om-gta02: remove yaffs2 from image file types, this product will only use jffs2 --- conf/machine/om-gta02.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 18678cc336..e041b34c6f 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -34,6 +34,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ --littleendian --pad \ @@ -45,7 +46,3 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc - -# build YAFFS2 -IMAGE_FSTYPES ?= "jffs2 yaffs2" - -- cgit v1.2.3 From e766551e4d9abd394c002273370028a8d012ed49 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 28 Apr 2008 10:13:22 +0000 Subject: preferred-om-2008-versions.inc: something has changed default preference for glib-2, add it here, so we don't get 2.8.6 --- conf/distro/include/preferred-om-2008-versions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc index a54cf9174f..f2d816cd9e 100644 --- a/conf/distro/include/preferred-om-2008-versions.inc +++ b/conf/distro/include/preferred-om-2008-versions.inc @@ -1,7 +1,8 @@ PREFERRED_VERSION_asterisk = "1.4.17" PREFERRED_VERSION_busybox = "1.9.1" -PREFERRED_VERSION_dbus = "1.1.20" +PREFERRED_VERSION_dbus = "1.2.1" PREFERRED_VERSION_dbus-glib = "0.74" +PREFERRED_VERSION_glib-2.0 = "2.16.1" PREFERRED_VERSION_gnash = "0.8.2" PREFERRED_VERSION_gpsdrive = "2.10pre4" PREFERRED_VERSION_gst-pulse = "0.9.7" @@ -12,4 +13,3 @@ 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 713ee7d6854b5a5ff8293e64127c4fd91fbfa24b Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 28 Apr 2008 10:13:42 +0000 Subject: sane-srcrevs.inc: bump gsm0710muxd. this equals version 0.9.1 --- conf/distro/include/sane-srcrevs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index bc86ba7e67..9028630653 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" -SRCREV_pn-gsm0710muxd ?= "193" +SRCREV_pn-gsm0710muxd ?= "263" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -- cgit v1.2.3 From f37239b69eba869e67a53062cc6b8de6be89ff5b Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 28 Apr 2008 10:37:04 +0000 Subject: htckaiser.conf : machine description for kaiser WIP linux-kaiser_2.6.24+git.bb : kernel for kaiser WIP --- conf/machine/htckaiser.conf | 25 +++++++++++++++++++++++++ packages/linux/linux-kaiser_2.6.24+git.bb | 15 +++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 conf/machine/htckaiser.conf create mode 100644 packages/linux/linux-kaiser_2.6.24+git.bb diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf new file mode 100644 index 0000000000..ad17bb82bf --- /dev/null +++ b/conf/machine/htckaiser.conf @@ -0,0 +1,25 @@ +#@TYPE: Machine +#@NAME: HTC Kaiser phone +#@DESCRIPTION: Machine configuration for HTC Kaiser phone +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te armv6" + +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" +XSERVER = "xserver-kdrive-fbdev" + +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_DISPLAY_WIDTH_PIXELS = "240" +MACHINE_DISPLAY_HEIGHT_PIXELS = "320" + +TARGET_FPU = "soft" +TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s" +FEED_ARCH = "armv6" +PACKAGE_ARCH = "armv6" + + +IMAGE_FSTYPES ?= "tar.gz cpio.gz" + +PREFERRED_PROVIDER_virtual/kernel = "linux-kaiser" + +MACHINE_FEATURES = "kernel26 touchscreen screen keyboard" + diff --git a/packages/linux/linux-kaiser_2.6.24+git.bb b/packages/linux/linux-kaiser_2.6.24+git.bb new file mode 100644 index 0000000000..ba4e6c1973 --- /dev/null +++ b/packages/linux/linux-kaiser_2.6.24+git.bb @@ -0,0 +1,15 @@ +require linux.inc + +PV = "2.6.24+git${SRCREV}" + +COMPATIBLE_MACHINE = "htckaiser" + +SRC_URI = "git://git.android.com/kernel.git;branch=android-msm;protocol=git \ + http://baliniak.pl/android/kernel.diff;patch=1" + +S = "${WORKDIR}/git" + +do_configure_prepend() { + cp .config ../defconfig +} + -- cgit v1.2.3 From c067ead252920fa4b551fabe966d30e750acb5d3 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Mon, 28 Apr 2008 11:09:27 +0000 Subject: wpa-supplicant_0.5.10.bb: update to version 0.5.10 --- packages/wpa-supplicant/wpa-supplicant-0.5.inc | 3 --- packages/wpa-supplicant/wpa-supplicant_0.5.10.bb | 1 + packages/wpa-supplicant/wpa-supplicant_0.5.5.bb | 2 ++ packages/wpa-supplicant/wpa-supplicant_0.5.7.bb | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.10.bb diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc index b5e53e3f56..ccded27ffb 100644 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ b/packages/wpa-supplicant/wpa-supplicant-0.5.inc @@ -8,11 +8,8 @@ DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "", MY_ARCH := "${PACKAGE_ARCH}" PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" -DEFAULT_PREFERENCE = "-2" - SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ file://defconfig-gnutls \ - file://gnutlsfix.patch;patch=1 \ file://ifupdown.sh \ file://functions.sh" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb new file mode 100644 index 0000000000..6594bbfdbe --- /dev/null +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -0,0 +1 @@ +require wpa-supplicant-0.5.inc diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb index ce744b3fe7..2b45ce9389 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb @@ -1,3 +1,5 @@ require wpa-supplicant-0.5.inc +SRC_URI += "file://gnutlsfix.patch;patch=1" + PR = "r3" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb index 2aa871bb74..5dc49302c9 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb @@ -1,3 +1,5 @@ require wpa-supplicant-0.5.inc -PR = "r1" \ No newline at end of file +SRC_URI += "file://gnutlsfix.patch;patch=1" + +PR = "r1" -- cgit v1.2.3 From da246fe0b1e996c8f3d18824d8fb2cd0fafb5be3 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 28 Apr 2008 11:22:01 +0000 Subject: classes/kernel.bbclass : fix for situation in which we generate no modules. --- classes/kernel.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 90583b42a4..a295c144e7 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -470,7 +470,10 @@ do_deploy() { install -d ${DEPLOY_DIR_IMAGE} install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin + + if [ -d "${D}lib" ]; then tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib + fi if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/compressed/vmlinux ; then -- cgit v1.2.3 From f10bb06b29f0be63068a2143e8155e3ae4c4d2a2 Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Mon, 28 Apr 2008 11:57:36 +0000 Subject: wpa-supplicant: drop antique 0.2.x and 0.3.x releases --- .../wpa-supplicant-nossl/.mtn2git_empty | 0 .../wpa-supplicant-nossl/wpa-defconfig | 4 -- .../wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb | 7 --- .../wpa-supplicant-ssl/.mtn2git_empty | 0 .../wpa-supplicant-ssl/wpa-defconfig | 15 ------ .../wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb | 9 ---- packages/wpa-supplicant/wpa-supplicant_0.2.6.inc | 33 ------------ packages/wpa-supplicant/wpa-supplicant_0.3.6.bb | 33 ------------ packages/wpa-supplicant/wpa-supplicant_0.3.8.bb | 36 -------------- packages/wpa-supplicant/wpa-supplicant_cvs.bb | 58 ---------------------- 10 files changed, 195 deletions(-) delete mode 100644 packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty delete mode 100644 packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig delete mode 100644 packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb delete mode 100644 packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty delete mode 100644 packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig delete mode 100644 packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.2.6.inc delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.3.6.bb delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.3.8.bb delete mode 100644 packages/wpa-supplicant/wpa-supplicant_cvs.bb diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant-nossl/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig b/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig deleted file mode 100644 index bf5d5e28e7..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl/wpa-defconfig +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y - diff --git a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb deleted file mode 100644 index fe1a30b58b..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-nossl_0.2.6.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "User space helper for WPA and WPA2 client operations. \ -The Supplicant is used in WPA/WPA2 key handshakes to authenticate \ -with the AP and to generate dynamic encryption keys (TKIP or CCMP)." - -PR = "r3" - -require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant-ssl/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig b/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig deleted file mode 100644 index 2dac008aa5..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl/wpa-defconfig +++ /dev/null @@ -1,15 +0,0 @@ -# CONFIG_DRIVER_HOSTAP is not set -CONFIG_DRIVER_WEXT=y -CONFIG_WIRELESS_EXTENSION=y -CONFIG_DRIVER_HOSTAP=y -CONFIG_IEEE8021X_EAPOL=y -CONFIG_EAP_MD5=y -CONFIG_MSCHAPV2=y -CONFIG_EAP_TLS=y -CONFIG_EAP_PEAP=y -CONFIG_EAP_TTLS=y -CONFIG_EAP_GTC=y -CONFIG_EAP_OTP=y -CONFIG_EAP_SIM=y -CONFIG_EAP_LEAP=y -#CONFIG_PCSC=y diff --git a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb b/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb deleted file mode 100644 index 34f370a10e..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-ssl_0.2.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "User space helper for WPA and WPA2 client operations with SSL. \ -The Supplicant is used in WPA/WPA2 key handshakes to authenticate \ -with the AP and to generate dynamic encryption keys (TKIP or CCMP)." -DEPENDSS = "openssl" -PR = "r3" - -EXTRA_OEMAKE="LIBS='-L${STAGING_LIBDIR} -lssl -lcrypto' LIBS_p='-L${STAGING_LIBDIR} -lssl -lcrypto'" - -require wpa-supplicant_${PV}.inc diff --git a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc b/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc deleted file mode 100644 index e75ce2e570..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.2.6.inc +++ /dev/null @@ -1,33 +0,0 @@ -SECTION = "kernel/userland" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -PRIORITY = "optional" -LICENSE = "GPL" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://wpa-defconfig \ - file://wpa_supplicant_default.conf" - -RREPLACES_${PN} = "hostap-${PN}" -RPROVIDES_${PN} = "hostap-${PN}" -RCONFLICTS_${PN} = "hostap-${PN}" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_compile() { - unset CFLAGS - base_do_compile -} - -do_configure() { - install -m 0644 ${WORKDIR}/wpa-defconfig .config -} - -do_install() { - install -d ${D}${sysconfdir} ${D}${bindir} - install -m 0644 wpa_supplicant.conf ${D}${sysconfdir}/wpa_supplicant.conf.sample - install -m 0644 ../wpa_supplicant_default.conf ${D}${sysconfdir}/wpa_supplicant.conf - install -m 0755 wpa_passphrase ${D}${bindir} - install -m 0755 wpa_cli ${D}${bindir} - install -m 0755 wpa_supplicant ${D}${bindir} -} - diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb deleted file mode 100644 index 365bcb78cc..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.6.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -PR = "r3" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-0.3.6.tar.gz \ - file://defconfig \ - file://driver-hermes.patch;patch=1 \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb b/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb deleted file mode 100644 index e11bcbc7cb..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.3.8.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -DEPENDS_append_mtx-1 = " madwifi-modules" -DEPENDS_append_mtx-2 = " madwifi-modules" -PR = "r1" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://madwifi-bsd-fix.diff;patch=1;pnum=0 \ - file://defconfig \ - file://driver-hermes.patch;patch=1 \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/wpa_supplicant-${PV}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${sysconfdir} - install -m644 ${WORKDIR}/wpa_supplicant.conf ${D}${sysconfdir} - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${D}${docdir}/wpa_supplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant_cvs.bb b/packages/wpa-supplicant/wpa-supplicant_cvs.bb deleted file mode 100644 index db1395d76b..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_cvs.bb +++ /dev/null @@ -1,58 +0,0 @@ -DESCRIPTION = "Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "openssl" -PV = "0.0+cvs${SRCDATE}" -PR = "r2" - -SRC_URI = "cvs://anonymous@hostap.epitest.fi/cvs;module=hostap \ - file://use-channel.patch;patch=1 \ - file://driver-hermes.patch;patch=1 \ - file://defconfig \ - file://defaults \ - file://init.sh \ - file://wpa_supplicant.conf" -S = "${WORKDIR}/hostap/wpa_supplicant" - - -PACKAGES_prepend = "wpa-supplicant-passphrase wpa-supplicant-cli " -FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" -FILES_wpa-supplicant-cli = "/usr/sbin/wpa_cli" - -RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli" - - -INITSCRIPT_NAME = "wpa" -INITSCRIPT_PARAMS = "defaults 10" -inherit update-rc.d - - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig .config -} - - -do_compile () { - make -} - - -do_install () { - set -x - install -d ${D}${sbindir} - install -m755 wpa_supplicant ${D}${sbindir} - install -m755 wpa_passphrase ${D}${sbindir} - install -m755 wpa_cli ${D}${sbindir} - - install -d ${D}${localstatedir}/run/wpa_supplicant - - install -d ${D}${docdir}/wpa_supplicant - install -m644 README ${WORKDIR}/wpa_supplicant.conf ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/init.d - install -m700 ${WORKDIR}/init.sh ${D}${sysconfdir}/init.d/wpa - - install -d ${D}${sysconfdir}/default - install -m600 ${WORKDIR}/defaults ${D}${sysconfdir}/default/wpa -} -- cgit v1.2.3 From f6536f4e827cd982cc390648ddc1ba85f00cc54c Mon Sep 17 00:00:00 2001 From: Jeremy Laine Date: Mon, 28 Apr 2008 12:07:26 +0000 Subject: wpa_supplicant: only keep version 0.5.10 for 0.5.x (stable) branch --- packages/wpa-supplicant/wpa-supplicant-0.5.inc | 61 --------------------- .../wpa-supplicant/wpa-supplicant/.mtn2git_empty | 0 .../wpa-supplicant/wpa-supplicant/gnutlsfix.patch | 19 ------- packages/wpa-supplicant/wpa-supplicant_0.5.10.bb | 62 +++++++++++++++++++++- packages/wpa-supplicant/wpa-supplicant_0.5.5.bb | 5 -- packages/wpa-supplicant/wpa-supplicant_0.5.7.bb | 5 -- 6 files changed, 61 insertions(+), 91 deletions(-) delete mode 100644 packages/wpa-supplicant/wpa-supplicant-0.5.inc delete mode 100644 packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty delete mode 100644 packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.5.bb delete mode 100644 packages/wpa-supplicant/wpa-supplicant_0.5.7.bb diff --git a/packages/wpa-supplicant/wpa-supplicant-0.5.inc b/packages/wpa-supplicant/wpa-supplicant-0.5.inc deleted file mode 100644 index ccded27ffb..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant-0.5.inc +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." -SECTION = "network" -LICENSE = "GPL" -HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" -DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" - -#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds -MY_ARCH := "${PACKAGE_ARCH}" -PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" - -SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ - file://defconfig-gnutls \ - file://ifupdown.sh \ - file://functions.sh" - -S = "${WORKDIR}/wpa_supplicant-${PV}" - -PACKAGES_prepend = "wpa-supplicant-passphrase " -FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" - -RREPLACES = "wpa-supplicant-cli" - -RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" - -export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" - -do_configure () { - install -m 0755 ${WORKDIR}/defconfig-gnutls .config - - if [ "x$HAS_PCI" == "x1" ] ; then - echo "CONFIG_DRIVER_MADWIFI=y" >> .config - echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config - fi -} - -do_compile () { - make -} - -do_install () { - install -d ${D}${sbindir} - install -m 755 wpa_supplicant ${D}${sbindir} - install -m 755 wpa_passphrase ${D}${sbindir} - install -m 755 wpa_cli ${D}${sbindir} - - install -d ${D}${localstatedir}/run/wpa_supplicant - - install -d ${D}${docdir}/wpa_supplicant - install -m 644 README ${D}${docdir}/wpa_supplicant - - install -d ${D}${sysconfdir}/network/if-pre-up.d/ - install -d ${D}${sysconfdir}/network/if-post-down.d/ - install -d ${D}${sysconfdir}/network/if-down.d/ - - install -d ${D}${sysconfdir}/wpa_supplicant - install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/ - install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant - - ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant - ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant -} diff --git a/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty b/packages/wpa-supplicant/wpa-supplicant/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch b/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch deleted file mode 100644 index 795306bb35..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant/gnutlsfix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: wpa_supplicant-0.5.5/tls_gnutls.c -=================================================================== ---- wpa_supplicant-0.5.5.orig/tls_gnutls.c 2006-06-25 03:05:07.000000000 +0200 -+++ wpa_supplicant-0.5.5/tls_gnutls.c 2006-10-29 15:12:21.000000000 +0100 -@@ -1029,8 +1029,13 @@ - const u8 *in_data, size_t in_len, - size_t *out_len) - { -+ u8 *appl_data; -+ size_t appl_data_len; -+ -+ appl_data = NULL; -+ - return tls_connection_handshake(ssl_ctx, conn, in_data, in_len, -- out_len); -+ out_len, appl_data, appl_data_len); - } - - diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb index 6594bbfdbe..ccded27ffb 100644 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb +++ b/packages/wpa-supplicant/wpa-supplicant_0.5.10.bb @@ -1 +1,61 @@ -require wpa-supplicant-0.5.inc +DESCRIPTION = "A Client for Wi-Fi Protected Access (WPA)." +SECTION = "network" +LICENSE = "GPL" +HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/" +DEPENDS = "gnutls ${@base_contains("COMBINED_FEATURES", "pci", "madwifi-ng", "",d)}" + +#we introduce MY_ARCH to get 'armv5te' as arch instead of the misleading 'arm' on armv5te builds +MY_ARCH := "${PACKAGE_ARCH}" +PACKAGE_ARCH = "${@base_contains('COMBINED_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}', d)}" + +SRC_URI = "http://hostap.epitest.fi/releases/wpa_supplicant-${PV}.tar.gz \ + file://defconfig-gnutls \ + file://ifupdown.sh \ + file://functions.sh" + +S = "${WORKDIR}/wpa_supplicant-${PV}" + +PACKAGES_prepend = "wpa-supplicant-passphrase " +FILES_wpa-supplicant-passphrase = "/usr/sbin/wpa_passphrase" + +RREPLACES = "wpa-supplicant-cli" + +RRECOMMENDS_${PN} = "wpa-supplicant-passphrase" + +export HAS_PCI = "${@base_contains('COMBINED_FEATURES', 'pci', 1, 0,d)}" + +do_configure () { + install -m 0755 ${WORKDIR}/defconfig-gnutls .config + + if [ "x$HAS_PCI" == "x1" ] ; then + echo "CONFIG_DRIVER_MADWIFI=y" >> .config + echo "CFLAGS += -I${STAGING_INCDIR}/madwifi-ng" >> .config + fi +} + +do_compile () { + make +} + +do_install () { + install -d ${D}${sbindir} + install -m 755 wpa_supplicant ${D}${sbindir} + install -m 755 wpa_passphrase ${D}${sbindir} + install -m 755 wpa_cli ${D}${sbindir} + + install -d ${D}${localstatedir}/run/wpa_supplicant + + install -d ${D}${docdir}/wpa_supplicant + install -m 644 README ${D}${docdir}/wpa_supplicant + + install -d ${D}${sysconfdir}/network/if-pre-up.d/ + install -d ${D}${sysconfdir}/network/if-post-down.d/ + install -d ${D}${sysconfdir}/network/if-down.d/ + + install -d ${D}${sysconfdir}/wpa_supplicant + install -m 755 ${WORKDIR}/ifupdown.sh ${D}${sysconfdir}/wpa_supplicant/ + install -m 755 ${WORKDIR}/functions.sh ${D}${sysconfdir}/wpa_supplicant + + ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-pre-up.d/wpasupplicant + ln -s /etc/wpa_supplicant/ifupdown.sh ${D}${sysconfdir}/network/if-post-down.d/wpasupplicant +} diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb deleted file mode 100644 index 2b45ce9389..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.5.bb +++ /dev/null @@ -1,5 +0,0 @@ -require wpa-supplicant-0.5.inc - -SRC_URI += "file://gnutlsfix.patch;patch=1" - -PR = "r3" diff --git a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb b/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb deleted file mode 100644 index 5dc49302c9..0000000000 --- a/packages/wpa-supplicant/wpa-supplicant_0.5.7.bb +++ /dev/null @@ -1,5 +0,0 @@ -require wpa-supplicant-0.5.inc - -SRC_URI += "file://gnutlsfix.patch;patch=1" - -PR = "r1" -- cgit v1.2.3