From 3d1be3cae0cb224b7966ea7c0c6da9a69ecdcd5d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 09:02:11 +0000 Subject: Added /dev/video to openslug device_table.txt --- .../initscripts-1.0/openslug/device_table.txt | 1 + packages/pwc/pwc-10.0.7a/.mtn2git_empty | 0 packages/pwc/pwc-10.0.7a/Makefile | 13 ++++++++++ packages/pwc/pwc_10.0.7a.bb | 30 ++++++++++++++++++++++ 4 files changed, 44 insertions(+) create mode 100644 packages/pwc/pwc-10.0.7a/.mtn2git_empty create mode 100644 packages/pwc/pwc-10.0.7a/Makefile create mode 100644 packages/pwc/pwc_10.0.7a.bb diff --git a/packages/initscripts/initscripts-1.0/openslug/device_table.txt b/packages/initscripts/initscripts-1.0/openslug/device_table.txt index e01396ecd6..287319c162 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 - - - /dev/zero c 644 0 0 1 5 - - - /dev/input/mice c 660 0 0 13 63 - - - 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 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 " +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 +} + -- cgit v1.2.3 From 330e55046a29c4d95318dd34e9a0be2d563e5b74 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 09:05:59 +0000 Subject: Bumped the initscripts-openslug PR --- packages/initscripts/initscripts-openslug_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)}" -- cgit v1.2.3 From 632ffda86e0a2d87d71cd8cbf2438af5645c4d1d Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 23:57:58 +0000 Subject: Added setpwc for controlling Philips webcams. --- packages/atftp/atftp_0.7.bb | 0 packages/libmpeg2/libmpeg2_0.4.0b.bb | 0 packages/miau/miau_0.5.3.bb | 0 packages/puppy/puppy_1.8.bb | 0 packages/puppy/puppy_1.9.bb | 0 packages/setpwc/.mtn2git_empty | 0 packages/setpwc/files/.mtn2git_empty | 0 packages/setpwc/files/Makefile.patch | 14 ++++++++++++++ packages/setpwc/setpwc_0.9.bb | 17 +++++++++++++++++ packages/thc/thcrut_1.2.5.bb | 0 10 files changed, 31 insertions(+) mode change 100755 => 100644 packages/atftp/atftp_0.7.bb mode change 100755 => 100644 packages/libmpeg2/libmpeg2_0.4.0b.bb mode change 100755 => 100644 packages/miau/miau_0.5.3.bb mode change 100755 => 100644 packages/puppy/puppy_1.8.bb mode change 100755 => 100644 packages/puppy/puppy_1.9.bb create mode 100644 packages/setpwc/.mtn2git_empty create mode 100644 packages/setpwc/files/.mtn2git_empty create mode 100644 packages/setpwc/files/Makefile.patch create mode 100644 packages/setpwc/setpwc_0.9.bb mode change 100755 => 100644 packages/thc/thcrut_1.2.5.bb diff --git a/packages/atftp/atftp_0.7.bb b/packages/atftp/atftp_0.7.bb old mode 100755 new mode 100644 diff --git a/packages/libmpeg2/libmpeg2_0.4.0b.bb b/packages/libmpeg2/libmpeg2_0.4.0b.bb old mode 100755 new mode 100644 diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb old mode 100755 new mode 100644 diff --git a/packages/puppy/puppy_1.8.bb b/packages/puppy/puppy_1.8.bb old mode 100755 new mode 100644 diff --git a/packages/puppy/puppy_1.9.bb b/packages/puppy/puppy_1.9.bb old mode 100755 new mode 100644 diff --git a/packages/setpwc/.mtn2git_empty b/packages/setpwc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/setpwc/files/.mtn2git_empty b/packages/setpwc/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 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 " +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 old mode 100755 new mode 100644 -- cgit v1.2.3 From db70a2a0b0b79f3da80a30c604642cec27bc9264 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Mon, 25 Jul 2005 23:59:56 +0000 Subject: Changed /dev/video to /dev/video[0-4] for openslug --- packages/initscripts/initscripts-1.0/openslug/device_table.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/initscripts/initscripts-1.0/openslug/device_table.txt b/packages/initscripts/initscripts-1.0/openslug/device_table.txt index 287319c162..ae3cb79913 100644 --- a/packages/initscripts/initscripts-1.0/openslug/device_table.txt +++ b/packages/initscripts/initscripts-1.0/openslug/device_table.txt @@ -164,6 +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 - - - +/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 - - - -- cgit v1.2.3 From 861cdc3844c7c672c6f961a52267d1465f469f72 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Jul 2005 11:21:58 +0000 Subject: first try at libgc --- packages/libgc/.mtn2git_empty | 0 packages/libgc/libgc_6.5.bb | 5 +++++ 2 files changed, 5 insertions(+) create mode 100644 packages/libgc/.mtn2git_empty create mode 100644 packages/libgc/libgc_6.5.bb diff --git a/packages/libgc/.mtn2git_empty b/packages/libgc/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb new file mode 100644 index 0000000000..f6705ff154 --- /dev/null +++ b/packages/libgc/libgc_6.5.bb @@ -0,0 +1,5 @@ +SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz" + +S = "${WORKDIR}/gc6.5" + +inherit autotools -- cgit v1.2.3 From 5a4ae54b32052a93c6fec5adb602d8e4da7bfc94 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Jul 2005 11:24:07 +0000 Subject: first try at inkscape 0.42 --- packages/inkscape/inkscape_0.42.bb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/inkscape/inkscape_0.42.bb diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb new file mode 100644 index 0000000000..b6fbcde316 --- /dev/null +++ b/packages/inkscape/inkscape_0.42.bb @@ -0,0 +1,14 @@ +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 " +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" -- cgit v1.2.3 From 8952fd9bdee1da27621ddda32ef9ba89d6b697f4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Jul 2005 11:41:42 +0000 Subject: Fill in some blanks for gc --- packages/libgc/libgc_6.5.bb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb index f6705ff154..4627f36f4f 100644 --- a/packages/libgc/libgc_6.5.bb +++ b/packages/libgc/libgc_6.5.bb @@ -1,5 +1,9 @@ -SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz" +DESCRIPTION = "Garbage collector for C and C++" +LICENSE = "As is" -S = "${WORKDIR}/gc6.5" +HOMEPAGE = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/" + +SRC_URI = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc6.5.tar.gz" +S = "${WORKDIR}/gc6.5" inherit autotools -- cgit v1.2.3 From e6ac92faf6df4b492ab85229cac81f557a03ba72 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Jul 2005 12:44:47 +0000 Subject: make libgc compile --- packages/libgc/libgc_6.5.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb index 4627f36f4f..ec8f86787a 100644 --- a/packages/libgc/libgc_6.5.bb +++ b/packages/libgc/libgc_6.5.bb @@ -1,9 +1,16 @@ 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 +} -- cgit v1.2.3 From 444d74478da5df4fa280d48ddcab7c1f4ed19584 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Jul 2005 12:53:35 +0000 Subject: stage libgc headers and libs --- packages/libgc/libgc_6.5.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/libgc/libgc_6.5.bb b/packages/libgc/libgc_6.5.bb index ec8f86787a..143b62dcec 100644 --- a/packages/libgc/libgc_6.5.bb +++ b/packages/libgc/libgc_6.5.bb @@ -14,3 +14,9 @@ do_configure_append() { 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}/ +} -- cgit v1.2.3 From 503f111db3dc9ca1c212f44770946d9f53ebd6c0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Jul 2005 23:18:38 +0000 Subject: zaurus machine confs: add console-tools and zaurus-updater --- conf/machine/poodle.conf | 2 ++ conf/machine/tosa.conf | 2 ++ conf/machine/zaurus-clamshell-2.4.conf | 4 ++-- conf/machine/zaurus-clamshell.conf | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index ad0ebc96bc..4ff3fe7e56 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}" +EXTRA_BOOTSTRAP_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..dfdabf482f 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}" +EXTRA_BOOTSTRAP_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..d03c9a7f6b 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" +EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" + GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed" GPE_EXTRA_INSTALL += "gaim sylpheed" -- cgit v1.2.3 From 7f4531c6654d89c928c64c057207149c3d4d9fe6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 27 Jul 2005 23:19:48 +0000 Subject: openembedded/classes/tinderclient.bbclass: -No reason to include 'make' from bb. Specially as it was removed some time ago... --- classes/tinderclient.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From c1e3c7856b26a69340f93328e6ca2f2914605ea1 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Jul 2005 23:32:08 +0000 Subject: openzaurus-pxa27x: fix CMDLINE constructing, fix module_autoload for pxa27x ohci module --- .../openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) 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..3aaed3b607 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,12 +53,14 @@ 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_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete LOGOLANG=1 DEFYEAR=2006 LOGO=1 LAUNCH=q" -# CMDLINE_INIT = "init=/bin/busybox ash" -CMDLINE_INIT = " " -CMDLINE = "${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_CONSOLE} ${CMDLINE_INIT}" +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_MTDPARTS_akita = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)" +CMDLINE_SHARP_akita = "EQUIPMENT=0 LOGOLANG=1 DEFYEAR=2005 LOGO=1 LAUNCH=q" + +CMDLINE_ROOT = "root=/dev/mtdblock2 jffs2_orphaned_inodes=delete" +CMDLINE = "${CMDLINE_CONSOLE} ${CMDLINE_MTDPARTS} ${CMDLINE_ROOT} ${CMDLINE_SHARP}" # # Compensate for sucky bootloader on all Sharp Zaurus models @@ -77,7 +79,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." -- cgit v1.2.3 From 89860207abf5ed96ea35d16fa8c66067dec88d1a Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Jul 2005 23:34:37 +0000 Subject: spitz fstab: reorder for more clarity --- packages/base-files/base-files/spitz/fstab | 38 ++++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-) 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 + -- cgit v1.2.3 From f2651fba64059b95364ff36a88cbdcd334aab867 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 27 Jul 2005 23:35:27 +0000 Subject: update attributes --- packages/opie-taskbar/opie-taskbar/c7x0/opie | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 packages/opie-taskbar/opie-taskbar/c7x0/opie diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie old mode 100644 new mode 100755 -- cgit v1.2.3 From f58099c4b71893db89309bb714f01b1482f10667 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2005 09:43:57 +0000 Subject: Attempt to fix the overrides situation in h3900.conf --- conf/machine/h3900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 37dd0a52f2..aee3bacdbd 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" -- cgit v1.2.3 From 00473bf1e8ad87f24780b5abf250d73bffae3d9c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2005 09:51:05 +0000 Subject: disable inkscape 0.42 for now --- packages/inkscape/inkscape_0.42.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/inkscape/inkscape_0.42.bb b/packages/inkscape/inkscape_0.42.bb index b6fbcde316..e97d862812 100644 --- a/packages/inkscape/inkscape_0.42.bb +++ b/packages/inkscape/inkscape_0.42.bb @@ -1,3 +1,5 @@ +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 \ -- cgit v1.2.3 From 01d62c4ab8d7d07f4b6e7db7c3e099ad720475eb Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 28 Jul 2005 10:21:57 +0000 Subject: s/EXTRA_BOOTSTRAP_DEPENDS/BOOTSTRAP_EXTRA_DEPENDS/ thanks Justin --- conf/machine/poodle.conf | 2 +- conf/machine/tosa.conf | 2 +- conf/machine/zaurus-clamshell.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf index 4ff3fe7e56..e0cc83e6aa 100644 --- a/conf/machine/poodle.conf +++ b/conf/machine/poodle.conf @@ -12,7 +12,7 @@ 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}" -EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" include conf/machine/handheld-common.conf diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf index dfdabf482f..ab5b169d4f 100644 --- a/conf/machine/tosa.conf +++ b/conf/machine/tosa.conf @@ -12,7 +12,7 @@ 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}" -EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim" diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf index d03c9a7f6b..285ab851ab 100644 --- a/conf/machine/zaurus-clamshell.conf +++ b/conf/machine/zaurus-clamshell.conf @@ -11,7 +11,7 @@ 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" -EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater" +BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater" GUI_MACHINE_CLASS = "bigscreen" GPE_EXTRA_DEPENDS += "gaim sylpheed" -- cgit v1.2.3 From a71d272b399e7d37adafa1926f7dc4207cada6d8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 28 Jul 2005 11:23:36 +0000 Subject: add : before KERNEL in h3900.conf --- conf/machine/h3900.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index aee3bacdbd..9e91dcfbbc 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -5,7 +5,7 @@ KERNEL ?= "kernel24" #KERNEL ?= "kernel26" -OVERRIDES .= "${KERNEL}" +OVERRIDES =. "${KERNEL}:" TARGET_ARCH = "arm" IPKG_ARCHS = "all arm ipaqpxa h3900" -- cgit v1.2.3