From d2c226306e5fd4695677b55b364a540b112c689b Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sat, 6 Aug 2005 18:31:11 +0000 Subject: Change permissions to allow access to lmtp socket. --- packages/cyrus-imapd/files/volatiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cyrus-imapd/files/volatiles b/packages/cyrus-imapd/files/volatiles index f707ff5519..e0a55493b3 100644 --- a/packages/cyrus-imapd/files/volatiles +++ b/packages/cyrus-imapd/files/volatiles @@ -1,4 +1,4 @@ -d cyrus mail 0750 /var/lib/cyrus +d cyrus mail 0755 /var/lib/cyrus d cyrus root 0755 /var/lib/cyrus/db d cyrus mail 0755 /var/lib/cyrus/proc d cyrus mail 0755 /var/lib/cyrus/sieve -- cgit v1.2.3 From 9b1f7ada983d8693ef15514bb01051a1fd3c4f30 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sat, 6 Aug 2005 23:39:01 +0000 Subject: UcSlugC: make (significantly) smaller by removing the kernel from the root file system - the size of the rootfs is reduced by 35% of the previous size! --- conf/distro/ucslugc.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf index c321f18009..7eb8e2f9ad 100644 --- a/conf/distro/ucslugc.conf +++ b/conf/distro/ucslugc.conf @@ -61,6 +61,12 @@ EXTRA_IMAGECMD_jffs2 = "--pad --big-endian --eraseblock=0x20000 -D ${OPENSLUG_DE # issues in the kernel need to cancel this (set CMDLINE_DEBUG empty in local.conf) CMDLINE_DEBUG = "noirqdebug" +# IMAGE_PREPROCESS_COMMAND is run before making the image. In UcSlugC the +# kernel image is removed from the root file system to recover the space used - +# UcSlugC is assumed to boot from a separate kernel image in flash (not in the +# root file system), if this is not the case the following must not be done! +IMAGE_PREPROCESS_COMMAND = "rm ${IMAGE_ROOTFS}/boot/zImage*;" + # EXTRA PACKAGES # -------------- # UcSlugC builds an openslug-image with no extra packages - to add packages to the -- cgit v1.2.3 From 395adae982d620a129b790244eea937ac5fae697 Mon Sep 17 00:00:00 2001 From: ccsmart Date: Sun, 7 Aug 2005 14:22:13 +0000 Subject: Add LMTP transport for Cyrus IMAP. --- packages/postfix/files/main.cf_2.0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/postfix/files/main.cf_2.0 b/packages/postfix/files/main.cf_2.0 index 1c50b4ae00..002f681217 100644 --- a/packages/postfix/files/main.cf_2.0 +++ b/packages/postfix/files/main.cf_2.0 @@ -1,19 +1,24 @@ #!/bin/sh cat < Date: Sun, 7 Aug 2005 19:51:47 +0000 Subject: Added diffstat to feed --- conf/distro/openslug-packages.conf | 2 ++ packages/meta/openslug-packages.bb | 1 + 2 files changed, 3 insertions(+) diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index 46f5b8babc..f1a031075c 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -26,6 +26,7 @@ ${PKGDIR}/packages/cyrus-sasl/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ +${PKGDIR}/packages/diffstat/*.bb \ ${PKGDIR}/packages/dnsmasq/*.bb \ ${PKGDIR}/packages/dropbear/*.bb \ ${PKGDIR}/packages/e2fsprogs/*.bb \ @@ -144,6 +145,7 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/softdog/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ ${PKGDIR}/packages/sudo/*.bb \ diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb index 75fe4699a8..533f188795 100644 --- a/packages/meta/openslug-packages.bb +++ b/packages/meta/openslug-packages.bb @@ -57,6 +57,7 @@ OPENSLUG_PACKAGES = "\ cvs\ cyrus-imapd \ db4 \ + diffstat \ dnsmasq \ expat \ ftpd-topfield \ -- cgit v1.2.3 From ad00f15597bda01daefa99e1ced2af8cd490cf1f Mon Sep 17 00:00:00 2001 From: John Bowler Date: Sun, 7 Aug 2005 19:51:53 +0000 Subject: Add diffstat. --- conf/distro/ucslugc-packages.conf | 1 + packages/meta/ucslugc-packages.bb | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf index b922ffe0b9..489b1c0112 100644 --- a/conf/distro/ucslugc-packages.conf +++ b/conf/distro/ucslugc-packages.conf @@ -26,6 +26,7 @@ ${PKGDIR}/packages/cyrus-imapd/*.bb \ ${PKGDIR}/packages/cyrus-sasl/*.bb \ ${PKGDIR}/packages/db/*.bb \ ${PKGDIR}/packages/devio/*.bb \ +${PKGDIR}/packages/diffstat/*.bb \ ${PKGDIR}/packages/diffutils/*.bb \ ${PKGDIR}/packages/dnsmasq/*.bb \ ${PKGDIR}/packages/dropbear/*.bb \ diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb index d705de728d..e9377823b6 100644 --- a/packages/meta/ucslugc-packages.bb +++ b/packages/meta/ucslugc-packages.bb @@ -31,6 +31,7 @@ UCSLUGC_PACKAGES = "\ cvs\ cyrus-imapd \ db4 \ + diffstat \ diffutils \ dnsmasq \ expat \ -- cgit v1.2.3 From 0d49fb3677ef0b7977c85108ec881f4f17007c6c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 8 Aug 2005 07:41:59 +0000 Subject: linux-oz-2.6: Corgi Sound Updates. Complete the wm8731 i2c driver. --- packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb index 6648fff740..1ab1eecffa 100644 --- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb @@ -54,7 +54,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ ${RPSRC}/corgi_power1-r1.patch;patch=1 \ ${DOSRC}/mmc-bulk-r0.patch;patch=1 \ ${RPSRC}/mmc_timeout-r0.patch;patch=1 \ - ${RPSRC}/corgi_snd-r8.patch;patch=1 \ + ${RPSRC}/corgi_snd-r10.patch;patch=1 \ ${DOSRC}/rmk-i2c-pxa-r0.patch;patch=1 \ ${RPSRC}/spitz_mtd-r0.patch;patch=1 \ ${RPSRC}/ipaq/hx2750_base-r20.patch;patch=1 \ -- cgit v1.2.3 From 0cf79f14c5f5d467826883fd260adc3d5f433180 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 8 Aug 2005 08:14:09 +0000 Subject: Fix cairo.patch for libgpewidget --- .../libgpewidget/libgpewidget-0.102/cairo.patch | 39 ++++++++++++++++++++++ packages/libgpewidget/libgpewidget_0.102.bb | 2 +- 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/packages/libgpewidget/libgpewidget-0.102/cairo.patch b/packages/libgpewidget/libgpewidget-0.102/cairo.patch index e69de29bb2..64b0dd3a3f 100644 --- a/packages/libgpewidget/libgpewidget-0.102/cairo.patch +++ b/packages/libgpewidget/libgpewidget-0.102/cairo.patch @@ -0,0 +1,39 @@ +--- /tmp/gpeclockface.c 2005-08-07 22:30:20.000000000 +0200 ++++ libgpewidget-0.102/gpeclockface.c 2005-08-08 10:10:09.180756032 +0200 +@@ -1,5 +1,5 @@ + /* +- * Copyright (C) 2003 Philip Blundell ++ * Copyright (C) 2003, 2005 Philip Blundell + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License +@@ -11,6 +11,7 @@ + + #include + #include ++#include + #include + #include + #include +@@ -267,7 +268,7 @@ + 0, + 2 * M_PI); + cairo_fill (clock->cr); +- cairo_set_rgb_color (clock->cr, 0, 0, 0); ++ cairo_set_source_rgba (clock->cr, 0, 0, 0, 1.0); + cairo_arc (clock->cr, + clock->x_offset + clock->radius, + clock->y_offset + clock->radius, +@@ -493,11 +494,10 @@ + gcm = gdk_drawable_get_colormap (widget->window); + + #ifdef HAVE_CAIRO +- clock->cr = cairo_create (); + clock->surface = cairo_xlib_surface_create (dpy, GDK_WINDOW_XWINDOW (clock->backing_pixmap), + gdk_x11_visual_get_xvisual (gv), 0, + gdk_x11_colormap_get_xcolormap (gcm)); +- cairo_set_target_surface (clock->cr, clock->surface); ++ clock->cr = cairo_create (clock->surface); + #else + clock->backing_poly_gc = gdk_gc_new (clock->backing_pixmap); + #endif diff --git a/packages/libgpewidget/libgpewidget_0.102.bb b/packages/libgpewidget/libgpewidget_0.102.bb index 4954dd336e..35f09b5c21 100644 --- a/packages/libgpewidget/libgpewidget_0.102.bb +++ b/packages/libgpewidget/libgpewidget_0.102.bb @@ -1,5 +1,5 @@ LICENSE = "LGPL" -PR = "r1" +PR = "r2" DESCRIPTION = "libgpewidget contains a collection of widgets and other common code shared by many GPE applications." SECTION = "gpe/libs" PRIORITY = "optional" -- cgit v1.2.3 From ea0a9c3e0ced61b9e4c330ad2362f262f0e08037 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 8 Aug 2005 14:45:47 +0000 Subject: Update glibmm to 2.6.1 --- packages/glibmm/glibmm_2.6.1.bb | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 packages/glibmm/glibmm_2.6.1.bb diff --git a/packages/glibmm/glibmm_2.6.1.bb b/packages/glibmm/glibmm_2.6.1.bb new file mode 100644 index 0000000000..f65abf61bc --- /dev/null +++ b/packages/glibmm/glibmm_2.6.1.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "C++ bindings for the glib library." +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" +PRIORITY = "optional" +MAINTAINER = "Johan Bilien " +LICENSE = "LGPL" +DEPENDS = "gtk+ libsigc++-2.0" +PR = "r2" + +SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/2.6/glibmm-${PV}.tar.bz2" + +inherit autotools pkgconfig flow-lossage + +FILES_${PN} = "${libdir}/lib*.so.*" + +LIBV = "2.6.1" + +do_stage () { + oe_libinstall -so -C glib/glibmm libglibmm-2.4 ${STAGING_LIBDIR} + oe_libinstall -so -C tools/extra_defs_gen libglibmm_generate_extra_defs-2.6 ${STAGING_LIBDIR} + + autotools_stage_includes + + install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.6 + + install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/ +} -- cgit v1.2.3 From 9fb2641bccd42f1000029d6829c8233de5233fe4 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 8 Aug 2005 14:48:34 +0000 Subject: altboot: Add 'Copy rootfs to SD/CF' menuitem. *NEEDS DEBUGGING*. Deactivated for now. --- .../files/altboot-menu/Advanced/80-copyrootfs | 325 +++++++++++++++++++++ packages/altboot/files/init.altboot | 2 +- 2 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 packages/altboot/files/altboot-menu/Advanced/80-copyrootfs diff --git a/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs new file mode 100644 index 0000000000..bac366303c --- /dev/null +++ b/packages/altboot/files/altboot-menu/Advanced/80-copyrootfs @@ -0,0 +1,325 @@ +# !/bin/sh +M_TITLE="Copy rootfs to SD/CF" + +exit 0 + +die() { + echo "ERROR: $1" >/dev/tty0 + exec $SH_SHELL /dev/tty0 2>&1 +} + +ask_target() { + available_disks="`mount | grep "/media" | grep -v ram | awk '{print $3}'`" + + if test -z "$available_disks" + then + die "No mounted targets found!" + fi + + cnt=1 + for d in $available_disks + do + echo -e "\t[$cnt] $d" + let cnt=$cnt+1 + done + + while test -z "$ROOTFS_TARGET" + do + echo -n "Target: " + read junk /dev/null 2>&1 + then + echo -n "Use [$junk]MB? [y|n] " + read junk2 + if test "$junk2" = y + then + ROOTFS_IMAGE_SIZE="$junk" + fi + fi + done + + echo -e "\nPlease enter a name for the image file." + echo "The name must _not_ contain whitespaces or the '-' sign." + + while test -z "$ROOTFS_IMAGE_NAME" + do + echo -n "File name: " + read junk + + if ! test -z "$junk" + then + echo -n "Use [$junk] as image name? [y|n] " + read junk2 + + if test "$junk2" = y + then + ROOTFS_IMAGE_NAME="$junk" + fi + fi + done + + echo -e "\nDo you want to format [$ROOTFS_TARGET_DEV] to the ext2 filesystem?" + + while true + do + echo -n "Format to ext2? [y|n] " + read junk + case "$junk" in + y) format_target + break ;; + n) break ;; + esac + done + + /etc/init.d/devices start + + echo -en "\nCreating image file [$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin] (${ROOTFS_IMAGE_SIZE}MB)..." + mkdir -p "$ROOTFS_TARGET/$IMAGE_PATH" + + dd if=/dev/zero of="$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" bs=1024k count=$ROOTFS_IMAGE_SIZE >/dev/null 2>&1 && echo ok || die "FAILED" + losetup /dev/loop1 "$ROOTFS_TARGET/$IMAGE_PATH/$ROOTFS_IMAGE_NAME-rootfs.bin" + + echo -n "Creating filesystem..." + mkfs.ext2 -m0 /dev/loop1 >/dev/null 2>&1 && echo ok || die FAILED + + mkdir -p /media/temp + mount /dev/loop1 /media/temp || die "mount /dev/loop1 /media/temo FAILED!" + + copy_files + +} + +copy_files() { + echo -e "\nCopying files..." + + exclude_list="tmp sys proc var dev media root" + mkdir_list="var proc sys dev media/card media/cf /media/hdd" + + if (cat /etc/fstab | grep -q "/home") + then + echo "Note: /home appears to be mounted on a different flash partition: not copying /home" + exclude_list="$exclude_list home" + mkdir_list="$mkdir_list home/root" + + fi + + + + source_dirs="`ls -1 /`" + + echo -n "Excluding [" + for d in $exclude_list + do + echo -n "$d " + source_dirs="`echo "$source_dirs" | grep -v "$d"`" + done + echo "] from copy" + + + cd / + for dir in $source_dirs + do + if test -d "$dir" + then + echo -n "Copying [$dir]..." + cp -a $dir /media/temp && echo ok || echo FAILED + fi + done + + for dir in $mkdir_list + do + mkdir -p /media/temp/$dir + done + + rm /media/temp/etc/rcS.s/S39sd + +} +run_module() { + + test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!" + + echo -e "${C_RED}* * * * * WARNING * * * * *${C_RESET}" + echo -e "${C_RED}Continueing will delete the content of the selected target device.\nTHIS IS NO JOKE. If you do now know what this menu-item does, exit NOW${C_RESET}" + + mount -o remount,rw / + + while true + do + echo -en "\nContinue? [y|n] " + read junk /dev/null 2>&1 && echo ok || echo "FAILED" +# +# echo -n "Trying to mount SD card..." +# /etc/init.d/sd start >/dev/null 2>&1 +# sleep 3 +# /etc/sdcontrol insert >/dev/null 2>&1 && echo ok || echo "FAILED" + + #exit 0 + echo -e "\nPlease select the target device:" + + # Sets ROOTFS_TARGET* + ask_target + + # Sets ROOTFS_TARGET_TYPE ([direct | image] + ask_format + + # Ask confirmation + ask_confirm + + case "$ROOTFS_TARGET_TYPE" in + direct) direct_install;; + image) image_install;; + esac +} + +case "$1" in +title) echo "$M_TITLE";; +run) run_module;; +esac diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index d9443c568e..57560b8326 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -252,7 +252,7 @@ else # Execute scripts in /etc/altboot.rc before doing anything else. # Required for special situations, like booting spitz - for file in `ls -1 /etc/altboot.rc/*.sh` + for file in `ls -1 /etc/altboot.rc/*.sh` >/dev/null 2>&1 do . $file >/dev/tty1 2>&1 || echo "/etc/altboot.rc/$file failed!" done -- cgit v1.2.3