diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-08-22 15:05:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-22 15:05:58 +0000 |
| commit | 47632ce0ea60e766909f004d75e4cf7a266c62c6 (patch) | |
| tree | 48a6d23dce09e1cc819c00165f2fec4feee439c8 | |
| parent | 2dc09e524df860dc15c5a8b3093711c57d62f600 (diff) | |
| parent | b6fab8d87d9b8ff470fb0b99658d807e6afe4b56 (diff) | |
merge of 0bcaa551d84ba78a6e2e40137eb0e4ff36d0b68e
and 3c029d760d1bb441a3632db0b6ea12f2d8a5ad37
62 files changed, 71138 insertions, 23 deletions
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/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/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 Control_m Control_m +keycode 14 = +n +N +n Control_n Control_n +keycode 15 = +o +O +o Control_o Control_o +keycode 16 = +p +P +p Control_p Control_p +keycode 17 = +q +Q +q Control_q Control_q +keycode 18 = +r +R plus Control_r Control_r +keycode 19 = +s +S +s Control_s Control_s +keycode 20 = +t +T bracketleft Control_t Control_t +keycode 21 = +u +U +u Control_u Control_u +keycode 22 = +v +V +v Control_v Control_v +keycode 23 = +w +W asciicircum Control_w Control_w +keycode 24 = +x +X +x Control_x Control_x +keycode 25 = +y +Y bracketright Control_y Control_y +keycode 26 = +z +Z +z Control_z Control_z +keycode 27 = Shift Shift Shift Shift Shift +keycode 28 = Return Return Return Return Return +keycode 29 = F11 F11 F11 F11 F11 +keycode 30 = AltGr AltGr AltGr AltGr AltGr +keycode 31 = BackSpace BackSpace Delete BackSpace BackSpace +keycode 32 = Num_Lock Num_Lock Num_Lock Num_Lock Num_Lock +keycode 33 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 34 = Escape Escape Escape Escape Escape +keycode 35 = Left Left Home Left Left +keycode 36 = Up Up PageUp Up Up +keycode 37 = Down Down PageDown Down Down +keycode 38 = Right Right End Right Right +keycode 39 = Return Return Return Return Return +keycode 40 = F12 VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 41 = one exclam VoidSymbol VoidSymbol VoidSymbol +keycode 42 = two quotedbl VoidSymbol VoidSymbol VoidSymbol +keycode 43 = three numbersign VoidSymbol VoidSymbol VoidSymbol +keycode 44 = four dollar VoidSymbol VoidSymbol VoidSymbol +keycode 45 = five percent VoidSymbol VoidSymbol VoidSymbol +keycode 46 = six ampersand VoidSymbol VoidSymbol VoidSymbol +keycode 47 = seven apostrophe VoidSymbol VoidSymbol VoidSymbol +keycode 48 = eight parenleft VoidSymbol VoidSymbol VoidSymbol +keycode 49 = nine parenright VoidSymbol VoidSymbol VoidSymbol +keycode 50 = zero asciitilde VoidSymbol VoidSymbol VoidSymbol +keycode 51 = minus equal VoidSymbol VoidSymbol VoidSymbol +keycode 52 = asciicircum asciitilde VoidSymbol VoidSymbol VoidSymbol +keycode 53 = backslash bar VoidSymbol VoidSymbol VoidSymbol +keycode 54 = bracketleft braceleft VoidSymbol VoidSymbol VoidSymbol +keycode 55 = at grave VoidSymbol VoidSymbol VoidSymbol +keycode 56 = Control Control Control Control Control +keycode 57 = Alt Alt Alt Alt Alt +keycode 58 = Control Control Control Control Control +keycode 59 = minus at VoidSymbol VoidSymbol VoidSymbol +keycode 60 = Shift_Lock Shift_Lock Shift_Lock Shift_Lock Shift_Lock +keycode 61 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 62 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 63 = comma slash less VoidSymbol VoidSymbol +keycode 64 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 65 = Tab Tab Caps_Lock Tab Tab +keycode 66 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 67 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 68 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 69 = asciitilde VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 70 = slash VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 71 = KP_1 KP_1 KP_1 KP_1 KP_1 +keycode 72 = KP_2 KP_2 KP_2 KP_2 KP_2 +keycode 73 = KP_3 KP_3 KP_3 KP_3 KP_3 +keycode 74 = KP_4 KP_4 KP_4 KP_4 KP_4 +keycode 75 = KP_5 KP_5 KP_5 KP_5 KP_5 +keycode 76 = KP_6 KP_6 KP_6 KP_6 KP_6 +keycode 77 = KP_7 KP_7 KP_7 KP_7 KP_7 +keycode 78 = KP_8 KP_8 KP_8 KP_8 KP_8 +keycode 79 = KP_9 KP_9 KP_9 KP_9 KP_9 +keycode 80 = KP_0 KP_0 KP_0 KP_0 KP_0 +keycode 81 = Delete Delete Delete Delete Delete +keycode 82 = KP_Divide KP_Divide KP_Divide KP_Divide KP_Divide +keycode 83 = KP_Multiply KP_Multiply KP_Multiply KP_Multiply KP_Multiply +keycode 84 = Return Return Return Return Return +keycode 85 = KP_Subtract KP_Subtract KP_Subtract KP_Subtract KP_Subtract +keycode 86 = KP_Add KP_Add KP_Add KP_Add KP_Add +keycode 87 = KP_Enter KP_Enter KP_Enter KP_Enter KP_Enter +keycode 88 = F9 F9 F9 F9 F9 +keycode 89 = F10 F10 F10 F10 F10 +keycode 90 = F13 F13 F13 F13 F13 +keycode 91 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 92 = space space space space space +keycode 93 = KP_Period KP_Period KP_Period KP_Period KP_Period +keycode 94 = Escape Escape Escape Escape +keycode 95 = semicolon plus VoidSymbol VoidSymbol VoidSymbol +keycode 96 = colon asterisk VoidSymbol VoidSymbol VoidSymbol +keycode 97 = bracketright braceright VoidSymbol VoidSymbol VoidSymbol +keycode 98 = comma less VoidSymbol VoidSymbol VoidSymbol +keycode 99 = period greater VoidSymbol VoidSymbol VoidSymbol +keycode 100 = slash question VoidSymbol VoidSymbol VoidSymbol +keycode 101 = underscore underscore VoidSymbol VoidSymbol VoidSymbol +keycode 102 = F15 VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 103 = period question greater VoidSymbol VoidSymbol +keycode 104 = Find Find Find Find Find +keycode 105 = Select Select Select Select Select +keycode 106 = Prior Scroll_Backward Prior Prior Prior +keycode 107 = Next Scroll_Forward Next Next Next +keycode 108 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 109 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 110 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 111 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 112 = Shift Shift Shift Shift Shift +keycode 113 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 114 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 115 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 116 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 117 = Control Control Control Control Control +keycode 118 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 119 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 120 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 121 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 122 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol +keycode 123 = VoidSymbol VoidSymbol VoidSymbol VoidSymbol VoidSymbol |