diff options
82 files changed, 71275 insertions, 36 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf index aba754b368..2a31d3a678 100644 --- a/conf/distro/openslug-packages.conf +++ b/conf/distro/openslug-packages.conf @@ -69,9 +69,11 @@ ${PKGDIR}/packages/ixp425-eth/*.bb \ ${PKGDIR}/packages/ixp4xx/*.bb \ ${PKGDIR}/packages/jpeg/*.bb \ ${PKGDIR}/packages/joe/*.bb \ +${PKGDIR}/packages/lcdproc/*.bb \ ${PKGDIR}/packages/less/*.bb \ ${PKGDIR}/packages/libaal/*.bb \ ${PKGDIR}/packages/libao/*.bb \ +${PKGDIR}/packages/libdvb/*.bb \ ${PKGDIR}/packages/libexif/*.bb \ ${PKGDIR}/packages/libgphoto2/*.bb \ ${PKGDIR}/packages/libid3tag/*.bb \ @@ -149,6 +151,7 @@ ${PKGDIR}/packages/puppy/*.bb \ ${PKGDIR}/packages/pwc/*.bb \ ${PKGDIR}/packages/python/*.bb \ ${PKGDIR}/packages/quilt/*.bb \ +${PKGDIR}/packages/qc-usb-messenger/*.bb \ ${PKGDIR}/packages/readline/*.bb \ ${PKGDIR}/packages/reiser4progs/*.bb \ ${PKGDIR}/packages/reiserfsprogs/*.bb \ @@ -159,6 +162,7 @@ ${PKGDIR}/packages/screen/*.bb \ ${PKGDIR}/packages/sed/*.bb \ ${PKGDIR}/packages/setpwc/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ +${PKGDIR}/packages/spca5xx/*.bb \ ${PKGDIR}/packages/ssmtp/*.bb \ ${PKGDIR}/packages/strace/*.bb \ ${PKGDIR}/packages/streamripper/*.bb \ diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf new file mode 100644 index 0000000000..0950a5a008 --- /dev/null +++ b/conf/machine/borzoi.conf @@ -0,0 +1,20 @@ +#@TYPE: Machine +#@NAME: Sharp Zaurus SL-C3100 +#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device + +KERNEL_VERSION ?= "2.4" + +include conf/machine/zaurus-clamshell.conf +include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf + +PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs" +PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs" +PIVOTBOOT_EXTRA_RRECOMMENDS += "" + +# Useful things for the built-in Harddisk +BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs" +BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" + +IMAGE_FSTYPES = "jffs2 tar" + +ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 9b0ef708fa..b3e0a50bc6 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,10 +27,10 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" # Infrared Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ - kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm +# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" # USB Gadget Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ - kernel-module-g-serial kernel-module-g-ether" +#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ +# kernel-module-g-serial kernel-module-g-ether" diff --git a/packages/alsa/alsa-utils_1.0.8.bb b/packages/alsa/alsa-utils_1.0.8.bb index 5a6d04f0e3..ca9a52e58a 100644 --- a/packages/alsa/alsa-utils_1.0.8.bb +++ b/packages/alsa/alsa-utils_1.0.8.bb @@ -2,8 +2,8 @@ DESCRIPTION = "ALSA Utilities" MAINTAINER = "Lorn Potter <lpotter@trolltech.com>" SECTION = "console/utils" LICENSE = "GPL" -DEPENDS = "alsa-lib" -PR = "r1" +DEPENDS = "alsa-lib ncurses" +PR = "r2" SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2" diff --git a/packages/apache/apache_2.0.54.bb b/packages/apache/apache_2.0.54.bb index 882b7f2c71..3ab58c590f 100644 --- a/packages/apache/apache_2.0.54.bb +++ b/packages/apache/apache_2.0.54.bb @@ -2,7 +2,7 @@ MAINTAINER="David Karlstrom <daka@nslu2-linux.org>" SECTION = "net" DEPENDS = "openssl expat pcre" -PR = "r2" +PR = "r4" # ------------------------------------------ # NOTE: This package is currently only meant @@ -16,7 +16,7 @@ S = "${WORKDIR}/httpd-${PV}" inherit autotools update-rc.d -INITSCRIPT_NAME = "httpd" +INITSCRIPT_NAME = "apache" INITSCRIPT_PARAMS = "defaults 91 20" CONFFILES_${PN} = "${sysconfdir}/apache/httpd.conf \ @@ -74,8 +74,8 @@ do_install_append () { -e 's,/usr/bin/,${bindir}/,g' \ -e 's,/usr/lib,${libdir}/,g' \ -e 's,/etc/,${sysconfdir}/,g' \ - -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/httpd - chmod 755 ${D}/${sysconfdir}/init.d/httpd + -e 's,/usr/,${prefix}/,g' > ${D}/${sysconfdir}/init.d/apache + chmod 755 ${D}/${sysconfdir}/init.d/apache install -m 0644 ${FILESDIR}/httpd.conf ${D}/${sysconfdir}/apache/httpd.conf diff --git a/packages/apache/files/init b/packages/apache/files/init index 46dae0395f..6c8ff0a6ec 100755 --- a/packages/apache/files/init +++ b/packages/apache/files/init @@ -64,7 +64,7 @@ case "$1" in ;; esac -if [ $? == 0 ]; then +if [ $? = 0 ]; then echo . exit 0 else diff --git a/packages/base-files/base-files/borzoi/.mtn2git_empty b/packages/base-files/base-files/borzoi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/base-files/base-files/borzoi/.mtn2git_empty diff --git a/packages/base-files/base-files/borzoi/fstab b/packages/base-files/base-files/borzoi/fstab new file mode 100644 index 0000000000..754f140b34 --- /dev/null +++ b/packages/base-files/base-files/borzoi/fstab @@ -0,0 +1,16 @@ +/dev/mtdblock2 / jffs2 rw,noatime 1 1 +/dev/mtdblock3 /home jffs2 defaults,noatime 1 2 +proc /proc proc defaults 0 0 +/dev/hda1 /media/cf auto defaults,sync,noauto 0 0 + +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 + +# SD/MMC in kernel 2.4 +/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +# SD/MMC in kernel 2.6 +/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 + +# USB Storage +/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 + diff --git a/packages/e17/e-wm_20050810.bb b/packages/e17/e-wm_20050810.bb index ea93bfc3e2..e0fa41311c 100644 --- a/packages/e17/e-wm_20050810.bb +++ b/packages/e17/e-wm_20050810.bb @@ -30,4 +30,4 @@ FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir}" do_install_append() { install -d ${D}/${sysconfdir}/X11/Xsession.d install -m 755 ${WORKDIR}/Xsession.d/98enlightenment ${D}/${sysconfdir}/X11/Xsession.d -}
\ No newline at end of file +} diff --git a/packages/gammu/gammu_1.01.0.bb b/packages/gammu/gammu_1.02.0.bb index 967a551eb2..967a551eb2 100644 --- a/packages/gammu/gammu_1.01.0.bb +++ b/packages/gammu/gammu_1.02.0.bb diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb index 81091bf2d8..b6a3891cd2 100644 --- a/packages/hostap/hostap-modules_0.3.9.bb +++ b/packages/hostap/hostap-modules_0.3.9.bb @@ -3,11 +3,12 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r2" +PR = "r3" SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ file://hostap_cs.conf \ file://Makefile.patch;patch=1 \ + file://add_event.patch;patch=1 \ file://hostap-utsname.patch;patch=1" SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" diff --git a/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty b/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/borzoi/.mtn2git_empty diff --git a/packages/initscripts/initscripts-1.0/borzoi/devices b/packages/initscripts/initscripts-1.0/borzoi/devices new file mode 100644 index 0000000000..083090ecb9 --- /dev/null +++ b/packages/initscripts/initscripts-1.0/borzoi/devices @@ -0,0 +1,68 @@ +#!/bin/sh +# +# Devfs handling script. Since we arent running devfsd due to various reasons +# which I will not lay out here, we need to create some links for compatibility. + +. /etc/default/rcS + +# exit without doing anything if udev is active +if test -e /dev/.udevdb; then + exit 0 +fi + +if test -e /dev/.devfsd +then + if test "$VERBOSE" != "no"; then echo -n "Setting up device links for devfs: "; fi + ln -s /dev/touchscreen/0 /dev/ts + ln -s /dev/touchscreen/0raw /dev/tsraw + ln -s /dev/vc/0 /dev/tty0 + ln -s /dev/vc/1 /dev/tty1 + ln -s /dev/vc/2 /dev/tty2 + ln -s /dev/vc/3 /dev/tty3 + ln -s /dev/vc/4 /dev/tty4 + ln -s /dev/vc/5 /dev/tty5 + ln -s /dev/fb/0 /dev/fb0 +# ln -s /dev/tts/0 /dev/ttySA0 +# ln -s /dev/tts/1 /dev/ttySA1 +# ln -s /dev/tts/2 /dev/ttySA2 + + ln -s /dev/sound/dsp /dev/dsp + ln -s /dev/sound/mixer /dev/mixer + + ln -s /dev/v4l/video0 /dev/video0 + ln -s /dev/v4l/video0 /dev/video + ln -s /dev/misc/rtc /dev/rtc + + ## need this so that ppp will autoload the ppp modules + mknod /dev/ppp c 108 0 + if test "$VERBOSE" != "no"; then echo "done"; fi +else + if test "$VERBOSE" != "no"; then echo -n "Mounting /dev ramdisk: "; fi + mount -t ramfs ramfs /dev || mount -t tmpfs ramfs /dev + if test $? -ne 0; then + if test "$VERBOSE" != "no"; then echo "failed"; fi + else + if test "$VERBOSE" != "no"; then echo "done"; fi + fi + if test "$VERBOSE" != "no"; then echo -n "Populating /dev: "; fi + cd / + mkdir -p dev/msys + mkdir -p dev/pts + mkdir -p dev/input + mkdir -p dev/vc + for i in 0 1 2 3 4 5 6 7 8 9; do + ln -s /dev/tty$i /dev/vc/$i + done + ln -sf /dev/sharp_ts /dev/ts + ln -sf /dev/sharp_fl /dev/fl + ln -sf /proc/self/fd /dev/fd + ln -sf /proc/kcore /dev/core + /sbin/makedevs -r / -D /etc/device_table + if test $? -ne 0; then + if test "$VERBOSE" != "no"; then echo "failed"; fi + else + if test "$VERBOSE" != "no"; then echo "done"; fi + fi +fi + +exit 0 diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map new file mode 100644 index 0000000000..dc45e948df --- /dev/null +++ b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map @@ -0,0 +1,128 @@ +keymaps 0-2,4-5 +keycode 1 = +a +A +a Control_a Control_a +keycode 2 = +b +B underscore Control_b Control_b +keycode 3 = +c +C +c Control_c Control_c +keycode 4 = +d +D +d Control_d Control_d +keycode 5 = +e +E equal Control_e Control_e +keycode 6 = +f +F backslash Control_f Control_f +keycode 7 = +g +G semicolon Control_g Control_g +keycode 8 = +h +H colon BackSpace BackSpace +keycode 9 = +i +I +i Tab Tab +keycode 10 = +j +J asterisk Linefeed Linefeed +keycode 11 = +k +K backslash Control_k Control_k +keycode 12 = +l +L bar Control_l Control_l +keycode 13 = +m +M +m Contro |