diff options
27 files changed, 149 insertions, 27 deletions
diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index 0c0c470bb8..5de9b8755a 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -51,7 +51,7 @@ def tinder_do_tinder_report(event): tinderclient.log """ from bb.event import getName - from bb import data, make, mkdirhier + from bb import data, mkdirhier import os, glob # variables diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 37dd0a52f2..9e91dcfbbc 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES := "${KERNEL}:${OVERRIDES}" +OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index ad0ebc96bc..e0cc83e6aa 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -12,6 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" + include conf/machine/handheld-common.conf # yes, it has 64MB... diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index c3f440fae2..ab5b169d4f 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -12,6 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" ROOT_FLASH_SIZE = "32" diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index 705dcd1905..0934d84baa 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -9,11 +9,11 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" PREFERRED_VERSION_orinoco-modules = "0.13e" BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \ -pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \ +pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ wpa-supplicant-nossl ppp ppp-dialin openswan" # Misc Modules diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index e0b8d31349..285ab851ab 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -11,6 +11,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed" GPE_EXTRA_INSTALL += "gaim sylpheed" diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb index ab51647096..ab51647096 100755..100644 --- a/packages/atftp/atftp_0.7.bb +++ b/packages/atftp/atftp_0.7.bb diff --git a/packages/base-files/base-files/spitz/fstab b/packages/base-files/base-files/spitz/fstab index 94880f8af4..b4fc969634 100644 --- a/packages/base-files/base-files/spitz/fstab +++ b/packages/base-files/base-files/spitz/fstab @@ -1,24 +1,26 @@ -# don't mount mtdblocks on spitz since they reside on harddisk -# /dev/mtdblock2 / jffs2 rw,noatime 1 1 -# /dev/mtdblock3 /home jffs2 defaults,noatime 1 2 - -rootfs / auto defaults 1 1 -proc /proc proc defaults 0 0 - -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 - -tmpfs /var tmpfs defaults 0 0 -tmpfs /media/ram tmpfs defaults 0 0 +# don't mount /dev/mtdblock2 since Spitz uses pivot_root +# /dev/mtdblock2 / jffs2 rw,noatime 1 1 +rootfs / auto defaults 1 1 +proc /proc proc defaults 0 0 +tmpfs /var tmpfs defaults 0 0 +tmpfs /media/ram tmpfs defaults 0 0 # Compact Flash memory cards -/dev/hdb1 /media/cf auto defaults,sync,noauto 0 0 +/dev/hdb1 /media/cf auto defaults,sync,noauto 0 0 # SD/MMC in kernel 2.4 -/dev/mmcda1 /media/card auto defaults,sync,noauto 0 0 +/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 +#/dev/mmcblk0p1 /media/card auto defaults,sync,noauto 0 0 +# # USB -/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 -devpts /dev/pts devpts mode=0620,gid=5 0 0 -usbdevfs /proc/bus/usb usbdevfs noauto 0 0 +# +/dev/sda1 /media/usbhdd vfat noauto,umask=000,noatime,iocharset=utf8,codepage=932 0 0 +devpts /dev/pts devpts mode=0620,gid=5 0 0 +usbdevfs /proc/bus/usb usbdevfs noauto 0 0 + +# +# Harddisk +# +/dev/hda1 /media/hdd ext3 noauto,defaults,noatime 0 0 + diff --git a/packages/initscripts/initscripts-1.0/openslug/device_table.txt b/packages/initscripts/initscripts-1.0/openslug/device_table.txt index e01396ecd6..ae3cb79913 100644 --- a/packages/initscripts/initscripts-1.0/openslug/device_table.txt +++ b/packages/initscripts/initscripts-1.0/openslug/device_table.txt @@ -164,5 +164,6 @@ /dev/ttyUSB c 660 0 5 188 0 0 1 2 /dev/urandom c 644 0 0 1 9 - - - /dev/usbmouse c 640 0 45 10 32 - - - +/dev/video c 644 0 0 81 0 0 1 4 /dev/zero c 644 0 0 1 5 - - - /dev/input/mice c 660 0 0 13 63 - - - diff --git a/packages/initscripts/initscripts-openslug_1.0.bb b/packages/initscripts/initscripts-openslug_1.0.bb index 475e273f3d..b5252bfdeb 100644 --- a/packages/initscripts/initscripts-openslug_1.0.bb +++ b/packages/initscripts/initscripts-openslug_1.0.bb @@ -11,7 +11,7 @@ RCONFLICTS = "initscripts" # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.1" +PR := "${PR}.2" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb new file mode 100644 index 0000000000..e97d862812 --- /dev/null +++ b/packages/inkscape/inkscape_0.42.bb @@ -0,0 +1,16 @@ +DEFAULT_PREFERENCE = "-1" + +SECTION = "x11/utils" +DESCRIPTION = "Inkscape is an SVG-based graphics editor featuring alpha \ +blending, node editing, SVG to PNG export, and more. Its goal is for features \ +similar to Illustrator, CorelDraw, Visio, etc." +MAINTAINER = "Koen Kooi <koen@handhelds.org>" +DEPENDS = "libgc intltool-native gtk+ libart-lgpl libxml2 libsigc++-1.2 popt" +LICENSE = "GPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/inkscape/inkscape-${PV}.tar.bz2" +S = "${WORKDIR}/inkscape-${PV}" + +inherit autotools gettext + +EXTRA_OECONF = "--disable-mmx" diff --git a/packages/libgc/.mtn2git_empty b/packages/libgc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/libgc/.mtn2git_empty diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb new file mode 100644 index 0000000000..143b62dcec --- /dev/null +++ b/packages/libgc/libgc_6.5.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Garbage collector for C and C++" +LICENSE = "As is" +HOMEPAGE = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/" + +DEPENDS = "sed-native" +SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz" +S = "${WORKDIR}/gc6.5" +FILES_${PN}-doc += "/usr/share/gc/" + +inherit autotools + +do_configure_append() { + #fix libtool script + sed -i 's:${SED}:sed:g' libtool + sed -i 's:$SED:sed:g' libtool +} + +do_stage() { + autotools_stage_includes + install -d ${STAGING_LIBDIR} + install -m 755 .libs/libgc.so* ${STAGING_LIBDIR}/ +} diff --git a/packages/libmpeg2/libmpeg2_0.4.0b.bb b/packages/libmpeg2/libmpeg2_0.4.0b.bb index 3fa46f1f24..3fa46f1f24 100755..100644 --- a/packages/libmpeg2/libmpeg2_0.4.0b.bb +++ b/packages/libmpeg2/libmpeg2_0.4.0b.bb diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index 65e01a18f7..31c2b8fdf8 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -5,7 +5,7 @@ SECTION = "kernel" PV = "2.4.20-rmk2-embedix" LICENSE = "GPL" KV = "2.4.20" -PR = "r10" +PR = "r11" SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \ file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \ @@ -53,8 +53,9 @@ inherit kernel # # Create the kernel command line. CMDLINE_CONSOLE is set through kernel.oeclass. # -CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home) EQUIPMENT=4 RTC_RESET=1" -CMDLINE_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home) EQUIPMENT=0" +CMDLINE_MTDPARTS_spitz = "mtdparts=sharpsl-nand:7168k@0k(smf),5120k@7168k(root),-(home)" +CMDLINE_SHARP_spitz = "RTC_RESET=1 EQUIPMENT=4 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q" + CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q" # CMDLINE_INIT = "init=/bin/busybox ash" CMDLINE_INIT = " " @@ -77,7 +78,7 @@ PARALLEL_MAKE = "" module_conf_usbdmonitor = "alias usbd0 usbdmonitor" module_conf_pxa27x_bi = "below pxa27x_bi net_fd usbdcore " module_autoload_pxa27x_bi = "pxa27x_bi" -module_autoload_usb-ohci-pxa27x = "usb-ohci-pxa27x" +module_autoload_usb_ohci_pxa27x = "usb_ohci_pxa27x" do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available." diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb index 5644c1141e..5644c1141e 100755..100644 --- a/packages/miau/miau_0.5.3.bb +++ b/packages/miau/miau_0.5.3.bb diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie index dddb7caa0d..dddb7caa0d 100644..100755 --- a/packages/opie-taskbar/opie-taskbar/c7x0/opie +++ b/packages/opie-taskbar/opie-taskbar/c7x0/opie diff --git a/packages/puppy/puppy_1.8.bb b/packages/puppy/puppy_1.8.bb index 5ea2713873..5ea2713873 100755..100644 --- a/packages/puppy/puppy_1.8.bb +++ b/packages/puppy/puppy_1.8.bb diff --git a/packages/puppy/puppy_1.9.bb b/packages/puppy/puppy_1.9.bb index 4c578cc9b3..4c578cc9b3 100755..100644 --- a/packages/puppy/puppy_1.9.bb +++ b/packages/puppy/puppy_1.9.bb diff --git a/packages/pwc/pwc-10.0.7a/.mtn2git_empty b/packages/pwc/pwc-10.0.7a/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/pwc/pwc-10.0.7a/.mtn2git_empty diff --git a/packages/pwc/pwc-10.0.7a/Makefile b/packages/pwc/pwc-10.0.7a/Makefile new file mode 100644 index 0000000000..d941f1a6f2 --- /dev/null +++ b/packages/pwc/pwc-10.0.7a/Makefile @@ -0,0 +1,13 @@ +ifneq ($(KERNELRELEASE),) +pwc-objs := pwc-if.o pwc-misc.o pwc-ctrl.o pwc-v4l.o pwc-uncompress.o \ + pwc-dec1.o pwc-dec23.o pwc-kiara.o pwc-timon.o + +obj-m += pwc.o + +else +KDIR := /lib/modules/$(shell uname -r)/build +PWD := $(shell pwd) + +default modules: + $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules +endif diff --git a/packages/pwc/pwc_10.0.7a.bb b/packages/pwc/pwc_10.0.7a.bb new file mode 100644 index 0000000000..f6af027f56 --- /dev/null +++ b/packages/pwc/pwc_10.0.7a.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Philips USB Webcam driver for Linux that supports VGA resolution" +PRIORITY = "optional" +SECTION = "kernel/modules" +MAINTAINER = "dyoung <dyoung8888@yahoo.com>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.saillard.org/linux/pwc/files/pwc-${PV}.tar.bz2 \ + file://Makefile" + +S = "${WORKDIR}/pwc-${PV}" + +inherit module + +do_compile_prepend() { + cp -f ${WORKDIR}/Makefile ${S}/ +} + +do_compile () { + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake 'KDIR=${STAGING_KERNEL_DIR}' \ + 'CC=${KERNEL_CC}' \ + 'LD=${KERNEL_LD}' +} + +do_install() { + install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media + install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/usb/media +} + diff --git a/packages/setpwc/.mtn2git_empty b/packages/setpwc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/setpwc/.mtn2git_empty diff --git a/packages/setpwc/files/.mtn2git_empty b/packages/setpwc/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/setpwc/files/.mtn2git_empty diff --git a/packages/setpwc/files/Makefile.patch b/packages/setpwc/files/Makefile.patch new file mode 100644 index 0000000000..257f90a1ac --- /dev/null +++ b/packages/setpwc/files/Makefile.patch @@ -0,0 +1,14 @@ +*** setpwc-0.9/Makefile.orig 2005-07-26 09:16:09.000000000 +0930 +--- setpwc-0.9/Makefile 2005-07-26 09:16:18.000000000 +0930 +*************** +*** 22,30 **** + + setpwc: $(OBJS) + $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o setpwc +- strip setpwc +- echo +- echo Oh, blatant plug: http://keetweej.vanheusden.com/wishlist.html + + install: setpwc + cp setpwc /usr/bin +--- 22,27 ---- diff --git a/packages/setpwc/setpwc_0.9.bb b/packages/setpwc/setpwc_0.9.bb new file mode 100644 index 0000000000..595e2ab764 --- /dev/null +++ b/packages/setpwc/setpwc_0.9.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Set various aspects of Philips (and compatible) WebCams." +SECTION = "console" +PRIORITY = "optional" +MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>" +HOMEPAGE = "http://www.vanheusden.com/setpwc/" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.vanheusden.com/setpwc/setpwc-${PV}.tgz \ + file://Makefile.patch;patch=1" + +inherit autotools + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/setpwc ${D}${bindir}/setpwc +} diff --git a/packages/thc/thcrut_1.2.5.bb b/packages/thc/thcrut_1.2.5.bb index 57e91d3417..57e91d3417 100755..100644 --- a/packages/thc/thcrut_1.2.5.bb +++ b/packages/thc/thcrut_1.2.5.bb |