diff options
Diffstat (limited to 'packages')
59 files changed, 361 insertions, 242 deletions
diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb index 399352f299..4cf393843b 100644 --- a/packages/alsa/alsa-lib_1.0.15.bb +++ b/packages/alsa/alsa-lib_1.0.15.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library" HOMEPAGE = "http://www.alsa-project.org" SECTION = "libs/multimedia" LICENSE = "GPL" -PR = "1" +PR = "r1" # configure.in sets -D__arm__ on the command line for any arm system # (not just those with the ARM instruction set), this should be removed, diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb index 09eddaeb6b..3956c4878b 100644 --- a/packages/busybox/busybox_1.11.3.bb +++ b/packages/busybox/busybox_1.11.3.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r2" +PR = "r3" SRC_URI = "\ http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb index 4ef3cfeb66..346506c10d 100644 --- a/packages/busybox/busybox_1.2.1.bb +++ b/packages/busybox/busybox_1.2.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r17" +PR = "r18" SRC_URI += "file://wget-long-options.patch;patch=1 \ file://df_rootfs.patch;patch=1 \ diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb index 14379a5da6..250802116a 100644 --- a/packages/busybox/busybox_1.2.2.bb +++ b/packages/busybox/busybox_1.2.2.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb index 31a2f1abe7..4742c87d1a 100644 --- a/packages/busybox/busybox_1.3.1.bb +++ b/packages/busybox/busybox_1.3.1.bb @@ -1,6 +1,6 @@ require busybox.inc -PR = "r3" +PR = "r4" DEFAULT_PREFERENCE = "-1" diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb index 53304df387..4d93394ff4 100644 --- a/packages/busybox/busybox_1.7.2.bb +++ b/packages/busybox/busybox_1.7.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r9" +PR = "r10" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://busybox-cron \ diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb index e5c0f2473c..3db360423b 100644 --- a/packages/busybox/busybox_1.9.2.bb +++ b/packages/busybox/busybox_1.9.2.bb @@ -1,5 +1,5 @@ require busybox.inc -PR = "r2" +PR = "r3" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://udhcpscript.patch;patch=1 \ diff --git a/packages/busybox/files/hwclock.sh b/packages/busybox/files/hwclock.sh index 5acfb9fb24..aab5c054af 100644 --- a/packages/busybox/files/hwclock.sh +++ b/packages/busybox/files/hwclock.sh @@ -14,6 +14,8 @@ . /etc/default/rcS +[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime + case "$1" in start) if [ "$VERBOSE" != no ] @@ -26,9 +28,9 @@ case "$1" in then if [ -z "$TZ" ] then - hwclock --hctosys + hwclock --hctosys $UTC else - TZ="$TZ" hwclock --hctosys + TZ="$TZ" hwclock --hctosys $UTC fi fi @@ -51,7 +53,7 @@ case "$1" in fi if [ "$HWCLOCKACCESS" != no ] then - hwclock --systohc + hwclock --systohc $UTC fi if [ "$VERBOSE" != no ] then @@ -62,7 +64,7 @@ case "$1" in show) if [ "$HWCLOCKACCESS" != no ] then - hwclock --show + hwclock --show $UTC fi ;; *) diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc index 8b995b3a70..64ef21cbd4 100644 --- a/packages/dbus/dbus.inc +++ b/packages/dbus/dbus.inc @@ -49,6 +49,7 @@ RDEPENDS_${PN}-x11 = "${PN}" RRECOMMENDS_${PN}-lib = "${PN}" RCONFLICTS_${PN} = "dbus-1" RREPLACES_${PN} = "dbus-1" +RPROVIDES_${PN} = "dbus-1" PACKAGES =+ "${PN}-lib ${PN}-x11" diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb index b3768ceb1e..6f71d062ce 100644 --- a/packages/dbus/dbus_1.0.3.bb +++ b/packages/dbus/dbus_1.0.3.bb @@ -1,4 +1,4 @@ require dbus.inc -PR = "r14" +PR = "r15" DEFAULT_PREFERENCE = "-1" diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb index f5c07e3a91..e14523daaf 100644 --- a/packages/dbus/dbus_1.2.1.bb +++ b/packages/dbus/dbus_1.2.1.bb @@ -1,3 +1,3 @@ include dbus.inc -PR = "r8" +PR = "r9" diff --git a/packages/directfb/lite_0.9.26+cvs20070207.bb b/packages/directfb/lite_0.9.26+cvs20070207.bb index 2f43627829..32f97bf962 100644 --- a/packages/directfb/lite_0.9.26+cvs20070207.bb +++ b/packages/directfb/lite_0.9.26+cvs20070207.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL" # this is a CVS only release -SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[9:]}" +SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[10:]}" S = "${WORKDIR}/lite" diff --git a/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf b/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf new file mode 100644 index 0000000000..3581064245 --- /dev/null +++ b/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf @@ -0,0 +1,38 @@ +[frameworkd] +version = 1 +log_level = DEBUG +log_to = syslog + +[odeviced.kernel26] +# set 1 to disable the module +disable = 0 + +[odeviced.idlenotifier] +# set 1 to disable the module +disable = 1 +# add input nodes to ignore for idle activity +ignoreinput = 2,3,4 + +[odeviced.powercontrol-neo] +disable = 1 + +[ogsmd] +disable = 1 +# specify your modemtype here + +[ogpsd] +device = EtenDevice +channel = SerialChannel +path = /dev/ttySAC2 + +[ogpsd.serialchannel] +baudrate = 57600 + +[opreferencesd] +rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml + +[opimd] +disable = 1 diff --git a/packages/glibc/glibc-2.3.6/etc/ld.so.conf b/packages/glibc/glibc-2.3.6/etc/ld.so.conf new file mode 100644 index 0000000000..46e06d3f0a --- /dev/null +++ b/packages/glibc/glibc-2.3.6/etc/ld.so.conf @@ -0,0 +1,2 @@ +/usr/local/lib + diff --git a/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch b/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch new file mode 100644 index 0000000000..f05c04cb45 --- /dev/null +++ b/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch @@ -0,0 +1,166 @@ +--- + ChangeLog | 4 ++++ + modules/cfgfile.c | 49 +++++++++++++++++++++++++++++-------------------- + 2 files changed, 33 insertions(+), 20 deletions(-) + +--- ChangeLog.orig ++++ ChangeLog +@@ -1,5 +1,9 @@ ++2008-12-18 Florian Boor <florian@kernelconcepts.de> ++ ++ * cfgfile.c: Some fixes to wifi key string generation. ++ + 2008-05-23 Florian Boor <florian.boor@kernelconcepts.de> + + * Relase version 0.2.7 + * Update translations + +--- modules/cfgfile.c.orig ++++ modules/cfgfile.c +@@ -1,8 +1,8 @@ + /* + * +- * Copyright (C) 2002, 2003 Florian Boor <florian.boor@kernelconcepts.de> ++ * Copyright (C) 2002, 2003, 2008 Florian Boor <florian.boor@kernelconcepts.de> + * 2004 Ole Reinhardt <ole.reinhardt@kernelconcepts.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version +@@ -128,12 +128,10 @@ gint get_param_val(gchar* line, gchar* p + for (b=a+1;b<strlen(line);b++) + if ((line[b]=='\n') || (line[b]=='\0')) break; + param=strncpy(param,&line[st],sep-st); + param[sep-st]='\0'; + +-//KC-OR: changed because singe character values not recognized correctly +-// if ((b-a) > 0) value=strncpy(value,&line[a],b-a); + if ((b-a) > 0) value=strncpy(value,&line[a],b-a); + value[b-a]='\0'; + return 0; + } + +@@ -562,15 +560,17 @@ gchar *get_iflist() + strncat(result," ",255); + } + return result; + } + +-void get_wifikey_string(NWInterface_t iface, char* key) ++void get_wifikey_string(NWInterface_t iface, gchar** key) + { + gint nokeys = FALSE; + gint count; + gchar temp[42]; ++ gchar *lkey = g_strdup(""), *t; ++ + + if ((strlen(iface.key[0]) == 0) && + (strlen(iface.key[1]) == 0) && + (strlen(iface.key[2]) == 0) && + (strlen(iface.key[3]) == 0)) +@@ -581,29 +581,36 @@ void get_wifikey_string(NWInterface_t if + + if (strlen(iface.key[iface.keynr-1]) == 0) + for (iface.keynr = 1; iface.keynr <=4; iface.keynr++) + if (strlen(iface.key[iface.keynr-1]) != 0) break; + +- switch (iface.encmode) +- { +- case ENC_OFF: strcpy(key, "off"); break; +- case ENC_OPEN: strcpy(key, "open"); break; +- case ENC_RESTRICTED: strcpy(key, "restricted"); break; +- } +- + if (!nokeys) + { + for (count = 0; count < 4; count++) + if (strlen(iface.key[count]) > 0) + { +- sprintf(temp, " key %s [%d]", iface.key[count], count+1); +- strcat(key, temp); ++ t = lkey; ++ lkey = g_strdup_printf("%s key %s [%d]", lkey, iface.key[count], count+1); ++ g_free(t); + } + +- sprintf(temp, " key [%d]", iface.keynr); +- strcat(key, temp); ++ t = lkey; ++ lkey = g_strdup_printf(" %s key [%d]", lkey, iface.keynr); ++ g_free(t); + } ++ ++ t = lkey; ++ switch (iface.encmode) ++ { ++ case ENC_OPEN: lkey = g_strdup_printf ("%s key open", lkey); break; ++ case ENC_RESTRICTED: lkey = g_strdup_printf("%s key restricted", lkey); break; ++ case ENC_OFF: lkey = g_strdup_printf("%s key off", lkey); break; ++ default: lkey = g_strdup_printf("%s key off", lkey); break; ++ } ++ g_free(t); ++ ++ *key = lkey; + } + + gint write_sections() + { + gint i,j; +@@ -613,11 +620,11 @@ gint write_sections() + gchar paramval[255]; + gchar ifname[255]; + gint svd[14]; + gint lastwpos = 0; + gint last_i; +- gchar key[128]; ++ gchar *key; + + for (i=0;i<configlen;i++) + { + get_param_val(configtext[i],paramval,ifname); // get next tokens + /* handled by hotplug +@@ -724,12 +731,13 @@ gint write_sections() + svd[Swifichannel] = TRUE; + lastwpos = i; + } else + if (!strcmp("wireless_key", paramval)) + { +- get_wifikey_string(iflist[l-1], key); ++ get_wifikey_string(iflist[l-1], &key); + configtext[i] = subst_val(configtext[i], key); ++ g_free(key); + svd[Swifikey] = TRUE; + lastwpos = i; + } + + } // else +@@ -807,11 +815,11 @@ gint write_sections() + add_line(lastwpos,outstr); + i++; + } + if (!svd[Swifikey]) + { +- get_wifikey_string(iflist[l-1], key); ++ get_wifikey_string(iflist[l-1], &key); + sprintf(outstr,"\twireless_key %s",key); + add_line(lastwpos,outstr); + i++; + } + } +@@ -884,12 +892,13 @@ gint write_sections() + if (strlen (iflist[i].channel) > 0) + { + sprintf(outstr,"\twireless_channel %s",iflist[i].channel); + add_line(configlen,outstr); + } +- get_wifikey_string(iflist[i], key); +- sprintf(outstr,"\twireless_key %s",key); ++ get_wifikey_string(iflist[i], &key); ++ sprintf(outstr,"\twireless_key %s",key); ++ g_free(key); + add_line(configlen,outstr); + } + + } //if status + diff --git a/packages/gpe-conf/gpe-conf_0.2.7.bb b/packages/gpe-conf/gpe-conf_0.2.7.bb index ec836eb068..2d4fb2168e 100644 --- a/packages/gpe-conf/gpe-conf_0.2.7.bb +++ b/packages/gpe-conf/gpe-conf_0.2.7.bb @@ -10,13 +10,14 @@ RDEPENDS_gpe-conf-panel = "gpe-conf" RPROVIDES_${PN} += " bl" RCONFLICTS_${PN} = "bl" -PR = "r1" +PR = "r2" GPE_TARBALL_SUFFIX = "bz2" inherit gpe autotools pkgconfig -SRC_URI += "file://poweroff.patch;patch=1" +SRC_URI += "file://poweroff.patch;patch=1 \ + file://wifi-key.patch;patch=1;pnum=0" PACKAGES += "gpe-conf-panel" diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb deleted file mode 100644 index e7307c73d0..0000000000 --- a/packages/images/openmoko-asu-image.bb +++ /dev/null @@ -1,10 +0,0 @@ -#------------------------------------------------------ -# Openmoko Qtopia/X11 Image Recipe -#------------------------------------------------------ - -require openmoko-minimal-image.bb - -IMAGE_INSTALL += "\ - task-openmoko-asu \ - task-openmoko-basic \ - " diff --git a/packages/images/openmoko-base-image.bb b/packages/images/openmoko-base-image.bb deleted file mode 100644 index 8acb0f5f90..0000000000 --- a/packages/images/openmoko-base-image.bb +++ /dev/null @@ -1,7 +0,0 @@ -#------------------------------------------------------ -# Openmoko Base Image Recipe -#------------------------------------------------------ - -require openmoko-minimal-image.bb - -IMAGE_INSTALL += "task-openmoko-basic" diff --git a/packages/linux/linux-2.6.26/boc01/012-081121-cy3218-btns.patch b/packages/linux/linux-2.6.26/boc01/012-081218-cy3218-btns.patch index 51d092c528..d5985f3f0a 100644 --- a/packages/linux/linux-2.6.26/boc01/012-081121-cy3218-btns.patch +++ b/packages/linux/linux-2.6.26/boc01/012-081218-cy3218-btns.patch @@ -70,11 +70,11 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver +} + +unsigned short keymap[5] = { -+ KEY_A, -+ KEY_B, -+ KEY_C, -+ KEY_D, -+ KEY_E, ++ KEY_UP, ++ KEY_F1, ++ KEY_ENTER, ++ KEY_DOWN, ++ KEY_BACKSPACE, +}; + +static void handle_buttons(struct input_polled_dev *dev) @@ -89,7 +89,7 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver + if(uValue == MASK0) + { + report_key(idev, keymap[0]); -+ printk("Bouton A\n"); ++ printk("Bouton UP\n"); + } + + uValue = i2c_smbus_read_byte_data(&capsense->client, CAP_STATE_GP0); @@ -97,24 +97,24 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver + if(uValue == MASK0) + { + report_key(idev, keymap[1]); -+ printk("Bouton E\n"); ++ printk("Bouton HELP\n"); + } + + if(uValue == MASK1) + { + report_key(idev, keymap[2]); -+ printk("Bouton B\n"); ++ printk("Bouton OK\n"); + } + + if(uValue == MASK2) + { + report_key(idev, keymap[3]); -+ printk("Bouton C\n"); ++ printk("Bouton DOWN\n"); + } + if(uValue == MASK3) + { + report_key(idev, keymap[4]); -+ printk("Bouton D\n"); ++ printk("Bouton BACK\n"); + } +} + @@ -167,8 +167,8 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver + set_bit(EV_KEY, ipdev->input->evbit); + + -+ for (i = 0; i < 3; i++) -+ set_bit(keymap[i], ipdev->input->keybit); ++ for (i = 0; i < ARRAY_SIZE(keymap); i++) ++ set_bit(keymap[i], ipdev->input->keybit); + + rc = input_register_polled_device(ipdev); + if(rc) diff --git a/packages/linux/linux-openmoko-devel/defconfig-oe b/packages/linux/linux-openmoko-devel/defconfig-oe index b5d7e2f4df..32bcb9a52d 100644 --- a/packages/linux/linux-openmoko-devel/defconfig-oe +++ b/packages/linux/linux-openmoko-devel/defconfig-oe @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28-rc4 -# Sun Dec 14 16:59:01 2008 +# Thu Dec 18 22:58:51 2008 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1823,7 +1823,11 @@ CONFIG_ROMFS_FS=y # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set +CONFIG_NFS_FS=y +CONFIG_NFS_V3=y +CONFIG_NFS_V3_ACL=y +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y CONFIG_NFSD=y CONFIG_NFSD_V2_ACL=y CONFIG_NFSD_V3=y @@ -1843,6 +1847,7 @@ CONFIG_CIFS=m # CONFIG_CIFS_STATS is not set # CONFIG_CIFS_WEAK_PW_HASH is not set # CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_POSIX is not set |