diff options
33 files changed, 543 insertions, 200 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 75d078e02f..9fdf115781 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -41,7 +41,7 @@ SRCDATE_web ?= "20060613" SRCDATE_zaurusd ?= "20060628" # OpenMoko -SRCDATE_uboot-openmoko = "20070820" +SRCDATE_uboot-openmoko = "20070829" # GPE SRCDATE_dasher-gpe ?= "20060814" diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf index 6862a8095f..20fc2fb873 100644 --- a/conf/machine/c7x0.conf +++ b/conf/machine/c7x0.conf @@ -10,5 +10,5 @@ IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "25" # yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. -XSERVER = "xserver-kdrive-w100" +XSERVER = "xserver-kdrive-imageon" diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf index 0ca65b79a9..146ecf9495 100644 --- a/conf/machine/dht-walnut.conf +++ b/conf/machine/dht-walnut.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405" PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" +UBOOT_ENTRYPOINT = "0" MACHINE_FEATURES = "kernel26 ext2" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index cc604a0ada..f3c70c56a7 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux-gta01" +UBOOT_ENTRYPOINT = "30008000" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index c9e1e73814..d18e5e8b8b 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -8,6 +8,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux-gta02" +UBOOT_ENTRYPOINT = "30008000" MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone wifi" diff --git a/conf/machine/include/gumstix.inc b/conf/machine/include/gumstix.inc index c271940f63..67fefd3835 100644 --- a/conf/machine/include/gumstix.inc +++ b/conf/machine/include/gumstix.inc @@ -20,12 +20,15 @@ MACHINE_FEATURES = "kernel26 alsa ext2 bluetooth" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --squash" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-unix \ +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS = "kernel-module-unix \ kernel-module-rtc-core \ kernel-module-rtc-dev \ kernel-module-rtc-proc \ kernel-module-rtc-sa1100 \ - kernel-module-rtc-sysfs" + kernel-module-rtc-sysfs \ + kernel-module-smc91x \ + kernel-module-gumstix-smc91x \ + " # used by sysvinit_2 diff --git a/conf/machine/smdk2443.conf b/conf/machine/smdk2443.conf index 0f7419f80b..199adb515f 100644 --- a/conf/machine/smdk2443.conf +++ b/conf/machine/smdk2443.conf @@ -7,6 +7,7 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv4t" PREFERRED_PROVIDER_virtual/kernel = "linux-smdk2443" +UBOOT_ENTRYPOINT = "30008000" # used by sysvinit_2 SERIAL_CONSOLE = "115200 ttySAC0" diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb new file mode 100644 index 0000000000..bb5e3c66be --- /dev/null +++ b/packages/angstrom/angstrom-x11-gpe-image.bb @@ -0,0 +1,36 @@ +#Angstrom X11 image, with apps and kernel modules included +LICENSE = "MIT" +PR = "r0" + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-image" + +DEPENDS = "task-base" +RDEPENDS = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + angstrom-gpe-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export PACKAGE_INSTALL = "${RDEPENDS}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb new file mode 100644 index 0000000000..cfe8220291 --- /dev/null +++ b/packages/angstrom/angstrom-x11-office-image.bb @@ -0,0 +1,41 @@ +#Angstrom X11 image, with apps and kernel modules included +LICENSE = "MIT" +PR = "r1" + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-image" + +DEPENDS = "task-base" +RDEPENDS = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + abiword \ + gnumeric \ + cups \ + claws-mail claws-mail claws-plugin-maildir claws-plugin-mailmbox claws-plugin-rssyl \ + midori minimo \ + gphoto2 \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export PACKAGE_INSTALL = "${RDEPENDS}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/angstrom/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb new file mode 100644 index 0000000000..0ddaeae12b --- /dev/null +++ b/packages/angstrom/angstrom-x11-pimlico-image.bb @@ -0,0 +1,36 @@ +#Angstrom X11 image, with apps and kernel modules included +LICENSE = "MIT" +PR = "r0" + +PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" +PREFERRED_PROVIDER_tslib ?= "tslib" +PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" +PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" +PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" + +ANGSTROM_EXTRA_INSTALL += " \ + ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \ + " +XSERVER ?= "xserver-kdrive-fbdev" + +export IMAGE_BASENAME = "x11-image" + +DEPENDS = "task-base" +RDEPENDS = "\ + ${XSERVER} \ + task-base-extended \ + angstrom-x11-base-depends \ + angstrom-gpe-task-base \ + angstrom-gpe-task-settings \ + kernel-modules \ + hal \ + angstrom-ohand-task-pim \ + ${ANGSTROM_EXTRA_INSTALL}" + + +export PACKAGE_INSTALL = "${RDEPENDS}" + +#zap root password for release images +ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}' + +inherit image diff --git a/packages/blktool/.mtn2git_empty b/packages/blktool/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/blktool/.mtn2git_empty diff --git a/packages/blktool/blktool_4.bb b/packages/blktool/blktool_4.bb new file mode 100644 index 0000000000..e658e3256f --- /dev/null +++ b/packages/blktool/blktool_4.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Display or change block device settings" +LICENSE = "GPLv2" + +SRC_URI = "${DEBIAN_MIRROR}/main/b/blktool/blktool_4.orig.tar.gz" + +S = "${WORKDIR}/${PN}-${PV}.orig" + +inherit autotools
\ No newline at end of file diff --git a/packages/linux/linux-gta01.inc b/packages/linux/linux-gta01.inc index 11729553ab..4ee117ea90 100644 --- a/packages/linux/linux-gta01.inc +++ b/packages/linux/linux-gta01.inc @@ -12,7 +12,7 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-gta01" ############################################################## # source and patches # -SRC_URI = "http://ftp.de.kernel.org/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ +SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ file://defconfig-${VANILLA_VERSION}-${MACHINE} \ file://logo_linux_clut224.ppm" S = "${WORKDIR}/linux-${VANILLA_VERSION}" @@ -51,7 +51,7 @@ module_autoload_s3cmci = "s3cmci" do_prepatch() { mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.old + mv patches patches.openmoko mv .pc .pc.old } diff --git a/packages/linux/linux-handhelds-2.6/h2200/defconfig b/packages/linux/linux-handhelds-2.6/h2200/defconfig index 85a7ae0e6e..9b72b0bd9d 100644 --- a/packages/linux/linux-handhelds-2.6/h2200/defconfig +++ b/packages/linux/linux-handhelds-2.6/h2200/defconfig @@ -729,9 +729,9 @@ CONFIG_FIXED_MII_100_FDX=y # CONFIG_NET_ETHERNET=y CONFIG_MII=m -CONFIG_SMC91X=m +# CONFIG_SMC91X is not set CONFIG_DM9000=m -CONFIG_SMC911X=m +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) diff --git a/packages/nfs-utils/files/nfsserver b/packages/nfs-utils/files/nfsserver index 4ff75916d0..0e9d7be787 100644 --- a/packages/nfs-utils/files/nfsserver +++ b/packages/nfs-utils/files/nfsserver @@ -2,16 +2,15 @@ # # Startup script for nfs-utils # -# The nfsd kernel module must exist along with its dependencies -modprobe -n nfsd || exit 0 # # The environment variable NFS_SERVERS may be set in /etc/default/nfsd # Other control variables may be overridden here too test -r /etc/default/nfsd && . /etc/default/nfsd # -# Location of exectuables: +# Location of executables: test -x "$NFS_MOUNTD" || NFS_MOUNTD=/usr/sbin/mountd test -x "$NFS_NFSD" || NFS_NFSD=/usr/sbin/nfsd +test -x "$NFS_STATD" || NFS_STATD=/usr/sbin/statd # # The user mode program must also exist (it just starts the kernel # threads using the kernel module code). @@ -106,6 +105,20 @@ stop_nfsd(){ echo failed fi } + +#statd +start_statd(){ + echo -n "starting statd: " + start-stop-daemon --start --exec "$NFS_STATD" + echo done +} +stop_statd(){ + # WARNING: this kills any process with the executable + # name 'statd'. + echo -n 'stopping statd: ' + start-stop-daemon --stop --quiet --signal 1 --name statd + echo done +} #---------------------------------------------------------------------- # # supported options: @@ -118,15 +131,19 @@ case "$1" in start) create_directories start_nfsd "$NFS_SERVERS" start_mountd + start_statd test -r /etc/exports && exportfs -a;; stop) exportfs -ua + stop_statd stop_mountd stop_nfsd;; reload) test -r /etc/exports && exportfs -r;; restart)exportfs -ua stop_mountd + stop_statd # restart does not restart the kernel threads, # only the user mode processes start_mountd + start_statd test -r /etc/exports && exportfs -a;; esac diff --git a/packages/nfs-utils/files/uclibc_bzero_fix.patch b/packages/nfs-utils/files/uclibc_bzero_fix.patch new file mode 100644 index 0000000000..9a276d326e --- /dev/null +++ b/packages/nfs-utils/files/uclibc_bzero_fix.patch @@ -0,0 +1,68 @@ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ +--- + support/nfs/svc_socket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: nfs-utils-1.0.6/support/nfs/svc_socket.c +=================================================================== +--- nfs-utils-1.0.6.orig/support/nfs/svc_socket.c 2007-05-27 16:14:09.000000000 +0100 ++++ nfs-utils-1.0.6/support/nfs/svc_socket.c 2007-05-28 22:43:55.000000000 +0100 +@@ -63,7 +63,7 @@ svc_socket (u_long number, int type, int + } + } + +- __bzero ((char *) &addr, sizeof (addr)); ++ memset ((char *) &addr,0, sizeof (addr)); + addr.sin_family = AF_INET; + + #ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */ diff --git a/packages/nfs-utils/nfs-utils_1.0.6.bb b/packages/nfs-utils/nfs-utils_1.0.6.bb index a941843488..15e3914472 100644 --- a/packages/nfs-utils/nfs-utils_1.0.6.bb +++ b/packages/nfs-utils/nfs-utils_1.0.6.bb @@ -2,7 +2,7 @@ DESCRIPTION = "userspace utilities for kernel nfs" PRIORITY = "optional" SECTION = "console/network" LICENSE = "GPL" -PR = "r9" +PR = "r12" SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://acinclude-lossage.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \ file://stat-include.patch;patch=1 \ file://nfs-utils-1.0.6-uclibc.patch;patch=1 \ file://kernel-2.6.18+.patch;patch=1 \ + file://uclibc_bzero_fix.patch;patch=1 \ file://nfsserver \ file://forgotten-defines" diff --git a/packages/openmoko-panel-plugins/files/panel-bluetooth.patch b/packages/openmoko-panel-plugins/files/panel-bluetooth.patch deleted file mode 100644 index 1355158c7c..0000000000 --- a/packages/openmoko-panel-plugins/files/panel-bluetooth.patch +++ /dev/null @@ -1,174 +0,0 @@ -Index: src/openmoko-panel-bt.c -=================================================================== ---- a/src/openmoko-panel-bt.c (revision 2567) -+++ b/src/openmoko-panel-bt.c (working copy) -@@ -17,18 +17,131 @@ - #include <libmokopanelui2/moko-panel-applet.h> - - #include <gtk/gtkimage.h> -+#include <gtk/gtkbox.h> -+#include <gtk/gtk.h> - #include <time.h> -+#include <stdlib.h> -+#include <stdio.h> - -+ - typedef struct { -- GtkImage *image; -+ MokoPanelApplet *mokoapplet; -+ GtkImage *image; -+ int state; - } BtApplet; - -+void quick_message(gchar *message) { -+ -+ GtkWidget *dialog, *label, *okay_button; -+ -+ /* Create the widgets */ -+ -+ dialog = gtk_dialog_new(); -+ label = gtk_label_new (message); -+ okay_button = gtk_button_new_with_label("Okay"); -+ -+ /* Ensure that the dialog box is destroyed when the user clicks ok. */ -+ -+ gtk_signal_connect_object (GTK_OBJECT (okay_button), "clicked", -+ GTK_SIGNAL_FUNC (gtk_widget_destroy), dialog); -+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->action_area), -+ okay_button); -+ -+ gtk_window_set_title(GTK_WINDOW(dialog), "Bt Status"); -+ -+ /* Add the label, and show everything we've added to the dialog. */ -+ -+ gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), -+ label); -+ gtk_widget_show_all (dialog); -+} -+ -+#define BT_POWERON_FILENAME "/sys/class/i2c-dev/i2c-0/device/0-0008/gta01-pm-bt.0/power_on" -+ -+static int -+read_bt_power(void) -+{ -+ FILE * f = fopen(BT_POWERON_FILENAME, "r+"); -+ int val; -+ -+ if (f == NULL) return -1; -+ -+ fscanf(f, "%i", &val); -+ fclose(f); -+ return val; -+} -+ -+static int -+set_bt_power(int val) -+{ -+ FILE * f = fopen(BT_POWERON_FILENAME, "w"); -+ -+ if (f == NULL) return -1; -+ -+ fprintf(f, "%i\n", val); -+ -+ fclose(f); -+ -+ return val; -+} -+ - static void -+mb_panel_update(BtApplet *applet, int state) -+{ -+ -+ if(applet->state != state) { -+ printf("Will change the image ... \n"); -+ if (state == 1) -+ gtk_image_set_from_file(applet->image, PKGDATADIR "/Bluetooth_On.png"); -+ else -+ gtk_image_set_from_file(applet->image, PKGDATADIR "/Bluetooth_Off.png"); -+ applet->state = state; -+ } -+} -+ -+ -+ -+static void -+bt_applet_power_on(GtkWidget* menu, BtApplet* applet) -+{ -+ int ret; -+ ret = set_bt_power(1); -+ mb_panel_update(applet, 1); -+ quick_message(" Bluetooth turned on \n\n"); -+} -+ -+static void -+bt_applet_power_off(GtkWidget* menu, BtApplet* applet) -+{ -+ int ret; -+ ret = set_bt_power(0); -+ mb_panel_update(applet, 0); -+ quick_message(" Bluetooth turned off \n\n"); -+} -+ -+ -+static void -+bt_applet_status(GtkWidget* menu, BtApplet* applet) -+{ -+ int ret; -+ char tmp_string[256]; -+ -+ ret = read_bt_power(); -+ -+ sprintf(tmp_string, " Bluetooth is %s \n\n", ret ? "on" : "off"); -+ -+ quick_message(tmp_string); -+ -+} -+ -+static void - bt_applet_free (BtApplet *applet) - { - g_slice_free (BtApplet, applet); - } - -+ -+ - G_MODULE_EXPORT GtkWidget* - mb_panel_applet_create(const char* id, GtkOrientation orientation) - { -@@ -40,11 +153,33 @@ - - applet = g_slice_new (BtApplet); - -- applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Bluetooth_Off.png")); -+ applet->state = read_bt_power(); -+ applet->mokoapplet = mokoapplet; -+ -+ if (applet->state == 0) { -+ applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Bluetooth_Off.png")); -+ } else { -+ applet->image = GTK_IMAGE(gtk_image_new_from_file ( PKGDATADIR "/Bluetooth_On.png")); -+ } - gtk_widget_set_name( applet->image, "openmoko-bt-applet" ); - g_object_weak_ref( G_OBJECT(applet->image), (GWeakNotify) bt_applet_free, applet ); -+ moko_panel_applet_set_widget( GTK_CONTAINER(applet->mokoapplet), applet->image ); -+ gtk_widget_show_all( GTK_WIDGET(applet->mokoapplet) ); -+ - -- moko_panel_applet_set_widget( GTK_CONTAINER(mokoapplet), applet->image ); -- gtk_widget_show_all( GTK_WIDGET(mokoapplet) ); -+ GtkMenu* menu = GTK_MENU(gtk_menu_new()); -+ GtkWidget* item1 = gtk_menu_item_new_with_label("Power-Up Bluetooth radio"); -+ g_signal_connect(G_OBJECT(item1), "activate", G_CALLBACK(bt_applet_power_on), applet); -+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item1); -+ GtkWidget* item2 = gtk_menu_item_new_with_label("Power-Off Bluetooth radio"); -+ g_signal_connect(G_OBJECT(item2), "activate", G_CALLBACK(bt_applet_power_off), applet); -+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item2); -+ GtkWidget* item3 = gtk_menu_item_new_with_label("Bluetooth status"); -+ g_signal_connect(G_OBJECT(item3), "activate", G_CALLBACK(bt_applet_status), applet); -+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item3); -+ -+ gtk_widget_show_all(GTK_WIDGET(menu)); -+ moko_panel_applet_set_popup( mokoapplet, GTK_WIDGET(menu), MOKO_PANEL_APPLET_CLICK_POPUP); -+ - return GTK_WIDGET(mokoapplet); - }; diff --git a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb index 29ae8fb4db..e87a26230f 100644 --- a/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb +++ b/packages/openmoko-panel-plugins/openmoko-panel-bt_svn.bb @@ -5,5 +5,3 @@ PR = "r1" inherit openmoko-panel-plugin -SRC_URI += "file://panel-bluetooth.patch;patch=1" - diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 046f59b3d9..31d38382df 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ SECTION = "x11" RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2" RCONFLICTS = "openmoko-session" -PR = "r29" +PR = "r30" SRC_URI = "file://etc" S = ${WORKDIR} diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session index b2867047b1..dee3e58051 100755 --- a/packages/openmoko2/openmoko-session2/etc/matchbox/session +++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session @@ -1,6 +1,8 @@ #!/bin/sh SHOWCURSOR="no" +export GTK_MODULES="libgtkstylus.so" + openmoko-today & openmoko-dialer & diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb index ebe234aca5..9824fd3d79 100644 --- a/packages/openocd/openocd_svn.bb +++ b/packages/openocd/openocd_svn.bb @@ -9,4 +9,4 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \ file://openocd-link-static.patch;patch=1" S = "${WORKDIR}/trunk" -EXTRA_OECONF = " --disable-ftdi2232 --disable-ftd2xx" +EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx" diff --git a/packages/squid/.mtn2git_empty b/packages/squid/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/squid/.mtn2git_empty diff --git a/packages/squid/squid_2.6.STABLE14.bb b/packages/squid/squid_2.6.STABLE14.bb new file mode 100644 index 0000000000..580ec52ac6 --- /dev/null +++ b/packages/squid/squid_2.6.STABLE14.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Squid is a caching proxy for the Web supporting HTTP, HTTPS, FTP, and more" +LICENSE = "GPLv2" + +DEPENDS = "aio" + +SRC_URI = "http://www.squid-cache.org/Versions/v2/2.6/squid-2.6.STABLE14.tar.bz2" + +inherit autotools + + + diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb new file mode 100644 index 0000000000..9657eccc1d --- /dev/null +++ b/packages/tasks/task-openmoko-feed.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "OpenMoko: Misc. Feed Items" +SECTION = "openmoko/base" +LICENSE = "MIT" +PR = "r1" + +inherit task + +RDEPENDS_task-openmoko-feed = "\ + python \ + python-pygtk \ + python-pyserial \ +" diff --git a/packages/uboot/uboot-openmoko_svn.bb b/packages/uboot/uboot-openmoko_svn.bb index c14c523ac0..e33f560b53 100644 --- a/packages/uboot/uboot-openmoko_svn.bb +++ b/packages/uboot/uboot-openmoko_svn.bb @@ -4,22 +4,22 @@ LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -UBOOT_UPSTREAM_REV = "8993e54b6f397973794f3d6f47d3b3c0c98dd4f6" +UBOOT_UPSTREAM_REV = "3e66c078003607a7d1d214c15a5f262bc1b4032f" PV = "1.2.0+git${UBOOT_UPSTREAM_REV}+svn${SRCDATE}" -PR = "r1" +PR = "r2" PROVIDES = "virtual/bootloader" S = "${WORKDIR}/git" SRC_URI = "git://www.denx.de/git/u-boot.git/;protocol=git;tag=${UBOOT_UPSTREAM_REV} \ - svn://svn.openmoko.org/branches/u-boot/pre-20070822;module=patches;proto=http \ + svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;proto=http \ file://uboot-eabi-fix-HACK.patch \ file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \ " EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" TARGET_LDFLAGS = "" -UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1" +UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 smdk2440 hxd8 qt2410 gta02v1 gta02v2" do_quilt() { mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av diff --git a/packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine b/packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine index ec0385bc0f..e27931cf6b 100644 --- a/packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine +++ b/packages/uclibc/uclibc-0.9.29/gumstix-verdex/uClibc.machine @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Sun May 13 11:16:02 2007 +# Sat May 12 23:18:41 2007 # # TARGET_alpha is not set TARGET_arm=y @@ -48,8 +48,8 @@ USE_BX=y # CONFIG_ARM1176JZF_S is not set # CONFIG_ARM_SA110 is not set # CONFIG_ARM_SA1100 is not set -CONFIG_ARM_XSCALE=y -# CONFIG_ARM_IWMMXT is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y TARGET_SUBARCH="" # @@ -65,6 +65,6 @@ UCLIBC_HAS_FLOATS=y # UCLIBC_HAS_FPU is not set UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y -KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +KERNEL_HEADERS="/usr/include" HAVE_DOT_CONFIG=y diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t b/packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t new file mode 100644 index 0000000000..898b73a33b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/uClibc.machine.armv4t @@ -0,0 +1,69 @@ +# +# Automatically generated make config: don't edit +# Mon May 14 10:23:14 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +CONFIG_ARM920T=y +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te b/packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te new file mode 100644 index 0000000000..ec0385bc0f --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/uClibc.machine.armv5te @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:16:02 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +CONFIG_ARM_XSCALE=y +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt b/packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt new file mode 100644 index 0000000000..e27931cf6b --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/uClibc.machine.iwmmxt @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sat May 12 23:18:41 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +# CONFIG_ARM_OABI is not set +CONFIG_ARM_EABI=y +USE_BX=y +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +# CONFIG_ARM_SA1100 is not set +# CONFIG_ARM_XSCALE is not set +CONFIG_ARM_IWMMXT=y +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm b/packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm new file mode 100644 index 0000000000..6e89444a64 --- /dev/null +++ b/packages/uclibc/uclibc-0.9.29/uClibc.machine.strongarm @@ -0,0 +1,70 @@ +# +# Automatically generated make config: don't edit +# Sun May 13 11:29:51 2007 +# +# TARGET_alpha is not set +TARGET_arm=y +# TARGET_bfin is not set +# TARGET_cris is not set +# TARGET_e1 is not set +# TARGET_frv is not set +# TARGET_h8300 is not set +# TARGET_hppa is not set +# TARGET_i386 is not set +# TARGET_i960 is not set +# TARGET_ia64 is not set +# TARGET_m68k is not set +# TARGET_microblaze is not set +# TARGET_mips is not set +# TARGET_nios is not set +# TARGET_nios2 is not set +# TARGET_powerpc is not set +# TARGET_sh is not set +# TARGET_sh64 is not set +# TARGET_sparc is not set +# TARGET_v850 is not set +# TARGET_vax is not set +# TARGET_x86_64 is not set + +# +# Target Architecture Features and Options +# +TARGET_ARCH="arm" +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +# USE_BX is not set +# CONFIG_GENERIC_ARM is not set +# CONFIG_ARM610 is not set +# CONFIG_ARM710 is not set +# CONFIG_ARM7TDMI is not set +# CONFIG_ARM720T is not set +# CONFIG_ARM920T is not set +# CONFIG_ARM922T is not set +# CONFIG_ARM926T is not set +# CONFIG_ARM10T is not set +# CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set +# CONFIG_ARM_SA110 is not set +CONFIG_ARM_SA1100=y +# CONFIG_ARM_XSCALE is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y +ARCH_LITTLE_ENDIAN=y +# ARCH_WANTS_BIG_ENDIAN is not set +ARCH_WANTS_LITTLE_ENDIAN=y +ARCH_HAS_MMU=y +ARCH_USE_MMU=y +UCLIBC_HAS_FLOATS=y +# UCLIBC_HAS_FPU is not set +UCLIBC_HAS_SOFT_FLOAT=y +DO_C99_MATH=y +KERNEL_HEADERS="/usr/include" +HAVE_DOT_CONFIG=y + diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index f27bbe7c22..f00a347aa8 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r6" +PR = "r7" require uclibc.inc diff --git a/packages/update-modules/update-modules_1.0.bb b/packages/update-modules/update-modules_1.0.bb index dc4c3c0d92..dadcddb8c3 100644 --- a/packages/update-modules/update-modules_1.0.bb +++ b/packages/update-modules/update-modules_1.0.bb @@ -2,7 +2,8 @@ SECTION = "base" DESCRIPTION = "Script to manage module configuration files" LICENSE = "GPLv2" PACKAGE_ARCH = "all" -PR = "r4" +RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " +PR = "r5" SRC_URI = "file://update-modules" |