summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--classes/autotools.bbclass3
-rw-r--r--classes/fso-plugin.bbclass4
-rw-r--r--classes/vala.bbclass3
-rw-r--r--conf/checksums.ini12
-rw-r--r--conf/distro/include/fso-autorev.inc2
-rw-r--r--conf/distro/minimal.conf5
-rw-r--r--packages/cpubench/cpubench_06.bb15
-rw-r--r--packages/cpubench/files/openwrt_cpu_bench_v06.c227
-rw-r--r--packages/freesmartphone/fsodeviced_git.bb15
-rw-r--r--packages/freesmartphone/libfsoframework_git.bb17
-rw-r--r--packages/gpephone/soundserver/libtool.patch10
-rw-r--r--packages/gpephone/soundserver_1.0.bb4
-rw-r--r--packages/mesa/mesa-dri_7.2.bb2
-rw-r--r--packages/vala/vala-native_git.bb9
14 files changed, 302 insertions, 26 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index fd8687ebb6..20f371a987 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -212,7 +212,8 @@ autotools_stage_all() {
for i in $las
do
sed -e 's/^installed=yes$/installed=no/' \
- -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*.la\),${STAGING_LIBDIR}/\1,g' \
+ -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR},g' \
-e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
-i ${STAGE_TEMP}/${libdir}/$i
done
diff --git a/classes/fso-plugin.bbclass b/classes/fso-plugin.bbclass
new file mode 100644
index 0000000000..d050540ef6
--- /dev/null
+++ b/classes/fso-plugin.bbclass
@@ -0,0 +1,4 @@
+FILES_${PN} += "${libdir}/cornucopia/modules/*/*.so"
+FILES_${PN}-dev += "${libdir}/cornucopia/modules/*/*.la"
+FILES_${PN}-dbg += "${libdir}/cornucopia/modules/*/.debug"
+
diff --git a/classes/vala.bbclass b/classes/vala.bbclass
new file mode 100644
index 0000000000..bcd906aeb9
--- /dev/null
+++ b/classes/vala.bbclass
@@ -0,0 +1,3 @@
+DEPENDS += "vala-native"
+
+FILES_${PN}-dev += "${datadir}/vala/vapi/*.vapi"
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a206eb7443..578a6d8b57 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -18119,8 +18119,8 @@ md5=e4e6155530a23ea0ea4ca59f8c5fda8c
sha256=e86a0a81ce1b989a4d06e0c07d64e1fcbba2456fa8e22ae24f333f186f3fc663
[http://gpephone.linuxtogo.org/download/gpephone/phoneserver-1.0/phoneserver-1.0.tar.bz2]
-md5=195b684e025ff5c15617d6f757cf631f
-sha256=e14546d11e899e7e9f06ca58979fee14b273d53c637eb268d7c6fe3bf78d564d
+md5=6f6450c4e762059e790216b15b5930e6
+sha256=a1f05eba12369fb8bafb53559ae5ab2855ab1e83746049a100ce5a6d69bec2a6
[http://de3.php.net/distributions/php-4.4.4.tar.bz2]
md5=bc6fa8908e2ac36e93bab9f7d42cda3a
@@ -20999,8 +20999,8 @@ md5=a362dc3f5f23d785990917103c76a43d
sha256=084f8286eb945455f3f1567c0a7e7df3a759f2a4e1aab3b881b8ef1bda5bdb21
[http://gpephone.linuxtogo.org/download/gpephone/soundserver-1.0/soundserver-1.0.tar.bz2]
-md5=95a2346791fb461d570808369ac5a2bb
-sha256=0b1009cd6bb5a345be3fe69048b23c8f3248a86340832861f0ffda9e368a6015
+md5=14cbf40e5c6ba1ac05a9309d392326fc
+sha256=2cd45d30fcf862f65d3d9a096e69df1e6520920b01cc35fe66e1f21799645614
[http://mutab0r.chat.ru/soundtracker-0.6.7.gtk2.tar.bz2]
md5=e10563187f49d9f39d360d4c59de6c6c
@@ -23059,8 +23059,8 @@ md5=511ffbc8ed8d9df82e7c67852164728c
sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a
[http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz]
-md5=c775c0663a5c499d3f2ac23602e98426
-sha256=52f8a7087960aa8845941d08d4fe58c29670c374fbeccd722dd5fbfe995fb89c
+md5=7fa731310c2f5e334ca4eba9c5482965
+sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e
[http://www.wirelessdefence.org/Contents/Files/void11-0.2.0.tar.bz2]
md5=1c5b3e3e70916de74c2932c7f3e46d9e
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index 6de3c82a38..a95a0da4ef 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -3,6 +3,7 @@ SRCREV_pn-dbus-hlid = "${AUTOREV}"
SRCREV_pn-frameworkd = "${AUTOREV}"
SRCREV_pn-frameworkd-devel = "${AUTOREV}"
SRCREV_pn-fsod = "${AUTOREV}"
+SRCREV_pn-fsodeviced = "${AUTOREV}"
SRCREV_pn-fso-abyss = "${AUTOREV}"
SRCREV_pn-fso-apm = "${AUTOREV}"
SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
@@ -11,6 +12,7 @@ SRCREV_pn-fso-monitord = "${AUTOREV}"
SRCREV_pn-fso-sounds = "${AUTOREV}"
SRCREV_pn-gsmd2 = "${AUTOREV}"
SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
+SRCREV_pn-libfsoframework = "${AUTOREV}"
SRCREV_pn-libframeworkd-glib = "${AUTOREV}"
SRCREV_pn-libgsm0710 = "${AUTOREV}"
SRCREV_pn-libgsm0710mux = "${AUTOREV}"
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 196018b431..f7c33d4ed6 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -99,8 +99,8 @@ require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
#############################################################################
# Ship extra debug utils in the rootfs when doing a debug build
-DEBUG_APPS ?= ""
-DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
+DISTRO_EXTRA_APPS ?= ""
+DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}'
# Additional content I (only valid if you include task-base)
# distro-feed-configs: configuration files for the online feeds
@@ -110,6 +110,7 @@ DISTRO_EXTRA_RDEPENDS += "\
distro-feed-configs \
util-linux-ng-mount util-linux-ng-umount \
angstrom-libc-fixup-hack \
+ ${DISTRO_EXTRA_APPS} \
"
# Additional content II (can be masked with BAD_RECOMMENDS)
diff --git a/packages/cpubench/cpubench_06.bb b/packages/cpubench/cpubench_06.bb
new file mode 100644
index 0000000000..82735310b6
--- /dev/null
+++ b/packages/cpubench/cpubench_06.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "OpenWRT's CPU Benchmark"
+HOMEPAGE = "http://wiki.openwrt.org/HardwarePerformance"
+LICENSE = "GPL"
+SECTION = "devel"
+
+SRC_URI = "file://openwrt_cpu_bench_v06.c"
+
+do_compile() {
+ ${CC} -O0 ${LDFLAGS} ${WORKDIR}/openwrt_cpu_bench_v06.c -o cpubench
+}
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 cpubench ${D}${bindir}
+}
diff --git a/packages/cpubench/files/openwrt_cpu_bench_v06.c b/packages/cpubench/files/openwrt_cpu_bench_v06.c
new file mode 100644
index 0000000000..dfb05a8360
--- /dev/null
+++ b/packages/cpubench/files/openwrt_cpu_bench_v06.c
@@ -0,0 +1,227 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+
+
+
+#define VERSION_STR "v0.6"
+
+// This is the overhead of calling gettimeofday() 2 times
+double overhead = -1;
+
+double begin_secs = 0;
+double real_get_seconds()
+{
+ struct timeval tv;
+ double total;
+
+ gettimeofday(&tv, NULL);
+ total = (double)tv.tv_sec;
+ total += ((double)tv.tv_usec)/(double)1000000.0;
+
+ //printf("Secs: %d / Usecs: %d / FSecs: %f\n", tv.tv_sec, tv.tv_usec, total);
+
+ return total;
+}
+double get_seconds()
+{
+ if (begin_secs == 0)
+ {
+ // First call
+ begin_secs = real_get_seconds();
+ }
+
+ return (real_get_seconds() - begin_secs);
+}
+
+
+double run_float_bench()
+{
+ double secs;
+ double begin = get_seconds();
+ int i;
+
+ double nb=0;
+ for (i=0;i<300000;i++)
+ {
+ nb *= i;
+ int n = i >> 10;
+ nb /= n;
+ }
+
+ double end = get_seconds();
+ secs = end-begin;
+ printf("Time to run float bench: %.2f[secs]\n", secs);
+
+ return secs;
+}
+
+
+double do_run_memory_bench()
+{
+ double begin, end;
+ int i;
+ int* buf;
+ int len, index;
+ double secs;
+
+ begin = get_seconds();
+
+ len = (1<<21)/sizeof(int); // 2Mb
+ buf = malloc(len*sizeof(int));
+
+ // Write to memory - sequential
+ for (i=0;i<len;i++)
+ {
+ buf[i] = i;
+ }
+
+ // Read memory - sequential
+ for (i=0;i<len;i++)
+ {
+ int a = buf[i];
+ }
+
+ // Read memory - random
+ for (i=0;i<len;i++)
+ {
+ index = (i*23)%(len/2);
+ int a = buf[index];
+ }
+
+ // Write memory - random
+ for (i=0;i<len;i++)
+ {
+ index = (i*23)%(len/2);
+ buf[index] = i;
+ }
+ free(buf);
+
+ end = get_seconds();
+ secs = (end-begin);
+
+ return secs;
+}
+
+double run_memory_bench()
+{
+ double secs = 0;
+ int i;
+
+ for (i=0;i<10;i++)
+ {
+ secs += do_run_memory_bench();
+ }
+
+ printf("Time to run memory bench: %.2f[secs]\n", secs);
+
+ return secs;
+}
+
+#define NBD 9009
+double run_compute_e()
+{
+ double begin, end;
+ double secs;
+
+ begin = get_seconds();
+
+ int N=NBD, n=N, a[NBD],x;
+ while(--n)
+ {
+ a[n]=1+1/n;
+ }
+
+ for(;N>9;)
+ {
+ for(n=N--;--n; a[n]=x%n, x=10*a[n-1]+x/n)
+ {
+ }
+ }
+
+ end = get_seconds();
+
+ secs = (end-begin);
+ printf("Time to run computation of e (%d digits): %.2f[secs]\n", NBD, secs);
+
+ return secs;
+}
+
+double run_compute_pi()
+{
+ double begin, end;
+ double secs;
+ int i;
+
+ begin = get_seconds();
+ //printf("Begin: %f\n", begin);
+
+ for (i=0;i<10;i++)
+ {
+ int a=10000,b=0,c=8400,d=0,e=0,f[8401],g=0;
+
+ //printf("i:%d\n", i);
+ for(;b-c;)
+ {
+ f[b++]=a/5;
+ }
+
+ for(;d=0,g=c*2;c-=14,e=d%a)
+ {
+ for(b=c;d+=f[b]*a,f[b]=d%--g,d/=g--,--b;d*=b)
+ {
+ }
+ }
+ //printf("Mid: %lld\n", (get_seconds()-end));
+ }
+
+ end = get_seconds();
+ //printf("End: %f\n", end);
+
+ secs = (end-begin);
+ printf("Time to run computation of pi (2400 digits, 10 times): %.2f[secs]\n", secs);
+
+ return secs;
+}
+
+int main()
+{
+ printf("This is CPU and memory benchmark for OpenWRT "VERSION_STR". This will then take some time... (typically 30-60 seconds on a 200MHz computer)\n");
+
+ double begin = get_seconds();
+ double end = get_seconds();
+ overhead = (end-begin)*1000000;
+ printf("Overhead for getting time: %.0fus\n", overhead);
+
+
+ // Nb 1
+ double sec_mem = run_memory_bench();
+
+ // Nb 2
+ double sec_pi = run_compute_pi();
+
+ // Nb 3
+ double sec_e = run_compute_e();
+
+ // Nb 4
+ double sec_float = run_float_bench();
+
+
+
+
+ printf("Total time: %.1fs\n", (sec_mem+sec_e+sec_pi+sec_float));
+
+ time_t t = time(0);
+ struct tm ti;
+ localtime_r(&t, &ti);
+ printf("\nYou can copy/paste the following line in the wiki table at: http://wiki.openwrt.org/HardwarePerformance\n");
+
+ printf("|| %04d-%02d-%02d || ''Author'' || %.1fs || %.1fs || %.1fs || %.1fs || " VERSION_STR " || ''OS'' || ''DeviceModel'' || ''CPU model'' || ''CPU Frequency'' || ''LinkToHwPage'' ||\n", (ti.tm_year+1900), (ti.tm_mon+1), ti.tm_mday, sec_mem, sec_pi, sec_e, sec_float);
+
+ return 0;
+}
+
diff --git a/packages/freesmartphone/fsodeviced_git.bb b/packages/freesmartphone/fsodeviced_git.bb
new file mode 100644
index 0000000000..e8a77fd617
--- /dev/null
+++ b/packages/freesmartphone/fsodeviced_git.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Reference implementation of the org.freesmartphone.Device.* APIs"
+SECTION = "console/network"
+DEPENDS = "libfsoframework"
+LICENSE = "GPL"
+PV = "0.0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "\
+ ${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master \
+"
+S = "${WORKDIR}/git/fsodeviced"
+
+inherit autotools
+
+FILES_${PN} += "${datadir}"
diff --git a/packages/freesmartphone/libfsoframework_git.bb b/packages/freesmartphone/libfsoframework_git.bb
new file mode 100644
index 0000000000..7b03e17041
--- /dev/null
+++ b/packages/freesmartphone/libfsoframework_git.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "freesmartphone.org support library"
+LICENSE = "GPL"
+SECTION = "devel"
+DEPENDS = "vala-native glib-2.0 dbus dbus-glib"
+PV = "0.0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "\
+ ${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master \
+"
+S = "${WORKDIR}/git/libfsoframework"
+
+inherit autotools_stage pkgconfig
+
+FILES_${PN} += "${sysconfdir} ${datadir}"
+# ship vapi files
+FILES_${PN}-dev += "${datadir}/vala"
diff --git a/packages/gpephone/soundserver/libtool.patch b/packages/gpephone/soundserver/libtool.patch
deleted file mode 100644
index 6ae60d9288..0000000000
--- a/packages/gpephone/soundserver/libtool.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- soundserver-1.0/configure.ac.orig 2007-02-21 18:51:48.000000000 +0100
-+++ soundserver-1.0/configure.ac 2007-02-21 18:52:03.000000000 +0100
-@@ -9,7 +9,6 @@
-
- # Checks for programs.
- AC_PROG_CC
--AC_PROG_LIBTOOL
-
- # Localization
- AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
diff --git a/packages/gpephone/soundserver_1.0.bb b/packages/gpephone/soundserver_1.0.bb
index 17e3c6b6b1..5309ea2e82 100644
--- a/packages/gpephone/soundserver_1.0.bb
+++ b/packages/gpephone/soundserver_1.0.bb
@@ -2,15 +2,13 @@ LICENSE = "LiPS"
DESCRIPTION = "Cellphone alarm daemon"
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r1"
+PR = "r2"
DEPENDS = "glib-2.0 libiac gstreamer"
GPE_TARBALL_SUFFIX = "bz2"
inherit gpephone autotools
-SRC_URI += " file://libtool.patch;patch=1"
-
EXTRA_OECONF="--disable-osc8k"
LDFLAGS += " -L${STAGING_LIBDIR}"
diff --git a/packages/mesa/mesa-dri_7.2.bb b/packages/mesa/mesa-dri_7.2.bb
index 13a22afe01..296a254841 100644
--- a/packages/mesa/mesa-dri_7.2.bb
+++ b/packages/mesa/mesa-dri_7.2.bb
@@ -1,6 +1,6 @@
include mesa-common.inc
-PROTO_DEPS = "xf86driproto glproto dri2proto"
+PROTO_DEPS = "xf86driproto glproto dri2proto expat"
LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
diff --git a/packages/vala/vala-native_git.bb b/packages/vala/vala-native_git.bb
index b33dbc28ab..66abd5e292 100644
--- a/packages/vala/vala-native_git.bb
+++ b/packages/vala/vala-native_git.bb
@@ -2,12 +2,15 @@ require vala_0.5.7.bb
# vala from git always needs the latest released version to compile itself
DEPENDS = "vala-native"
-SRCREV = "633493367757a8e5f663c69c975bf525ab8a6d53"
-PV := "0.5.7+0.5.8pre01-git${SRCREV}"
+SRCREV = "e7462e3ed00b75c16c11c27f6d8a640c7f35fafc"
+PV := "0.5.7+0.5.8pre02-gitr${SRCREV}"
DEFAULT_PREFERENCE = "-1"
-SRC_URI = "${GNOME_GIT}/vala;protocol=git;branch=master"
+SRC_URI = "\
+ ${FREESMARTPHONE_GIT}/vala;protocol=git;branch=master \
+ file://static-dbus-methods.patch;patch=1 \
+"
S = "${WORKDIR}/git"
inherit native
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-25 07:04:58 +0000