From 53b0ec9989097170b359d19ddff4df55211eb733 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 21 Aug 2008 17:03:42 +0000 Subject: minimal-uclibc: keep up to date with latest naming fashions --- conf/distro/minimal-uclibc.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/minimal-uclibc.conf b/conf/distro/minimal-uclibc.conf index d76a9c444f..db08775d4a 100644 --- a/conf/distro/minimal-uclibc.conf +++ b/conf/distro/minimal-uclibc.conf @@ -8,7 +8,7 @@ #@COMMENT: It bases on conservative settings and should always be buildable. #----------------------------------------------------------------------------- -require conf/distro/generic.conf +require conf/distro/minimal.conf # # Header -- cgit v1.2.3 From dbefaf7050d96fcc07f73e236526edf309bb887b Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Thu, 21 Aug 2008 19:15:07 +0000 Subject: illume_svn.bb: Illume moved to the E svn repo * Change SRC_URI * Fix AUTHOR * Set sne-srcrev to 35605 as the old rev is not valid for the new repo * Bum PR --- conf/distro/include/sane-srcrevs.inc | 2 +- packages/openmoko-projects/illume_svn.bb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index fd6d5612a2..1447773296 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -47,7 +47,7 @@ SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f" SRCREV_pn-gtkhtml2 ?= "1158" SRCREV_pn-gypsy ?= "134" SRCREV_pn-hildon-1 ?= "14429" -SRCREV_pn-illume ?= "170" +SRCREV_pn-illume ?= "35605" SRCREV_pn-illume-theme-asu ?= "170" SRCREV_pn-illume-theme-freesmartphone ?= "da904c73236ced2b04c272af5178eab4d66f144d" SRCREV_pn-kismet ?= "2285" diff --git a/packages/openmoko-projects/illume_svn.bb b/packages/openmoko-projects/illume_svn.bb index 5f4127b5ab..d7b6233edf 100644 --- a/packages/openmoko-projects/illume_svn.bb +++ b/packages/openmoko-projects/illume_svn.bb @@ -1,13 +1,13 @@ DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager" HOMEPAGE = "http://illume.projects.openmoko.org" -AUTHOR = "Rasterman" +AUTHOR = "Carsten 'Rasterman' Haitzler" LICENSE = "MIT/BSD" DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native" PV = "0.0+svnr${SRCREV}" -PR = "r11" +PR = "r12" SRC_URI = "\ - svn://svn.projects.openmoko.org/svnroot/;module=${PN};proto=http \ + svn://svn.enlightenment.org/svn/e/trunk/;module=${PN};proto=http \ file://configure-keyboard.patch;patch=1;pnum=0;maxrev=170 \ file://module.illume.src \ " -- cgit v1.2.3 From 7a12ebc94b26ba820722265bf465e7f870c3741a Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 21 Aug 2008 20:09:48 +0000 Subject: package.bbclass: add per-package staging hooks --- classes/package.bbclass | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/classes/package.bbclass b/classes/package.bbclass index 814715e1fa..e01479677f 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -117,6 +117,20 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst PACKAGE_DEPENDS += "file-native" +def package_stash_hook(func, name, d): + import bb, os.path + body = bb.data.getVar(func, d, True) + pn = bb.data.getVar('PN', d, True) + staging = bb.data.getVar('PKGDATA_DIR', d, True) + dirname = os.path.join(staging, 'hooks', name) + bb.mkdirhier(dirname) + fn = os.path.join(dirname, pn) + f = open(fn, 'w') + f.write("python () {\n"); + f.write(body); + f.write("}\n"); + f.close() + python () { import bb if bb.data.getVar('PACKAGES', d, True) != '': @@ -656,6 +670,7 @@ python package_do_shlibs() { dep_pkg = dep_pkg[0] shlib_provider[l] = (dep_pkg, lib_ver) + dep_packages = [] for pkg in packages.split(): bb.debug(2, "calculating shlib requirements for %s" % pkg) @@ -673,6 +688,9 @@ python package_do_shlibs() { dep = dep_pkg if not dep in deps: deps.append(dep) + if not dep_pkg in dep_packages: + dep_packages.append(dep_pkg) + else: bb.note("Couldn't find shared library provider for %s" % n) @@ -924,6 +942,38 @@ PACKAGEFUNCS ?= "package_do_split_locales \ package_depchains \ emit_pkgdata" +def package_run_hooks(f, d): + import bb, os + staging = bb.data.getVar('PKGDATA_DIR', d, True) + dn = os.path.join(staging, 'hooks', f) + if os.access(dn, os.R_OK): + for f in os.listdir(dn): + fn = os.path.join(dn, f) + fp = open(fn, 'r') + line = 0 + for l in fp.readlines(): + l = l.rstrip() + bb.parse.parse_py.BBHandler.feeder(line, l, fn, os.path.basename(fn), d) + line += 1 + fp.close() + anonqueue = bb.data.getVar("__anonqueue", d, 1) or [] + body = [x['content'] for x in anonqueue] + flag = { 'python' : 1, 'func' : 1 } + bb.data.setVar("__anonfunc", "\n".join(body), d) + bb.data.setVarFlags("__anonfunc", flag, d) + try: + t = bb.data.getVar('T', d) + bb.data.setVar('T', '${TMPDIR}/', d) + bb.build.exec_func("__anonfunc", d) + bb.data.delVar('T', d) + if t: + bb.data.setVar('T', t, d) + except Exception, e: + bb.msg.debug(1, bb.msg.domain.Parsing, "Exception when executing anonymous function: %s" % e) + raise + bb.data.delVar("__anonqueue", d) + bb.data.delVar("__anonfunc", d) + python package_do_package () { packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() if len(packages) < 1: @@ -932,6 +982,7 @@ python package_do_package () { for f in (bb.data.getVar('PACKAGEFUNCS', d, 1) or '').split(): bb.build.exec_func(f, d) + package_run_hooks(f, d) } do_package[dirs] = "${D}" addtask package before do_build after do_install -- cgit v1.2.3 From 15325e321d0ee0d1a185c756c4d58d133d2c1c27 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Thu, 21 Aug 2008 21:14:31 +0000 Subject: disapproval of revision 'a54a6607517e20ec074b70c4070cfa9d989624e1' --- packages/u-boot/u-boot-git/akita/.mtn2git_empty | 0 .../akita/akita-standard-partitioning.patch | 112 - packages/u-boot/u-boot-git/c7x0/.mtn2git_empty | 0 .../c7x0/corgi-standard-partitioning.patch | 112 - packages/u-boot/u-boot-git/pdaXrom-u-boot.patch | 4934 -------------------- .../u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch | 94 - packages/u-boot/u-boot_git.bb | 12 +- 7 files changed, 1 insertion(+), 5263 deletions(-) delete mode 100644 packages/u-boot/u-boot-git/akita/.mtn2git_empty delete mode 100644 packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch delete mode 100644 packages/u-boot/u-boot-git/c7x0/.mtn2git_empty delete mode 100644 packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch delete mode 100644 packages/u-boot/u-boot-git/pdaXrom-u-boot.patch delete mode 100644 packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch diff --git a/packages/u-boot/u-boot-git/akita/.mtn2git_empty b/packages/u-boot/u-boot-git/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch b/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch deleted file mode 100644 index 9d65de8daa..0000000000 --- a/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000 -+++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000 -@@ -81,35 +81,35 @@ - "if testkey 101 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \ - "bootm; " \ - "fi; " \ - "if testkey 2 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \ - "bootm; " \ - "fi; " \ - "if testkey 18 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \ - "bootm; " \ - "fi; " \ - "if testkey 3 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \ - "bootm; " \ - "fi; " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home); " \ - "bootm; " - #else - #define CONFIG_BOOTCOMMAND "" // "run boot_flash" - #endif - --#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)" - #define CONFIG_SETUP_MEMORY_TAGS 1 - #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ - #define CONFIG_INITRD_TAG 1 -@@ -302,9 +302,9 @@ - /* Note: fake mtd_id used, no linux mtd map file */ - - #define CONFIG_JFFS2_CMDLINE --#define MTDIDS_DEFAULT "nand0=laze-0" -+#define MTDIDS_DEFAULT "nand0=sharpsl-nand" - //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" --#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand-0:7168k(smf),59392k(root),-(home)" - - /* - * SHARP SL NAND logical partition ---- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000 -+++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000 -@@ -81,35 +81,35 @@ - "if testkey 101 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \ - "bootm; " \ - "fi; " \ - "if testkey 2 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \ - "bootm; " \ - "fi; " \ - "if testkey 18 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \ - "bootm; " \ - "fi; " \ - "if testkey 3 ; " \ - "then " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \ - "bootm; " \ - "fi; " \ - "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \ - "bootm; " - #else - #define CONFIG_BOOTCOMMAND "" // "run boot_flash" - #endif - --#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)" - #define CONFIG_SETUP_MEMORY_TAGS 1 - #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ - #define CONFIG_INITRD_TAG 1 -@@ -302,9 +302,9 @@ - /* Note: fake mtd_id used, no linux mtd map file */ - - #define CONFIG_JFFS2_CMDLINE --#define MTDIDS_DEFAULT "nand0=laze-0" -+#define MTDIDS_DEFAULT "nand0=sharpsl-nand" - //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" --#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand-0:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)" - - /* - * SHARP SL NAND logical partition diff --git a/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty b/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch b/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch deleted file mode 100644 index 205f05b53e..0000000000 --- a/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000 -+++ git/include/configs/corgi.h 2007-12-26 18:07:47.000000000 +0000 -@@ -81,35 +81,35 @@ - "if testkey 101 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x00060000 0x00540000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home); " \ - "bootm; " \ - "fi; " \ - "if testkey 2 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " \ - "bootm; " \ - "fi; " \ - "if testkey 18 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; " \ - "bootm; " \ - "fi; " \ - "if testkey 3 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; " \ - "bootm; " \ - "fi; " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home); " \ - "bootm; " - #else - #define CONFIG_BOOTCOMMAND "" // "run boot_flash" - #endif - --#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home)" - #define CONFIG_SETUP_MEMORY_TAGS 1 - #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ - #define CONFIG_INITRD_TAG 1 -@@ -304,9 +304,9 @@ - /* Note: fake mtd_id used, no linux mtd map file */ - - #define CONFIG_JFFS2_CMDLINE --#define MTDIDS_DEFAULT "nand0=laze-0" -+#define MTDIDS_DEFAULT "nand0=sharpsl-nand" - //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" --#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand:7168k(smf),54272k(root),-(home)" - - /* - * SHARP SL NAND logical partition ---- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000 -+++ git/include/configs/corgi.h 2007-12-26 18:07:47.000000000 +0000 -@@ -81,35 +81,35 @@ - "if testkey 101 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x00060000 0x00540000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \ - "bootm; " \ - "fi; " \ - "if testkey 2 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " \ - "bootm; " \ - "fi; " \ - "if testkey 18 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; " \ - "bootm; " \ - "fi; " \ - "if testkey 3 ; " \ - "then " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; " \ - "bootm; " \ - "fi; " \ - "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home); " \ - "bootm; " - #else - #define CONFIG_BOOTCOMMAND "" // "run boot_flash" - #endif - --#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192" -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)" - #define CONFIG_SETUP_MEMORY_TAGS 1 - #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ - #define CONFIG_INITRD_TAG 1 -@@ -304,9 +304,9 @@ - /* Note: fake mtd_id used, no linux mtd map file */ - - #define CONFIG_JFFS2_CMDLINE --#define MTDIDS_DEFAULT "nand0=laze-0" -+#define MTDIDS_DEFAULT "nand0=sharpsl-nand" - //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" --#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand:7168k(smf),CUSTOM_ROOTFS_SIZE(root),-(home)" - - /* - * SHARP SL NAND logical partition diff --git a/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch b/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch deleted file mode 100644 index 9ceadde6dc..0000000000 --- a/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch +++ /dev/null @@ -1,4934 +0,0 @@ -diff -Nur u-boot-2006-04-18-1106/CREDITS u-boot-2006-04-18-1106-new/CREDITS ---- u-boot-2006-04-18-1106/CREDITS 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/CREDITS 2006-07-05 11:19:44.000000000 +0000 -@@ -93,6 +93,12 @@ - E: jonathan.debruyne@siemens.atea.be - D: Port to Siemens IAD210 board - -+N: Alexander Chukov -+E: sash@pdaXrom.org -+D: initial support for Sharp Zaurus SL-C1000/3100 -+D: initial support for Sharp Zaurus SL-C7x0/C860 -+W: http://www.pdaXrom.org -+ - N: Ken Chou - E: kchou@ieee.org - D: Support for A3000 SBC board -diff -Nur u-boot-2006-04-18-1106/MAINTAINERS u-boot-2006-04-18-1106-new/MAINTAINERS ---- u-boot-2006-04-18-1106/MAINTAINERS 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/MAINTAINERS 2006-07-05 11:19:44.000000000 +0000 -@@ -379,6 +379,11 @@ - - AT91RM9200DK at91rm9200 - -+Alexander Chukov -+ -+ akita xscale -+ corgi xscale -+ - George G. Davis - - assabet SA1100 -diff -Nur u-boot-2006-04-18-1106/MAKEALL u-boot-2006-04-18-1106-new/MAKEALL ---- u-boot-2006-04-18-1106/MAKEALL 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/MAKEALL 2006-07-05 11:19:44.000000000 +0000 -@@ -206,7 +206,7 @@ - adsvix cerf250 cradle csb226 \ - delta innokom lubbock pxa255_idp \ - wepep250 xaeniax xm250 xsengine \ -- zylonite \ -+ zylonite akita corgi \ - " - - LIST_ixp="ixdp425" -diff -Nur u-boot-2006-04-18-1106/Makefile u-boot-2006-04-18-1106-new/Makefile ---- u-boot-2006-04-18-1106/Makefile 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/Makefile 2006-07-05 11:19:44.000000000 +0000 -@@ -61,7 +61,7 @@ - CROSS_COMPILE = powerpc-linux- - endif - ifeq ($(ARCH),arm) --CROSS_COMPILE = arm-linux- -+CROSS_COMPILE = armv5tel-linux- - endif - ifeq ($(ARCH),i386) - ifeq ($(HOSTARCH),i386) -@@ -1709,6 +1709,12 @@ - zylonite_config : - @./mkconfig $(@:_config=) arm pxa zylonite - -+akita_config : unconfig -+ @./mkconfig $(@:_config=) arm pxa akita -+ -+corgi_config : unconfig -+ @./mkconfig $(@:_config=) arm pxa corgi -+ - ######################################################################### - ## ARM1136 Systems - ######################################################################### -diff -Nur u-boot-2006-04-18-1106/README u-boot-2006-04-18-1106-new/README ---- u-boot-2006-04-18-1106/README 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/README 2006-07-05 11:19:44.000000000 +0000 -@@ -311,7 +311,8 @@ - CONFIG_KB9202, CONFIG_LART, CONFIG_LPD7A400, - CONFIG_LUBBOCK, CONFIG_OSK_OMAP5912, CONFIG_OMAP2420H4, - CONFIG_SHANNON, CONFIG_P2_OMAP730, CONFIG_SMDK2400, -- CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9 -+ CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9, -+ CONFIG_AKITA, CONFIG_CORGI - - MicroBlaze based boards: - ------------------------ -diff -Nur u-boot-2006-04-18-1106/board/akita/Makefile u-boot-2006-04-18-1106-new/board/akita/Makefile ---- u-boot-2006-04-18-1106/board/akita/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/Makefile 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,51 @@ -+# -+# board/akita/Makefile -+# -+# (C) Copyright 2006 Alexander Chukov -+# -+# (C) Copyright 2000 -+# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+# -+# See file CREDITS for list of people who contributed to this -+# project. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = lib$(BOARD).a -+ -+OBJS := akita.o nand.o kbd.o -+SOBJS := lowlevel_init.o -+ -+$(LIB): $(OBJS) $(SOBJS) -+ $(AR) crv $@ $(OBJS) $(SOBJS) -+ -+clean: -+ rm -f $(SOBJS) $(OBJS) -+ -+distclean: clean -+ rm -f $(LIB) core *.bak .depend -+ -+######################################################################### -+ -+.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) -+ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ -+ -+-include .depend -+ -+######################################################################### -diff -Nur u-boot-2006-04-18-1106/board/akita/akita.c u-boot-2006-04-18-1106-new/board/akita/akita.c ---- u-boot-2006-04-18-1106/board/akita/akita.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/akita.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,89 @@ -+/* -+ * board/akita/akita.c -+ * -+ * Configuration settings for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+void set_turbo_mode(void); -+ -+/* ------------------------------------------------------------------------- */ -+ -+/* -+ * Miscellaneous platform dependent initialisations -+ */ -+ -+int board_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ /* memory and cpu-speed are setup before relocation */ -+ /* so we do _nothing_ here */ -+ -+ /* arch number of Sharp Zaurus Akita : MACH_TYPE_AKITA */ -+ gd->bd->bi_arch_number = 744; -+ -+ /* adress of boot parameters */ -+ gd->bd->bi_boot_params = 0xa0000100; -+ -+ /* set cpu turbo mode */ -+ set_turbo_mode(); -+ -+ spitzkbd_init(); -+ -+ return 0; -+} -+ -+int board_late_init(void) -+{ -+ setenv("stdout", "serial"); -+ setenv("stderr", "serial"); -+ return 0; -+} -+ -+ -+int dram_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; -+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; -+ gd->bd->bi_dram[1].start = PHYS_SDRAM_2; -+ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; -+ gd->bd->bi_dram[2].start = PHYS_SDRAM_3; -+ gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; -+ gd->bd->bi_dram[3].start = PHYS_SDRAM_4; -+ gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; -+ -+ return 0; -+} -diff -Nur u-boot-2006-04-18-1106/board/akita/config.mk u-boot-2006-04-18-1106-new/board/akita/config.mk ---- u-boot-2006-04-18-1106/board/akita/config.mk 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/config.mk 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1 @@ -+TEXT_BASE = 0xa3000000 -diff -Nur u-boot-2006-04-18-1106/board/akita/kbd.c u-boot-2006-04-18-1106-new/board/akita/kbd.c ---- u-boot-2006-04-18-1106/board/akita/kbd.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/kbd.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,261 @@ -+/* -+ * board/akita/kbd.c -+ * -+ * Keyboard driver for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from: -+ * -+ * linux/drivers/input/keyboard/spitzkbd.c -+ * -+ * Keyboard driver for Sharp Spitz, Borzoi and Akita (SL-Cxx00 series) -+ * -+ * Copyright (C) 2005 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define GPIO_DFLT_LOW 0x400 -+#define GPIO_DFLT_HIGH 0x800 -+ -+void pxa_gpio_mode(int gpio_mode) -+{ -+ int gpio = gpio_mode & GPIO_MD_MASK_NR; -+ int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; -+ int gafr; -+ -+ if (gpio_mode & GPIO_DFLT_LOW) -+ GPCR(gpio) = GPIO_bit(gpio); -+ else if (gpio_mode & GPIO_DFLT_HIGH) -+ GPSR(gpio) = GPIO_bit(gpio); -+ if (gpio_mode & GPIO_MD_MASK_DIR) -+ GPDR(gpio) |= GPIO_bit(gpio); -+ else -+ GPDR(gpio) &= ~GPIO_bit(gpio); -+ gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); -+ GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); -+} -+ -+#define SPITZ_KEY_STROBE_NUM (11) -+#define SPITZ_KEY_SENSE_NUM (7) -+ -+#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000 -+#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000 -+#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000 -+#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880 -+#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000 -+#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4 -+#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000 -+#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000 -+ -+#define SPITZ_GPIO_KEY_STROBE0 88 -+#define SPITZ_GPIO_KEY_STROBE1 23 -+#define SPITZ_GPIO_KEY_STROBE2 24 -+#define SPITZ_GPIO_KEY_STROBE3 25 -+#define SPITZ_GPIO_KEY_STROBE4 26 -+#define SPITZ_GPIO_KEY_STROBE5 27 -+#define SPITZ_GPIO_KEY_STROBE6 52 -+#define SPITZ_GPIO_KEY_STROBE7 103 -+#define SPITZ_GPIO_KEY_STROBE8 107 -+#define SPITZ_GPIO_KEY_STROBE9 108 -+#define SPITZ_GPIO_KEY_STROBE10 114 -+ -+#define SPITZ_GPIO_KEY_SENSE0 12 -+#define SPITZ_GPIO_KEY_SENSE1 17 -+#define SPITZ_GPIO_KEY_SENSE2 91 -+#define SPITZ_GPIO_KEY_SENSE3 34 -+#define SPITZ_GPIO_KEY_SENSE4 36 -+#define SPITZ_GPIO_KEY_SENSE5 38 -+#define SPITZ_GPIO_KEY_SENSE6 39 -+ -+#define SPITZ_GPIO_ON_KEY (95) -+ -+#define KB_ROWS 7 -+#define KB_COLS 11 -+#define KB_ROWMASK(r) (1 << (r)) -+#define SCANCODE(r,c) (((r)<<4) + (c) + 1) -+#define NR_SCANCODES ((KB_ROWS<<4) + 1) -+ -+#define SCAN_INTERVAL (50) /* ms */ -+#define HINGE_SCAN_INTERVAL (150) /* ms */ -+ -+#define KB_DISCHARGE_DELAY 10 -+#define KB_ACTIVATE_DELAY 10 -+ -+static int spitz_strobes[] = { -+ SPITZ_GPIO_KEY_STROBE0, -+ SPITZ_GPIO_KEY_STROBE1, -+ SPITZ_GPIO_KEY_STROBE2, -+ SPITZ_GPIO_KEY_STROBE3, -+ SPITZ_GPIO_KEY_STROBE4, -+ SPITZ_GPIO_KEY_STROBE5, -+ SPITZ_GPIO_KEY_STROBE6, -+ SPITZ_GPIO_KEY_STROBE7, -+ SPITZ_GPIO_KEY_STROBE8, -+ SPITZ_GPIO_KEY_STROBE9, -+ SPITZ_GPIO_KEY_STROBE10, -+}; -+ -+static int spitz_senses[] = { -+ SPITZ_GPIO_KEY_SENSE0, -+ SPITZ_GPIO_KEY_SENSE1, -+ SPITZ_GPIO_KEY_SENSE2, -+ SPITZ_GPIO_KEY_SENSE3, -+ SPITZ_GPIO_KEY_SENSE4, -+ SPITZ_GPIO_KEY_SENSE5, -+ SPITZ_GPIO_KEY_SENSE6, -+}; -+ -+static inline void spitzkbd_discharge_all(void) -+{ -+ /* STROBE All HiZ */ -+ GPCR0 = SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; -+ GPCR1 = SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; -+ GPCR2 = SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; -+ GPCR3 = SPITZ_GPIO_G3_STROBE_BIT; -+ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; -+} -+ -+static inline void spitzkbd_activate_all(void) -+{ -+ /* STROBE ALL -> High */ -+ GPSR0 = SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR0 |= SPITZ_GPIO_G0_STROBE_BIT; -+ GPSR1 = SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR1 |= SPITZ_GPIO_G1_STROBE_BIT; -+ GPSR2 = SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR2 |= SPITZ_GPIO_G2_STROBE_BIT; -+ GPSR3 = SPITZ_GPIO_G3_STROBE_BIT; -+ GPDR3 |= SPITZ_GPIO_G3_STROBE_BIT; -+ -+ udelay(KB_DISCHARGE_DELAY); -+} -+ -+static inline void spitzkbd_activate_col(int col) -+{ -+ int gpio = spitz_strobes[col]; -+ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; -+ GPSR(gpio) = GPIO_bit(gpio); -+ GPDR(gpio) |= GPIO_bit(gpio); -+} -+ -+static inline void spitzkbd_reset_col(int col) -+{ -+ int gpio = spitz_strobes[col]; -+ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; -+ GPCR(gpio) = GPIO_bit(gpio); -+ GPDR(gpio) |= GPIO_bit(gpio); -+} -+ -+static inline int spitzkbd_get_row_status(int col) -+{ -+ return ((GPLR0 >> 12) & 0x01) | ((GPLR0 >> 16) & 0x02) -+ | ((GPLR2 >> 25) & 0x04) | ((GPLR1 << 1) & 0x08) -+ | ((GPLR1 >> 0) & 0x10) | ((GPLR1 >> 1) & 0x60); -+} -+ -+static int spitzkbd_scankeyboard(void) -+{ -+ unsigned int row, col, rowd; -+ unsigned int num_pressed, pwrkey = ((GPLR(SPITZ_GPIO_ON_KEY) & GPIO_bit(SPITZ_GPIO_ON_KEY)) != 0); -+ int ret = -1; -+ -+ num_pressed = 0; -+ for (col = 0; col < KB_COLS; col++) { -+ spitzkbd_discharge_all(); -+ udelay(KB_DISCHARGE_DELAY); -+ -+ spitzkbd_activate_col(col); -+ udelay(KB_ACTIVATE_DELAY); -+ -+ rowd = spitzkbd_get_row_status(col); -+ for (row = 0; row < KB_ROWS; row++) { -+ unsigned int scancode, pressed; -+ -+ scancode = SCANCODE(row, col); -+ pressed = rowd & KB_ROWMASK(row); -+ -+ if (pressed) -+ ret = scancode; -+ } -+ spitzkbd_reset_col(col); -+ } -+ -+ spitzkbd_activate_all(); -+ -+ if (pwrkey) -+ return -2; -+ -+ return ret; -+} -+ -+void spitzkbd_init(void) -+{ -+ int i; -+ -+ /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ -+ for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) -+ pxa_gpio_mode(spitz_senses[i] | GPIO_IN); -+ -+ /* Set Strobe lines as outputs - set high */ -+ for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++) -+ pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH); -+ -+ pxa_gpio_mode(SPITZ_GPIO_ON_KEY | GPIO_IN); -+} -+ -+int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ int scan; -+ -+ if (argc < 2) -+ return 1; -+ -+ scan = spitzkbd_scankeyboard(); -+ -+ -+// if (scan >= 0) -+// printf("Scan = %d\n", scan); -+// else -+// printf("Nothing!\n"); -+ -+ return !(simple_strtol(argv[1], NULL, 10) == scan); -+} -+ -+U_BOOT_CMD( -+ testkey, 2, 1, do_testkey, -+ "testkey - compare pressed key with arg\n", -+ "" -+); -diff -Nur u-boot-2006-04-18-1106/board/akita/lowlevel_init.S u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S ---- u-boot-2006-04-18-1106/board/akita/lowlevel_init.S 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,135 @@ -+/* -+ * board/akita/lowlevel_init.S -+ * -+ * Configuration settings for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * This was originally from the Lubbock u-boot port and from BLOB with cleanup -+ * -+ * NOTE: I haven't clean this up considerably, just enough to get it -+ * running. See hal_platform_setup.h for the source. See -+ * board/cradle/lowlevel_init.S for another PXA250 setup that is -+ * much cleaner. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+ -+/* wait for coprocessor write complete */ -+ .macro CPWAIT reg -+ mrc p15,0,\reg,c2,c0,0 -+ mov \reg,\reg -+ sub pc,pc,#4 -+ .endm -+ -+/*********** Write out to HEX 7 segment leds *********/ -+ -+#undef DEBUG_HEXLOG -+ -+#ifdef DEBUG_HEXLOG -+#define LEDCTL 0x08000040 -+#define LEDDAT1 0x08000010 -+#define LEDDAT2 0x08000014 -+ -+.macro wait, count -+ mov r10, \count -+0: -+ subs r10, r10, #1 -+ bne 0b -+.endm -+ -+.macro hexlog_init -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ ldr r11, =LEDDAT1 -+ mov r10, #0x0 -+ str r10, [r11] -+.endm -+ -+.macro hexlog, val -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ -+ ldr r11, =LEDDAT1 -+ mov r10, \val -+ str r10, [r11] -+ -+ wait #0x400000 -+.endm -+ -+#else -+ -+.macro hexlog_init -+ nop -+.endm -+ -+.macro hexlog, val -+ nop -+.endm -+ -+#endif -+ -+/***********************************/ -+ -+/* -+ * Memory setup -+ */ -+ -+.globl lowlevel_init -+lowlevel_init: -+ -+ mov pc, lr -+ -+.globl set_turbo_mode -+ -+set_turbo_mode: -+ /* Turn on turbo mode */ -+ mrc p14, 0, r2, c6, c0, 0 -+ orr r2, r2, #0xB /* Turbo, Fast-Bus, Freq change**/ -+ mcr p14, 0, r2, c6, c0, 0 -+ -+ /* Setup vectors */ -+ ldr r0, =TEXT_BASE -+ ldr r1, =TEXT_BASE+0x40 -+ ldr r2, =0x0 -+1: -+ ldr r3, [r0] -+ str r3, [r2] -+ add r0, r0, #4 -+ add r2, r2, #4 -+ cmp r0, r1 -+ bne 1b -+ -+ ldr r0, =0x0 -+ ldr r1, [r0, #4] -+ str r1, [r0] -+ -+ mov pc, lr -diff -Nur u-boot-2006-04-18-1106/board/akita/nand.c u-boot-2006-04-18-1106-new/board/akita/nand.c ---- u-boot-2006-04-18-1106/board/akita/nand.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/nand.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,169 @@ -+/* -+ * board/akita/nand.c -+ * -+ * NAND driver for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from mtd nand driver: -+ * -+ * drivers/mtd/nand/sharpsl.c -+ * -+ * Copyright (C) 2004 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_NAND) -+ -+#include -+#include -+ -+static int sharpsl_io_base = CFG_NAND_BASE; -+ -+/* register offset */ -+#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */ -+#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */ -+#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */ -+#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */ -+#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */ -+#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */ -+#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */ -+ -+/* Flash control bit */ -+#define FLRYBY (1 << 5) -+#define FLCE1 (1 << 4) -+#define FLWP (1 << 3) -+#define FLALE (1 << 2) -+#define FLCLE (1 << 1) -+#define FLCE0 (1 << 0) -+ -+#define readb(address) *((volatile unsigned char *)(address)) -+#define writeb(v, address) *((volatile unsigned char *)(address))=v -+ -+/* -+ * hardware specific access to control-lines -+ */ -+static void -+sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd) -+{ -+ switch (cmd) { -+ case NAND_CTL_SETCLE: -+ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRCLE: -+ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETALE: -+ writeb(readb(FLASHCTL) | FLALE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRALE: -+ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETNCE: -+ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL); -+ break; -+ case NAND_CTL_CLRNCE: -+ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL); -+ break; -+ } -+} -+ -+static int -+sharpsl_nand_dev_ready(struct mtd_info* mtd) -+{ -+ return !((readb(FLASHCTL) & FLRYBY) == 0); -+} -+ -+static void -+sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode) -+{ -+ writeb(0 ,ECCCLRR); -+} -+ -+static int -+sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat, -+ u_char* ecc_code) -+{ -+ ecc_code[0] = ~readb(ECCLPUB); -+ ecc_code[1] = ~readb(ECCLPLB); -+ ecc_code[2] = (~readb(ECCCP) << 2) | 0x03; -+ return readb(ECCCNTR) != 0; -+} -+ -+static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; -+ -+static struct nand_bbt_descr sharpsl_akita_bbt = { -+ .options = 0, -+ .offs = 4, -+ .len = 1, -+ .pattern = scan_ff_pattern -+}; -+ -+static struct nand_oobinfo akita_oobinfo = { -+ .useecc = MTD_NANDECC_AUTOPLACE, -+ .eccbytes = 24, -+ .eccpos = { -+ 0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11, -+ 0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23, -+ 0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37}, -+ .oobfree = { {0x08, 0x09} } -+}; -+ -+/* -+ * Board-specific NAND initialization. The following members of the -+ * argument are board-specific (per include/linux/mtd/nand.h): -+ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device -+ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device -+ * - hwcontrol: hardwarespecific function for accesing control-lines -+ * - dev_ready: hardwarespecific function for accesing device ready/busy line -+ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must -+ * only be provided if a hardware ECC is available -+ * - eccmode: mode of ecc, see defines -+ * - chip_delay: chip dependent delay for transfering data from array to -+ * read regs (tR) -+ * - options: various chip options. They can partly be set to inform -+ * nand_scan about special functionality. See the defines for further -+ * explanation -+ * Members with a "?" were not set in the merged testing-NAND branch, -+ * so they are not set here either. -+ */ -+void board_nand_init(struct nand_chip *nand) -+{ -+ writeb(readb(FLASHCTL) | FLWP, FLASHCTL); -+ -+ nand->IO_ADDR_R = FLASHIO; -+ nand->IO_ADDR_W = FLASHIO; -+ nand->hwcontrol = sharpsl_nand_hwcontrol; -+ nand->dev_ready = sharpsl_nand_dev_ready; -+ nand->eccmode = NAND_ECC_HW3_256; -+ nand->chip_delay = 15; -+ nand->options = NAND_SAMSUNG_LP_OPTIONS; -+ nand->badblock_pattern = &sharpsl_akita_bbt; -+ nand->autooob = &akita_oobinfo; -+ nand->enable_hwecc = sharpsl_nand_enable_hwecc; -+ nand->calculate_ecc = sharpsl_nand_calculate_ecc; -+ nand->correct_data = nand_correct_data; -+} -+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ -diff -Nur u-boot-2006-04-18-1106/board/akita/u-boot.lds u-boot-2006-04-18-1106-new/board/akita/u-boot.lds ---- u-boot-2006-04-18-1106/board/akita/u-boot.lds 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/u-boot.lds 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,56 @@ -+/* -+ * (C) Copyright 2000 -+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -+OUTPUT_ARCH(arm) -+ENTRY(_start) -+SECTIONS -+{ -+ . = 0x00000000; -+ -+ . = ALIGN(4); -+ .text : -+ { -+ cpu/pxa/start.o (.text) -+ *(.text) -+ } -+ -+ . = ALIGN(4); -+ .rodata : { *(.rodata) } -+ -+ . = ALIGN(4); -+ .data : { *(.data) } -+ -+ . = ALIGN(4); -+ .got : { *(.got) } -+ -+ . = .; -+ __u_boot_cmd_start = .; -+ .u_boot_cmd : { *(.u_boot_cmd) } -+ __u_boot_cmd_end = .; -+ -+ . = ALIGN(4); -+ __bss_start = .; -+ .bss : { *(.bss) } -+ _end = .; -+} -diff -Nur u-boot-2006-04-18-1106/board/corgi/Makefile u-boot-2006-04-18-1106-new/board/corgi/Makefile ---- u-boot-2006-04-18-1106/board/corgi/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/Makefile 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,51 @@ -+# -+# board/corgi/Makefile -+# -+# (C) Copyright 2006 Alexander Chukov -+# -+# (C) Copyright 2000 -+# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+# -+# See file CREDITS for list of people who contributed to this -+# project. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = lib$(BOARD).a -+ -+OBJS := corgi.o nand.o kbd.o -+SOBJS := lowlevel_init.o -+ -+$(LIB): $(OBJS) $(SOBJS) -+ $(AR) crv $@ $(OBJS) $(SOBJS) -+ -+clean: -+ rm -f $(SOBJS) $(OBJS) -+ -+distclean: clean -+ rm -f $(LIB) core *.bak .depend -+ -+######################################################################### -+ -+.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) -+ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ -+ -+-include .depend -+ -+######################################################################### -diff -Nur u-boot-2006-04-18-1106/board/corgi/config.mk u-boot-2006-04-18-1106-new/board/corgi/config.mk ---- u-boot-2006-04-18-1106/board/corgi/config.mk 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/config.mk 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1 @@ -+TEXT_BASE = 0xa1000000 -diff -Nur u-boot-2006-04-18-1106/board/corgi/corgi.c u-boot-2006-04-18-1106-new/board/corgi/corgi.c ---- u-boot-2006-04-18-1106/board/corgi/corgi.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/corgi.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,87 @@ -+/* -+ * board/corgi/corgi.c -+ * -+ * Configuration settings for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+/* ------------------------------------------------------------------------- */ -+ -+/* -+ * Miscellaneous platform dependent initialisations -+ */ -+ -+int board_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ /* memory and cpu-speed are setup before relocation */ -+ /* so we do _nothing_ here */ -+ -+ /* arch number of Sharp Zaurus Corgi : MACH_TYPE_CORGI */ -+ gd->bd->bi_arch_number = 423; -+ -+ /* adress of boot parameters */ -+ gd->bd->bi_boot_params = 0xa0000100; -+ -+ /* set cpu turbo mode */ -+ set_turbo_mode(); -+ -+ corgikbd_init(); -+ -+ return 0; -+} -+ -+int board_late_init(void) -+{ -+ setenv("stdout", "serial"); -+ setenv("stderr", "serial"); -+ return 0; -+} -+ -+ -+int dram_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; -+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; -+ gd->bd->bi_dram[1].start = PHYS_SDRAM_2; -+ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; -+ gd->bd->bi_dram[2].start = PHYS_SDRAM_3; -+ gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; -+ gd->bd->bi_dram[3].start = PHYS_SDRAM_4; -+ gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; -+ -+ return 0; -+} -diff -Nur u-boot-2006-04-18-1106/board/corgi/kbd.c u-boot-2006-04-18-1106-new/board/corgi/kbd.c ---- u-boot-2006-04-18-1106/board/corgi/kbd.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/kbd.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,202 @@ -+/* -+ * board/corgi/kbd.c -+ * -+ * Keyboard driver for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from: -+ * -+ * linux/drivers/input/keyboard/spitzkbd.c -+ * -+ * Keyboard driver for Sharp Corgi models (SL-C7xx) -+ * -+ * Copyright (C) 2005 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define GPIO_DFLT_LOW 0x400 -+#define GPIO_DFLT_HIGH 0x800 -+ -+void pxa_gpio_mode(int gpio_mode) -+{ -+ int gpio = gpio_mode & GPIO_MD_MASK_NR; -+ int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; -+ int gafr; -+ -+ if (gpio_mode & GPIO_DFLT_LOW) -+ GPCR(gpio) = GPIO_bit(gpio); -+ else if (gpio_mode & GPIO_DFLT_HIGH) -+ GPSR(gpio) = GPIO_bit(gpio); -+ if (gpio_mode & GPIO_MD_MASK_DIR) -+ GPDR(gpio) |= GPIO_bit(gpio); -+ else -+ GPDR(gpio) &= ~GPIO_bit(gpio); -+ gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); -+ GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); -+} -+ -+/* -+ * Corgi Keyboard Definitions -+ */ -+#define CORGI_KEY_STROBE_NUM (12) -+#define CORGI_KEY_SENSE_NUM (8) -+#define CORGI_GPIO_ALL_STROBE_BIT (0x00003ffc) -+#define CORGI_GPIO_HIGH_SENSE_BIT (0xfc000000) -+#define CORGI_GPIO_HIGH_SENSE_RSHIFT (26) -+#define CORGI_GPIO_LOW_SENSE_BIT (0x00000003) -+#define CORGI_GPIO_LOW_SENSE_LSHIFT (6) -+#define CORGI_GPIO_STROBE_BIT(a) GPIO_bit(66+(a)) -+#define CORGI_GPIO_SENSE_BIT(a) GPIO_bit(58+(a)) -+#define CORGI_GAFR_ALL_STROBE_BIT (0x0ffffff0) -+#define CORGI_GAFR_HIGH_SENSE_BIT (0xfff00000) -+#define CORGI_GAFR_LOW_SENSE_BIT (0x0000000f) -+#define CORGI_GPIO_KEY_SENSE(a) (58+(a)) -+#define CORGI_GPIO_KEY_STROBE(a) (66+(a)) -+ -+#define CORGI_GPIO_AK_INT (4) /* Headphone Jack Control Interrupt */ -+ -+#define KB_ROWS 8 -+#define KB_COLS 12 -+#define KB_ROWMASK(r) (1 << (r)) -+#define SCANCODE(r,c) ( ((r)<<4) + (c) + 1 ) -+/* zero code, 124 scancodes */ -+#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 ) -+ -+#define SCAN_INTERVAL (50) /* ms */ -+#define HINGE_SCAN_INTERVAL (250) /* ms */ -+ -+#define KB_DISCHARGE_DELAY 10 -+#define KB_ACTIVATE_DELAY 10 -+ -+static inline void corgikbd_discharge_all(void) -+{ -+ /* STROBE All HiZ */ -+ GPCR2 = CORGI_GPIO_ALL_STROBE_BIT; -+ GPDR2 &= ~CORGI_GPIO_ALL_STROBE_BIT; -+} -+ -+static inline void corgikbd_activate_all(void) -+{ -+ /* STROBE ALL -> High */ -+ GPSR2 = CORGI_GPIO_ALL_STROBE_BIT; -+ GPDR2 |= CORGI_GPIO_ALL_STROBE_BIT; -+ -+ udelay(KB_DISCHARGE_DELAY); -+ -+ /* Clear any interrupts we may have triggered when altering the GPIO lines */ -+ GEDR1 = CORGI_GPIO_HIGH_SENSE_BIT; -+ GEDR2 = CORGI_GPIO_LOW_SENSE_BIT; -+} -+ -+static inline void corgikbd_activate_col(int col) -+{ -+ /* STROBE col -> High, not col -> HiZ */ -+ GPSR2 = CORGI_GPIO_STROBE_BIT(col); -+ GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col); -+} -+ -+static inline void corgikbd_reset_col(int col) -+{ -+ /* STROBE col -> Low */ -+ GPCR2 = CORGI_GPIO_STROBE_BIT(col); -+ /* STROBE col -> out, not col -> HiZ */ -+ GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col); -+} -+ -+#define GET_ROWS_STATUS(c) (((GPLR1 & CORGI_GPIO_HIGH_SENSE_BIT) >> CORGI_GPIO_HIGH_SENSE_RSHIFT) | ((GPLR2 & CORGI_GPIO_LOW_SENSE_BIT) << CORGI_GPIO_LOW_SENSE_LSHIFT)) -+ -+static int corgikbd_scankeyboard(void) -+{ -+ unsigned int row, col, rowd; -+ unsigned int num_pressed; -+ int ret = -1; -+ -+ num_pressed = 0; -+ for (col = 0; col < KB_COLS; col++) { -+ corgikbd_discharge_all(); -+ udelay(KB_DISCHARGE_DELAY); -+ -+ corgikbd_activate_col(col); -+ udelay(KB_ACTIVATE_DELAY); -+ -+ rowd = GET_ROWS_STATUS(col); -+ for (row = 0; row < KB_ROWS; row++) { -+ unsigned int scancode, pressed; -+ -+ scancode = SCANCODE(row, col); -+ pressed = rowd & KB_ROWMASK(row); -+ -+ if (pressed) -+ ret = scancode; -+ } -+ corgikbd_reset_col(col); -+ } -+ -+ corgikbd_activate_all(); -+ -+ return ret; -+} -+ -+void corgikbd_init(void) -+{ -+ int i; -+ -+ /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ -+ for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) -+ pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN); -+ -+ /* Set Strobe lines as outputs - set high */ -+ for (i = 0; i < CORGI_KEY_STROBE_NUM; i++) -+ pxa_gpio_mode(CORGI_GPIO_KEY_STROBE(i) | GPIO_OUT | GPIO_DFLT_HIGH); -+ -+ /* Setup the headphone jack as an input */ -+ pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN); -+} -+ -+int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ int scan; -+ -+ if (argc < 2) -+ return 1; -+ -+ scan = corgikbd_scankeyboard(); -+ -+ -+// if (scan >= 0) -+// printf("Scan = %d\n", scan); -+// else -+// printf("Nothing!\n"); -+ -+ return !(simple_strtol(argv[1], NULL, 10) == scan); -+} -+ -+U_BOOT_CMD( -+ testkey, 2, 1, do_testkey, -+ "testkey - compare pressed key with arg\n", -+ "" -+); -diff -Nur u-boot-2006-04-18-1106/board/corgi/lowlevel_init.S u-boot-2006-04-18-1106-new/board/corgi/lowlevel_init.S ---- u-boot-2006-04-18-1106/board/corgi/lowlevel_init.S 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/lowlevel_init.S 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,136 @@ -+/* -+ * board/corgi/lowlevel_init.S -+ * -+ * Configuration settings for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * This was originally from the Lubbock u-boot port and from BLOB with cleanup -+ * -+ * NOTE: I haven't clean this up considerably, just enough to get it -+ * running. See hal_platform_setup.h for the source. See -+ * board/cradle/lowlevel_init.S for another PXA250 setup that is -+ * much cleaner. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+ -+/* wait for coprocessor write complete */ -+ .macro CPWAIT reg -+ mrc p15,0,\reg,c2,c0,0 -+ mov \reg,\reg -+ sub pc,pc,#4 -+ .endm -+ -+/*********** Write out to HEX 7 segment leds *********/ -+ -+#undef DEBUG_HEXLOG -+ -+#ifdef DEBUG_HEXLOG -+#define LEDCTL 0x08000040 -+#define LEDDAT1 0x08000010 -+#define LEDDAT2 0x08000014 -+ -+.macro wait, count -+ mov r10, \count -+0: -+ subs r10, r10, #1 -+ bne 0b -+.endm -+ -+.macro hexlog_init -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ ldr r11, =LEDDAT1 -+ mov r10, #0x0 -+ str r10, [r11] -+.endm -+ -+.macro hexlog, val -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ -+ ldr r11, =LEDDAT1 -+ mov r10, \val -+ str r10, [r11] -+ -+ wait #0x400000 -+.endm -+ -+#else -+ -+.macro hexlog_init -+ nop -+.endm -+ -+.macro hexlog, val -+ nop -+.endm -+ -+#endif -+ -+/***********************************/ -+ -+/* -+ * Memory setup -+ */ -+ -+.globl lowlevel_init -+lowlevel_init: -+ -+ mov pc, lr -+ -+.globl set_turbo_mode -+ -+set_turbo_mode: -+ /* Turn on turbo mode */ -+ mrc p14, 0, r2, c6, c0, 0 -+ orr r2, r2, #0x3 /* Turbo, Freq change */ -+ mcr p14, 0, r2, c6, c0, 0 -+ -+ -+ /* Setup vectors */ -+ ldr r0, =TEXT_BASE -+ ldr r1, =TEXT_BASE+0x40 -+ ldr r2, =0x0 -+1: -+ ldr r3, [r0] -+ str r3, [r2] -+ add r0, r0, #4 -+ add r2, r2, #4 -+ cmp r0, r1 -+ bne 1b -+ -+ ldr r0, =0x0 -+ ldr r1, [r0, #4] -+ str r1, [r0] -+ -+ mov pc, lr -diff -Nur u-boot-2006-04-18-1106/board/corgi/nand.c u-boot-2006-04-18-1106-new/board/corgi/nand.c ---- u-boot-2006-04-18-1106/board/corgi/nand.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/nand.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,157 @@ -+/* -+ * board/corgi/nand.c -+ * -+ * NAND driver for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from mtd nand driver: -+ * -+ * drivers/mtd/nand/sharpsl.c -+ * -+ * Copyright (C) 2004 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_NAND) -+ -+#include -+#include -+ -+static int sharpsl_io_base = CFG_NAND_BASE; -+ -+/* register offset */ -+#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */ -+#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */ -+#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */ -+#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */ -+#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */ -+#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */ -+#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */ -+ -+/* Flash control bit */ -+#define FLRYBY (1 << 5) -+#define FLCE1 (1 << 4) -+#define FLWP (1 << 3) -+#define FLALE (1 << 2) -+#define FLCLE (1 << 1) -+#define FLCE0 (1 << 0) -+ -+#define readb(address) *((volatile unsigned char *)(address)) -+#define writeb(v, address) *((volatile unsigned char *)(address))=v -+ -+/* -+ * hardware specific access to control-lines -+ */ -+static void -+sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd) -+{ -+ switch (cmd) { -+ case NAND_CTL_SETCLE: -+ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRCLE: -+ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETALE: -+ writeb(readb(FLASHCTL) | FLALE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRALE: -+ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETNCE: -+ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL); -+ break; -+ case NAND_CTL_CLRNCE: -+ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL); -+ break; -+ } -+} -+ -+static int -+sharpsl_nand_dev_ready(struct mtd_info* mtd) -+{ -+ return !((readb(FLASHCTL) & FLRYBY) == 0); -+} -+ -+static void -+sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode) -+{ -+ writeb(0 ,ECCCLRR); -+} -+ -+static int -+sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat, -+ u_char* ecc_code) -+{ -+ ecc_code[0] = ~readb(ECCLPUB); -+ ecc_code[1] = ~readb(ECCLPLB); -+ ecc_code[2] = (~readb(ECCCP) << 2) | 0x03; -+ return readb(ECCCNTR) != 0; -+} -+ -+static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; -+ -+static struct nand_bbt_descr sharpsl_bbt = { -+ .options = 0, -+ .offs = 4, -+ .len = 2, -+ .pattern = scan_ff_pattern -+}; -+ -+/* -+ * Board-specific NAND initialization. The following members of the -+ * argument are board-specific (per include/linux/mtd/nand.h): -+ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device -+ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device -+ * - hwcontrol: hardwarespecific function for accesing control-lines -+ * - dev_ready: hardwarespecific function for accesing device ready/busy line -+ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must -+ * only be provided if a hardware ECC is available -+ * - eccmode: mode of ecc, see defines -+ * - chip_delay: chip dependent delay for transfering data from array to -+ * read regs (tR) -+ * - options: various chip options. They can partly be set to inform -+ * nand_scan about special functionality. See the defines for further -+ * explanation -+ * Members with a "?" were not set in the merged testing-NAND branch, -+ * so they are not set here either. -+ */ -+void board_nand_init(struct nand_chip *nand) -+{ -+ writeb(readb(FLASHCTL) | FLWP, FLASHCTL); -+ -+ nand->IO_ADDR_R = FLASHIO; -+ nand->IO_ADDR_W = FLASHIO; -+ nand->hwcontrol = sharpsl_nand_hwcontrol; -+ nand->dev_ready = sharpsl_nand_dev_ready; -+ nand->eccmode = NAND_ECC_HW3_256; -+ nand->chip_delay = 15; -+ nand->badblock_pattern = &sharpsl_bbt; -+ nand->enable_hwecc = sharpsl_nand_enable_hwecc; -+ nand->calculate_ecc = sharpsl_nand_calculate_ecc; -+ nand->correct_data = nand_correct_data; -+} -+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ -diff -Nur u-boot-2006-04-18-1106/board/corgi/u-boot.lds u-boot-2006-04-18-1106-new/board/corgi/u-boot.lds ---- u-boot-2006-04-18-1106/board/corgi/u-boot.lds 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/u-boot.lds 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,56 @@ -+/* -+ * (C) Copyright 2000 -+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -+OUTPUT_ARCH(arm) -+ENTRY(_start) -+SECTIONS -+{ -+ . = 0x00000000; -+ -+ . = ALIGN(4); -+ .text : -+ { -+ cpu/pxa/start.o (.text) -+ *(.text) -+ } -+ -+ . = ALIGN(4); -+ .rodata : { *(.rodata) } -+ -+ . = ALIGN(4); -+ .data : { *(.data) } -+ -+ . = ALIGN(4); -+ .got : { *(.got) } -+ -+ . = .; -+ __u_boot_cmd_start = .; -+ .u_boot_cmd : { *(.u_boot_cmd) } -+ __u_boot_cmd_end = .; -+ -+ . = ALIGN(4); -+ __bss_start = .; -+ .bss : { *(.bss) } -+ _end = .; -+} -diff -Nur u-boot-2006-04-18-1106/common/cmd_nand.c u-boot-2006-04-18-1106-new/common/cmd_nand.c ---- u-boot-2006-04-18-1106/common/cmd_nand.c 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/common/cmd_nand.c 2006-07-05 11:19:44.000000000 +0000 -@@ -81,6 +81,63 @@ - return 0; - } - -+#ifdef NAND_LOGICAL -+///////////////////////////////////////////////////////////////////// -+// oob structure -+///////////////////////////////////////////////////////////////////// -+ -+#define NAND_NOOB_LOGADDR_00 8 -+#define NAND_NOOB_LOGADDR_01 9 -+#define NAND_NOOB_LOGADDR_10 10 -+#define NAND_NOOB_LOGADDR_11 11 -+#define NAND_NOOB_LOGADDR_20 12 -+#define NAND_NOOB_LOGADDR_21 13 -+ -+static uint nand_get_logical_no(unsigned char *oob) -+{ -+ unsigned short us,bit; -+ int par; -+ int good0, good1; -+ -+ if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] && -+ oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){ -+ good0 = NAND_NOOB_LOGADDR_00; -+ good1 = NAND_NOOB_LOGADDR_01; -+ }else -+ if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] && -+ oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){ -+ good0 = NAND_NOOB_LOGADDR_10; -+ good1 = NAND_NOOB_LOGADDR_11; -+ }else -+ if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] && -+ oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){ -+ good0 = NAND_NOOB_LOGADDR_20; -+ good1 = NAND_NOOB_LOGADDR_21; -+ }else{ -+ return (uint)-1; -+ } -+ -+ us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) | -+ (((unsigned short)(oob[good1]) & 0x00ff) << 8); -+ -+ par = 0; -+ for(bit = 0x0001; bit != 0; bit <<= 1){ -+ if(us & bit){ -+ par++; -+ } -+ } -+ if(par & 1){ -+ return (uint)-2; -+ } -+ -+ if(us == 0xffff){ -+ return 0xffff; -+ }else{ -+ return ((us & 0x07fe) >> 1); -+ } -+} -+#endif -+ - /* ------------------------------------------------------------------------- */ - - static void -@@ -245,6 +302,55 @@ - if (off == 0 && size == 0) - return 1; - -+#ifdef NAND_LOGICAL -+ s = strchr(cmd, '.'); -+ if (s != NULL) { -+ if (strcmp(s, ".logical") == 0) { -+ int blocks = NAND_LOGICAL_SIZE / nand->erasesize; -+ ulong *log2phy = malloc(blocks * sizeof(ulong)); -+ u_char *oobuf = malloc(nand->oobblock + nand->oobsize); -+ int i; -+ ulong offset; -+ ret = 1; -+ for (i = 0; i < blocks; i++) -+ log2phy[i] = (uint) -1; -+ offset = 0; -+ for (i = 0; i < blocks; i++) { -+ ret = nand_read_raw(nand, oobuf, offset, nand->oobblock, nand->oobsize); -+ if (!ret) { -+ int log_no = nand_get_logical_no(oobuf + nand->oobblock); -+ if (((int)log_no >= 0) && (log_no < blocks)) { -+ log2phy[log_no] = offset; -+ //printf("NAND logical - %08X -> %04X\n", offset, log_no); -+ } -+ } -+ offset += nand->erasesize; -+ } -+ -+ for (i = 0; i < size / nand->erasesize; i++) { -+ ulong sz = nand->erasesize; -+ offset = log2phy[off / nand->erasesize]; -+ if ((int)offset < 0) { -+ printf("NAND logical - offset %08X not found\n", off); -+ return 1; -+ } -+ //printf("NAND logical - %04X -> %08X\n", off / nand->erasesize, offset); -+ ret = nand_read(nand, offset, &sz, (u_char *)addr); -+ if (ret) { -+ printf("NAND logical - offset %08X, read error\n", off); -+ return 1; -+ } -+ off += nand->erasesize; -+ addr += nand->erasesize; -+ } -+ printf(" %d bytes read from NAND logical\n", size); -+ free(oobuf); -+ free(log2phy); -+ return ret == 0 ? 0 : 1; -+ } -+ } -+#endif -+ - i = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */ - printf("\nNAND %s: device %d offset %u, size %u ... ", - i ? "read" : "write", nand_curr_device, off, size); -diff -Nur u-boot-2006-04-18-1106/cpu/pxa/config.mk u-boot-2006-04-18-1106-new/cpu/pxa/config.mk ---- u-boot-2006-04-18-1106/cpu/pxa/config.mk 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/cpu/pxa/config.mk 2006-07-05 11:19:44.000000000 +0000 -@@ -22,8 +22,7 @@ - # MA 02111-1307 USA - # - --PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -- -msoft-float -+PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 -fomit-frame-pointer - - #PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100 - PLATFORM_CPPFLAGS += -march=armv5 -mtune=xscale -@@ -32,5 +31,5 @@ - # Supply options according to compiler version - # - # ======================================================================== --PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) -+#PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) - PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -diff -Nur u-boot-2006-04-18-1106/cpu/pxa/start.S u-boot-2006-04-18-1106-new/cpu/pxa/start.S ---- u-boot-2006-04-18-1106/cpu/pxa/start.S 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/cpu/pxa/start.S 2006-07-05 11:19:44.000000000 +0000 -@@ -42,6 +42,7 @@ - ldr pc, _irq - ldr pc, _fiq - -+_reset: .word reset - _undefined_instruction: .word undefined_instruction - _software_interrupt: .word software_interrupt - _prefetch_abort: .word prefetch_abort -diff -Nur u-boot-2006-04-18-1106/fs/cramfs/cramfs.c u-boot-2006-04-18-1106-new/fs/cramfs/cramfs.c ---- u-boot-2006-04-18-1106/fs/cramfs/cramfs.c 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/fs/cramfs/cramfs.c 2006-07-05 11:19:44.000000000 +0000 -@@ -44,8 +44,13 @@ - - /* CPU address space offset calculation macro, struct part_info offset is - * device address space offset, so we need to shift it by a device start address. */ -+#if (CONFIG_COMMANDS & CFG_CMD_FLASH) - extern flash_info_t flash_info[]; - #define PART_OFFSET(x) (x->offset + flash_info[x->dev->id->num].start[0]) -+#else -+static struct cramfs_super super_fake; -+#define PART_OFFSET(x) (&super_fake) -+#endif - - static int cramfs_read_super (struct part_info *info) - { -diff -Nur u-boot-2006-04-18-1106/include/asm-arm/arch-pxa/pxa-regs.h u-boot-2006-04-18-1106-new/include/asm-arm/arch-pxa/pxa-regs.h ---- u-boot-2006-04-18-1106/include/asm-arm/arch-pxa/pxa-regs.h 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/include/asm-arm/arch-pxa/pxa-regs.h 2006-07-05 11:19:44.000000000 +0000 -@@ -1269,15 +1269,16 @@ - #define _GEDR(x) __REG2(0x40E00048, ((x) & 0x60) >> 3) - #define _GAFR(x) __REG2(0x40E00054, ((x) & 0x70) >> 2) - --#define GPLR(x) ((((x) & 0x7f) < 96) ? _GPLR(x) : GPLR3) --#define GPDR(x) ((((x) & 0x7f) < 96) ? _GPDR(x) : GPDR3) --#define GPSR(x) ((((x) & 0x7f) < 96) ? _GPSR(x) : GPSR3) --#define GPCR(x) ((((x) & 0x7f) < 96) ? _GPCR(x) : GPCR3) --#define GRER(x) ((((x) & 0x7f) < 96) ? _GRER(x) : GRER3) --#define GFER(x) ((((x) & 0x7f) < 96) ? _GFER(x) : GFER3) --#define GEDR(x) ((((x) & 0x7f) < 96) ? _GEDR(x) : GEDR3) --#define GAFR(x) ((((x) & 0x7f) < 96) ? _GAFR(x) : \ -- ((((x) & 0x7f) < 112) ? GAFR3_L : GAFR3_U)) -+#define GPLR(x) (*((((x) & 0x7f) < 96) ? &_GPLR(x) : &GPLR3)) -+#define GPDR(x) (*((((x) & 0x7f) < 96) ? &_GPDR(x) : &GPDR3)) -+#define GPSR(x) (*((((x) & 0x7f) < 96) ? &_GPSR(x) : &GPSR3)) -+#define GPCR(x) (*((((x) & 0x7f) < 96) ? &_GPCR(x) : &GPCR3)) -+#define GRER(x) (*((((x) & 0x7f) < 96) ? &_GRER(x) : &GRER3)) -+#define GFER(x) (*((((x) & 0x7f) < 96) ? &_GFER(x) : &GFER3)) -+#define GEDR(x) (*((((x) & 0x7f) < 96) ? &_GEDR(x) : &GEDR3)) -+#define GAFR(x) (*((((x) & 0x7f) < 96) ? &_GAFR(x) : \ -+ ((((x) & 0x7f) < 112) ? &GAFR3_L : &GAFR3_U))) -+ - #else - - #define GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) -diff -Nur u-boot-2006-04-18-1106/include/configs/akita.h u-boot-2006-04-18-1106-new/include/configs/akita.h ---- u-boot-2006-04-18-1106/include/configs/akita.h 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/include/configs/akita.h 2006-07-13 11:00:46.000000000 +0000 -@@ -0,0 +1,324 @@ -+/* -+ * include/configs/akita.h -+ * -+ * Configuration settings for the Sharp Zaurus SL-C1000/C3100. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT -+ -+#undef SKIP_CONFIG_RELOCATE_UBOOT -+ -+#undef CONFIG_HARD_I2C -+ -+/* -+ * High Level Configuration Options -+ * (easy to change) -+ */ -+#define CONFIG_PXA27X 1 /* This is an PXA27x CPU */ -+#define CONFIG_AKITA 1 /* on Sharp Zaurus Akita */ -+//#define CONFIG_MMC 1 -+#define BOARD_LATE_INIT 1 -+ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+ -+#define RTC 1 -+ -+/* -+ * Size of malloc() pool -+ */ -+//#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) -+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) -+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+/* -+ * select serial console configuration -+ */ -+#define CONFIG_FFUART 1 /* we use FFUART on Mainstone */ -+ -+/* allow to overwrite serial and ethaddr */ -+#define CONFIG_BAUDRATE 115200 -+//#define CONFIG_DOS_PARTITION 1 -+ -+#undef CONFIG_SHOW_BOOT_PROGRESS -+ -+#if 1 -+#define CONFIG_BOOTDELAY 1 -+#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" -+ -+#define CONFIG_BOOTCOMMAND \ -+ "if testkey 101 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 2 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 18 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 3 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ -+ "bootm; " -+#else -+#define CONFIG_BOOTCOMMAND "" // "run boot_flash" -+#endif -+ -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_INITRD_TAG 1 -+ -+#define CONFIG_COMMANDS (( \ -+ CONFIG_CMD_DFL | \ -+ CFG_CMD_NAND | \ -+ CFG_CMD_JFFS2 \ -+ ) & ~( \ -+ CFG_CMD_NET | \ -+ CFG_CMD_FLASH | \ -+ CFG_CMD_IMLS \ -+ )) -+ -+// CFG_CMD_ENV -+ -+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -+#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ -+#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ -+#endif -+ -+/* -+ * Miscellaneous configurable options -+ */ -+#define CFG_HUSH_PARSER 1 -+#define CFG_PROMPT_HUSH_PS2 "> " -+ -+#define CFG_LONGHELP /* undef to save memory */ -+#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+ -+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ -+#define CFG_MAXARGS 16 /* max number of command args */ -+#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -+#define CFG_DEVICE_NULLDEV 1 -+ -+#define CFG_MEMTEST_START 0xa0400000 /* memtest works on */ -+#define CFG_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ -+ -+#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ -+ -+#define CFG_LOAD_ADDR 0xa1000000 /* default load address */ -+ -+#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ -+#define CFG_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ -+ -+ /* valid baudrates */ -+#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -+ -+#define CFG_MMC_BASE 0xF0000000 -+ -+/* -+ * Stack sizes -+ * -+ * The stack sizes are set up in start.S using the settings below -+ */ -+#define CONFIG_STACKSIZE (128*1024) /* regular stack */ -+#ifdef CONFIG_USE_IRQ -+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ -+#endif -+ -+/* -+ * Physical Memory Map -+ */ -+#define CONFIG_NR_DRAM_BANKS 4 /* we have 2 banks of DRAM */ -+#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ -+#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ -+#define PHYS_SDRAM_2 0xa4000000 /* SDRAM Bank #2 */ -+#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_3 0xa8000000 /* SDRAM Bank #3 */ -+#define PHYS_SDRAM_3_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_4 0xac000000 /* SDRAM Bank #4 */ -+#define PHYS_SDRAM_4_SIZE 0x00000000 /* 0 MB */ -+ -+#define PHYS_FLASH_1 0xd4000000 /* Flash Bank #1 */ -+ -+#define CFG_DRAM_BASE 0xa0000000 -+#define CFG_DRAM_SIZE 0x04000000 -+ -+#define CFG_FLASH_BASE PHYS_FLASH_1 -+ -+/* -+ * GPIO settings for Mainstone -+ */ -+ -+#define CFG_GPSR0_VAL 0x00708800 -+#define CFG_GPSR1_VAL 0x03cf0002 -+#define CFG_GPSR2_VAL 0x0021FC00 -+#define CFG_GPSR3_VAL 0x00000000 -+ -+#define CFG_GPCR0_VAL 0x00001000 -+#define CFG_GPCR1_VAL 0x00000000 -+#define CFG_GPCR2_VAL 0x00000000 -+#define CFG_GPCR3_VAL 0x00000000 -+ -+#define CFG_GPDR0_VAL 0xC27B9C04 -+#define CFG_GPDR1_VAL 0x00EFAA83 -+#define CFG_GPDR2_VAL 0x0E23FC00 -+#define CFG_GPDR3_VAL 0x001E1F81 -+ -+#define CFG_GAFR0_L_VAL 0x94F00000 -+#define CFG_GAFR0_U_VAL 0x015A859A -+#define CFG_GAFR1_L_VAL 0x999A955A -+#define CFG_GAFR1_U_VAL 0x0005A4AA -+#define CFG_GAFR2_L_VAL 0x6AA00000 -+#define CFG_GAFR2_U_VAL 0x55A8041A -+#define CFG_GAFR3_L_VAL 0x56AA955A -+#define CFG_GAFR3_U_VAL 0x00000001 -+ -+#define CFG_PSSR_VAL 0x20 // ??????????? -+ -+/* -+ * PCMCIA and CF Interfaces -+ */ -+#define CFG_MECR_VAL 0x00000001 -+#define CFG_MCMEM0_VAL 0x00010204 -+#define CFG_MCMEM1_VAL 0x00010204 -+#define CFG_MCATT0_VAL 0x00010204 -+#define CFG_MCATT1_VAL 0x00010204 -+#define CFG_MCIO0_VAL 0x0000c108 -+#define CFG_MCIO1_VAL 0x0001c108 -+ -+//#define CONFIG_PXA_PCMCIA 1 -+//#define CONFIG_PXA_IDE 1 -+ -+#define CONFIG_PCMCIA_SLOT_A 1 -+/* just to keep build system happy */ -+ -+#define CFG_PCMCIA_MEM_ADDR 0x28000000 -+#define CFG_PCMCIA_MEM_SIZE 0x04000000 -+ -+#define CFG_IDE_MAXBUS 1 -+/* max. 1 IDE bus */ -+#define CFG_IDE_MAXDEVICE 1 -+/* max. 1 drive per IDE bus */ -+ -+#define CFG_ATA_IDE0_OFFSET 0x0000 -+ -+#define CFG_ATA_BASE_ADDR 0x20000000 -+ -+/* Offset for data I/O */ -+#define CFG_ATA_DATA_OFFSET 0x1f0 -+ -+/* Offset for normal register accesses */ -+#define CFG_ATA_REG_OFFSET 0x1f0 -+ -+/* Offset for alternate registers */ -+#define CFG_ATA_ALT_OFFSET 0x3f0 -+ -+#define CFG_NO_FLASH 1 -+#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ -+#define CFG_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ -+ -+/*----------------------------------------------------------------------- -+ * NAND-FLASH stuff -+ *----------------------------------------------------------------------- -+ */ -+#undef CFG_NAND_LEGACY -+ -+/* NAND debugging */ -+//#define CONFIG_MTD_DEBUG -+//#define CONFIG_MTD_DEBUG_VERBOSE 3 -+ -+#define CFG_NAND_BASE 0xd4000000 -+#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define NAND_MAX_CHIPS 1 -+ -+//#define CONFIG_MTD_NAND_VERIFY_WRITE 1 /* verify all writes!!! */ -+//#define CFG_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ -+ -+#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ -+#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ -+ -+/* -+ * JFFS2 partitions -+ * -+ */ -+/* No command line, one static partition */ -+//#undef CONFIG_JFFS2_CMDLINE -+//#define CONFIG_JFFS2_DEV "nand0" -+//#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF -+//#define CONFIG_JFFS2_PART_OFFSET 0x00060000 -+ -+/* mtdparts command line support */ -+/* Note: fake mtd_id used, no linux mtd map file */ -+ -+#define CONFIG_JFFS2_CMDLINE -+#define MTDIDS_DEFAULT "nand0=laze-0" -+//#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" -+#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+ -+/* -+ * SHARP SL NAND logical partition -+ */ -+#define NAND_LOGICAL 1 -+#define NAND_LOGICAL_SIZE 0x700000 -+ -+/* -+ * Environment -+ */ -+ -+#define CFG_ENV_IS_IN_NAND 1 -+#define CFG_ENV_OFFSET 0x40000 -+//#define CFG_ENV_OFFSET_REDUND 0x44000 -+#define CFG_ENV_SIZE 0x20000 -+ -+#endif /* __CONFIG_H */ -diff -Nur u-boot-2006-04-18-1106/include/configs/corgi.h u-boot-2006-04-18-1106-new/include/configs/corgi.h ---- u-boot-2006-04-18-1106/include/configs/corgi.h 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/include/configs/corgi.h 2006-07-13 11:19:04.000000000 +0000 -@@ -0,0 +1,326 @@ -+/* -+ * include/configs/corgi.h -+ * -+ * Configuration settings for the Sharp Zaurus SL-C7x0/C860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT -+ -+#undef SKIP_CONFIG_RELOCATE_UBOOT -+ -+#undef CONFIG_HARD_I2C -+ -+/* -+ * High Level Configuration Options -+ * (easy to change) -+ */ -+#define CONFIG_PXA250 1 /* This is an PXA255 CPU */ -+#define CONFIG_CORGI 1 /* on Sharp Zaurus Corgi */ -+//#define CONFIG_MMC 1 -+#define BOARD_LATE_INIT 1 -+ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+ -+#define RTC 1 -+ -+/* -+ * Size of malloc() pool -+ */ -+//#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) -+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) -+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+/* -+ * select serial console configuration -+ */ -+#define CONFIG_FFUART 1 /* we use FFUART on Mainstone */ -+ -+/* allow to overwrite serial and ethaddr */ -+#define CONFIG_BAUDRATE 115200 -+//#define CONFIG_DOS_PARTITION 1 -+ -+#undef CONFIG_SHOW_BOOT_PROGRESS -+ -+#if 1 -+#define CONFIG_BOOTDELAY 1 -+#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" -+ -+#define CONFIG_BOOTCOMMAND \ -+ "if testkey 101 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x00060000 0x00540000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 2 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 18 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 3 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \ -+ "bootm; " -+#else -+#define CONFIG_BOOTCOMMAND "" // "run boot_flash" -+#endif -+ -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192" -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_INITRD_TAG 1 -+ -+#define CONFIG_COMMANDS (( \ -+ CONFIG_CMD_DFL | \ -+ CFG_CMD_NAND | \ -+ CFG_CMD_JFFS2 \ -+ ) & ~( \ -+ CFG_CMD_NET | \ -+ CFG_CMD_FLASH | \ -+ CFG_CMD_IMLS \ -+ )) -+ -+// CFG_CMD_ENV -+ -+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -+#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ -+#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ -+#endif -+ -+/* -+ * Miscellaneous configurable options -+ */ -+#define CFG_HUSH_PARSER 1 -+#define CFG_PROMPT_HUSH_PS2 "> " -+ -+#define CFG_LONGHELP /* undef to save memory */ -+#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+ -+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ -+#define CFG_MAXARGS 16 /* max number of command args */ -+#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -+#define CFG_DEVICE_NULLDEV 1 -+ -+#define CFG_MEMTEST_START 0xa0400000 /* memtest works on */ -+#define CFG_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ -+ -+#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ -+ -+#define CFG_LOAD_ADDR 0xa0800000 /* default load address */ -+ -+#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ -+#define CFG_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ -+ -+ /* valid baudrates */ -+#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -+ -+#define CFG_MMC_BASE 0xF0000000 -+ -+/* -+ * Stack sizes -+ * -+ * The stack sizes are set up in start.S using the settings below -+ */ -+#define CONFIG_STACKSIZE (128*1024) /* regular stack */ -+#ifdef CONFIG_USE_IRQ -+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ -+#endif -+ -+/* -+ * Physical Memory Map -+ */ -+#define CONFIG_NR_DRAM_BANKS 4 /* we have 2 banks of DRAM */ -+#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ -+#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ -+#define PHYS_SDRAM_2 0xa4000000 /* SDRAM Bank #2 */ -+#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_3 0xa8000000 /* SDRAM Bank #3 */ -+#define PHYS_SDRAM_3_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_4 0xac000000 /* SDRAM Bank #4 */ -+#define PHYS_SDRAM_4_SIZE 0x00000000 /* 0 MB */ -+ -+#define PHYS_FLASH_1 0xd4000000 /* Flash Bank #1 */ -+ -+#define CFG_DRAM_BASE 0xa0000000 -+#define CFG_DRAM_SIZE 0x04000000 -+ -+#define CFG_FLASH_BASE PHYS_FLASH_1 -+ -+/* -+ * GPIO settings for Mainstone -+ */ -+ -+#define CFG_GPSR0_VAL 0x00708800 -+#define CFG_GPSR1_VAL 0x03cf0002 -+#define CFG_GPSR2_VAL 0x0021FC00 -+#define CFG_GPSR3_VAL 0x00000000 -+ -+#define CFG_GPCR0_VAL 0x00001000 -+#define CFG_GPCR1_VAL 0x00000000 -+#define CFG_GPCR2_VAL 0x00000000 -+#define CFG_GPCR3_VAL 0x00000000 -+ -+#define CFG_GPDR0_VAL 0xC27B9C04 -+#define CFG_GPDR1_VAL 0x00EFAA83 -+#define CFG_GPDR2_VAL 0x0E23FC00 -+#define CFG_GPDR3_VAL 0x001E1F81 -+ -+#define CFG_GAFR0_L_VAL 0x94F00000 -+#define CFG_GAFR0_U_VAL 0x015A859A -+#define CFG_GAFR1_L_VAL 0x999A955A -+#define CFG_GAFR1_U_VAL 0x0005A4AA -+#define CFG_GAFR2_L_VAL 0x6AA00000 -+#define CFG_GAFR2_U_VAL 0x55A8041A -+#define CFG_GAFR3_L_VAL 0x56AA955A -+#define CFG_GAFR3_U_VAL 0x00000001 -+ -+#define CFG_PSSR_VAL 0x20 // ??????????? -+ -+/* -+ * PCMCIA and CF Interfaces -+ */ -+#define CFG_MECR_VAL 0x00000001 -+#define CFG_MCMEM0_VAL 0x00010204 -+#define CFG_MCMEM1_VAL 0x00010204 -+#define CFG_MCATT0_VAL 0x00010204 -+#define CFG_MCATT1_VAL 0x00010204 -+#define CFG_MCIO0_VAL 0x0000c108 -+#define CFG_MCIO1_VAL 0x0001c108 -+ -+//#define CONFIG_PXA_PCMCIA 1 -+//#define CONFIG_PXA_IDE 1 -+ -+#define CONFIG_PCMCIA_SLOT_A 1 -+/* just to keep build system happy */ -+ -+#define CFG_PCMCIA_MEM_ADDR 0x28000000 -+#define CFG_PCMCIA_MEM_SIZE 0x04000000 -+ -+#define CFG_IDE_MAXBUS 1 -+/* max. 1 IDE bus */ -+#define CFG_IDE_MAXDEVICE 1 -+/* max. 1 drive per IDE bus */ -+ -+#define CFG_ATA_IDE0_OFFSET 0x0000 -+ -+#define CFG_ATA_BASE_ADDR 0x20000000 -+ -+/* Offset for data I/O */ -+#define CFG_ATA_DATA_OFFSET 0x1f0 -+ -+/* Offset for normal register accesses */ -+#define CFG_ATA_REG_OFFSET 0x1f0 -+ -+/* Offset for alternate registers */ -+#define CFG_ATA_ALT_OFFSET 0x3f0 -+ -+#define CFG_NO_FLASH 1 -+#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ -+#define CFG_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ -+ -+/*----------------------------------------------------------------------- -+ * NAND-FLASH stuff -+ *----------------------------------------------------------------------- -+ */ -+#undef CFG_NAND_LEGACY -+ -+/* NAND debugging */ -+//#define CONFIG_MTD_DEBUG -+//#define CONFIG_MTD_DEBUG_VERBOSE 3 -+ -+#define CFG_NAND_BASE 0xd4000000 -+#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define NAND_MAX_CHIPS 1 -+ -+//#define CONFIG_MTD_NAND_VERIFY_WRITE 1 /* verify all writes!!! */ -+//#define CFG_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ -+ -+#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ -+#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ -+ -+#define NAND_ALLOW_ERASE_ALL 1 -+ -+/* -+ * JFFS2 partitions -+ * -+ */ -+/* No command line, one static partition */ -+//#undef CONFIG_JFFS2_CMDLINE -+//#define CONFIG_JFFS2_DEV "nand0" -+//#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF -+//#define CONFIG_JFFS2_PART_OFFSET 0x00060000 -+ -+/* mtdparts command line support */ -+/* Note: fake mtd_id used, no linux mtd map file */ -+ -+#define CONFIG_JFFS2_CMDLINE -+#define MTDIDS_DEFAULT "nand0=laze-0" -+//#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" -+#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+ -+/* -+ * SHARP SL NAND logical partition -+ */ -+#define NAND_LOGICAL 1 -+#define NAND_LOGICAL_SIZE 0x700000 -+ -+/* -+ * Environment -+ */ -+ -+#define CFG_ENV_IS_IN_NAND 1 -+#define CFG_ENV_OFFSET 0x40000 -+//#define CFG_ENV_OFFSET_REDUND 0x44000 -+#define CFG_ENV_SIZE 0x20000 -+ -+#endif /* __CONFIG_H */ ---- s/examples/Makefile.orig 2006-12-09 15:08:45.000000000 +0600 -+++ s/examples/Makefile 2006-12-09 15:09:00.000000000 +0600 -@@ -60,7 +60,7 @@ - include $(TOPDIR)/config.mk - - SREC = hello_world.srec --BIN = hello_world.bin hello_world -+BIN = hello_world hello_world.bin - - ifeq ($(CPU),mpc8xx) - SREC = test_burst.srec -@@ -122,7 +122,7 @@ - - CPPFLAGS += -I.. - --all: .depend $(OBJS) $(LIB) $(SREC) $(BIN) -+all: .depend $(OBJS) $(LIB) $(BIN) $(SREC) - - ######################################################################### - $(LIB): .depend $(LIBOBJS) -diff -Nur u-boot-2006-04-18-1106/CREDITS u-boot-2006-04-18-1106-new/CREDITS ---- u-boot-2006-04-18-1106/CREDITS 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/CREDITS 2006-07-05 11:19:44.000000000 +0000 -@@ -93,6 +93,12 @@ - E: jonathan.debruyne@siemens.atea.be - D: Port to Siemens IAD210 board - -+N: Alexander Chukov -+E: sash@pdaXrom.org -+D: initial support for Sharp Zaurus SL-C1000/3100 -+D: initial support for Sharp Zaurus SL-C7x0/C860 -+W: http://www.pdaXrom.org -+ - N: Ken Chou - E: kchou@ieee.org - D: Support for A3000 SBC board -diff -Nur u-boot-2006-04-18-1106/MAINTAINERS u-boot-2006-04-18-1106-new/MAINTAINERS ---- u-boot-2006-04-18-1106/MAINTAINERS 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/MAINTAINERS 2006-07-05 11:19:44.000000000 +0000 -@@ -379,6 +379,11 @@ - - AT91RM9200DK at91rm9200 - -+Alexander Chukov -+ -+ akita xscale -+ corgi xscale -+ - George G. Davis - - assabet SA1100 -diff -Nur u-boot-2006-04-18-1106/MAKEALL u-boot-2006-04-18-1106-new/MAKEALL ---- u-boot-2006-04-18-1106/MAKEALL 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/MAKEALL 2006-07-05 11:19:44.000000000 +0000 -@@ -206,7 +206,7 @@ - adsvix cerf250 cradle csb226 \ - delta innokom lubbock pxa255_idp \ - wepep250 xaeniax xm250 xsengine \ -- zylonite \ -+ zylonite akita corgi \ - " - - LIST_ixp="ixdp425" -diff -Nur u-boot-2006-04-18-1106/Makefile u-boot-2006-04-18-1106-new/Makefile ---- u-boot-2006-04-18-1106/Makefile 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/Makefile 2006-07-05 11:19:44.000000000 +0000 -@@ -61,7 +61,7 @@ - CROSS_COMPILE = powerpc-linux- - endif - ifeq ($(ARCH),arm) --CROSS_COMPILE = arm-linux- -+CROSS_COMPILE = armv5tel-linux- - endif - ifeq ($(ARCH),i386) - ifeq ($(HOSTARCH),i386) -@@ -1709,6 +1709,12 @@ - zylonite_config : - @./mkconfig $(@:_config=) arm pxa zylonite - -+akita_config : unconfig -+ @./mkconfig $(@:_config=) arm pxa akita -+ -+corgi_config : unconfig -+ @./mkconfig $(@:_config=) arm pxa corgi -+ - ######################################################################### - ## ARM1136 Systems - ######################################################################### -diff -Nur u-boot-2006-04-18-1106/README u-boot-2006-04-18-1106-new/README ---- u-boot-2006-04-18-1106/README 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/README 2006-07-05 11:19:44.000000000 +0000 -@@ -311,7 +311,8 @@ - CONFIG_KB9202, CONFIG_LART, CONFIG_LPD7A400, - CONFIG_LUBBOCK, CONFIG_OSK_OMAP5912, CONFIG_OMAP2420H4, - CONFIG_SHANNON, CONFIG_P2_OMAP730, CONFIG_SMDK2400, -- CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9 -+ CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9, -+ CONFIG_AKITA, CONFIG_CORGI - - MicroBlaze based boards: - ------------------------ -diff -Nur u-boot-2006-04-18-1106/board/akita/Makefile u-boot-2006-04-18-1106-new/board/akita/Makefile ---- u-boot-2006-04-18-1106/board/akita/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/Makefile 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,51 @@ -+# -+# board/akita/Makefile -+# -+# (C) Copyright 2006 Alexander Chukov -+# -+# (C) Copyright 2000 -+# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+# -+# See file CREDITS for list of people who contributed to this -+# project. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = lib$(BOARD).a -+ -+OBJS := akita.o nand.o kbd.o -+SOBJS := lowlevel_init.o -+ -+$(LIB): $(OBJS) $(SOBJS) -+ $(AR) crv $@ $(OBJS) $(SOBJS) -+ -+clean: -+ rm -f $(SOBJS) $(OBJS) -+ -+distclean: clean -+ rm -f $(LIB) core *.bak .depend -+ -+######################################################################### -+ -+.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) -+ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ -+ -+-include .depend -+ -+######################################################################### -diff -Nur u-boot-2006-04-18-1106/board/akita/akita.c u-boot-2006-04-18-1106-new/board/akita/akita.c ---- u-boot-2006-04-18-1106/board/akita/akita.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/akita.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,89 @@ -+/* -+ * board/akita/akita.c -+ * -+ * Configuration settings for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+void set_turbo_mode(void); -+ -+/* ------------------------------------------------------------------------- */ -+ -+/* -+ * Miscellaneous platform dependent initialisations -+ */ -+ -+int board_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ /* memory and cpu-speed are setup before relocation */ -+ /* so we do _nothing_ here */ -+ -+ /* arch number of Sharp Zaurus Akita : MACH_TYPE_AKITA */ -+ gd->bd->bi_arch_number = 744; -+ -+ /* adress of boot parameters */ -+ gd->bd->bi_boot_params = 0xa0000100; -+ -+ /* set cpu turbo mode */ -+ set_turbo_mode(); -+ -+ spitzkbd_init(); -+ -+ return 0; -+} -+ -+int board_late_init(void) -+{ -+ setenv("stdout", "serial"); -+ setenv("stderr", "serial"); -+ return 0; -+} -+ -+ -+int dram_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; -+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; -+ gd->bd->bi_dram[1].start = PHYS_SDRAM_2; -+ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; -+ gd->bd->bi_dram[2].start = PHYS_SDRAM_3; -+ gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; -+ gd->bd->bi_dram[3].start = PHYS_SDRAM_4; -+ gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; -+ -+ return 0; -+} -diff -Nur u-boot-2006-04-18-1106/board/akita/config.mk u-boot-2006-04-18-1106-new/board/akita/config.mk ---- u-boot-2006-04-18-1106/board/akita/config.mk 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/config.mk 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1 @@ -+TEXT_BASE = 0xa3000000 -diff -Nur u-boot-2006-04-18-1106/board/akita/kbd.c u-boot-2006-04-18-1106-new/board/akita/kbd.c ---- u-boot-2006-04-18-1106/board/akita/kbd.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/kbd.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,261 @@ -+/* -+ * board/akita/kbd.c -+ * -+ * Keyboard driver for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from: -+ * -+ * linux/drivers/input/keyboard/spitzkbd.c -+ * -+ * Keyboard driver for Sharp Spitz, Borzoi and Akita (SL-Cxx00 series) -+ * -+ * Copyright (C) 2005 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define GPIO_DFLT_LOW 0x400 -+#define GPIO_DFLT_HIGH 0x800 -+ -+void pxa_gpio_mode(int gpio_mode) -+{ -+ int gpio = gpio_mode & GPIO_MD_MASK_NR; -+ int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; -+ int gafr; -+ -+ if (gpio_mode & GPIO_DFLT_LOW) -+ GPCR(gpio) = GPIO_bit(gpio); -+ else if (gpio_mode & GPIO_DFLT_HIGH) -+ GPSR(gpio) = GPIO_bit(gpio); -+ if (gpio_mode & GPIO_MD_MASK_DIR) -+ GPDR(gpio) |= GPIO_bit(gpio); -+ else -+ GPDR(gpio) &= ~GPIO_bit(gpio); -+ gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); -+ GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); -+} -+ -+#define SPITZ_KEY_STROBE_NUM (11) -+#define SPITZ_KEY_SENSE_NUM (7) -+ -+#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000 -+#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000 -+#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000 -+#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880 -+#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000 -+#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4 -+#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000 -+#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000 -+ -+#define SPITZ_GPIO_KEY_STROBE0 88 -+#define SPITZ_GPIO_KEY_STROBE1 23 -+#define SPITZ_GPIO_KEY_STROBE2 24 -+#define SPITZ_GPIO_KEY_STROBE3 25 -+#define SPITZ_GPIO_KEY_STROBE4 26 -+#define SPITZ_GPIO_KEY_STROBE5 27 -+#define SPITZ_GPIO_KEY_STROBE6 52 -+#define SPITZ_GPIO_KEY_STROBE7 103 -+#define SPITZ_GPIO_KEY_STROBE8 107 -+#define SPITZ_GPIO_KEY_STROBE9 108 -+#define SPITZ_GPIO_KEY_STROBE10 114 -+ -+#define SPITZ_GPIO_KEY_SENSE0 12 -+#define SPITZ_GPIO_KEY_SENSE1 17 -+#define SPITZ_GPIO_KEY_SENSE2 91 -+#define SPITZ_GPIO_KEY_SENSE3 34 -+#define SPITZ_GPIO_KEY_SENSE4 36 -+#define SPITZ_GPIO_KEY_SENSE5 38 -+#define SPITZ_GPIO_KEY_SENSE6 39 -+ -+#define SPITZ_GPIO_ON_KEY (95) -+ -+#define KB_ROWS 7 -+#define KB_COLS 11 -+#define KB_ROWMASK(r) (1 << (r)) -+#define SCANCODE(r,c) (((r)<<4) + (c) + 1) -+#define NR_SCANCODES ((KB_ROWS<<4) + 1) -+ -+#define SCAN_INTERVAL (50) /* ms */ -+#define HINGE_SCAN_INTERVAL (150) /* ms */ -+ -+#define KB_DISCHARGE_DELAY 10 -+#define KB_ACTIVATE_DELAY 10 -+ -+static int spitz_strobes[] = { -+ SPITZ_GPIO_KEY_STROBE0, -+ SPITZ_GPIO_KEY_STROBE1, -+ SPITZ_GPIO_KEY_STROBE2, -+ SPITZ_GPIO_KEY_STROBE3, -+ SPITZ_GPIO_KEY_STROBE4, -+ SPITZ_GPIO_KEY_STROBE5, -+ SPITZ_GPIO_KEY_STROBE6, -+ SPITZ_GPIO_KEY_STROBE7, -+ SPITZ_GPIO_KEY_STROBE8, -+ SPITZ_GPIO_KEY_STROBE9, -+ SPITZ_GPIO_KEY_STROBE10, -+}; -+ -+static int spitz_senses[] = { -+ SPITZ_GPIO_KEY_SENSE0, -+ SPITZ_GPIO_KEY_SENSE1, -+ SPITZ_GPIO_KEY_SENSE2, -+ SPITZ_GPIO_KEY_SENSE3, -+ SPITZ_GPIO_KEY_SENSE4, -+ SPITZ_GPIO_KEY_SENSE5, -+ SPITZ_GPIO_KEY_SENSE6, -+}; -+ -+static inline void spitzkbd_discharge_all(void) -+{ -+ /* STROBE All HiZ */ -+ GPCR0 = SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; -+ GPCR1 = SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; -+ GPCR2 = SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; -+ GPCR3 = SPITZ_GPIO_G3_STROBE_BIT; -+ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; -+} -+ -+static inline void spitzkbd_activate_all(void) -+{ -+ /* STROBE ALL -> High */ -+ GPSR0 = SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR0 |= SPITZ_GPIO_G0_STROBE_BIT; -+ GPSR1 = SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR1 |= SPITZ_GPIO_G1_STROBE_BIT; -+ GPSR2 = SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR2 |= SPITZ_GPIO_G2_STROBE_BIT; -+ GPSR3 = SPITZ_GPIO_G3_STROBE_BIT; -+ GPDR3 |= SPITZ_GPIO_G3_STROBE_BIT; -+ -+ udelay(KB_DISCHARGE_DELAY); -+} -+ -+static inline void spitzkbd_activate_col(int col) -+{ -+ int gpio = spitz_strobes[col]; -+ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; -+ GPSR(gpio) = GPIO_bit(gpio); -+ GPDR(gpio) |= GPIO_bit(gpio); -+} -+ -+static inline void spitzkbd_reset_col(int col) -+{ -+ int gpio = spitz_strobes[col]; -+ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; -+ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; -+ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; -+ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; -+ GPCR(gpio) = GPIO_bit(gpio); -+ GPDR(gpio) |= GPIO_bit(gpio); -+} -+ -+static inline int spitzkbd_get_row_status(int col) -+{ -+ return ((GPLR0 >> 12) & 0x01) | ((GPLR0 >> 16) & 0x02) -+ | ((GPLR2 >> 25) & 0x04) | ((GPLR1 << 1) & 0x08) -+ | ((GPLR1 >> 0) & 0x10) | ((GPLR1 >> 1) & 0x60); -+} -+ -+static int spitzkbd_scankeyboard(void) -+{ -+ unsigned int row, col, rowd; -+ unsigned int num_pressed, pwrkey = ((GPLR(SPITZ_GPIO_ON_KEY) & GPIO_bit(SPITZ_GPIO_ON_KEY)) != 0); -+ int ret = -1; -+ -+ num_pressed = 0; -+ for (col = 0; col < KB_COLS; col++) { -+ spitzkbd_discharge_all(); -+ udelay(KB_DISCHARGE_DELAY); -+ -+ spitzkbd_activate_col(col); -+ udelay(KB_ACTIVATE_DELAY); -+ -+ rowd = spitzkbd_get_row_status(col); -+ for (row = 0; row < KB_ROWS; row++) { -+ unsigned int scancode, pressed; -+ -+ scancode = SCANCODE(row, col); -+ pressed = rowd & KB_ROWMASK(row); -+ -+ if (pressed) -+ ret = scancode; -+ } -+ spitzkbd_reset_col(col); -+ } -+ -+ spitzkbd_activate_all(); -+ -+ if (pwrkey) -+ return -2; -+ -+ return ret; -+} -+ -+void spitzkbd_init(void) -+{ -+ int i; -+ -+ /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ -+ for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) -+ pxa_gpio_mode(spitz_senses[i] | GPIO_IN); -+ -+ /* Set Strobe lines as outputs - set high */ -+ for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++) -+ pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH); -+ -+ pxa_gpio_mode(SPITZ_GPIO_ON_KEY | GPIO_IN); -+} -+ -+int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ int scan; -+ -+ if (argc < 2) -+ return 1; -+ -+ scan = spitzkbd_scankeyboard(); -+ -+ -+// if (scan >= 0) -+// printf("Scan = %d\n", scan); -+// else -+// printf("Nothing!\n"); -+ -+ return !(simple_strtol(argv[1], NULL, 10) == scan); -+} -+ -+U_BOOT_CMD( -+ testkey, 2, 1, do_testkey, -+ "testkey - compare pressed key with arg\n", -+ "" -+); -diff -Nur u-boot-2006-04-18-1106/board/akita/lowlevel_init.S u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S ---- u-boot-2006-04-18-1106/board/akita/lowlevel_init.S 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,135 @@ -+/* -+ * board/akita/lowlevel_init.S -+ * -+ * Configuration settings for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * This was originally from the Lubbock u-boot port and from BLOB with cleanup -+ * -+ * NOTE: I haven't clean this up considerably, just enough to get it -+ * running. See hal_platform_setup.h for the source. See -+ * board/cradle/lowlevel_init.S for another PXA250 setup that is -+ * much cleaner. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+ -+/* wait for coprocessor write complete */ -+ .macro CPWAIT reg -+ mrc p15,0,\reg,c2,c0,0 -+ mov \reg,\reg -+ sub pc,pc,#4 -+ .endm -+ -+/*********** Write out to HEX 7 segment leds *********/ -+ -+#undef DEBUG_HEXLOG -+ -+#ifdef DEBUG_HEXLOG -+#define LEDCTL 0x08000040 -+#define LEDDAT1 0x08000010 -+#define LEDDAT2 0x08000014 -+ -+.macro wait, count -+ mov r10, \count -+0: -+ subs r10, r10, #1 -+ bne 0b -+.endm -+ -+.macro hexlog_init -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ ldr r11, =LEDDAT1 -+ mov r10, #0x0 -+ str r10, [r11] -+.endm -+ -+.macro hexlog, val -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ -+ ldr r11, =LEDDAT1 -+ mov r10, \val -+ str r10, [r11] -+ -+ wait #0x400000 -+.endm -+ -+#else -+ -+.macro hexlog_init -+ nop -+.endm -+ -+.macro hexlog, val -+ nop -+.endm -+ -+#endif -+ -+/***********************************/ -+ -+/* -+ * Memory setup -+ */ -+ -+.globl lowlevel_init -+lowlevel_init: -+ -+ mov pc, lr -+ -+.globl set_turbo_mode -+ -+set_turbo_mode: -+ /* Turn on turbo mode */ -+ mrc p14, 0, r2, c6, c0, 0 -+ orr r2, r2, #0xB /* Turbo, Fast-Bus, Freq change**/ -+ mcr p14, 0, r2, c6, c0, 0 -+ -+ /* Setup vectors */ -+ ldr r0, =TEXT_BASE -+ ldr r1, =TEXT_BASE+0x40 -+ ldr r2, =0x0 -+1: -+ ldr r3, [r0] -+ str r3, [r2] -+ add r0, r0, #4 -+ add r2, r2, #4 -+ cmp r0, r1 -+ bne 1b -+ -+ ldr r0, =0x0 -+ ldr r1, [r0, #4] -+ str r1, [r0] -+ -+ mov pc, lr -diff -Nur u-boot-2006-04-18-1106/board/akita/nand.c u-boot-2006-04-18-1106-new/board/akita/nand.c ---- u-boot-2006-04-18-1106/board/akita/nand.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/nand.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,169 @@ -+/* -+ * board/akita/nand.c -+ * -+ * NAND driver for the Sharp Zaurus SL-Cxx00. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from mtd nand driver: -+ * -+ * drivers/mtd/nand/sharpsl.c -+ * -+ * Copyright (C) 2004 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_NAND) -+ -+#include -+#include -+ -+static int sharpsl_io_base = CFG_NAND_BASE; -+ -+/* register offset */ -+#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */ -+#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */ -+#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */ -+#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */ -+#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */ -+#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */ -+#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */ -+ -+/* Flash control bit */ -+#define FLRYBY (1 << 5) -+#define FLCE1 (1 << 4) -+#define FLWP (1 << 3) -+#define FLALE (1 << 2) -+#define FLCLE (1 << 1) -+#define FLCE0 (1 << 0) -+ -+#define readb(address) *((volatile unsigned char *)(address)) -+#define writeb(v, address) *((volatile unsigned char *)(address))=v -+ -+/* -+ * hardware specific access to control-lines -+ */ -+static void -+sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd) -+{ -+ switch (cmd) { -+ case NAND_CTL_SETCLE: -+ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRCLE: -+ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETALE: -+ writeb(readb(FLASHCTL) | FLALE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRALE: -+ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETNCE: -+ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL); -+ break; -+ case NAND_CTL_CLRNCE: -+ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL); -+ break; -+ } -+} -+ -+static int -+sharpsl_nand_dev_ready(struct mtd_info* mtd) -+{ -+ return !((readb(FLASHCTL) & FLRYBY) == 0); -+} -+ -+static void -+sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode) -+{ -+ writeb(0 ,ECCCLRR); -+} -+ -+static int -+sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat, -+ u_char* ecc_code) -+{ -+ ecc_code[0] = ~readb(ECCLPUB); -+ ecc_code[1] = ~readb(ECCLPLB); -+ ecc_code[2] = (~readb(ECCCP) << 2) | 0x03; -+ return readb(ECCCNTR) != 0; -+} -+ -+static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; -+ -+static struct nand_bbt_descr sharpsl_akita_bbt = { -+ .options = 0, -+ .offs = 4, -+ .len = 1, -+ .pattern = scan_ff_pattern -+}; -+ -+static struct nand_oobinfo akita_oobinfo = { -+ .useecc = MTD_NANDECC_AUTOPLACE, -+ .eccbytes = 24, -+ .eccpos = { -+ 0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11, -+ 0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23, -+ 0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37}, -+ .oobfree = { {0x08, 0x09} } -+}; -+ -+/* -+ * Board-specific NAND initialization. The following members of the -+ * argument are board-specific (per include/linux/mtd/nand.h): -+ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device -+ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device -+ * - hwcontrol: hardwarespecific function for accesing control-lines -+ * - dev_ready: hardwarespecific function for accesing device ready/busy line -+ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must -+ * only be provided if a hardware ECC is available -+ * - eccmode: mode of ecc, see defines -+ * - chip_delay: chip dependent delay for transfering data from array to -+ * read regs (tR) -+ * - options: various chip options. They can partly be set to inform -+ * nand_scan about special functionality. See the defines for further -+ * explanation -+ * Members with a "?" were not set in the merged testing-NAND branch, -+ * so they are not set here either. -+ */ -+void board_nand_init(struct nand_chip *nand) -+{ -+ writeb(readb(FLASHCTL) | FLWP, FLASHCTL); -+ -+ nand->IO_ADDR_R = FLASHIO; -+ nand->IO_ADDR_W = FLASHIO; -+ nand->hwcontrol = sharpsl_nand_hwcontrol; -+ nand->dev_ready = sharpsl_nand_dev_ready; -+ nand->eccmode = NAND_ECC_HW3_256; -+ nand->chip_delay = 15; -+ nand->options = NAND_SAMSUNG_LP_OPTIONS; -+ nand->badblock_pattern = &sharpsl_akita_bbt; -+ nand->autooob = &akita_oobinfo; -+ nand->enable_hwecc = sharpsl_nand_enable_hwecc; -+ nand->calculate_ecc = sharpsl_nand_calculate_ecc; -+ nand->correct_data = nand_correct_data; -+} -+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ -diff -Nur u-boot-2006-04-18-1106/board/akita/u-boot.lds u-boot-2006-04-18-1106-new/board/akita/u-boot.lds ---- u-boot-2006-04-18-1106/board/akita/u-boot.lds 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/akita/u-boot.lds 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,56 @@ -+/* -+ * (C) Copyright 2000 -+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -+OUTPUT_ARCH(arm) -+ENTRY(_start) -+SECTIONS -+{ -+ . = 0x00000000; -+ -+ . = ALIGN(4); -+ .text : -+ { -+ cpu/pxa/start.o (.text) -+ *(.text) -+ } -+ -+ . = ALIGN(4); -+ .rodata : { *(.rodata) } -+ -+ . = ALIGN(4); -+ .data : { *(.data) } -+ -+ . = ALIGN(4); -+ .got : { *(.got) } -+ -+ . = .; -+ __u_boot_cmd_start = .; -+ .u_boot_cmd : { *(.u_boot_cmd) } -+ __u_boot_cmd_end = .; -+ -+ . = ALIGN(4); -+ __bss_start = .; -+ .bss : { *(.bss) } -+ _end = .; -+} -diff -Nur u-boot-2006-04-18-1106/board/corgi/Makefile u-boot-2006-04-18-1106-new/board/corgi/Makefile ---- u-boot-2006-04-18-1106/board/corgi/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/Makefile 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,51 @@ -+# -+# board/corgi/Makefile -+# -+# (C) Copyright 2006 Alexander Chukov -+# -+# (C) Copyright 2000 -+# Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+# -+# See file CREDITS for list of people who contributed to this -+# project. -+# -+# This program is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+# MA 02111-1307 USA -+# -+ -+include $(TOPDIR)/config.mk -+ -+LIB = lib$(BOARD).a -+ -+OBJS := corgi.o nand.o kbd.o -+SOBJS := lowlevel_init.o -+ -+$(LIB): $(OBJS) $(SOBJS) -+ $(AR) crv $@ $(OBJS) $(SOBJS) -+ -+clean: -+ rm -f $(SOBJS) $(OBJS) -+ -+distclean: clean -+ rm -f $(LIB) core *.bak .depend -+ -+######################################################################### -+ -+.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) -+ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ -+ -+-include .depend -+ -+######################################################################### -diff -Nur u-boot-2006-04-18-1106/board/corgi/config.mk u-boot-2006-04-18-1106-new/board/corgi/config.mk ---- u-boot-2006-04-18-1106/board/corgi/config.mk 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/config.mk 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1 @@ -+TEXT_BASE = 0xa1000000 -diff -Nur u-boot-2006-04-18-1106/board/corgi/corgi.c u-boot-2006-04-18-1106-new/board/corgi/corgi.c ---- u-boot-2006-04-18-1106/board/corgi/corgi.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/corgi.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,87 @@ -+/* -+ * board/corgi/corgi.c -+ * -+ * Configuration settings for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+/* ------------------------------------------------------------------------- */ -+ -+/* -+ * Miscellaneous platform dependent initialisations -+ */ -+ -+int board_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ /* memory and cpu-speed are setup before relocation */ -+ /* so we do _nothing_ here */ -+ -+ /* arch number of Sharp Zaurus Corgi : MACH_TYPE_CORGI */ -+ gd->bd->bi_arch_number = 423; -+ -+ /* adress of boot parameters */ -+ gd->bd->bi_boot_params = 0xa0000100; -+ -+ /* set cpu turbo mode */ -+ set_turbo_mode(); -+ -+ corgikbd_init(); -+ -+ return 0; -+} -+ -+int board_late_init(void) -+{ -+ setenv("stdout", "serial"); -+ setenv("stderr", "serial"); -+ return 0; -+} -+ -+ -+int dram_init (void) -+{ -+ DECLARE_GLOBAL_DATA_PTR; -+ -+ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; -+ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; -+ gd->bd->bi_dram[1].start = PHYS_SDRAM_2; -+ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; -+ gd->bd->bi_dram[2].start = PHYS_SDRAM_3; -+ gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; -+ gd->bd->bi_dram[3].start = PHYS_SDRAM_4; -+ gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; -+ -+ return 0; -+} -diff -Nur u-boot-2006-04-18-1106/board/corgi/kbd.c u-boot-2006-04-18-1106-new/board/corgi/kbd.c ---- u-boot-2006-04-18-1106/board/corgi/kbd.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/kbd.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,202 @@ -+/* -+ * board/corgi/kbd.c -+ * -+ * Keyboard driver for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from: -+ * -+ * linux/drivers/input/keyboard/spitzkbd.c -+ * -+ * Keyboard driver for Sharp Corgi models (SL-C7xx) -+ * -+ * Copyright (C) 2005 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#define GPIO_DFLT_LOW 0x400 -+#define GPIO_DFLT_HIGH 0x800 -+ -+void pxa_gpio_mode(int gpio_mode) -+{ -+ int gpio = gpio_mode & GPIO_MD_MASK_NR; -+ int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; -+ int gafr; -+ -+ if (gpio_mode & GPIO_DFLT_LOW) -+ GPCR(gpio) = GPIO_bit(gpio); -+ else if (gpio_mode & GPIO_DFLT_HIGH) -+ GPSR(gpio) = GPIO_bit(gpio); -+ if (gpio_mode & GPIO_MD_MASK_DIR) -+ GPDR(gpio) |= GPIO_bit(gpio); -+ else -+ GPDR(gpio) &= ~GPIO_bit(gpio); -+ gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); -+ GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); -+} -+ -+/* -+ * Corgi Keyboard Definitions -+ */ -+#define CORGI_KEY_STROBE_NUM (12) -+#define CORGI_KEY_SENSE_NUM (8) -+#define CORGI_GPIO_ALL_STROBE_BIT (0x00003ffc) -+#define CORGI_GPIO_HIGH_SENSE_BIT (0xfc000000) -+#define CORGI_GPIO_HIGH_SENSE_RSHIFT (26) -+#define CORGI_GPIO_LOW_SENSE_BIT (0x00000003) -+#define CORGI_GPIO_LOW_SENSE_LSHIFT (6) -+#define CORGI_GPIO_STROBE_BIT(a) GPIO_bit(66+(a)) -+#define CORGI_GPIO_SENSE_BIT(a) GPIO_bit(58+(a)) -+#define CORGI_GAFR_ALL_STROBE_BIT (0x0ffffff0) -+#define CORGI_GAFR_HIGH_SENSE_BIT (0xfff00000) -+#define CORGI_GAFR_LOW_SENSE_BIT (0x0000000f) -+#define CORGI_GPIO_KEY_SENSE(a) (58+(a)) -+#define CORGI_GPIO_KEY_STROBE(a) (66+(a)) -+ -+#define CORGI_GPIO_AK_INT (4) /* Headphone Jack Control Interrupt */ -+ -+#define KB_ROWS 8 -+#define KB_COLS 12 -+#define KB_ROWMASK(r) (1 << (r)) -+#define SCANCODE(r,c) ( ((r)<<4) + (c) + 1 ) -+/* zero code, 124 scancodes */ -+#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 ) -+ -+#define SCAN_INTERVAL (50) /* ms */ -+#define HINGE_SCAN_INTERVAL (250) /* ms */ -+ -+#define KB_DISCHARGE_DELAY 10 -+#define KB_ACTIVATE_DELAY 10 -+ -+static inline void corgikbd_discharge_all(void) -+{ -+ /* STROBE All HiZ */ -+ GPCR2 = CORGI_GPIO_ALL_STROBE_BIT; -+ GPDR2 &= ~CORGI_GPIO_ALL_STROBE_BIT; -+} -+ -+static inline void corgikbd_activate_all(void) -+{ -+ /* STROBE ALL -> High */ -+ GPSR2 = CORGI_GPIO_ALL_STROBE_BIT; -+ GPDR2 |= CORGI_GPIO_ALL_STROBE_BIT; -+ -+ udelay(KB_DISCHARGE_DELAY); -+ -+ /* Clear any interrupts we may have triggered when altering the GPIO lines */ -+ GEDR1 = CORGI_GPIO_HIGH_SENSE_BIT; -+ GEDR2 = CORGI_GPIO_LOW_SENSE_BIT; -+} -+ -+static inline void corgikbd_activate_col(int col) -+{ -+ /* STROBE col -> High, not col -> HiZ */ -+ GPSR2 = CORGI_GPIO_STROBE_BIT(col); -+ GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col); -+} -+ -+static inline void corgikbd_reset_col(int col) -+{ -+ /* STROBE col -> Low */ -+ GPCR2 = CORGI_GPIO_STROBE_BIT(col); -+ /* STROBE col -> out, not col -> HiZ */ -+ GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col); -+} -+ -+#define GET_ROWS_STATUS(c) (((GPLR1 & CORGI_GPIO_HIGH_SENSE_BIT) >> CORGI_GPIO_HIGH_SENSE_RSHIFT) | ((GPLR2 & CORGI_GPIO_LOW_SENSE_BIT) << CORGI_GPIO_LOW_SENSE_LSHIFT)) -+ -+static int corgikbd_scankeyboard(void) -+{ -+ unsigned int row, col, rowd; -+ unsigned int num_pressed; -+ int ret = -1; -+ -+ num_pressed = 0; -+ for (col = 0; col < KB_COLS; col++) { -+ corgikbd_discharge_all(); -+ udelay(KB_DISCHARGE_DELAY); -+ -+ corgikbd_activate_col(col); -+ udelay(KB_ACTIVATE_DELAY); -+ -+ rowd = GET_ROWS_STATUS(col); -+ for (row = 0; row < KB_ROWS; row++) { -+ unsigned int scancode, pressed; -+ -+ scancode = SCANCODE(row, col); -+ pressed = rowd & KB_ROWMASK(row); -+ -+ if (pressed) -+ ret = scancode; -+ } -+ corgikbd_reset_col(col); -+ } -+ -+ corgikbd_activate_all(); -+ -+ return ret; -+} -+ -+void corgikbd_init(void) -+{ -+ int i; -+ -+ /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ -+ for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) -+ pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN); -+ -+ /* Set Strobe lines as outputs - set high */ -+ for (i = 0; i < CORGI_KEY_STROBE_NUM; i++) -+ pxa_gpio_mode(CORGI_GPIO_KEY_STROBE(i) | GPIO_OUT | GPIO_DFLT_HIGH); -+ -+ /* Setup the headphone jack as an input */ -+ pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN); -+} -+ -+int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) -+{ -+ int scan; -+ -+ if (argc < 2) -+ return 1; -+ -+ scan = corgikbd_scankeyboard(); -+ -+ -+// if (scan >= 0) -+// printf("Scan = %d\n", scan); -+// else -+// printf("Nothing!\n"); -+ -+ return !(simple_strtol(argv[1], NULL, 10) == scan); -+} -+ -+U_BOOT_CMD( -+ testkey, 2, 1, do_testkey, -+ "testkey - compare pressed key with arg\n", -+ "" -+); -diff -Nur u-boot-2006-04-18-1106/board/corgi/lowlevel_init.S u-boot-2006-04-18-1106-new/board/corgi/lowlevel_init.S ---- u-boot-2006-04-18-1106/board/corgi/lowlevel_init.S 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/lowlevel_init.S 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,136 @@ -+/* -+ * board/corgi/lowlevel_init.S -+ * -+ * Configuration settings for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * This was originally from the Lubbock u-boot port and from BLOB with cleanup -+ * -+ * NOTE: I haven't clean this up considerably, just enough to get it -+ * running. See hal_platform_setup.h for the source. See -+ * board/cradle/lowlevel_init.S for another PXA250 setup that is -+ * much cleaner. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+#include -+#include -+ -+/* wait for coprocessor write complete */ -+ .macro CPWAIT reg -+ mrc p15,0,\reg,c2,c0,0 -+ mov \reg,\reg -+ sub pc,pc,#4 -+ .endm -+ -+/*********** Write out to HEX 7 segment leds *********/ -+ -+#undef DEBUG_HEXLOG -+ -+#ifdef DEBUG_HEXLOG -+#define LEDCTL 0x08000040 -+#define LEDDAT1 0x08000010 -+#define LEDDAT2 0x08000014 -+ -+.macro wait, count -+ mov r10, \count -+0: -+ subs r10, r10, #1 -+ bne 0b -+.endm -+ -+.macro hexlog_init -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ ldr r11, =LEDDAT1 -+ mov r10, #0x0 -+ str r10, [r11] -+.endm -+ -+.macro hexlog, val -+ ldr r11, =LEDCTL -+ mov r10, #0xff -+ str r10, [r11] -+ ldr r11, =LEDDAT2 -+ mov r10, #0xFFFFFFFF -+ str r10, [r11] -+ -+ ldr r11, =LEDDAT1 -+ mov r10, \val -+ str r10, [r11] -+ -+ wait #0x400000 -+.endm -+ -+#else -+ -+.macro hexlog_init -+ nop -+.endm -+ -+.macro hexlog, val -+ nop -+.endm -+ -+#endif -+ -+/***********************************/ -+ -+/* -+ * Memory setup -+ */ -+ -+.globl lowlevel_init -+lowlevel_init: -+ -+ mov pc, lr -+ -+.globl set_turbo_mode -+ -+set_turbo_mode: -+ /* Turn on turbo mode */ -+ mrc p14, 0, r2, c6, c0, 0 -+ orr r2, r2, #0x3 /* Turbo, Freq change */ -+ mcr p14, 0, r2, c6, c0, 0 -+ -+ -+ /* Setup vectors */ -+ ldr r0, =TEXT_BASE -+ ldr r1, =TEXT_BASE+0x40 -+ ldr r2, =0x0 -+1: -+ ldr r3, [r0] -+ str r3, [r2] -+ add r0, r0, #4 -+ add r2, r2, #4 -+ cmp r0, r1 -+ bne 1b -+ -+ ldr r0, =0x0 -+ ldr r1, [r0, #4] -+ str r1, [r0] -+ -+ mov pc, lr -diff -Nur u-boot-2006-04-18-1106/board/corgi/nand.c u-boot-2006-04-18-1106-new/board/corgi/nand.c ---- u-boot-2006-04-18-1106/board/corgi/nand.c 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/nand.c 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,157 @@ -+/* -+ * board/corgi/nand.c -+ * -+ * NAND driver for the Sharp Zaurus SL-C7x0/860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from mtd nand driver: -+ * -+ * drivers/mtd/nand/sharpsl.c -+ * -+ * Copyright (C) 2004 Richard Purdie -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_NAND) -+ -+#include -+#include -+ -+static int sharpsl_io_base = CFG_NAND_BASE; -+ -+/* register offset */ -+#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */ -+#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */ -+#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */ -+#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */ -+#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */ -+#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */ -+#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */ -+ -+/* Flash control bit */ -+#define FLRYBY (1 << 5) -+#define FLCE1 (1 << 4) -+#define FLWP (1 << 3) -+#define FLALE (1 << 2) -+#define FLCLE (1 << 1) -+#define FLCE0 (1 << 0) -+ -+#define readb(address) *((volatile unsigned char *)(address)) -+#define writeb(v, address) *((volatile unsigned char *)(address))=v -+ -+/* -+ * hardware specific access to control-lines -+ */ -+static void -+sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd) -+{ -+ switch (cmd) { -+ case NAND_CTL_SETCLE: -+ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRCLE: -+ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETALE: -+ writeb(readb(FLASHCTL) | FLALE, FLASHCTL); -+ break; -+ case NAND_CTL_CLRALE: -+ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL); -+ break; -+ -+ case NAND_CTL_SETNCE: -+ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL); -+ break; -+ case NAND_CTL_CLRNCE: -+ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL); -+ break; -+ } -+} -+ -+static int -+sharpsl_nand_dev_ready(struct mtd_info* mtd) -+{ -+ return !((readb(FLASHCTL) & FLRYBY) == 0); -+} -+ -+static void -+sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode) -+{ -+ writeb(0 ,ECCCLRR); -+} -+ -+static int -+sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat, -+ u_char* ecc_code) -+{ -+ ecc_code[0] = ~readb(ECCLPUB); -+ ecc_code[1] = ~readb(ECCLPLB); -+ ecc_code[2] = (~readb(ECCCP) << 2) | 0x03; -+ return readb(ECCCNTR) != 0; -+} -+ -+static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; -+ -+static struct nand_bbt_descr sharpsl_bbt = { -+ .options = 0, -+ .offs = 4, -+ .len = 2, -+ .pattern = scan_ff_pattern -+}; -+ -+/* -+ * Board-specific NAND initialization. The following members of the -+ * argument are board-specific (per include/linux/mtd/nand.h): -+ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device -+ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device -+ * - hwcontrol: hardwarespecific function for accesing control-lines -+ * - dev_ready: hardwarespecific function for accesing device ready/busy line -+ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must -+ * only be provided if a hardware ECC is available -+ * - eccmode: mode of ecc, see defines -+ * - chip_delay: chip dependent delay for transfering data from array to -+ * read regs (tR) -+ * - options: various chip options. They can partly be set to inform -+ * nand_scan about special functionality. See the defines for further -+ * explanation -+ * Members with a "?" were not set in the merged testing-NAND branch, -+ * so they are not set here either. -+ */ -+void board_nand_init(struct nand_chip *nand) -+{ -+ writeb(readb(FLASHCTL) | FLWP, FLASHCTL); -+ -+ nand->IO_ADDR_R = FLASHIO; -+ nand->IO_ADDR_W = FLASHIO; -+ nand->hwcontrol = sharpsl_nand_hwcontrol; -+ nand->dev_ready = sharpsl_nand_dev_ready; -+ nand->eccmode = NAND_ECC_HW3_256; -+ nand->chip_delay = 15; -+ nand->badblock_pattern = &sharpsl_bbt; -+ nand->enable_hwecc = sharpsl_nand_enable_hwecc; -+ nand->calculate_ecc = sharpsl_nand_calculate_ecc; -+ nand->correct_data = nand_correct_data; -+} -+#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ -diff -Nur u-boot-2006-04-18-1106/board/corgi/u-boot.lds u-boot-2006-04-18-1106-new/board/corgi/u-boot.lds ---- u-boot-2006-04-18-1106/board/corgi/u-boot.lds 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/board/corgi/u-boot.lds 2006-07-05 11:19:44.000000000 +0000 -@@ -0,0 +1,56 @@ -+/* -+ * (C) Copyright 2000 -+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -+OUTPUT_ARCH(arm) -+ENTRY(_start) -+SECTIONS -+{ -+ . = 0x00000000; -+ -+ . = ALIGN(4); -+ .text : -+ { -+ cpu/pxa/start.o (.text) -+ *(.text) -+ } -+ -+ . = ALIGN(4); -+ .rodata : { *(.rodata) } -+ -+ . = ALIGN(4); -+ .data : { *(.data) } -+ -+ . = ALIGN(4); -+ .got : { *(.got) } -+ -+ . = .; -+ __u_boot_cmd_start = .; -+ .u_boot_cmd : { *(.u_boot_cmd) } -+ __u_boot_cmd_end = .; -+ -+ . = ALIGN(4); -+ __bss_start = .; -+ .bss : { *(.bss) } -+ _end = .; -+} -diff -Nur u-boot-2006-04-18-1106/common/cmd_nand.c u-boot-2006-04-18-1106-new/common/cmd_nand.c ---- u-boot-2006-04-18-1106/common/cmd_nand.c 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/common/cmd_nand.c 2006-07-05 11:19:44.000000000 +0000 -@@ -81,6 +81,63 @@ - return 0; - } - -+#ifdef NAND_LOGICAL -+///////////////////////////////////////////////////////////////////// -+// oob structure -+///////////////////////////////////////////////////////////////////// -+ -+#define NAND_NOOB_LOGADDR_00 8 -+#define NAND_NOOB_LOGADDR_01 9 -+#define NAND_NOOB_LOGADDR_10 10 -+#define NAND_NOOB_LOGADDR_11 11 -+#define NAND_NOOB_LOGADDR_20 12 -+#define NAND_NOOB_LOGADDR_21 13 -+ -+static uint nand_get_logical_no(unsigned char *oob) -+{ -+ unsigned short us,bit; -+ int par; -+ int good0, good1; -+ -+ if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] && -+ oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){ -+ good0 = NAND_NOOB_LOGADDR_00; -+ good1 = NAND_NOOB_LOGADDR_01; -+ }else -+ if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] && -+ oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){ -+ good0 = NAND_NOOB_LOGADDR_10; -+ good1 = NAND_NOOB_LOGADDR_11; -+ }else -+ if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] && -+ oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){ -+ good0 = NAND_NOOB_LOGADDR_20; -+ good1 = NAND_NOOB_LOGADDR_21; -+ }else{ -+ return (uint)-1; -+ } -+ -+ us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) | -+ (((unsigned short)(oob[good1]) & 0x00ff) << 8); -+ -+ par = 0; -+ for(bit = 0x0001; bit != 0; bit <<= 1){ -+ if(us & bit){ -+ par++; -+ } -+ } -+ if(par & 1){ -+ return (uint)-2; -+ } -+ -+ if(us == 0xffff){ -+ return 0xffff; -+ }else{ -+ return ((us & 0x07fe) >> 1); -+ } -+} -+#endif -+ - /* ------------------------------------------------------------------------- */ - - static void -@@ -245,6 +302,55 @@ - if (off == 0 && size == 0) - return 1; - -+#ifdef NAND_LOGICAL -+ s = strchr(cmd, '.'); -+ if (s != NULL) { -+ if (strcmp(s, ".logical") == 0) { -+ int blocks = NAND_LOGICAL_SIZE / nand->erasesize; -+ ulong *log2phy = malloc(blocks * sizeof(ulong)); -+ u_char *oobuf = malloc(nand->oobblock + nand->oobsize); -+ int i; -+ ulong offset; -+ ret = 1; -+ for (i = 0; i < blocks; i++) -+ log2phy[i] = (uint) -1; -+ offset = 0; -+ for (i = 0; i < blocks; i++) { -+ ret = nand_read_raw(nand, oobuf, offset, nand->oobblock, nand->oobsize); -+ if (!ret) { -+ int log_no = nand_get_logical_no(oobuf + nand->oobblock); -+ if (((int)log_no >= 0) && (log_no < blocks)) { -+ log2phy[log_no] = offset; -+ //printf("NAND logical - %08X -> %04X\n", offset, log_no); -+ } -+ } -+ offset += nand->erasesize; -+ } -+ -+ for (i = 0; i < size / nand->erasesize; i++) { -+ ulong sz = nand->erasesize; -+ offset = log2phy[off / nand->erasesize]; -+ if ((int)offset < 0) { -+ printf("NAND logical - offset %08X not found\n", off); -+ return 1; -+ } -+ //printf("NAND logical - %04X -> %08X\n", off / nand->erasesize, offset); -+ ret = nand_read(nand, offset, &sz, (u_char *)addr); -+ if (ret) { -+ printf("NAND logical - offset %08X, read error\n", off); -+ return 1; -+ } -+ off += nand->erasesize; -+ addr += nand->erasesize; -+ } -+ printf(" %d bytes read from NAND logical\n", size); -+ free(oobuf); -+ free(log2phy); -+ return ret == 0 ? 0 : 1; -+ } -+ } -+#endif -+ - i = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */ - printf("\nNAND %s: device %d offset %u, size %u ... ", - i ? "read" : "write", nand_curr_device, off, size); -diff -Nur u-boot-2006-04-18-1106/cpu/pxa/config.mk u-boot-2006-04-18-1106-new/cpu/pxa/config.mk ---- u-boot-2006-04-18-1106/cpu/pxa/config.mk 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/cpu/pxa/config.mk 2006-07-05 11:19:44.000000000 +0000 -@@ -22,8 +22,7 @@ - # MA 02111-1307 USA - # - --PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -- -msoft-float -+PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 -fomit-frame-pointer - - #PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100 - PLATFORM_CPPFLAGS += -march=armv5 -mtune=xscale -@@ -32,5 +31,5 @@ - # Supply options according to compiler version - # - # ======================================================================== --PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) -+#PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) - PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -diff -Nur u-boot-2006-04-18-1106/cpu/pxa/start.S u-boot-2006-04-18-1106-new/cpu/pxa/start.S ---- u-boot-2006-04-18-1106/cpu/pxa/start.S 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/cpu/pxa/start.S 2006-07-05 11:19:44.000000000 +0000 -@@ -42,6 +42,7 @@ - ldr pc, _irq - ldr pc, _fiq - -+_reset: .word reset - _undefined_instruction: .word undefined_instruction - _software_interrupt: .word software_interrupt - _prefetch_abort: .word prefetch_abort -diff -Nur u-boot-2006-04-18-1106/fs/cramfs/cramfs.c u-boot-2006-04-18-1106-new/fs/cramfs/cramfs.c ---- u-boot-2006-04-18-1106/fs/cramfs/cramfs.c 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/fs/cramfs/cramfs.c 2006-07-05 11:19:44.000000000 +0000 -@@ -44,8 +44,13 @@ - - /* CPU address space offset calculation macro, struct part_info offset is - * device address space offset, so we need to shift it by a device start address. */ -+#if (CONFIG_COMMANDS & CFG_CMD_FLASH) - extern flash_info_t flash_info[]; - #define PART_OFFSET(x) (x->offset + flash_info[x->dev->id->num].start[0]) -+#else -+static struct cramfs_super super_fake; -+#define PART_OFFSET(x) (&super_fake) -+#endif - - static int cramfs_read_super (struct part_info *info) - { -diff -Nur u-boot-2006-04-18-1106/include/asm-arm/arch-pxa/pxa-regs.h u-boot-2006-04-18-1106-new/include/asm-arm/arch-pxa/pxa-regs.h ---- u-boot-2006-04-18-1106/include/asm-arm/arch-pxa/pxa-regs.h 2006-04-18 09:05:03.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/include/asm-arm/arch-pxa/pxa-regs.h 2006-07-05 11:19:44.000000000 +0000 -@@ -1269,15 +1269,16 @@ - #define _GEDR(x) __REG2(0x40E00048, ((x) & 0x60) >> 3) - #define _GAFR(x) __REG2(0x40E00054, ((x) & 0x70) >> 2) - --#define GPLR(x) ((((x) & 0x7f) < 96) ? _GPLR(x) : GPLR3) --#define GPDR(x) ((((x) & 0x7f) < 96) ? _GPDR(x) : GPDR3) --#define GPSR(x) ((((x) & 0x7f) < 96) ? _GPSR(x) : GPSR3) --#define GPCR(x) ((((x) & 0x7f) < 96) ? _GPCR(x) : GPCR3) --#define GRER(x) ((((x) & 0x7f) < 96) ? _GRER(x) : GRER3) --#define GFER(x) ((((x) & 0x7f) < 96) ? _GFER(x) : GFER3) --#define GEDR(x) ((((x) & 0x7f) < 96) ? _GEDR(x) : GEDR3) --#define GAFR(x) ((((x) & 0x7f) < 96) ? _GAFR(x) : \ -- ((((x) & 0x7f) < 112) ? GAFR3_L : GAFR3_U)) -+#define GPLR(x) (*((((x) & 0x7f) < 96) ? &_GPLR(x) : &GPLR3)) -+#define GPDR(x) (*((((x) & 0x7f) < 96) ? &_GPDR(x) : &GPDR3)) -+#define GPSR(x) (*((((x) & 0x7f) < 96) ? &_GPSR(x) : &GPSR3)) -+#define GPCR(x) (*((((x) & 0x7f) < 96) ? &_GPCR(x) : &GPCR3)) -+#define GRER(x) (*((((x) & 0x7f) < 96) ? &_GRER(x) : &GRER3)) -+#define GFER(x) (*((((x) & 0x7f) < 96) ? &_GFER(x) : &GFER3)) -+#define GEDR(x) (*((((x) & 0x7f) < 96) ? &_GEDR(x) : &GEDR3)) -+#define GAFR(x) (*((((x) & 0x7f) < 96) ? &_GAFR(x) : \ -+ ((((x) & 0x7f) < 112) ? &GAFR3_L : &GAFR3_U))) -+ - #else - - #define GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) -diff -Nur u-boot-2006-04-18-1106/include/configs/akita.h u-boot-2006-04-18-1106-new/include/configs/akita.h ---- u-boot-2006-04-18-1106/include/configs/akita.h 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/include/configs/akita.h 2006-07-13 11:00:46.000000000 +0000 -@@ -0,0 +1,324 @@ -+/* -+ * include/configs/akita.h -+ * -+ * Configuration settings for the Sharp Zaurus SL-C1000/C3100. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT -+ -+#undef SKIP_CONFIG_RELOCATE_UBOOT -+ -+#undef CONFIG_HARD_I2C -+ -+/* -+ * High Level Configuration Options -+ * (easy to change) -+ */ -+#define CONFIG_PXA27X 1 /* This is an PXA27x CPU */ -+#define CONFIG_AKITA 1 /* on Sharp Zaurus Akita */ -+//#define CONFIG_MMC 1 -+#define BOARD_LATE_INIT 1 -+ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+ -+#define RTC 1 -+ -+/* -+ * Size of malloc() pool -+ */ -+//#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) -+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) -+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+/* -+ * select serial console configuration -+ */ -+#define CONFIG_FFUART 1 /* we use FFUART on Mainstone */ -+ -+/* allow to overwrite serial and ethaddr */ -+#define CONFIG_BAUDRATE 115200 -+//#define CONFIG_DOS_PARTITION 1 -+ -+#undef CONFIG_SHOW_BOOT_PROGRESS -+ -+#if 1 -+#define CONFIG_BOOTDELAY 1 -+#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" -+ -+#define CONFIG_BOOTCOMMAND \ -+ "if testkey 101 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 2 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 18 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 3 ; " \ -+ "then " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ -+ "bootm; " -+#else -+#define CONFIG_BOOTCOMMAND "" // "run boot_flash" -+#endif -+ -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_INITRD_TAG 1 -+ -+#define CONFIG_COMMANDS (( \ -+ CONFIG_CMD_DFL | \ -+ CFG_CMD_NAND | \ -+ CFG_CMD_JFFS2 \ -+ ) & ~( \ -+ CFG_CMD_NET | \ -+ CFG_CMD_FLASH | \ -+ CFG_CMD_IMLS \ -+ )) -+ -+// CFG_CMD_ENV -+ -+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -+#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ -+#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ -+#endif -+ -+/* -+ * Miscellaneous configurable options -+ */ -+#define CFG_HUSH_PARSER 1 -+#define CFG_PROMPT_HUSH_PS2 "> " -+ -+#define CFG_LONGHELP /* undef to save memory */ -+#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+ -+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ -+#define CFG_MAXARGS 16 /* max number of command args */ -+#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -+#define CFG_DEVICE_NULLDEV 1 -+ -+#define CFG_MEMTEST_START 0xa0400000 /* memtest works on */ -+#define CFG_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ -+ -+#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ -+ -+#define CFG_LOAD_ADDR 0xa1000000 /* default load address */ -+ -+#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ -+#define CFG_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ -+ -+ /* valid baudrates */ -+#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -+ -+#define CFG_MMC_BASE 0xF0000000 -+ -+/* -+ * Stack sizes -+ * -+ * The stack sizes are set up in start.S using the settings below -+ */ -+#define CONFIG_STACKSIZE (128*1024) /* regular stack */ -+#ifdef CONFIG_USE_IRQ -+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ -+#endif -+ -+/* -+ * Physical Memory Map -+ */ -+#define CONFIG_NR_DRAM_BANKS 4 /* we have 2 banks of DRAM */ -+#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ -+#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ -+#define PHYS_SDRAM_2 0xa4000000 /* SDRAM Bank #2 */ -+#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_3 0xa8000000 /* SDRAM Bank #3 */ -+#define PHYS_SDRAM_3_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_4 0xac000000 /* SDRAM Bank #4 */ -+#define PHYS_SDRAM_4_SIZE 0x00000000 /* 0 MB */ -+ -+#define PHYS_FLASH_1 0xd4000000 /* Flash Bank #1 */ -+ -+#define CFG_DRAM_BASE 0xa0000000 -+#define CFG_DRAM_SIZE 0x04000000 -+ -+#define CFG_FLASH_BASE PHYS_FLASH_1 -+ -+/* -+ * GPIO settings for Mainstone -+ */ -+ -+#define CFG_GPSR0_VAL 0x00708800 -+#define CFG_GPSR1_VAL 0x03cf0002 -+#define CFG_GPSR2_VAL 0x0021FC00 -+#define CFG_GPSR3_VAL 0x00000000 -+ -+#define CFG_GPCR0_VAL 0x00001000 -+#define CFG_GPCR1_VAL 0x00000000 -+#define CFG_GPCR2_VAL 0x00000000 -+#define CFG_GPCR3_VAL 0x00000000 -+ -+#define CFG_GPDR0_VAL 0xC27B9C04 -+#define CFG_GPDR1_VAL 0x00EFAA83 -+#define CFG_GPDR2_VAL 0x0E23FC00 -+#define CFG_GPDR3_VAL 0x001E1F81 -+ -+#define CFG_GAFR0_L_VAL 0x94F00000 -+#define CFG_GAFR0_U_VAL 0x015A859A -+#define CFG_GAFR1_L_VAL 0x999A955A -+#define CFG_GAFR1_U_VAL 0x0005A4AA -+#define CFG_GAFR2_L_VAL 0x6AA00000 -+#define CFG_GAFR2_U_VAL 0x55A8041A -+#define CFG_GAFR3_L_VAL 0x56AA955A -+#define CFG_GAFR3_U_VAL 0x00000001 -+ -+#define CFG_PSSR_VAL 0x20 // ??????????? -+ -+/* -+ * PCMCIA and CF Interfaces -+ */ -+#define CFG_MECR_VAL 0x00000001 -+#define CFG_MCMEM0_VAL 0x00010204 -+#define CFG_MCMEM1_VAL 0x00010204 -+#define CFG_MCATT0_VAL 0x00010204 -+#define CFG_MCATT1_VAL 0x00010204 -+#define CFG_MCIO0_VAL 0x0000c108 -+#define CFG_MCIO1_VAL 0x0001c108 -+ -+//#define CONFIG_PXA_PCMCIA 1 -+//#define CONFIG_PXA_IDE 1 -+ -+#define CONFIG_PCMCIA_SLOT_A 1 -+/* just to keep build system happy */ -+ -+#define CFG_PCMCIA_MEM_ADDR 0x28000000 -+#define CFG_PCMCIA_MEM_SIZE 0x04000000 -+ -+#define CFG_IDE_MAXBUS 1 -+/* max. 1 IDE bus */ -+#define CFG_IDE_MAXDEVICE 1 -+/* max. 1 drive per IDE bus */ -+ -+#define CFG_ATA_IDE0_OFFSET 0x0000 -+ -+#define CFG_ATA_BASE_ADDR 0x20000000 -+ -+/* Offset for data I/O */ -+#define CFG_ATA_DATA_OFFSET 0x1f0 -+ -+/* Offset for normal register accesses */ -+#define CFG_ATA_REG_OFFSET 0x1f0 -+ -+/* Offset for alternate registers */ -+#define CFG_ATA_ALT_OFFSET 0x3f0 -+ -+#define CFG_NO_FLASH 1 -+#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ -+#define CFG_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ -+ -+/*----------------------------------------------------------------------- -+ * NAND-FLASH stuff -+ *----------------------------------------------------------------------- -+ */ -+#undef CFG_NAND_LEGACY -+ -+/* NAND debugging */ -+//#define CONFIG_MTD_DEBUG -+//#define CONFIG_MTD_DEBUG_VERBOSE 3 -+ -+#define CFG_NAND_BASE 0xd4000000 -+#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define NAND_MAX_CHIPS 1 -+ -+//#define CONFIG_MTD_NAND_VERIFY_WRITE 1 /* verify all writes!!! */ -+//#define CFG_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ -+ -+#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ -+#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ -+ -+/* -+ * JFFS2 partitions -+ * -+ */ -+/* No command line, one static partition */ -+//#undef CONFIG_JFFS2_CMDLINE -+//#define CONFIG_JFFS2_DEV "nand0" -+//#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF -+//#define CONFIG_JFFS2_PART_OFFSET 0x00060000 -+ -+/* mtdparts command line support */ -+/* Note: fake mtd_id used, no linux mtd map file */ -+ -+#define CONFIG_JFFS2_CMDLINE -+#define MTDIDS_DEFAULT "nand0=laze-0" -+//#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" -+#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+ -+/* -+ * SHARP SL NAND logical partition -+ */ -+#define NAND_LOGICAL 1 -+#define NAND_LOGICAL_SIZE 0x700000 -+ -+/* -+ * Environment -+ */ -+ -+#define CFG_ENV_IS_IN_NAND 1 -+#define CFG_ENV_OFFSET 0x40000 -+//#define CFG_ENV_OFFSET_REDUND 0x44000 -+#define CFG_ENV_SIZE 0x20000 -+ -+#endif /* __CONFIG_H */ -diff -Nur u-boot-2006-04-18-1106/include/configs/corgi.h u-boot-2006-04-18-1106-new/include/configs/corgi.h ---- u-boot-2006-04-18-1106/include/configs/corgi.h 1970-01-01 00:00:00.000000000 +0000 -+++ u-boot-2006-04-18-1106-new/include/configs/corgi.h 2006-07-13 11:19:04.000000000 +0000 -@@ -0,0 +1,326 @@ -+/* -+ * include/configs/corgi.h -+ * -+ * Configuration settings for the Sharp Zaurus SL-C7x0/C860. -+ * -+ * (C) Copyright 2006 Alexander Chukov -+ * -+ * portions from adsvix board configuration: -+ * (C) Copyright 2004 -+ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net -+ * (C) Copyright 2002 -+ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net -+ * (C) Copyright 2002 -+ * Sysgo Real-Time Solutions, GmbH -+ * Marius Groeger -+ * -+ * See file CREDITS for list of people who contributed to this -+ * project. -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of -+ * the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, -+ * MA 02111-1307 USA -+ */ -+ -+#ifndef __CONFIG_H -+#define __CONFIG_H -+ -+#define CONFIG_SKIP_LOWLEVEL_INIT -+ -+#undef SKIP_CONFIG_RELOCATE_UBOOT -+ -+#undef CONFIG_HARD_I2C -+ -+/* -+ * High Level Configuration Options -+ * (easy to change) -+ */ -+#define CONFIG_PXA250 1 /* This is an PXA255 CPU */ -+#define CONFIG_CORGI 1 /* on Sharp Zaurus Corgi */ -+//#define CONFIG_MMC 1 -+#define BOARD_LATE_INIT 1 -+ -+#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ -+ -+#define RTC 1 -+ -+/* -+ * Size of malloc() pool -+ */ -+//#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) -+#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) -+#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ -+ -+/* -+ * select serial console configuration -+ */ -+#define CONFIG_FFUART 1 /* we use FFUART on Mainstone */ -+ -+/* allow to overwrite serial and ethaddr */ -+#define CONFIG_BAUDRATE 115200 -+//#define CONFIG_DOS_PARTITION 1 -+ -+#undef CONFIG_SHOW_BOOT_PROGRESS -+ -+#if 1 -+#define CONFIG_BOOTDELAY 1 -+#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" -+ -+#define CONFIG_BOOTCOMMAND \ -+ "if testkey 101 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x00060000 0x00540000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 2 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 18 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "if testkey 3 ; " \ -+ "then " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \ -+ "bootm; " \ -+ "fi; " \ -+ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ -+ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \ -+ "bootm; " -+#else -+#define CONFIG_BOOTCOMMAND "" // "run boot_flash" -+#endif -+ -+#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192" -+#define CONFIG_SETUP_MEMORY_TAGS 1 -+#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -+#define CONFIG_INITRD_TAG 1 -+ -+#define CONFIG_COMMANDS (( \ -+ CONFIG_CMD_DFL | \ -+ CFG_CMD_NAND | \ -+ CFG_CMD_JFFS2 \ -+ ) & ~( \ -+ CFG_CMD_NET | \ -+ CFG_CMD_FLASH | \ -+ CFG_CMD_IMLS \ -+ )) -+ -+// CFG_CMD_ENV -+ -+/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ -+#include -+ -+ -+#if (CONFIG_COMMANDS & CFG_CMD_KGDB) -+#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ -+#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ -+#endif -+ -+/* -+ * Miscellaneous configurable options -+ */ -+#define CFG_HUSH_PARSER 1 -+#define CFG_PROMPT_HUSH_PS2 "> " -+ -+#define CFG_LONGHELP /* undef to save memory */ -+#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ -+ -+#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ -+#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ -+#define CFG_MAXARGS 16 /* max number of command args */ -+#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ -+#define CFG_DEVICE_NULLDEV 1 -+ -+#define CFG_MEMTEST_START 0xa0400000 /* memtest works on */ -+#define CFG_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ -+ -+#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ -+ -+#define CFG_LOAD_ADDR 0xa0800000 /* default load address */ -+ -+#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ -+#define CFG_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ -+ -+ /* valid baudrates */ -+#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } -+ -+#define CFG_MMC_BASE 0xF0000000 -+ -+/* -+ * Stack sizes -+ * -+ * The stack sizes are set up in start.S using the settings below -+ */ -+#define CONFIG_STACKSIZE (128*1024) /* regular stack */ -+#ifdef CONFIG_USE_IRQ -+#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ -+#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ -+#endif -+ -+/* -+ * Physical Memory Map -+ */ -+#define CONFIG_NR_DRAM_BANKS 4 /* we have 2 banks of DRAM */ -+#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ -+#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ -+#define PHYS_SDRAM_2 0xa4000000 /* SDRAM Bank #2 */ -+#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_3 0xa8000000 /* SDRAM Bank #3 */ -+#define PHYS_SDRAM_3_SIZE 0x00000000 /* 0 MB */ -+#define PHYS_SDRAM_4 0xac000000 /* SDRAM Bank #4 */ -+#define PHYS_SDRAM_4_SIZE 0x00000000 /* 0 MB */ -+ -+#define PHYS_FLASH_1 0xd4000000 /* Flash Bank #1 */ -+ -+#define CFG_DRAM_BASE 0xa0000000 -+#define CFG_DRAM_SIZE 0x04000000 -+ -+#define CFG_FLASH_BASE PHYS_FLASH_1 -+ -+/* -+ * GPIO settings for Mainstone -+ */ -+ -+#define CFG_GPSR0_VAL 0x00708800 -+#define CFG_GPSR1_VAL 0x03cf0002 -+#define CFG_GPSR2_VAL 0x0021FC00 -+#define CFG_GPSR3_VAL 0x00000000 -+ -+#define CFG_GPCR0_VAL 0x00001000 -+#define CFG_GPCR1_VAL 0x00000000 -+#define CFG_GPCR2_VAL 0x00000000 -+#define CFG_GPCR3_VAL 0x00000000 -+ -+#define CFG_GPDR0_VAL 0xC27B9C04 -+#define CFG_GPDR1_VAL 0x00EFAA83 -+#define CFG_GPDR2_VAL 0x0E23FC00 -+#define CFG_GPDR3_VAL 0x001E1F81 -+ -+#define CFG_GAFR0_L_VAL 0x94F00000 -+#define CFG_GAFR0_U_VAL 0x015A859A -+#define CFG_GAFR1_L_VAL 0x999A955A -+#define CFG_GAFR1_U_VAL 0x0005A4AA -+#define CFG_GAFR2_L_VAL 0x6AA00000 -+#define CFG_GAFR2_U_VAL 0x55A8041A -+#define CFG_GAFR3_L_VAL 0x56AA955A -+#define CFG_GAFR3_U_VAL 0x00000001 -+ -+#define CFG_PSSR_VAL 0x20 // ??????????? -+ -+/* -+ * PCMCIA and CF Interfaces -+ */ -+#define CFG_MECR_VAL 0x00000001 -+#define CFG_MCMEM0_VAL 0x00010204 -+#define CFG_MCMEM1_VAL 0x00010204 -+#define CFG_MCATT0_VAL 0x00010204 -+#define CFG_MCATT1_VAL 0x00010204 -+#define CFG_MCIO0_VAL 0x0000c108 -+#define CFG_MCIO1_VAL 0x0001c108 -+ -+//#define CONFIG_PXA_PCMCIA 1 -+//#define CONFIG_PXA_IDE 1 -+ -+#define CONFIG_PCMCIA_SLOT_A 1 -+/* just to keep build system happy */ -+ -+#define CFG_PCMCIA_MEM_ADDR 0x28000000 -+#define CFG_PCMCIA_MEM_SIZE 0x04000000 -+ -+#define CFG_IDE_MAXBUS 1 -+/* max. 1 IDE bus */ -+#define CFG_IDE_MAXDEVICE 1 -+/* max. 1 drive per IDE bus */ -+ -+#define CFG_ATA_IDE0_OFFSET 0x0000 -+ -+#define CFG_ATA_BASE_ADDR 0x20000000 -+ -+/* Offset for data I/O */ -+#define CFG_ATA_DATA_OFFSET 0x1f0 -+ -+/* Offset for normal register accesses */ -+#define CFG_ATA_REG_OFFSET 0x1f0 -+ -+/* Offset for alternate registers */ -+#define CFG_ATA_ALT_OFFSET 0x3f0 -+ -+#define CFG_NO_FLASH 1 -+#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ -+#define CFG_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ -+ -+/*----------------------------------------------------------------------- -+ * NAND-FLASH stuff -+ *----------------------------------------------------------------------- -+ */ -+#undef CFG_NAND_LEGACY -+ -+/* NAND debugging */ -+//#define CONFIG_MTD_DEBUG -+//#define CONFIG_MTD_DEBUG_VERBOSE 3 -+ -+#define CFG_NAND_BASE 0xd4000000 -+#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ -+#define NAND_MAX_CHIPS 1 -+ -+//#define CONFIG_MTD_NAND_VERIFY_WRITE 1 /* verify all writes!!! */ -+//#define CFG_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ -+ -+#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ -+#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ -+ -+#define NAND_ALLOW_ERASE_ALL 1 -+ -+/* -+ * JFFS2 partitions -+ * -+ */ -+/* No command line, one static partition */ -+//#undef CONFIG_JFFS2_CMDLINE -+//#define CONFIG_JFFS2_DEV "nand0" -+//#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF -+//#define CONFIG_JFFS2_PART_OFFSET 0x00060000 -+ -+/* mtdparts command line support */ -+/* Note: fake mtd_id used, no linux mtd map file */ -+ -+#define CONFIG_JFFS2_CMDLINE -+#define MTDIDS_DEFAULT "nand0=laze-0" -+//#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" -+#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" -+ -+/* -+ * SHARP SL NAND logical partition -+ */ -+#define NAND_LOGICAL 1 -+#define NAND_LOGICAL_SIZE 0x700000 -+ -+/* -+ * Environment -+ */ -+ -+#define CFG_ENV_IS_IN_NAND 1 -+#define CFG_ENV_OFFSET 0x40000 -+//#define CFG_ENV_OFFSET_REDUND 0x44000 -+#define CFG_ENV_SIZE 0x20000 -+ -+#endif /* __CONFIG_H */ ---- s/examples/Makefile.orig 2006-12-09 15:08:45.000000000 +0600 -+++ s/examples/Makefile 2006-12-09 15:09:00.000000000 +0600 -@@ -60,7 +60,7 @@ - include $(TOPDIR)/config.mk - - SREC = hello_world.srec --BIN = hello_world.bin hello_world -+BIN = hello_world hello_world.bin - - ifeq ($(CPU),mpc8xx) - SREC = test_burst.srec -@@ -122,7 +122,7 @@ - - CPPFLAGS += -I.. - --all: .depend $(OBJS) $(LIB) $(SREC) $(BIN) -+all: .depend $(OBJS) $(LIB) $(BIN) $(SREC) - - ######################################################################### - $(LIB): .depend $(LIBOBJS) diff --git a/packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch b/packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch deleted file mode 100644 index 858296b980..0000000000 --- a/packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch +++ /dev/null @@ -1,94 +0,0 @@ -Index: git/lib_arm/div0.c -=================================================================== ---- git.orig/lib_arm/div0.c -+++ git/lib_arm/div0.c -@@ -22,9 +22,3 @@ - */ - - /* Replacement (=dummy) for GNU/Linux division-by zero handler */ --void __div0 (void) --{ -- extern void hang (void); -- -- hang(); --} -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -225,7 +225,7 @@ LIBS := $(addprefix $(obj),$(LIBS)) - .PHONY : $(LIBS) - - # Add GCC lib --PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -+PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh - - # The "tools" are needed early, so put this first - # Don't include stuff already done in $(LIBS) ---- git/board/akita/akita.c.orig 2007-12-26 17:52:33.000000000 +0000 -+++ git/board/akita/akita.c 2007-12-26 17:52:59.000000000 +0000 -@@ -87,3 +87,7 @@ - - return 0; - } -+ -+void raise() {} -+ -+void abort() {} ---- git/board/corgi/corgi.c.orig 2007-12-26 17:52:33.000000000 +0000 -+++ git/board/corgi/corgi.c 2007-12-26 17:52:59.000000000 +0000 -@@ -87,3 +87,7 @@ - - return 0; - } -+ -+void raise() {} -+ -+void abort() {} -Index: git/lib_arm/div0.c -=================================================================== ---- git.orig/lib_arm/div0.c -+++ git/lib_arm/div0.c -@@ -22,9 +22,3 @@ - */ - - /* Replacement (=dummy) for GNU/Linux division-by zero handler */ --void __div0 (void) --{ -- extern void hang (void); -- -- hang(); --} -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -225,7 +225,7 @@ LIBS := $(addprefix $(obj),$(LIBS)) - .PHONY : $(LIBS) - - # Add GCC lib --PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -+PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh - - # The "tools" are needed early, so put this first - # Don't include stuff already done in $(LIBS) ---- git/board/akita/akita.c.orig 2007-12-26 17:52:33.000000000 +0000 -+++ git/board/akita/akita.c 2007-12-26 17:52:59.000000000 +0000 -@@ -87,3 +87,7 @@ - - return 0; - } -+ -+void raise() {} -+ -+void abort() {} ---- git/board/corgi/corgi.c.orig 2007-12-26 17:52:33.000000000 +0000 -+++ git/board/corgi/corgi.c 2007-12-26 17:52:59.000000000 +0000 -@@ -87,3 +87,7 @@ - - return 0; - } -+ -+void raise() {} -+ -+void abort() {} diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 56b0797e01..04eb7eb2e8 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,12 +1,10 @@ require u-boot.inc -PR="r17" +PR="r16" SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_beagleboard = "9c1c36409b2cb4e81aab0bd9d0a69c68f4475aae" SRCREV_neuros-osd2 = "bc66414cd99154a40949db1bd2f45a62b8febca9" -SRCREV_akita = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" -SRCREV_c7x0 = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " @@ -17,14 +15,6 @@ SRC_URI_beagleboard = "git://www.sakoman.net/git/u-boot-omap3.git;branch=test;pr " SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1" -SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;patch=1 \ - file://uboot-eabi-fix-HACK2.patch;patch=1 \ - file://akita-standard-partitioning.patch;patch=1 \ - " -SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \ - file://uboot-eabi-fix-HACK2.patch;patch=1 \ - file://corgi-standard-partitioning.patch;patch=1 \ - " S = "${WORKDIR}/git" -- cgit v1.2.3 From 862c7d370df9ad29d8321c5ca41359b6f95d27f0 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 21 Aug 2008 21:35:23 +0000 Subject: directfb: update to version 1.2.3 * fix-font-missing-char.patch was fixed upstream --- packages/directfb/directfb-1.2.3/.mtn2git_empty | 0 .../directfb-1.2.3/fix-pkgconfig-cflags.patch | 47 ++++++++++++++++++++++ packages/directfb/directfb.inc | 4 +- packages/directfb/directfb_1.2.3.bb | 28 +++++++++++++ 4 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 packages/directfb/directfb-1.2.3/.mtn2git_empty create mode 100644 packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch create mode 100644 packages/directfb/directfb_1.2.3.bb diff --git a/packages/directfb/directfb-1.2.3/.mtn2git_empty b/packages/directfb/directfb-1.2.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch b/packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch new file mode 100644 index 0000000000..745c561cc0 --- /dev/null +++ b/packages/directfb/directfb-1.2.3/fix-pkgconfig-cflags.patch @@ -0,0 +1,47 @@ +Index: DirectFB-1.1.1/directfb-internal.pc.in +=================================================================== +--- DirectFB-1.1.1.orig/directfb-internal.pc.in 2007-08-07 21:43:00.000000000 +0200 ++++ DirectFB-1.1.1/directfb-internal.pc.in 2008-07-17 21:00:47.424654304 +0200 +@@ -2,10 +2,10 @@ + exec_prefix=@exec_prefix@ + moduledir=@MODULEDIR@ + moduledirname=@MODULEDIRNAME@ +-includedir=@INTERNALINCLUDEDIR@ ++includedir=@includedir@ + + Name: DirectFB-Internal + Description: Third party module support package for DirectFB. + Version: @VERSION@ + Requires: directfb = @VERSION@ +-Cflags: @DFB_INTERNAL_CFLAGS@ -I@INTERNALINCLUDEDIR@ ++Cflags: @DFB_INTERNAL_CFLAGS@ -I${includedir}/directfb -I${includedir} +Index: DirectFB-1.1.1/directfb.pc.in +=================================================================== +--- DirectFB-1.1.1.orig/directfb.pc.in 2007-12-15 16:23:16.000000000 +0100 ++++ DirectFB-1.1.1/directfb.pc.in 2008-07-17 20:59:58.044985193 +0200 +@@ -9,4 +9,4 @@ + Requires: fusion direct + Libs: -L${libdir} -ldirectfb @THREADLIB@ @OSX_LIBS@ + Libs.private: -L${libdir} @DYNLIB@ @ZLIB_LIBS@ +-Cflags: @THREADFLAGS@ -I@INCLUDEDIR@ ++Cflags: @THREADFLAGS@ -I${includedir}/directfb +Index: DirectFB-1.1.1/lib/fusion/fusion.pc.in +=================================================================== +--- DirectFB-1.1.1.orig/lib/fusion/fusion.pc.in 2007-08-07 21:43:00.000000000 +0200 ++++ DirectFB-1.1.1/lib/fusion/fusion.pc.in 2008-07-17 20:58:07.051338866 +0200 +@@ -8,4 +8,4 @@ + Version: @VERSION@ + Requires: direct + Libs: -L${libdir} -lfusion +-Cflags: -I@INCLUDEDIR@ ++Cflags: -I${includedir}/directfb -I${includedir} +Index: DirectFB-1.1.1/lib/voodoo/voodoo.pc.in +=================================================================== +--- DirectFB-1.1.1.orig/lib/voodoo/voodoo.pc.in 2007-08-07 21:43:00.000000000 +0200 ++++ DirectFB-1.1.1/lib/voodoo/voodoo.pc.in 2008-07-17 20:58:07.054671842 +0200 +@@ -8,4 +8,4 @@ + Version: @VERSION@ + Requires: direct + Libs: -L${libdir} -lvoodoo +-Cflags: -I@INCLUDEDIR@ ++Cflags: -I${includedir}/directfb -I${includedir} diff --git a/packages/directfb/directfb.inc b/packages/directfb/directfb.inc index 07024402b9..948ffa892e 100644 --- a/packages/directfb/directfb.inc +++ b/packages/directfb/directfb.inc @@ -9,7 +9,7 @@ HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" SRC_URI = " \ - http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ + http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ file://fix-pkgconfig-cflags.patch;patch=1 \ file://fix-font-missing-char.patch;patch=1 \ file://getpagesize.patch;patch=1 \ @@ -21,7 +21,7 @@ S = "${WORKDIR}/DirectFB-${PV}" LDFLAGS_append =" -lts -lm" -inherit autotools pkgconfig +inherit autotools binconfig pkgconfig EXTRA_OECONF = "\ --with-gfxdrivers=none \ diff --git a/packages/directfb/directfb_1.2.3.bb b/packages/directfb/directfb_1.2.3.bb new file mode 100644 index 0000000000..57a4721a02 --- /dev/null +++ b/packages/directfb/directfb_1.2.3.bb @@ -0,0 +1,28 @@ +require directfb.inc + +RV = "1.2-0" +PR = "r0" + +DEPENDS += "sysfsutils" + +SRC_URI = " \ + http://www.directfb.org/downloads/Core/DirectFB-${PV}.tar.gz \ + file://fix-pkgconfig-cflags.patch;patch=1 \ + file://mkdfiff.patch;patch=1 \ + file://dont-use-linux-config.patch;patch=1 \ + file://ts_lib_autotools.patch;patch=1 \ +" + +EXTRA_OECONF = "\ + --enable-freetype=yes \ + --enable-zlib \ + --with-gfxdrivers=none \ + --disable-libmpeg3 \ + --disable-sdl \ + --disable-vnc \ + --disable-x11 \ +" + +LDFLAGS_append = "" + +LEAD_SONAME = "libdirectfb-1.2.so.0" -- cgit v1.2.3 From 7ff2c562ce1ac455beeb9867d6d5d253404eb356 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Aug 2008 21:37:42 +0000 Subject: udhcp: without ${PN} in PACKAGES, the package won't build because it cannot resolve the dependency on itself (udhcp-dbg -> udhcp) --- packages/udhcp/udhcp_0.9.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/udhcp/udhcp_0.9.8.bb b/packages/udhcp/udhcp_0.9.8.bb index d100be74da..40487efe84 100644 --- a/packages/udhcp/udhcp_0.9.8.bb +++ b/packages/udhcp/udhcp_0.9.8.bb @@ -19,7 +19,7 @@ EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CCLD}' \ 'usrbindir=${bindir}' \ 'datadir=${datadir}'" -PACKAGES = "${PN}-dbg udhcpc udhcpc-doc udhcpd udhcpd-doc" +PACKAGES = "${PN}-dbg udhcpc udhcpc-doc udhcpd udhcpd-doc ${PN}" FILES_udhcpc = "/sbin/udhcpc ${datadir}/udhcpc" FILES_udhcpc-doc = "${mandir}/man8/udhcpc.8" FILES_udhcpd = "${sbindir}/udhcpd \ -- cgit v1.2.3 From 4adf478c045861ba208f296b77c9b7984434cb08 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Aug 2008 21:53:48 +0000 Subject: icon-slicer: add 0.3 native --- packages/icon-slicer/.mtn2git_empty | 0 packages/icon-slicer/icon-slicer-native_0.3.bb | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 packages/icon-slicer/.mtn2git_empty create mode 100644 packages/icon-slicer/icon-slicer-native_0.3.bb diff --git a/packages/icon-slicer/.mtn2git_empty b/packages/icon-slicer/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/icon-slicer/icon-slicer-native_0.3.bb b/packages/icon-slicer/icon-slicer-native_0.3.bb new file mode 100644 index 0000000000..e23bcacdff --- /dev/null +++ b/packages/icon-slicer/icon-slicer-native_0.3.bb @@ -0,0 +1,18 @@ +LICENSE = "MIT" + +SRC_URI = "http://freedesktop.org/software/icon-slicer/releases/icon-slicer-${PV}.tar.gz" + +inherit autotools native + +DEPENDS = "gtk+-native popt-native" + +S = "${WORKDIR}/icon-slicer-${PV}" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + + + -- cgit v1.2.3 From 5a7ed4ea4a4a4166f4cc94b3ca5b162463d408e3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 21 Aug 2008 22:10:12 +0000 Subject: sugar-artwork: apply diff from git to use icon-slicer and fix packaging --- packages/sugar/sugar-artwork/.mtn2git_empty | 0 packages/sugar/sugar-artwork/icon-slicer.diff | 83 +++++++++++++++++++++++++++ packages/sugar/sugar-artwork_0.82.0.bb | 29 ++++++++++ 3 files changed, 112 insertions(+) create mode 100644 packages/sugar/sugar-artwork/.mtn2git_empty create mode 100644 packages/sugar/sugar-artwork/icon-slicer.diff create mode 100644 packages/sugar/sugar-artwork_0.82.0.bb diff --git a/packages/sugar/sugar-artwork/.mtn2git_empty b/packages/sugar/sugar-artwork/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sugar/sugar-artwork/icon-slicer.diff b/packages/sugar/sugar-artwork/icon-slicer.diff new file mode 100644 index 0000000000..4eacb91251 --- /dev/null +++ b/packages/sugar/sugar-artwork/icon-slicer.diff @@ -0,0 +1,83 @@ +From: Marco Pesenti Gritti +Date: Thu, 21 Aug 2008 12:52:39 +0000 (+0200) +Subject: User icon-slicer to generate the icons, instead of cursorthemegen. +X-Git-Url: http://dev.laptop.org/git?p=artwork;a=commitdiff_plain;h=2954f4c6d2c178ba005025a94f3d31e54fe37103 + +User icon-slicer to generate the icons, instead of cursorthemegen. +--- + +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,8 @@ AC_PROG_CC + AC_HEADER_STDC + AC_PROG_LIBTOOL + ++AC_PATH_PROG([ICON_SLICER], [icon-slicer]) ++ + PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,, + AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork])) + +@@ -46,7 +48,6 @@ fi + AC_OUTPUT([ + Makefile + cursor/Makefile +-cursor/cursorthemegen/Makefile + cursor/sugar/Makefile + icons/Makefile + icons/scalable/Makefile +diff --git a/cursor/Makefile.am b/cursor/Makefile.am +index 5f0148f..4fa44db 100644 +--- a/cursor/Makefile.am ++++ b/cursor/Makefile.am +@@ -1 +1 @@ +-SUBDIRS = cursorthemegen sugar ++SUBDIRS = sugar + +diff --git a/cursor/sugar/Makefile.am b/cursor/sugar/Makefile.am +index cb9beec..9af934c 100644 +--- a/cursor/sugar/Makefile.am ++++ b/cursor/sugar/Makefile.am +@@ -1,6 +1,3 @@ +-THEMEGEN = $(top_builddir)/cursor/cursorthemegen/cursorthemegen +-THEME_DIR = $(top_builddir)/cursor/sugar/theme +- + all-local: sugar.stamp + + sugar_images = \ +@@ -12,26 +9,24 @@ sugar_images = \ + sugar-05.png \ + sugar-06.png \ + sugar-07.png \ +- sugar-08.png \ +- sugar-09.png \ +- sugar-10.png \ +- sugar-11.png \ ++ sugar-08.png \ ++ sugar-09.png \ ++ sugar-10.png \ ++ sugar-11.png \ + sugar-hotspots.png + + sugar.stamp: $(sugar_images) $(THEMEGEN) sugar.cursortheme +- rm -rf sugar && \ +- BDIR=`pwd` && cd $(srcdir) && \ +- $$BDIR/$(THEMEGEN) sugar.cursortheme $$BDIR/theme && \ +- cd $$BDIR && touch sugar.stamp ++ $(ICON_SLICER) --image-dir=$(srcdir) --output-dir=$(builddir) $(srcdir)/sugar.cursortheme ++ touch sugar.stamp + + clean-local: +- rm -rf $(THEME_DIR) +- rm -rf $(top_builddir)/cursor/sugar/sugar.stamp ++ rm -rf cursors ++ rm sugar.stamp + + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(datadir)/icons/sugar/cursors/ +- for i in `cd $(THEME_DIR) && echo *` ; do \ +- $(INSTALL) $(THEME_DIR)/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ; \ ++ for i in `cd $(srcdir)/cursors && echo *` ; do \ ++ $(INSTALL) $(srcdir)/cursors/$$i $(DESTDIR)$(datadir)/icons/sugar/cursors/$$i ; \ + done + + uninstall-local: diff --git a/packages/sugar/sugar-artwork_0.82.0.bb b/packages/sugar/sugar-artwork_0.82.0.bb new file mode 100644 index 0000000000..4a1ab847e5 --- /dev/null +++ b/packages/sugar/sugar-artwork_0.82.0.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Sugar artwork" +LICENSE = "GPLv2" + +PR = "r1" + +DEPENDS = "sugar icon-slicer-native" + +SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-artwork/${PN}-${PV}.tar.bz2 \ + file://icon-slicer.diff;patch=1" + +inherit autotools distutils-base + +do_configure_prepend() { + mkdir -p ${S}/m4 +} + +FILES_${PN} += "${datadir}/${PN} \ + ${datadir}/icons \ + ${datadir}/themes \ + ${sysconfdir} " + +FILES_${PN}-dbg += "${libdir}/gtk-2.0/2.*/engines/.debug" + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} + -- cgit v1.2.3 From d63f8ac05b7d0d46ddaefa260c940c9134897573 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 21 Aug 2008 23:40:56 +0000 Subject: libexif: move to nonworking and close bug 1664 as LATER. --- packages/libexif/.mtn2git_empty | 0 packages/libexif/libexif_0.5.12.bb | 16 ---------------- packages/libexif/libexif_0.6.13.bb | 19 ------------------- packages/libexif/libexif_0.6.16.bb | 18 ------------------ packages/libexif/libexif_0.6.9.bb | 19 ------------------- packages/nonworking/libexif/.mtn2git_empty | 0 packages/nonworking/libexif/libexif_0.5.12.bb | 16 ++++++++++++++++ packages/nonworking/libexif/libexif_0.6.13.bb | 19 +++++++++++++++++++ packages/nonworking/libexif/libexif_0.6.16.bb | 18 ++++++++++++++++++ packages/nonworking/libexif/libexif_0.6.9.bb | 19 +++++++++++++++++++ 10 files changed, 72 insertions(+), 72 deletions(-) delete mode 100644 packages/libexif/.mtn2git_empty delete mode 100644 packages/libexif/libexif_0.5.12.bb delete mode 100644 packages/libexif/libexif_0.6.13.bb delete mode 100644 packages/libexif/libexif_0.6.16.bb delete mode 100644 packages/libexif/libexif_0.6.9.bb create mode 100644 packages/nonworking/libexif/.mtn2git_empty create mode 100644 packages/nonworking/libexif/libexif_0.5.12.bb create mode 100644 packages/nonworking/libexif/libexif_0.6.13.bb create mode 100644 packages/nonworking/libexif/libexif_0.6.16.bb create mode 100644 packages/nonworking/libexif/libexif_0.6.9.bb diff --git a/packages/libexif/.mtn2git_empty b/packages/libexif/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libexif/libexif_0.5.12.bb b/packages/libexif/libexif_0.5.12.bb deleted file mode 100644 index 94f3bee856..0000000000 --- a/packages/libexif/libexif_0.5.12.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -LICENSE = "LGPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done -} diff --git a/packages/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb deleted file mode 100644 index 8382de84f5..0000000000 --- a/packages/libexif/libexif_0.6.13.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPL" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/libexif/libexif_0.6.16.bb b/packages/libexif/libexif_0.6.16.bb deleted file mode 100644 index 2f896352db..0000000000 --- a/packages/libexif/libexif_0.6.16.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb deleted file mode 100644 index d255f5d862..0000000000 --- a/packages/libexif/libexif_0.6.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -LICENSE = "LGPL" -SECTION = "libs" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done -} diff --git a/packages/nonworking/libexif/.mtn2git_empty b/packages/nonworking/libexif/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/libexif/libexif_0.5.12.bb b/packages/nonworking/libexif/libexif_0.5.12.bb new file mode 100644 index 0000000000..94f3bee856 --- /dev/null +++ b/packages/nonworking/libexif/libexif_0.5.12.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +LICENSE = "LGPL" +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libexif + for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h + do + install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X + done +} diff --git a/packages/nonworking/libexif/libexif_0.6.13.bb b/packages/nonworking/libexif/libexif_0.6.13.bb new file mode 100644 index 0000000000..8382de84f5 --- /dev/null +++ b/packages/nonworking/libexif/libexif_0.6.13.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/nonworking/libexif/libexif_0.6.16.bb b/packages/nonworking/libexif/libexif_0.6.16.bb new file mode 100644 index 0000000000..2f896352db --- /dev/null +++ b/packages/nonworking/libexif/libexif_0.6.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/nonworking/libexif/libexif_0.6.9.bb b/packages/nonworking/libexif/libexif_0.6.9.bb new file mode 100644 index 0000000000..d255f5d862 --- /dev/null +++ b/packages/nonworking/libexif/libexif_0.6.9.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +LICENSE = "LGPL" +SECTION = "libs" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libexif + for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h + do + install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X + done +} -- cgit v1.2.3 From 537bec400cb35bfa94db58dcde0454c542ec3500 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 00:16:54 +0000 Subject: openttd: make it clear in the description that openttd is the engine only --- packages/openttd/openttd.inc | 4 +++- packages/openttd/openttd_0.6.0.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/openttd/openttd.inc b/packages/openttd/openttd.inc index 4c4c009296..a27da0fd4c 100644 --- a/packages/openttd/openttd.inc +++ b/packages/openttd/openttd.inc @@ -1,7 +1,9 @@ # Note: OpenTTD's build system changed considerably in 0.6.x # This include file is written towards the newer versions. -DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition." +DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition. \ +This package provides the engine only. You will need to get the data file elsewhere \ +through official channels." HOMEPAGE = "http://openttd.sf.net" LICENSE = "GPLv2" diff --git a/packages/openttd/openttd_0.6.0.bb b/packages/openttd/openttd_0.6.0.bb index b984d45dbf..893551ac59 100644 --- a/packages/openttd/openttd_0.6.0.bb +++ b/packages/openttd/openttd_0.6.0.bb @@ -1,6 +1,6 @@ require openttd.inc -PR = "r0" +PR = "r1" SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1" -- cgit v1.2.3 From 58cee914314ebf55d2c1051edca047f1c5327822 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 22 Aug 2008 01:30:42 +0000 Subject: Make 2.6.25omap1 build with gcc 4.3 Booted the kernel on osk5912 --- ...rm-fix-inline-asm-constraints-for-preload.patch | 22 ++++++++++++++++++++++ packages/linux/linux-omap1_2.6.25-omap1.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 packages/linux/linux-omap1-2.6.25-omap1/gcc43-arm-fix-inline-asm-constraints-for-preload.patch diff --git a/packages/linux/linux-omap1-2.6.25-omap1/gcc43-arm-fix-inline-asm-constraints-for-preload.patch b/packages/linux/linux-omap1-2.6.25-omap1/gcc43-arm-fix-inline-asm-constraints-for-preload.patch new file mode 100644 index 0000000000..4695917a57 --- /dev/null +++ b/packages/linux/linux-omap1-2.6.25-omap1/gcc43-arm-fix-inline-asm-constraints-for-preload.patch @@ -0,0 +1,22 @@ +Source: +http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=5196/1 + +Description: +This patch is already submitted upstream. So it will not be needed in 2.6.27 onwards I guess but anyone interested in compiling prior versions of kernels with gcc 4.3 for ARM would need this patch. + +diff --git a/include/asm-arm/processor.h b/include/asm-arm/processor.h +index b01d5e7..517a4d6 100644 +--- a/include/asm-arm/processor.h ++++ b/include/asm-arm/processor.h +@@ -112,9 +112,9 @@ extern int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags); + static inline void prefetch(const void *ptr) + { + __asm__ __volatile__( +- "pld\t%0" ++ "pld\t%a0" + : +- : "o" (*(char *)ptr) ++ : "p" (ptr) + : "cc"); + } + diff --git a/packages/linux/linux-omap1_2.6.25-omap1.bb b/packages/linux/linux-omap1_2.6.25-omap1.bb index 1d2d0bedc5..2f3f3ce22a 100644 --- a/packages/linux/linux-omap1_2.6.25-omap1.bb +++ b/packages/linux/linux-omap1_2.6.25-omap1.bb @@ -4,6 +4,7 @@ COMPATIBLE_MACHINE = "omap5912osk" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ http://www.muru.com/linux/omap/patches/patch-2.6.25-omap1.bz2;patch=1 \ + file://gcc43-arm-fix-inline-asm-constraints-for-preload.patch;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.25" -- cgit v1.2.3 From c367c54adc09d21456cef634f3460ebc15406c95 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 04:36:01 +0000 Subject: create opkg variant for very small rootfs systems (SlugOS 5.0) This is a work-in-progress at this time, preference is set to -1 --- packages/opkg/files/opkg_wget.patch | 88 ++++++++++++++++++++++++++++ packages/opkg/files/reduce-nogpg-noise.patch | 11 ++++ packages/opkg/opkg-nogpg-nocurl_svn.bb | 20 +++++++ 3 files changed, 119 insertions(+) create mode 100644 packages/opkg/files/opkg_wget.patch create mode 100644 packages/opkg/files/reduce-nogpg-noise.patch create mode 100644 packages/opkg/opkg-nogpg-nocurl_svn.bb diff --git a/packages/opkg/files/opkg_wget.patch b/packages/opkg/files/opkg_wget.patch new file mode 100644 index 0000000000..b9773a54b6 --- /dev/null +++ b/packages/opkg/files/opkg_wget.patch @@ -0,0 +1,88 @@ +--- opkg/libopkg/opkg_download.c.orig 2008-08-21 12:33:49.000000000 -0500 ++++ opkg/libopkg/opkg_download.c 2008-08-21 15:12:00.000000000 -0500 +@@ -17,7 +17,9 @@ + General Public License for more details. + */ + #include "config.h" ++#ifdef HAVE_CURL + #include ++#endif + #ifdef HAVE_GPGME + #include + #endif +@@ -76,6 +78,7 @@ + setenv("no_proxy", conf->no_proxy, 1); + } + ++#ifdef HAVE_CURL + CURL *curl; + CURLcode res; + FILE * file = fopen (tmp_file_location, "w"); +@@ -121,6 +124,27 @@ + free(src_basec); + return -1; + } ++#else ++ { ++ int res; ++ char *wgetcmd; ++ char *wgetopts; ++ wgetopts = getenv("OPKG_WGETOPTS"); ++ sprintf_alloc(&wgetcmd, "wget -q %s%s -O \"%s\" \"%s\"", ++ (conf->http_proxy || conf->ftp_proxy) ? "-Y on " : "", ++ (wgetopts!=NULL) ? wgetopts : "", ++ tmp_file_location, src); ++ opkg_message(conf, OPKG_INFO, "Executing: %s\n", wgetcmd); ++ res = xsystem(wgetcmd); ++ free(wgetcmd); ++ if (res) { ++ opkg_message(conf, OPKG_ERROR, "Failed to download %s, error %d\n", src, res); ++ free(tmp_file_location); ++ free(src_basec); ++ return res; ++ } ++ } ++#endif + + err = file_move(tmp_file_location, dest_file_name); + +--- opkg/configure.ac.orig 2008-07-08 09:39:11.000000000 -0500 ++++ opkg/configure.ac 2008-08-21 14:57:35.000000000 -0500 +@@ -23,7 +23,7 @@ + # Checks for libraries + + # check for libcurl +-PKG_CHECK_MODULES(CURL, libcurl) ++#PKG_CHECK_MODULES(CURL, libcurl) + + + +--- opkg/libopkg/opkg.c.orig 2008-08-21 19:49:35.000000000 -0500 ++++ opkg/libopkg/opkg.c 2008-08-21 19:55:27.000000000 -0500 +@@ -1021,7 +1021,9 @@ + return package; + } + ++#ifdef HAVE_CURL + #include ++#endif + /** + * @brief Check the accessibility of repositories. It will try to access the repository to check if the respository is accessible throught current network status. + * @param opkg The opkg_t +@@ -1071,12 +1073,16 @@ + repositories--; + + err = opkg_download(opkg->conf, iter1->data, "/dev/null", NULL, NULL); ++#ifdef HAVE_CURL + if (!(err == CURLE_OK || + err == CURLE_HTTP_RETURNED_ERROR || + err == CURLE_FILE_COULDNT_READ_FILE || + err == CURLE_REMOTE_FILE_NOT_FOUND || + err == CURLE_TFTP_NOTFOUND + )) { ++#else ++ if (!(err == 0)) { ++#endif + ret++; + } + str_list_elt_deinit(iter1); diff --git a/packages/opkg/files/reduce-nogpg-noise.patch b/packages/opkg/files/reduce-nogpg-noise.patch new file mode 100644 index 0000000000..b72560876e --- /dev/null +++ b/packages/opkg/files/reduce-nogpg-noise.patch @@ -0,0 +1,11 @@ +--- opkg/libopkg/opkg_cmd.c.orig 2008-08-21 22:18:43.000000000 -0500 ++++ opkg/libopkg/opkg_cmd.c 2008-08-21 22:19:20.000000000 -0500 +@@ -288,7 +288,7 @@ static int opkg_update_cmd(opkg_conf_t * + free (tmp_file_name); + free (url); + #else +- opkg_message (conf, OPKG_NOTICE, "Signiture check for %s skipped " ++ opkg_message (conf, OPKG_INFO, "Signature check for %s skipped " + "because GPG support was not enabled in this build\n", src->name); + #endif + free(list_file_name); diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb new file mode 100644 index 0000000000..5fa459630d --- /dev/null +++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb @@ -0,0 +1,20 @@ +require opkg_svn.bb + +DEPENDS = "" +PROVIDES += "opkg" + +SRC_URI += "file://opkg_wget.patch;patch=1 \ + file://reduce-nogpg-noise.patch;patch=1 \ + " +PR = "r0" + +SRCREV = "${SRCREV_pn-opkg}" + +EXTRA_OECONF += "--disable-gpg" + +# The nogpg version isn't getting much love and has an unused variable which trips up -Werror +do_configure_prepend() { + sed -i -e s:-Werror::g ${S}/libopkg/Makefile.am +} + +DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 064d9f29930b20b45d0a68691b7bed49e1707aad Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 04:39:50 +0000 Subject: slugOS 5.0 is born - initial commit. - enable many busybox options - replace several packages in rootfs with busybox, and adjust various config files and scripts to accomodate busybox options - change default alignment behavior to be more lenient Note: this is the first of many disruptive changes for SlugOS 5; this version is to be considered unstable at best! --- conf/distro/include/slugos.inc | 2 +- packages/base-files/base-files/slugos/filesystems | 5 + packages/base-files/base-files/slugos/fstab | 2 +- packages/base-files/base-files_3.0.14.bb | 2 +- .../busybox/busybox-1.11.1/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.11.1/slugos/defconfig | 851 +++++++++++++++++++++ .../initscripts-1.0/slugos/alignment.sh | 2 +- .../initscripts-1.0/slugos/bootclean.sh | 4 +- packages/initscripts/initscripts-slugos_1.0.bb | 2 +- packages/slugos-init/files/boot/disk | 1 + packages/slugos-init/files/boot/kexec | 2 +- packages/slugos-init/files/sysconf | 2 +- packages/slugos-init/files/turnup | 10 +- packages/slugos-init/slugos-init_5.0.bb | 148 ++++ packages/tasks/task-slugos.bb | 39 +- 15 files changed, 1048 insertions(+), 24 deletions(-) create mode 100644 packages/base-files/base-files/slugos/filesystems create mode 100644 packages/busybox/busybox-1.11.1/slugos/.mtn2git_empty create mode 100644 packages/busybox/busybox-1.11.1/slugos/defconfig create mode 100644 packages/slugos-init/slugos-init_5.0.bb diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index b998e4a015..05853d3936 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -16,7 +16,7 @@ #TARGET_OS "linux" or "linux-uclibc" # The following may be overridden to make sub-versions -SLUGOS_VERSION = "4.10" +SLUGOS_VERSION = "5.0" DISTRO_REVISION ?= "" DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}" # For release (only): diff --git a/packages/base-files/base-files/slugos/filesystems b/packages/base-files/base-files/slugos/filesystems new file mode 100644 index 0000000000..58dd33c0a3 --- /dev/null +++ b/packages/base-files/base-files/slugos/filesystems @@ -0,0 +1,5 @@ +ext3 +ext2 +vfat +fat +* diff --git a/packages/base-files/base-files/slugos/fstab b/packages/base-files/base-files/slugos/fstab index 53008e49a5..e00f057a08 100644 --- a/packages/base-files/base-files/slugos/fstab +++ b/packages/base-files/base-files/slugos/fstab @@ -1,6 +1,6 @@ rootfs / jffs2 defaults 1 1 +sysfs /sys sysfs defaults 0 0 proc /proc proc defaults 0 0 tmpfs /var/volatile tmpfs mode=0755 0 0 -#tmpfs /media/ram tmpfs defaults 0 0 tmpfs /dev/shm tmpfs mode=0777 0 0 usbfs /proc/bus/usb usbfs defaults 0 0 diff --git a/packages/base-files/base-files_3.0.14.bb b/packages/base-files/base-files_3.0.14.bb index 83f6be3054..287f022562 100644 --- a/packages/base-files/base-files_3.0.14.bb +++ b/packages/base-files/base-files_3.0.14.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Miscellaneous files for the base system." SECTION = "base" PRIORITY = "required" -PR = "r78" +PR = "r79" LICENSE = "GPL" SRC_URI = " \ diff --git a/packages/busybox/busybox-1.11.1/slugos/.mtn2git_empty b/packages/busybox/busybox-1.11.1/slugos/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/busybox/busybox-1.11.1/slugos/defconfig b/packages/busybox/busybox-1.11.1/slugos/defconfig new file mode 100644 index 0000000000..d922529cc2 --- /dev/null +++ b/packages/busybox/busybox-1.11.1/slugos/defconfig @@ -0,0 +1,851 @@ +# +# Automatically generated make config: don't edit +# Busybox version: 1.11.1 +# Thu Aug 21 23:08:10 2008 +# +CONFIG_HAVE_DOT_CONFIG=y + +# +# Busybox Settings +# + +# +# General Configuration +# +# CONFIG_DESKTOP is not set +# CONFIG_FEATURE_ASSUME_UNICODE is not set +CONFIG_FEATURE_BUFFERS_USE_MALLOC=y +# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +CONFIG_SHOW_USAGE=y +CONFIG_FEATURE_VERBOSE_USAGE=y +CONFIG_FEATURE_COMPRESS_USAGE=y +# CONFIG_FEATURE_INSTALLER is not set +CONFIG_LOCALE_SUPPORT=y +CONFIG_GETOPT_LONG=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_PIDFILE=y +CONFIG_FEATURE_SUID=y +CONFIG_FEATURE_SUID_CONFIG=y +# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set +# CONFIG_SELINUX is not set +# CONFIG_FEATURE_PREFER_APPLETS is not set +CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" +CONFIG_FEATURE_SYSLOG=y +CONFIG_FEATURE_HAVE_RPC=y + +# +# Build Options +# +# CONFIG_STATIC is not set +# CONFIG_PIE is not set +# CONFIG_NOMMU is not set +# CONFIG_BUILD_LIBBUSYBOX is not set +# CONFIG_FEATURE_INDIVIDUAL is not set +# CONFIG_FEATURE_SHARED_BUSYBOX is not set +CONFIG_LFS=y +CONFIG_CROSS_COMPILER_PREFIX="" + +# +# Debugging Options +# +# CONFIG_DEBUG is not set +# CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_WERROR is not set +CONFIG_NO_DEBUG_LIB=y +# CONFIG_DMALLOC is not set +# CONFIG_EFENCE is not set +# CONFIG_INCLUDE_SUSv2 is not set + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +CONFIG_INSTALL_APPLET_SYMLINKS=y +# CONFIG_INSTALL_APPLET_HARDLINKS is not set +# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set +# CONFIG_INSTALL_APPLET_DONT is not set +# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set +# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set +# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set +CONFIG_PREFIX="./_install" + +# +# Busybox Library Tuning +# +CONFIG_PASSWORD_MINLEN=6 +CONFIG_MD5_SIZE_VS_SPEED=1 +CONFIG_FEATURE_FAST_TOP=y +# CONFIG_FEATURE_ETC_NETWORKS is not set +CONFIG_FEATURE_EDITING=y +CONFIG_FEATURE_EDITING_MAX_LEN=1024 +# CONFIG_FEATURE_EDITING_VI is not set +CONFIG_FEATURE_EDITING_HISTORY=15 +CONFIG_FEATURE_EDITING_SAVEHISTORY=y +CONFIG_FEATURE_TAB_COMPLETION=y +CONFIG_FEATURE_USERNAME_COMPLETION=y +CONFIG_FEATURE_EDITING_FANCY_PROMPT=y +CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y +CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_MONOTONIC_SYSCALL=y +CONFIG_IOCTL_HEX2STR_ERROR=y +# CONFIG_FEATURE_HWIB is not set + +# +# Applets +# + +# +# Archival Utilities +# +CONFIG_AR=y +CONFIG_FEATURE_AR_LONG_FILENAMES=y +CONFIG_BUNZIP2=y +CONFIG_BZIP2=y +# CONFIG_CPIO is not set +# CONFIG_FEATURE_CPIO_O is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set +CONFIG_GUNZIP=y +CONFIG_FEATURE_GUNZIP_UNCOMPRESS=y +CONFIG_GZIP=y +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_FEATURE_RPM_BZ2 is not set +CONFIG_TAR=y +CONFIG_FEATURE_TAR_CREATE=y +CONFIG_FEATURE_TAR_GZIP=y +CONFIG_FEATURE_TAR_BZIP2=y +CONFIG_FEATURE_TAR_LZMA=y +CONFIG_FEATURE_TAR_COMPRESS=y +CONFIG_FEATURE_TAR_AUTODETECT=y +CONFIG_FEATURE_TAR_FROM=y +# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set +# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set +CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y +CONFIG_FEATURE_TAR_LONG_OPTIONS=y +CONFIG_FEATURE_TAR_UNAME_GNAME=y +CONFIG_UNCOMPRESS=y +CONFIG_UNLZMA=y +# CONFIG_FEATURE_LZMA_FAST is not set +CONFIG_UNZIP=y + +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_DEB_TAR_GZ is not set +# CONFIG_FEATURE_DEB_TAR_BZ2 is not set +# CONFIG_FEATURE_DEB_TAR_LZMA is not set + +# +# Coreutils +# +CONFIG_BASENAME=y +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CATV is not set +CONFIG_CHGRP=y +CONFIG_CHMOD=y +CONFIG_CHOWN=y +CONFIG_CHROOT=y +# CONFIG_CKSUM is not set +# CONFIG_COMM is not set +CONFIG_CP=y +CONFIG_CUT=y +CONFIG_DATE=y +CONFIG_FEATURE_DATE_ISOFMT=y +CONFIG_DD=y +CONFIG_FEATURE_DD_SIGNAL_HANDLING=y +CONFIG_FEATURE_DD_IBS_OBS=y +CONFIG_DF=y +CONFIG_FEATURE_DF_INODE=y +CONFIG_DIRNAME=y +CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y +CONFIG_DU=y +CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +CONFIG_ENV=y +CONFIG_FEATURE_ENV_LONG_OPTIONS=y +# CONFIG_EXPAND is not set +# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set +CONFIG_EXPR=y +# CONFIG_EXPR_MATH_SUPPORT_64 is not set +CONFIG_FALSE=y +# CONFIG_FOLD is not set +CONFIG_HEAD=y +CONFIG_FEATURE_FANCY_HEAD=y +# CONFIG_HOSTID is not set +CONFIG_ID=y +# CONFIG_INSTALL is not set +# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set +CONFIG_LENGTH=y +CONFIG_LN=y +CONFIG_LOGNAME=y +CONFIG_LS=y +CONFIG_FEATURE_LS_FILETYPES=y +CONFIG_FEATURE_LS_FOLLOWLINKS=y +CONFIG_FEATURE_LS_RECURSIVE=y +CONFIG_FEATURE_LS_SORTFILES=y +CONFIG_FEATURE_LS_TIMESTAMPS=y +CONFIG_FEATURE_LS_USERNAME=y +CONFIG_FEATURE_LS_COLOR=y +# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set +CONFIG_MD5SUM=y +CONFIG_MKDIR=y +CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y +CONFIG_MKFIFO=y +CONFIG_MKNOD=y +CONFIG_MV=y +CONFIG_FEATURE_MV_LONG_OPTIONS=y +CONFIG_NICE=y +CONFIG_NOHUP=y +CONFIG_OD=y +CONFIG_PRINTENV=y +CONFIG_PRINTF=y +CONFIG_PWD=y +CONFIG_READLINK=y +CONFIG_FEATURE_READLINK_FOLLOW=y +CONFIG_REALPATH=y +CONFIG_RM=y +CONFIG_RMDIR=y +CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y +CONFIG_SEQ=y +CONFIG_SHA1SUM=y +CONFIG_SLEEP=y +CONFIG_FEATURE_FANCY_SLEEP=y +CONFIG_SORT=y +CONFIG_FEATURE_SORT_BIG=y +CONFIG_SPLIT=y +CONFIG_FEATURE_SPLIT_FANCY=y +# CONFIG_STAT is not set +# CONFIG_FEATURE_STAT_FORMAT is not set +CONFIG_STTY=y +CONFIG_SUM=y +CONFIG_SYNC=y +# CONFIG_TAC is not set +CONFIG_TAIL=y +CONFIG_FEATURE_FANCY_TAIL=y +CONFIG_TEE=y +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y +CONFIG_TEST=y +# CONFIG_FEATURE_TEST_64 is not set +CONFIG_TOUCH=y +CONFIG_TR=y +CONFIG_FEATURE_TR_CLASSES=y +CONFIG_FEATURE_TR_EQUIV=y +CONFIG_TRUE=y +CONFIG_TTY=y +CONFIG_UNAME=y +# CONFIG_UNEXPAND is not set +# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set +CONFIG_UNIQ=y +CONFIG_USLEEP=y +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +CONFIG_WC=y +# CONFIG_FEATURE_WC_LARGE is not set +CONFIG_WHO=y +CONFIG_WHOAMI=y +CONFIG_YES=y + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls, more and telnet +# +CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# +CONFIG_FEATURE_HUMAN_READABLE=y + +# +# Common options for md5sum, sha1sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y + +# +# Console Utilities +# +CONFIG_CHVT=y +CONFIG_CLEAR=y +CONFIG_DEALLOCVT=y +CONFIG_DUMPKMAP=y +CONFIG_KBD_MODE=y +CONFIG_LOADFONT=y +CONFIG_LOADKMAP=y +CONFIG_OPENVT=y +CONFIG_RESET=y +CONFIG_RESIZE=y +CONFIG_FEATURE_RESIZE_PRINT=y +CONFIG_SETCONSOLE=y +CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y +CONFIG_SETKEYCODES=y +CONFIG_SETLOGCONS=y + +# +# Debian Utilities +# +CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set +CONFIG_RUN_PARTS=y +CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y +CONFIG_FEATURE_RUN_PARTS_FANCY=y +CONFIG_START_STOP_DAEMON=y +CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y +CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y +CONFIG_WHICH=y + +# +# Editors +# +CONFIG_AWK=y +CONFIG_FEATURE_AWK_MATH=y +CONFIG_CMP=y +CONFIG_DIFF=y +CONFIG_FEATURE_DIFF_BINARY=y +CONFIG_FEATURE_DIFF_DIR=y +CONFIG_FEATURE_DIFF_MINIMAL=y +# CONFIG_ED is not set +CONFIG_PATCH=y +CONFIG_SED=y +CONFIG_VI=y +CONFIG_FEATURE_VI_MAX_LEN=1024 +CONFIG_FEATURE_VI_8BIT=y +CONFIG_FEATURE_VI_COLON=y +CONFIG_FEATURE_VI_YANKMARK=y +CONFIG_FEATURE_VI_SEARCH=y +CONFIG_FEATURE_VI_USE_SIGNALS=y +# CONFIG_FEATURE_VI_DOT_CMD is not set +# CONFIG_FEATURE_VI_READONLY is not set +# CONFIG_FEATURE_VI_SETOPTS is not set +# CONFIG_FEATURE_VI_SET is not set +CONFIG_FEATURE_VI_WIN_RESIZE=y +CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_FEATURE_ALLOW_EXEC=y + +# +# Finding Utilities +# +CONFIG_FIND=y +CONFIG_FEATURE_FIND_PRINT0=y +CONFIG_FEATURE_FIND_MTIME=y +CONFIG_FEATURE_FIND_MMIN=y +CONFIG_FEATURE_FIND_PERM=y +CONFIG_FEATURE_FIND_TYPE=y +CONFIG_FEATURE_FIND_XDEV=y +CONFIG_FEATURE_FIND_MAXDEPTH=y +CONFIG_FEATURE_FIND_NEWER=y +CONFIG_FEATURE_FIND_INUM=y +CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_USER=y +CONFIG_FEATURE_FIND_GROUP=y +CONFIG_FEATURE_FIND_NOT=y +CONFIG_FEATURE_FIND_DEPTH=y +CONFIG_FEATURE_FIND_PAREN=y +CONFIG_FEATURE_FIND_SIZE=y +CONFIG_FEATURE_FIND_PRUNE=y +CONFIG_FEATURE_FIND_DELETE=y +CONFIG_FEATURE_FIND_PATH=y +CONFIG_FEATURE_FIND_REGEX=y +# CONFIG_FEATURE_FIND_CONTEXT is not set +CONFIG_GREP=y +CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y +CONFIG_FEATURE_GREP_CONTEXT=y +CONFIG_XARGS=y +CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y +CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y +CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y +CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_DEBUG_INIT is not set +# CONFIG_FEATURE_USE_INITTAB is not set +# CONFIG_FEATURE_KILL_REMOVED is not set +CONFIG_FEATURE_KILL_DELAY=0 +# CONFIG_FEATURE_INIT_SCTTY is not set +# CONFIG_FEATURE_INIT_SYSLOG is not set +# CONFIG_FEATURE_EXTRA_QUIET is not set +# CONFIG_FEATURE_INIT_COREDUMPS is not set +# CONFIG_FEATURE_INITRD is not set +# CONFIG_HALT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +# CONFIG_FEATURE_SHADOWPASSWDS is not set +CONFIG_USE_BB_PWD_GRP=y +# CONFIG_USE_BB_SHADOW is not set +CONFIG_USE_BB_CRYPT=y +CONFIG_ADDGROUP=y +CONFIG_FEATURE_ADDUSER_TO_GROUP=y +CONFIG_DELGROUP=y +CONFIG_FEATURE_DEL_USER_FROM_GROUP=y +CONFIG_FEATURE_CHECK_NAMES=y +CONFIG_ADDUSER=y +CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y +CONFIG_DELUSER=y +CONFIG_GETTY=y +CONFIG_FEATURE_UTMP=y +CONFIG_FEATURE_WTMP=y +CONFIG_LOGIN=y +# CONFIG_PAM is not set +CONFIG_LOGIN_SCRIPTS=y +CONFIG_FEATURE_NOLOGIN=y +CONFIG_FEATURE_SECURETTY=y +CONFIG_PASSWD=y +CONFIG_FEATURE_PASSWD_WEAK_CHECK=y +CONFIG_CRYPTPW=y +CONFIG_CHPASSWD=y +CONFIG_SU=y +CONFIG_FEATURE_SU_SYSLOG=y +CONFIG_FEATURE_SU_CHECKS_SHELLS=y +CONFIG_SULOGIN=y +# CONFIG_VLOCK is not set + +# +# Linux Ext2 FS Progs +# +# CONFIG_CHATTR is not set +# CONFIG_FSCK is not set +# CONFIG_LSATTR is not set + +# +# Linux Module Utilities +# +CONFIG_DEPMOD=y +# CONFIG_FEATURE_DEPMOD_PRUNE_FANCY is not set +CONFIG_FEATURE_DEPMOD_ALIAS=y +CONFIG_INSMOD=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set +CONFIG_RMMOD=y +CONFIG_LSMOD=y +CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y +CONFIG_MODPROBE=y +CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y +CONFIG_FEATURE_MODPROBE_BLACKLIST=y + +# +# Options common to multiple modutils +# +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y +# CONFIG_FEATURE_2_4_MODULES is not set +CONFIG_FEATURE_2_6_MODULES=y +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" +# CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set + +# +# Linux System Utilities +# +CONFIG_DMESG=y +CONFIG_FEATURE_DMESG_PRETTY=y +# CONFIG_FBSET is not set +# CONFIG_FEATURE_FBSET_FANCY is not set +# CONFIG_FEATURE_FBSET_READMODE is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +CONFIG_FDISK=y +CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +CONFIG_FEATURE_FDISK_WRITABLE=y +# CONFIG_FEATURE_AIX_LABEL is not set +# CONFIG_FEATURE_SGI_LABEL is not set +# CONFIG_FEATURE_SUN_LABEL is not set +# CONFIG_FEATURE_OSF_LABEL is not set +CONFIG_FEATURE_FDISK_ADVANCED=y +CONFIG_FINDFS=y +CONFIG_FREERAMDISK=y +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_FEATURE_MINIX2 is not set +CONFIG_GETOPT=y +CONFIG_HEXDUMP=y +CONFIG_FEATURE_HEXDUMP_REVERSE=y +CONFIG_HD=y +CONFIG_HWCLOCK=y +CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y +CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y +# CONFIG_IPCRM is not set +# CONFIG_IPCS is not set +CONFIG_LOSETUP=y +CONFIG_MDEV=y +CONFIG_FEATURE_MDEV_CONF=y +CONFIG_FEATURE_MDEV_RENAME=y +CONFIG_FEATURE_MDEV_RENAME_REGEXP=y +CONFIG_FEATURE_MDEV_EXEC=y +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y +CONFIG_MKSWAP=y +# CONFIG_FEATURE_MKSWAP_V0 is not set +CONFIG_MORE=y +CONFIG_FEATURE_USE_TERMIOS=y +CONFIG_VOLUMEID=y +CONFIG_FEATURE_VOLUMEID_EXT=y +# CONFIG_FEATURE_VOLUMEID_REISERFS is not set +CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_HFS=y +CONFIG_FEATURE_VOLUMEID_JFS=y +# CONFIG_FEATURE_VOLUMEID_XFS is not set +CONFIG_FEATURE_VOLUMEID_NTFS=y +CONFIG_FEATURE_VOLUMEID_ISO9660=y +CONFIG_FEATURE_VOLUMEID_UDF=y +CONFIG_FEATURE_VOLUMEID_LUKS=y +CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y +# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set +# CONFIG_FEATURE_VOLUMEID_ROMFS is not set +# CONFIG_FEATURE_VOLUMEID_SYSV is not set +# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set +CONFIG_FEATURE_VOLUMEID_LINUXRAID=y +CONFIG_MOUNT=y +CONFIG_FEATURE_MOUNT_FAKE=y +CONFIG_FEATURE_MOUNT_VERBOSE=y +CONFIG_FEATURE_MOUNT_HELPERS=y +CONFIG_FEATURE_MOUNT_LABEL=y +CONFIG_FEATURE_MOUNT_NFS=y +CONFIG_FEATURE_MOUNT_CIFS=y +CONFIG_FEATURE_MOUNT_FLAGS=y +CONFIG_FEATURE_MOUNT_FSTAB=y +CONFIG_PIVOT_ROOT=y +CONFIG_RDATE=y +# CONFIG_READPROFILE is not set +# CONFIG_RTCWAKE is not set +CONFIG_SCRIPT=y +# CONFIG_SETARCH is not set +CONFIG_SWAPONOFF=y +CONFIG_FEATURE_SWAPON_PRI=y +CONFIG_SWITCH_ROOT=y +CONFIG_UMOUNT=y +CONFIG_FEATURE_UMOUNT_ALL=y + +# +# Common options for mount/umount +# +CONFIG_FEATURE_MOUNT_LOOP=y +# CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Miscellaneous Utilities +# +CONFIG_ADJTIMEX=y +CONFIG_BBCONFIG=y +# CONFIG_CHAT is not set +# CONFIG_FEATURE_CHAT_NOFAIL is not set +# CONFIG_FEATURE_CHAT_TTY_HIFI is not set +# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set +# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set +# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set +# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set +# CONFIG_FEATURE_CHAT_CLR_ABORT is not set +# CONFIG_CHRT is not set +CONFIG_CROND=y +CONFIG_DEBUG_CROND_OPTION=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_CRONTAB=y +CONFIG_DC=y +# CONFIG_DEVFSD is not set +# CONFIG_DEVFSD_MODLOAD is not set +# CONFIG_DEVFSD_FG_NP is not set +# CONFIG_DEVFSD_VERBOSE is not set +# CONFIG_FEATURE_DEVFS is not set +# CONFIG_EJECT is not set +# CONFIG_FEATURE_EJECT_SCSI is not set +# CONFIG_FBSPLASH is not set +# CONFIG_INOTIFYD is not set +# CONFIG_LAST is not set +# CONFIG_FEATURE_LAST_SMALL is not set +# CONFIG_FEATURE_LAST_FANCY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +CONFIG_FEATURE_LESS_FLAGCS=y +CONFIG_FEATURE_LESS_MARKS=y +CONFIG_FEATURE_LESS_REGEXP=y +CONFIG_HDPARM=y +CONFIG_FEATURE_HDPARM_GET_IDENTITY=y +CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y +CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF=y +CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y +CONFIG_MAKEDEVS=y +# CONFIG_FEATURE_MAKEDEVS_LEAF is not set +CONFIG_FEATURE_MAKEDEVS_TABLE=y +# CONFIG_MAN is not set +CONFIG_MICROCOM=y +CONFIG_MOUNTPOINT=y +# CONFIG_MT is not set +CONFIG_RAIDAUTORUN=y +CONFIG_READAHEAD=y +CONFIG_RUNLEVEL=y +CONFIG_RX=y +# CONFIG_SETSID is not set +CONFIG_STRINGS=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set +CONFIG_TIME=y +# CONFIG_TTYSIZE is not set +# CONFIG_WATCHDOG is not set + +# +# Networking Utilities +# +CONFIG_FEATURE_IPV6=y +CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y +CONFIG_VERBOSE_RESOLUTION_ERRORS=y +CONFIG_ARP=y +CONFIG_ARPING=y +CONFIG_BRCTL=y +CONFIG_FEATURE_BRCTL_FANCY=y +CONFIG_FEATURE_BRCTL_SHOW=y +# CONFIG_DNSD is not set +# CONFIG_ETHER_WAKE is not set +# CONFIG_FAKEIDENTD is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set +CONFIG_HOSTNAME=y +CONFIG_HTTPD=y +CONFIG_FEATURE_HTTPD_RANGES=y +CONFIG_FEATURE_HTTPD_USE_SENDFILE=y +CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y +CONFIG_FEATURE_HTTPD_SETUID=y +CONFIG_FEATURE_HTTPD_BASIC_AUTH=y +CONFIG_FEATURE_HTTPD_AUTH_MD5=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y +CONFIG_FEATURE_HTTPD_CGI=y +CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y +CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y +CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y +CONFIG_FEATURE_HTTPD_ERROR_PAGES=y +CONFIG_FEATURE_HTTPD_PROXY=y +CONFIG_IFCONFIG=y +CONFIG_FEATURE_IFCONFIG_STATUS=y +# CONFIG_FEATURE_IFCONFIG_SLIP is not set +# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set +CONFIG_FEATURE_IFCONFIG_HW=y +CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y +# CONFIG_IFENSLAVE is not set +CONFIG_IFUPDOWN=y +CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" +# CONFIG_FEATURE_IFUPDOWN_IP is not set +# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set +CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN=y +CONFIG_FEATURE_IFUPDOWN_IPV4=y +CONFIG_FEATURE_IFUPDOWN_IPV6=y +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set +# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set +# CONFIG_INETD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set +# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set +# CONFIG_FEATURE_INETD_RPC is not set +CONFIG_IP=y +CONFIG_FEATURE_IP_ADDRESS=y +CONFIG_FEATURE_IP_LINK=y +CONFIG_FEATURE_IP_ROUTE=y +CONFIG_FEATURE_IP_TUNNEL=y +CONFIG_FEATURE_IP_RULE=y +CONFIG_FEATURE_IP_SHORT_FORMS=y +# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set +CONFIG_IPADDR=y +CONFIG_IPLINK=y +CONFIG_IPROUTE=y +CONFIG_IPTUNNEL=y +CONFIG_IPRULE=y +CONFIG_IPCALC=y +CONFIG_FEATURE_IPCALC_FANCY=y +CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set +CONFIG_NC=y +CONFIG_NC_SERVER=y +CONFIG_NC_EXTRA=y +CONFIG_NETSTAT=y +CONFIG_FEATURE_NETSTAT_WIDE=y +CONFIG_NSLOOKUP=y +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_PSCAN is not set +CONFIG_ROUTE=y +# CONFIG_SENDMAIL is not set +# CONFIG_FETCHMAIL is not set +# CONFIG_SLATTACH is not set +CONFIG_TELNET=y +CONFIG_FEATURE_TELNET_TTYPE=y +CONFIG_FEATURE_TELNET_AUTOLOGIN=y +CONFIG_TELNETD=y +# CONFIG_FEATURE_TELNETD_STANDALONE is not set +CONFIG_TFTP=y +CONFIG_TFTPD=y +CONFIG_FEATURE_TFTP_GET=y +CONFIG_FEATURE_TFTP_PUT=y +CONFIG_FEATURE_TFTP_BLOCKSIZE=y +CONFIG_DEBUG_TFTP=y +CONFIG_TRACEROUTE=y +CONFIG_FEATURE_TRACEROUTE_VERBOSE=y +CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE=y +# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set +# CONFIG_APP_UDHCPD is not set +# CONFIG_APP_DHCPRELAY is not set +# CONFIG_APP_DUMPLEASES is not set +# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +CONFIG_DHCPD_LEASES_FILE="" +CONFIG_APP_UDHCPC=y +CONFIG_FEATURE_UDHCPC_ARPING=y +# CONFIG_FEATURE_UDHCP_PORT is not set +# CONFIG_FEATURE_UDHCP_DEBUG is not set +# CONFIG_FEATURE_RFC3397 is not set +CONFIG_DHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=120 +CONFIG_VCONFIG=y +CONFIG_WGET=y +CONFIG_FEATURE_WGET_STATUSBAR=y +CONFIG_FEATURE_WGET_AUTHENTICATION=y +CONFIG_FEATURE_WGET_LONG_OPTIONS=y +# CONFIG_ZCIP is not set +# CONFIG_TCPSVD is not set +# CONFIG_UDPSVD is not set + +# +# Process Utilities +# +CONFIG_FREE=y +CONFIG_FUSER=y +CONFIG_KILL=y +CONFIG_KILLALL=y +# CONFIG_KILLALL5 is not set +# CONFIG_NMETER is not set +# CONFIG_PGREP is not set +CONFIG_PIDOF=y +CONFIG_FEATURE_PIDOF_SINGLE=y +CONFIG_FEATURE_PIDOF_OMIT=y +CONFIG_PKILL=y +CONFIG_PS=y +CONFIG_FEATURE_PS_WIDE=y +# CONFIG_FEATURE_PS_TIME is not set +# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set +CONFIG_RENICE=y +CONFIG_BB_SYSCTL=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +CONFIG_FEATURE_TOP_DECIMALS=y +CONFIG_FEATURE_TOPMEM=y +CONFIG_UPTIME=y +CONFIG_WATCH=y + +# +# Shells +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +CONFIG_ASH_BASH_COMPAT=y +CONFIG_ASH_JOB_CONTROL=y +CONFIG_ASH_READ_NCHARS=y +CONFIG_ASH_READ_TIMEOUT=y +CONFIG_ASH_ALIAS=y +CONFIG_ASH_MATH_SUPPORT=y +# CONFIG_ASH_MATH_SUPPORT_64 is not set +CONFIG_ASH_GETOPTS=y +CONFIG_ASH_BUILTIN_ECHO=y +CONFIG_ASH_BUILTIN_PRINTF=y +CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_CMDCMD=y +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +CONFIG_ASH_RANDOM_SUPPORT=y +CONFIG_ASH_EXPAND_PRMT=y +# CONFIG_HUSH is not set +# CONFIG_HUSH_HELP is not set +# CONFIG_HUSH_INTERACTIVE is not set +# CONFIG_HUSH_JOB is not set +# CONFIG_HUSH_TICK is not set +# CONFIG_HUSH_IF is not set +# CONFIG_HUSH_LOOPS is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +CONFIG_FEATURE_SH_EXTRA_QUIET=y +# CONFIG_FEATURE_SH_STANDALONE is not set +# CONFIG_FEATURE_SH_NOFORK is not set +CONFIG_CTTYHACK=y + +# +# System Logging Utilities +# +CONFIG_SYSLOGD=y +CONFIG_FEATURE_ROTATE_LOGFILE=y +CONFIG_FEATURE_REMOTE_LOG=y +CONFIG_FEATURE_SYSLOGD_DUP=y +CONFIG_FEATURE_IPC_SYSLOG=y +CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 +CONFIG_LOGREAD=y +CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_KLOGD=y +CONFIG_LOGGER=y + +# +# Runit Utilities +# +# CONFIG_RUNSV is not set +# CONFIG_RUNSVDIR is not set +# CONFIG_SV is not set +# CONFIG_SVLOGD is not set +# CONFIG_CHPST is not set +# CONFIG_SETUIDGID is not set +# CONFIG_ENVUIDGID is not set +# CONFIG_ENVDIR is not set +# CONFIG_SOFTLIMIT is not set +# CONFIG_CHCON is not set +# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set +# CONFIG_GETENFORCE is not set +# CONFIG_GETSEBOOL is not set +# CONFIG_LOAD_POLICY is not set +# CONFIG_MATCHPATHCON is not set +# CONFIG_RESTORECON is not set +# CONFIG_RUNCON is not set +# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set +# CONFIG_SELINUXENABLED is not set +# CONFIG_SETENFORCE is not set +# CONFIG_SETFILES is not set +# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set +# CONFIG_SETSEBOOL is not set +# CONFIG_SESTATUS is not set + +# +# Print Utilities +# +# CONFIG_LPD is not set +# CONFIG_LPR is not set +# CONFIG_LPQ is not set diff --git a/packages/initscripts/initscripts-1.0/slugos/alignment.sh b/packages/initscripts/initscripts-1.0/slugos/alignment.sh index bf193cb01c..52e43cc0c5 100644 --- a/packages/initscripts/initscripts-1.0/slugos/alignment.sh +++ b/packages/initscripts/initscripts-1.0/slugos/alignment.sh @@ -14,7 +14,7 @@ # Set ALIGN in /etc/default/rcS to override (do not edit this # file!) Set ALIGN to empty to avoid changing the kernel # default (currently '0'). -ALIGN=1 +ALIGN=3 . /etc/default/rcS test -e /proc/cpu/alignment -a -n "$ALIGN" -a "$ALIGN" -ge 0 -a "$ALIGN" -lt 6 && echo "$ALIGN" >/proc/cpu/alignment diff --git a/packages/initscripts/initscripts-1.0/slugos/bootclean.sh b/packages/initscripts/initscripts-1.0/slugos/bootclean.sh index 1304cb3794..3b17d6d617 100644 --- a/packages/initscripts/initscripts-1.0/slugos/bootclean.sh +++ b/packages/initscripts/initscripts-1.0/slugos/bootclean.sh @@ -16,8 +16,8 @@ if [ -d /tmp -a ! -L /tmp ] ; then echo "bootclean.sh: Cleaning /tmp..." cd /tmp || { echo "bootclean.sh: unable to cd to /tmp." ; return 1 ; } - find . -depth -xdev ! -type d -print0 | xargs -0r rm -f -- - find . -depth -xdev -type d ! -name . -empty -exec rmdir \{\} \; + find . -xdev ! -type d -print0 | xargs -0r rm -f -- + find . -depth -xdev -type d ! -name . -exec rmdir \{\} \; else echo "bootclean.sh: Skipping /tmp (not a directory)..." fi diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 0608db714d..242a55ad7a 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -10,7 +10,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}.12" +PR := "${PR}.13" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index a991bc50ac..d47be54c37 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -37,6 +37,7 @@ then # the UUID mount fails a standard device mount # is attempted. if test -n "$UUID" && + mount "$@" UUID="$UUID" /mnt || mount "$@" -U "$UUID" /mnt || mount "$@" "$device" /mnt then diff --git a/packages/slugos-init/files/boot/kexec b/packages/slugos-init/files/boot/kexec index 8973d20bfe..dd757fd771 100644 --- a/packages/slugos-init/files/boot/kexec +++ b/packages/slugos-init/files/boot/kexec @@ -126,7 +126,7 @@ if [ -n "$1" -a -n "$2" ] ; then sleep "$sleep" if [ -n "$UUID" ] ; then echo "mounting partition UUID \"$UUID\"..." - if mount -o ro -U "$UUID" /mnt ; then + if mount -o ro UUID="$UUID" /mnt ; then need_umount=1 kexec_image="/mnt/$kpath" fi diff --git a/packages/slugos-init/files/sysconf b/packages/slugos-init/files/sysconf index 57a69b7643..3059a466da 100644 --- a/packages/slugos-init/files/sysconf +++ b/packages/slugos-init/files/sysconf @@ -238,7 +238,7 @@ sysconf_save_conffiles(){ } # ( cd "$ffsdir" - find etc/*.conf $(sed 's!^/!!' usr/lib/ipkg/info/*.conffiles) ! -type d -newer etc/.configured -print | + find etc/*.conf $(sed 's!^/!!' usr/lib/opkg/info/*.conffiles) ! -type d -newer etc/.configured -print | sed 's/^/diff /' exec sed 's/#.*$//;/^[ ]*$/d' etc/default/conffiles ) | sed 's!^/*!!' | diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index c6220077a5..4aa1fba3ed 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -49,7 +49,7 @@ l root root 1777 /var/tmp /var/volatile/tmp d root root 0755 /var/lock/subsys none d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none -d root root 0755 /var/lib/ipkg none +d root root 0755 /var/lib/opkg none f root root 0664 /var/log/wtmp none f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" @@ -68,7 +68,7 @@ d root root 1777 /var/tmp none d root root 0755 /var/lock/subsys none d root root 0755 /var/lib/dropbear none d root root 0755 /var/lib/misc none -d root root 0755 /var/lib/ipkg none +d root root 0755 /var/lib/opkg none f root root 0664 /var/log/wtmp none f root root 0664 /var/log/lastlog none f root root 0664 /var/run/utmp none" @@ -578,7 +578,7 @@ disk() { fso="$(fsoptions "$@")" if if test -n "$uuid" then - mount "$@" -U "$uuid" "$new" + mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new" else mount "$@" "$device" "$new" fi @@ -591,7 +591,7 @@ disk() { if test -n "$fst" && if test -n "$uuid" then - mount -t "$fst" -o "$fso" -U "$uuid" "$new" + mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new" else mount -t "$fst" -o "$fso" "$device" "$new" fi @@ -633,7 +633,7 @@ disk() { then echo " options used: -t $fst -o $fso [error in this script]" >&2 test -n "$uuid" && - echo " uuid: $uuid (passed with -U)" >&2 + echo " uuid: $uuid (passed with UUID= or -U)" >&2 fi fi diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb new file mode 100644 index 0000000000..9c50cd61f6 --- /dev/null +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -0,0 +1,148 @@ +DESCRIPTION = "SlugOS initial network config via sysconf" +SECTION = "base" +PRIORITY = "required" +LICENSE = "GPL" +DEPENDS = "base-files devio" +RDEPENDS = "busybox devio" +PR = "r0" + +SRC_URI = "file://boot/flash \ + file://boot/disk \ + file://boot/nfs \ + file://boot/ram \ + file://boot/kexec \ + file://boot/network \ + file://boot/udhcpc.script \ + file://initscripts/fixfstab \ + file://initscripts/syslog.buffer \ + file://initscripts/syslog.file \ + file://initscripts/syslog.network \ + file://initscripts/zleds \ + file://initscripts/leds_startup \ + file://initscripts/rmrecovery \ + file://initscripts/sysconfsetup \ + file://initscripts/umountinitrd.sh \ + file://initscripts/loadmodules.sh \ + file://functions \ + file://modulefunctions \ + file://conffiles \ + file://sysconf \ + file://leds \ + file://turnup \ + " + +SBINPROGS = "" +USRSBINPROGS = "" +CPROGS = "${USRSBINPROGS} ${SBINPROGS}" +SCRIPTS = "turnup leds sysconf" +BOOTSCRIPTS = "flash disk nfs ram kexec network udhcpc.script" +INITSCRIPTS = "syslog.buffer syslog.file syslog.network zleds\ + leds_startup rmrecovery sysconfsetup umountinitrd.sh\ + fixfstab loadmodules.sh" + +# This just makes things easier... +S="${WORKDIR}" + +do_compile() { + set -ex + for p in ${CPROGS} + do + ${CC} ${CFLAGS} -o $p $p.c + done + set +ex +} + +do_install() { + set -ex + + # Directories + install -d ${D}${sysconfdir} \ + ${D}${sysconfdir}/default \ + ${D}${sysconfdir}/init.d \ + ${D}${sysconfdir}/modutils \ + ${D}${sysconfdir}/udev \ + ${D}${sbindir} \ + ${D}${base_sbindir} \ + ${D}/initrd \ + ${D}/boot + + # linuxrc + rm -f ${D}/linuxrc + ln -s boot/flash ${D}/linuxrc + + # C programs + for p in ${USRSBINPROGS} + do + install -m 0755 $p ${D}${sbindir}/$p + done + for p in ${SBINPROGS} + do + install -m 0755 $p ${D}${base_sbindir}/$p + done + + # Shell scripts + for p in ${SCRIPTS} + do + install -m 0755 $p ${D}${base_sbindir}/$p + done + + # + # Init scripts + install -m 0644 functions ${D}${sysconfdir}/default + install -m 0644 modulefunctions ${D}${sysconfdir}/default + for s in ${INITSCRIPTS} + do + install -m 0755 initscripts/$s ${D}${sysconfdir}/init.d/ + done + + # + # Boot scripts + for p in ${BOOTSCRIPTS} + do + install -m 0755 boot/$p ${D}/boot + done + + # Configuration files + install -m 0644 conffiles ${D}${sysconfdir}/default + + set +ex +} + +# If the package is installed on an NSLU2 $D will be empty, in that +# case it is normal to run 'start' and 'stop', but because the conf +# files installed don't actually start or stop anything this is +# unnecessary, so the package postfoo handling is simplified here. +#NB: do not use '08' (etc) for the first argument after start/stop, +# the value is interpreted as an octal number if there is a leading +# zero. +pkg_postinst_slugos-init() { + opt= + test -n "$D" && opt="-r $D" + update-rc.d $opt hwclock.sh start 8 S . start 45 0 6 . + update-rc.d $opt umountinitrd.sh start 9 S . + update-rc.d $opt fixfstab start 10 S . + update-rc.d $opt syslog.buffer start 11 S . start 49 0 6 . + update-rc.d $opt sysconfsetup start 12 S . + update-rc.d $opt loadmodules.sh start 21 S . + update-rc.d $opt syslog.file start 39 S . start 47 0 6 . + update-rc.d $opt syslog.network start 44 S . start 39 0 6 . + update-rc.d $opt zleds start 99 S 1 2 3 4 5 . start 89 0 6 . stop 5 0 1 2 3 4 5 6 . + update-rc.d $opt rmrecovery start 99 1 2 3 4 5 . + # bug fix for startup + update-rc.d $opt leds_startup start 1 1 2 3 4 5 . +} + +pkg_postrm_slugos-init() { + opt= + test -n "$D" && opt="-r $D" + for s in ${INITSCRIPTS} + do + update-rc.d $opt "$s" remove + done +} + +FILES_${PN} = "/" + +# It is bad to overwrite /linuxrc as it puts the system back to +# a flash boot (and the flash has potentially not been upgraded!) +CONFFILES_${PN} = "/linuxrc ${sysconfdir}/default/conffiles" diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index f8d9d3501b..186eab6d07 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r18" +PR = "r19" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" ALLOW_EMPTY = "1" @@ -23,10 +23,12 @@ SLUGOS_STANDARD_RRECOMMENDS = "" # diff, cpio and find are required for turnup and ipkg. SLUGOS_STANDARD_RRECOMMENDS += "\ -diffutils \ cpio \ -findutils \ " +## SlugOS 5.0 -- uses busybox diff & find; cpio still needs -p and ability to +## create CRC archives before we can use busybox cpio - MJW +#diffutils \ +#findutils \ # These lines add support for formatting ext2 and ext3 file systems # on a hard disk attached to the NSLU2. ext3 is the standard Linux @@ -42,7 +44,8 @@ e2fsprogs-blkid \ # These lines add support for an X/Y/ZModem package called lrzsz # (this is of use for people with modified NSLU2 hardware which # supports a serial port.) -SLUGOS_STANDARD_RRECOMMENDS += "lrzsz" +## SlugOS 5.0 -- uses busybox rx command - MJW +#SLUGOS_STANDARD_RRECOMMENDS += "lrzsz" # Filesystem selection. Adding entries here adds the module to the # image. The module must be built as part of nslu2-kernel (i.e. it @@ -116,19 +119,35 @@ DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" DISTRO_EXTRA_RDEPENDS ?= "" +##RDEPENDS += "\ +## kernel ixp4xx-npe \ +## base-files base-passwd netbase \ +## busybox initscripts-slugos slugos-init \ +## update-modules sysvinit tinylogin udev \ +## module-init-tools modutils-initscripts \ +## ipkg-collateral ipkg ipkg-link \ +## libgcc \ +## beep \ +## util-linux-mount \ +## util-linux-umount \ +## util-linux-swaponoff \ +## util-linux-losetup \ +## ${SLUGOS_STANDARD_RDEPENDS} \ +## ${DISTRO_EXTRA_RDEPENDS}" +## SlugOS 5.0 - original RDEPENDS above for reference; tinylogin and the +## util-linux-* utilities are now replaced by busybox tools. Also, ipkg +## is replaced by a trimmed-down version of opkg (no package signatures, +## and it uses the busybox wget command instead of libcurl - MJW + RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ busybox initscripts-slugos slugos-init \ - update-modules sysvinit tinylogin udev \ + update-modules sysvinit udev \ module-init-tools modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ + opkg-collateral opkg-nogpg-nocurl \ libgcc \ beep \ - util-linux-mount \ - util-linux-umount \ - util-linux-swaponoff \ - util-linux-losetup \ ${SLUGOS_STANDARD_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" -- cgit v1.2.3 From d3318d80e7c6f902ed937916728e7bc2fb7f042e Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 04:42:06 +0000 Subject: checksums.ini: busybox tar patch checksum changed to accomodate upstream (patch contents upstream were changed without changing the name of the patch) --- conf/checksums.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/checksums.ini b/conf/checksums.ini index 648da96cb6..394d8af91e 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -1711,8 +1711,8 @@ md5=f7780f73d3338b17d5f2eedbe76132de sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b [http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch] -md5=83763d83057bd5288bbd99f8a5b93c5c -sha256=8b09efc89a8618d526dd210a8a296558a27b1a5324d47b219826b2e1713e5e58 +md5=fb01aea02faf4c5107292454745806ff +sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443 [http://www.busybox.net/downloads/busybox-1.11.1.tar.gz] md5=9c9f06c2d949c6de844c7bed8eb47064 -- cgit v1.2.3 From 17e79f6175d5d44072bbac2d0990e2402a82786f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 15:02:39 +0000 Subject: fso-image: COMPATIBLE_MACHINE are om-gta(1|2) only --- packages/images/fso-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index a857c5b331..261caa3476 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -2,6 +2,7 @@ # freesmartphone.org Image Recipe #------------------------------------------------------ +COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" IMAGE_LINGUAS = "" # getting the base system up -- cgit v1.2.3 From 29115af38fc715fd35cd98176064b89fede86eeb Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 15:14:11 +0000 Subject: gphoto|sane: move some stuff depending on libexif to nonworking. * once libexif has been fixed, these packages can probably be moved back --- packages/gphoto2/.mtn2git_empty | 0 packages/gphoto2/gphoto2_2.1.4.bb | 9 ---- packages/gphoto2/gphoto2_2.1.5.bb | 9 ---- packages/gphoto2/gphoto2_2.1.6.bb | 9 ---- packages/gphoto2/gphoto2_2.4.0.bb | 14 ------ packages/libgphoto2/.mtn2git_empty | 0 packages/libgphoto2/libgphoto2_2.1.4.bb | 29 ------------ packages/libgphoto2/libgphoto2_2.1.5.bb | 32 ------------- packages/libgphoto2/libgphoto2_2.1.6.bb | 36 --------------- packages/libgphoto2/libgphoto2_2.4.0.bb | 31 ------------- packages/nonworking/gphoto2/.mtn2git_empty | 0 packages/nonworking/gphoto2/gphoto2_2.1.4.bb | 9 ++++ packages/nonworking/gphoto2/gphoto2_2.1.5.bb | 9 ++++ packages/nonworking/gphoto2/gphoto2_2.1.6.bb | 9 ++++ packages/nonworking/gphoto2/gphoto2_2.4.0.bb | 14 ++++++ packages/nonworking/gphoto2/libgphoto2_2.1.4.bb | 29 ++++++++++++ packages/nonworking/gphoto2/libgphoto2_2.1.5.bb | 32 +++++++++++++ packages/nonworking/gphoto2/libgphoto2_2.1.6.bb | 36 +++++++++++++++ packages/nonworking/gphoto2/libgphoto2_2.4.0.bb | 31 +++++++++++++ packages/nonworking/sane/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 +++++ .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ++++++++++++++++++++++ .../sane/sane-backends-1.0.17/saned.xinetd | 10 +++++ packages/nonworking/sane/sane-backends_1.0.17.bb | 42 +++++++++++++++++ packages/nonworking/sane/sane-frontends_1.0.13.bb | 20 +++++++++ packages/sane/.mtn2git_empty | 0 packages/sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 ----- .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ---------------------- packages/sane/sane-backends-1.0.17/saned.xinetd | 10 ----- packages/sane/sane-backends_1.0.17.bb | 42 ----------------- packages/sane/sane-frontends_1.0.13.bb | 20 --------- 33 files changed, 304 insertions(+), 304 deletions(-) delete mode 100644 packages/gphoto2/.mtn2git_empty delete mode 100644 packages/gphoto2/gphoto2_2.1.4.bb delete mode 100644 packages/gphoto2/gphoto2_2.1.5.bb delete mode 100644 packages/gphoto2/gphoto2_2.1.6.bb delete mode 100644 packages/gphoto2/gphoto2_2.4.0.bb delete mode 100644 packages/libgphoto2/.mtn2git_empty delete mode 100644 packages/libgphoto2/libgphoto2_2.1.4.bb delete mode 100644 packages/libgphoto2/libgphoto2_2.1.5.bb delete mode 100644 packages/libgphoto2/libgphoto2_2.1.6.bb delete mode 100644 packages/libgphoto2/libgphoto2_2.4.0.bb create mode 100644 packages/nonworking/gphoto2/.mtn2git_empty create mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.4.bb create mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.5.bb create mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.6.bb create mode 100644 packages/nonworking/gphoto2/gphoto2_2.4.0.bb create mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.4.bb create mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.5.bb create mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.6.bb create mode 100644 packages/nonworking/gphoto2/libgphoto2_2.4.0.bb create mode 100644 packages/nonworking/sane/.mtn2git_empty create mode 100644 packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty create mode 100644 packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch create mode 100644 packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch create mode 100644 packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd create mode 100644 packages/nonworking/sane/sane-backends_1.0.17.bb create mode 100644 packages/nonworking/sane/sane-frontends_1.0.13.bb delete mode 100644 packages/sane/.mtn2git_empty delete mode 100644 packages/sane/sane-backends-1.0.17/.mtn2git_empty delete mode 100644 packages/sane/sane-backends-1.0.17/Makefile.in.patch delete mode 100644 packages/sane/sane-backends-1.0.17/sane-plustek.patch delete mode 100644 packages/sane/sane-backends-1.0.17/saned.xinetd delete mode 100644 packages/sane/sane-backends_1.0.17.bb delete mode 100644 packages/sane/sane-frontends_1.0.13.bb diff --git a/packages/gphoto2/.mtn2git_empty b/packages/gphoto2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb deleted file mode 100644 index 80d0ee0f27..0000000000 --- a/packages/gphoto2/gphoto2_2.1.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" - -inherit autotools diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb deleted file mode 100644 index 0913b9743c..0000000000 --- a/packages/gphoto2/gphoto2_2.1.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" - -inherit autotools diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb deleted file mode 100644 index 63dad91f14..0000000000 --- a/packages/gphoto2/gphoto2_2.1.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" - -inherit autotools diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb deleted file mode 100644 index 6bc1a42f9e..0000000000 --- a/packages/gphoto2/gphoto2_2.4.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} - diff --git a/packages/libgphoto2/.mtn2git_empty b/packages/libgphoto2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/libgphoto2/libgphoto2_2.1.4.bb b/packages/libgphoto2/libgphoto2_2.1.4.bb deleted file mode 100644 index fed7c41e40..0000000000 --- a/packages/libgphoto2/libgphoto2_2.1.4.bb +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/libgphoto2/libgphoto2_2.1.5.bb b/packages/libgphoto2/libgphoto2_2.1.5.bb deleted file mode 100644 index 67efc38785..0000000000 --- a/packages/libgphoto2/libgphoto2_2.1.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb deleted file mode 100644 index ad57ba8cf1..0000000000 --- a/packages/libgphoto2/libgphoto2_2.1.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} -PACKAGES =+ "libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" -RDEPENDS_libgphoto2 = "libgphoto2-camlibs" - diff --git a/packages/libgphoto2/libgphoto2_2.4.0.bb b/packages/libgphoto2/libgphoto2_2.4.0.bb deleted file mode 100644 index c6f63374cc..0000000000 --- a/packages/libgphoto2/libgphoto2_2.4.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SECTION = "libs" -LICENSE = "GPL" -DEPENDS = "libtool jpeg libusb libexif" - -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -inherit autotools pkgconfig lib_package - -OE_LT_RPATH_ALLOW=":${libdir}:" -OE_LT_RPATH_ALLOW[export]="1" - -EXTRA_OECONF = " --with-drivers=all" - -PACKAGES =+ "libgphotoport libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" -RDEPENDS_${PN} = "libgphoto2-camlibs" - -FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" - -FILES_${PN} += "${libdir}/udev/*" -FILES_${PN}-dbg += "${libdir}/*/*/.debug" - -do_stage() { - autotools_stage_all -} - - diff --git a/packages/nonworking/gphoto2/.mtn2git_empty b/packages/nonworking/gphoto2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.4.bb b/packages/nonworking/gphoto2/gphoto2_2.1.4.bb new file mode 100644 index 0000000000..80d0ee0f27 --- /dev/null +++ b/packages/nonworking/gphoto2/gphoto2_2.1.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.5.bb b/packages/nonworking/gphoto2/gphoto2_2.1.5.bb new file mode 100644 index 0000000000..0913b9743c --- /dev/null +++ b/packages/nonworking/gphoto2/gphoto2_2.1.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.6.bb b/packages/nonworking/gphoto2/gphoto2_2.1.6.bb new file mode 100644 index 0000000000..63dad91f14 --- /dev/null +++ b/packages/nonworking/gphoto2/gphoto2_2.1.6.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.4.0.bb b/packages/nonworking/gphoto2/gphoto2_2.4.0.bb new file mode 100644 index 0000000000..6bc1a42f9e --- /dev/null +++ b/packages/nonworking/gphoto2/gphoto2_2.4.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb new file mode 100644 index 0000000000..fed7c41e40 --- /dev/null +++ b/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb @@ -0,0 +1,29 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb new file mode 100644 index 0000000000..67efc38785 --- /dev/null +++ b/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb @@ -0,0 +1,32 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb new file mode 100644 index 0000000000..ad57ba8cf1 --- /dev/null +++ b/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb @@ -0,0 +1,36 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r6" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} +PACKAGES =+ "libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" +RDEPENDS_libgphoto2 = "libgphoto2-camlibs" + diff --git a/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb b/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb new file mode 100644 index 0000000000..c6f63374cc --- /dev/null +++ b/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "libtool jpeg libusb libexif" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +inherit autotools pkgconfig lib_package + +OE_LT_RPATH_ALLOW=":${libdir}:" +OE_LT_RPATH_ALLOW[export]="1" + +EXTRA_OECONF = " --with-drivers=all" + +PACKAGES =+ "libgphotoport libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" +RDEPENDS_${PN} = "libgphoto2-camlibs" + +FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" + +FILES_${PN} += "${libdir}/udev/*" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/nonworking/sane/.mtn2git_empty b/packages/nonworking/sane/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch new file mode 100644 index 0000000000..d73a2f0fb5 --- /dev/null +++ b/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch @@ -0,0 +1,11 @@ +--- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 ++++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 +@@ -33,7 +33,7 @@ + + @SET_MAKE@ + +-SUBDIRS = include lib sanei backend frontend tools doc po ++SUBDIRS = include lib sanei backend frontend tools po + + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ + ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch new file mode 100644 index 0000000000..f6920c6e22 --- /dev/null +++ b/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch @@ -0,0 +1,52 @@ +--- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 ++++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 +@@ -106,17 +106,20 @@ + #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) + + /* useful for RGB-values */ ++#define PACKED8 __attribute__ ((packed,aligned(1))) ++#define PACKED16 __attribute__ ((packed,aligned(2))) ++ + typedef struct { + u_char Red; + u_char Green; + u_char Blue; +-} RGBByteDef, *pRGBByteDef; ++} PACKED8 RGBByteDef, *pRGBByteDef; + + typedef struct { + u_short Red; + u_short Green; + u_short Blue; +-} RGBUShortDef, *pRGBUShortDef; ++} PACKED16 RGBUShortDef, *pRGBUShortDef; + + typedef struct { + u_long Red; +@@ -126,22 +129,22 @@ + + typedef struct { + u_char a_bColor[3]; +-} ColorByteDef, *pColorByteDef; ++} PACKED8 ColorByteDef, *pColorByteDef; + + typedef struct { + u_char bHi; + u_char bLo; +-} HiLoDef, *pHiLoDef; ++} PACKED8 HiLoDef, *pHiLoDef; + + typedef union { + HiLoDef HiLo[3]; + u_short Colors[3]; +-} ColorWordDef, *pColorWordDef; ++} PACKED16 ColorWordDef, *pColorWordDef; + + typedef union { + HiLoDef HiLo; + u_short Mono; +-} MonoWordDef, *pMonoWordDef; ++} PACKED16 MonoWordDef, *pMonoWordDef; + + typedef union { + diff --git a/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd b/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd new file mode 100644 index 0000000000..f4e890fdbe --- /dev/null +++ b/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd @@ -0,0 +1,10 @@ +service sane-port +{ + socket_type = stream + server = /usr/sbin/saned + protocol = tcp + user = nobody + group = nogroup + wait = no + disable = no +} diff --git a/packages/nonworking/sane/sane-backends_1.0.17.bb b/packages/nonworking/sane/sane-backends_1.0.17.bb new file mode 100644 index 0000000000..4854f4d10c --- /dev/null +++ b/packages/nonworking/sane/sane-backends_1.0.17.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Scanner drivers for SANE" +DEPENDS = "gphoto2 jpeg libusb" +LICENSE = "LGPL" + +PR = "r2" + +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ + file://Makefile.in.patch;patch=1 \ + file://saned.xinetd \ + " + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--disable-translations" + +do_install_append() { + install -d "${D}/${sysconfdir}/xinetd.d" + install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" + install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" +} + +PACKAGES =+ "libsane libsane-dev saned sane-utils" + +FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" +RRECOMMENDS_libsane = "saned sane-utils" +FILES_libsane-dev += "${libdir}/sane/*" + +RRECOMMENDS_saned = "xinetd" +FILES_saned = "${sbindir}/saned" + +FILES_sane-utils = "${bindir}/*" +FILES_${PN}-dbg += "${libdir}/sane/.debug" + + +CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" + +do_stage() { + autotools_stage_all +} + + + diff --git a/packages/nonworking/sane/sane-frontends_1.0.13.bb b/packages/nonworking/sane/sane-frontends_1.0.13.bb new file mode 100644 index 0000000000..f79cf9e508 --- /dev/null +++ b/packages/nonworking/sane/sane-frontends_1.0.13.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Frontends for SANE" +DEPENDS = "virtual/libx11 gimp sane-backends" +LICENSE = "LGPL" + +PR = "r0" + +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \ + " + +inherit autotools + +EXTRA_OECONF = "--disable-translations" + +PACKAGES =+ "scanadf xcam xscanimage" + +FILES_scanadf = "${bindir}/scanadf" +FILES_xcam = "${bindir}/xcam" +FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane" + + diff --git a/packages/sane/.mtn2git_empty b/packages/sane/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/sane/sane-backends-1.0.17/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.17/Makefile.in.patch deleted file mode 100644 index d73a2f0fb5..0000000000 --- a/packages/sane/sane-backends-1.0.17/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 -+++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 -@@ -33,7 +33,7 @@ - - @SET_MAKE@ - --SUBDIRS = include lib sanei backend frontend tools doc po -+SUBDIRS = include lib sanei backend frontend tools po - - DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ - ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.17/sane-plustek.patch deleted file mode 100644 index f6920c6e22..0000000000 --- a/packages/sane/sane-backends-1.0.17/sane-plustek.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 -+++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 -@@ -106,17 +106,20 @@ - #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) - - /* useful for RGB-values */ -+#define PACKED8 __attribute__ ((packed,aligned(1))) -+#define PACKED16 __attribute__ ((packed,aligned(2))) -+ - typedef struct { - u_char Red; - u_char Green; - u_char Blue; --} RGBByteDef, *pRGBByteDef; -+} PACKED8 RGBByteDef, *pRGBByteDef; - - typedef struct { - u_short Red; - u_short Green; - u_short Blue; --} RGBUShortDef, *pRGBUShortDef; -+} PACKED16 RGBUShortDef, *pRGBUShortDef; - - typedef struct { - u_long Red; -@@ -126,22 +129,22 @@ - - typedef struct { - u_char a_bColor[3]; --} ColorByteDef, *pColorByteDef; -+} PACKED8 ColorByteDef, *pColorByteDef; - - typedef struct { - u_char bHi; - u_char bLo; --} HiLoDef, *pHiLoDef; -+} PACKED8 HiLoDef, *pHiLoDef; - - typedef union { - HiLoDef HiLo[3]; - u_short Colors[3]; --} ColorWordDef, *pColorWordDef; -+} PACKED16 ColorWordDef, *pColorWordDef; - - typedef union { - HiLoDef HiLo; - u_short Mono; --} MonoWordDef, *pMonoWordDef; -+} PACKED16 MonoWordDef, *pMonoWordDef; - - typedef union { - diff --git a/packages/sane/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.17/saned.xinetd deleted file mode 100644 index f4e890fdbe..0000000000 --- a/packages/sane/sane-backends-1.0.17/saned.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service sane-port -{ - socket_type = stream - server = /usr/sbin/saned - protocol = tcp - user = nobody - group = nogroup - wait = no - disable = no -} diff --git a/packages/sane/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.17.bb deleted file mode 100644 index 4854f4d10c..0000000000 --- a/packages/sane/sane-backends_1.0.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Scanner drivers for SANE" -DEPENDS = "gphoto2 jpeg libusb" -LICENSE = "LGPL" - -PR = "r2" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ - file://Makefile.in.patch;patch=1 \ - file://saned.xinetd \ - " - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--disable-translations" - -do_install_append() { - install -d "${D}/${sysconfdir}/xinetd.d" - install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" - install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" -} - -PACKAGES =+ "libsane libsane-dev saned sane-utils" - -FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" -RRECOMMENDS_libsane = "saned sane-utils" -FILES_libsane-dev += "${libdir}/sane/*" - -RRECOMMENDS_saned = "xinetd" -FILES_saned = "${sbindir}/saned" - -FILES_sane-utils = "${bindir}/*" -FILES_${PN}-dbg += "${libdir}/sane/.debug" - - -CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" - -do_stage() { - autotools_stage_all -} - - - diff --git a/packages/sane/sane-frontends_1.0.13.bb b/packages/sane/sane-frontends_1.0.13.bb deleted file mode 100644 index f79cf9e508..0000000000 --- a/packages/sane/sane-frontends_1.0.13.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Frontends for SANE" -DEPENDS = "virtual/libx11 gimp sane-backends" -LICENSE = "LGPL" - -PR = "r0" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \ - " - -inherit autotools - -EXTRA_OECONF = "--disable-translations" - -PACKAGES =+ "scanadf xcam xscanimage" - -FILES_scanadf = "${bindir}/scanadf" -FILES_xcam = "${bindir}/xcam" -FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane" - - -- cgit v1.2.3 From 3d947531d6e2a313b6e68631c93e50dc9b956b96 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Aug 2008 15:46:24 +0000 Subject: disapproval of revision '0ee2e3ebf2818ac252bbfb150badcf82e665fec4' --- packages/gphoto2/.mtn2git_empty | 0 packages/gphoto2/gphoto2_2.1.4.bb | 9 ++++ packages/gphoto2/gphoto2_2.1.5.bb | 9 ++++ packages/gphoto2/gphoto2_2.1.6.bb | 9 ++++ packages/gphoto2/gphoto2_2.4.0.bb | 14 ++++++ packages/libgphoto2/.mtn2git_empty | 0 packages/libgphoto2/libgphoto2_2.1.4.bb | 29 ++++++++++++ packages/libgphoto2/libgphoto2_2.1.5.bb | 32 +++++++++++++ packages/libgphoto2/libgphoto2_2.1.6.bb | 36 +++++++++++++++ packages/libgphoto2/libgphoto2_2.4.0.bb | 31 +++++++++++++ packages/nonworking/gphoto2/.mtn2git_empty | 0 packages/nonworking/gphoto2/gphoto2_2.1.4.bb | 9 ---- packages/nonworking/gphoto2/gphoto2_2.1.5.bb | 9 ---- packages/nonworking/gphoto2/gphoto2_2.1.6.bb | 9 ---- packages/nonworking/gphoto2/gphoto2_2.4.0.bb | 14 ------ packages/nonworking/gphoto2/libgphoto2_2.1.4.bb | 29 ------------ packages/nonworking/gphoto2/libgphoto2_2.1.5.bb | 32 ------------- packages/nonworking/gphoto2/libgphoto2_2.1.6.bb | 36 --------------- packages/nonworking/gphoto2/libgphoto2_2.4.0.bb | 31 ------------- packages/nonworking/sane/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 ----- .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ---------------------- .../sane/sane-backends-1.0.17/saned.xinetd | 10 ----- packages/nonworking/sane/sane-backends_1.0.17.bb | 42 ----------------- packages/nonworking/sane/sane-frontends_1.0.13.bb | 20 --------- packages/sane/.mtn2git_empty | 0 packages/sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 +++++ .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ++++++++++++++++++++++ packages/sane/sane-backends-1.0.17/saned.xinetd | 10 +++++ packages/sane/sane-backends_1.0.17.bb | 42 +++++++++++++++++ packages/sane/sane-frontends_1.0.13.bb | 20 +++++++++ 33 files changed, 304 insertions(+), 304 deletions(-) create mode 100644 packages/gphoto2/.mtn2git_empty create mode 100644 packages/gphoto2/gphoto2_2.1.4.bb create mode 100644 packages/gphoto2/gphoto2_2.1.5.bb create mode 100644 packages/gphoto2/gphoto2_2.1.6.bb create mode 100644 packages/gphoto2/gphoto2_2.4.0.bb create mode 100644 packages/libgphoto2/.mtn2git_empty create mode 100644 packages/libgphoto2/libgphoto2_2.1.4.bb create mode 100644 packages/libgphoto2/libgphoto2_2.1.5.bb create mode 100644 packages/libgphoto2/libgphoto2_2.1.6.bb create mode 100644 packages/libgphoto2/libgphoto2_2.4.0.bb delete mode 100644 packages/nonworking/gphoto2/.mtn2git_empty delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.4.bb delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.5.bb delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.6.bb delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.4.0.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.4.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.5.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.6.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.4.0.bb delete mode 100644 packages/nonworking/sane/.mtn2git_empty delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd delete mode 100644 packages/nonworking/sane/sane-backends_1.0.17.bb delete mode 100644 packages/nonworking/sane/sane-frontends_1.0.13.bb create mode 100644 packages/sane/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.17/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.17/Makefile.in.patch create mode 100644 packages/sane/sane-backends-1.0.17/sane-plustek.patch create mode 100644 packages/sane/sane-backends-1.0.17/saned.xinetd create mode 100644 packages/sane/sane-backends_1.0.17.bb create mode 100644 packages/sane/sane-frontends_1.0.13.bb diff --git a/packages/gphoto2/.mtn2git_empty b/packages/gphoto2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb new file mode 100644 index 0000000000..80d0ee0f27 --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb new file mode 100644 index 0000000000..0913b9743c --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb new file mode 100644 index 0000000000..63dad91f14 --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.6.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb new file mode 100644 index 0000000000..6bc1a42f9e --- /dev/null +++ b/packages/gphoto2/gphoto2_2.4.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + diff --git a/packages/libgphoto2/.mtn2git_empty b/packages/libgphoto2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libgphoto2/libgphoto2_2.1.4.bb b/packages/libgphoto2/libgphoto2_2.1.4.bb new file mode 100644 index 0000000000..fed7c41e40 --- /dev/null +++ b/packages/libgphoto2/libgphoto2_2.1.4.bb @@ -0,0 +1,29 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/libgphoto2/libgphoto2_2.1.5.bb b/packages/libgphoto2/libgphoto2_2.1.5.bb new file mode 100644 index 0000000000..67efc38785 --- /dev/null +++ b/packages/libgphoto2/libgphoto2_2.1.5.bb @@ -0,0 +1,32 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/libgphoto2/libgphoto2_2.1.6.bb b/packages/libgphoto2/libgphoto2_2.1.6.bb new file mode 100644 index 0000000000..ad57ba8cf1 --- /dev/null +++ b/packages/libgphoto2/libgphoto2_2.1.6.bb @@ -0,0 +1,36 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r6" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} +PACKAGES =+ "libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" +RDEPENDS_libgphoto2 = "libgphoto2-camlibs" + diff --git a/packages/libgphoto2/libgphoto2_2.4.0.bb b/packages/libgphoto2/libgphoto2_2.4.0.bb new file mode 100644 index 0000000000..c6f63374cc --- /dev/null +++ b/packages/libgphoto2/libgphoto2_2.4.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "libtool jpeg libusb libexif" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +inherit autotools pkgconfig lib_package + +OE_LT_RPATH_ALLOW=":${libdir}:" +OE_LT_RPATH_ALLOW[export]="1" + +EXTRA_OECONF = " --with-drivers=all" + +PACKAGES =+ "libgphotoport libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" +RDEPENDS_${PN} = "libgphoto2-camlibs" + +FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" + +FILES_${PN} += "${libdir}/udev/*" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/nonworking/gphoto2/.mtn2git_empty b/packages/nonworking/gphoto2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.4.bb b/packages/nonworking/gphoto2/gphoto2_2.1.4.bb deleted file mode 100644 index 80d0ee0f27..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.1.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" - -inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.5.bb b/packages/nonworking/gphoto2/gphoto2_2.1.5.bb deleted file mode 100644 index 0913b9743c..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.1.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" - -inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.6.bb b/packages/nonworking/gphoto2/gphoto2_2.1.6.bb deleted file mode 100644 index 63dad91f14..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.1.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" - -inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.4.0.bb b/packages/nonworking/gphoto2/gphoto2_2.4.0.bb deleted file mode 100644 index 6bc1a42f9e..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.4.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} - diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb deleted file mode 100644 index fed7c41e40..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb deleted file mode 100644 index 67efc38785..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb deleted file mode 100644 index ad57ba8cf1..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} -PACKAGES =+ "libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" -RDEPENDS_libgphoto2 = "libgphoto2-camlibs" - diff --git a/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb b/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb deleted file mode 100644 index c6f63374cc..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SECTION = "libs" -LICENSE = "GPL" -DEPENDS = "libtool jpeg libusb libexif" - -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -inherit autotools pkgconfig lib_package - -OE_LT_RPATH_ALLOW=":${libdir}:" -OE_LT_RPATH_ALLOW[export]="1" - -EXTRA_OECONF = " --with-drivers=all" - -PACKAGES =+ "libgphotoport libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" -RDEPENDS_${PN} = "libgphoto2-camlibs" - -FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" - -FILES_${PN} += "${libdir}/udev/*" -FILES_${PN}-dbg += "${libdir}/*/*/.debug" - -do_stage() { - autotools_stage_all -} - - diff --git a/packages/nonworking/sane/.mtn2git_empty b/packages/nonworking/sane/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch deleted file mode 100644 index d73a2f0fb5..0000000000 --- a/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 -+++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 -@@ -33,7 +33,7 @@ - - @SET_MAKE@ - --SUBDIRS = include lib sanei backend frontend tools doc po -+SUBDIRS = include lib sanei backend frontend tools po - - DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ - ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch deleted file mode 100644 index f6920c6e22..0000000000 --- a/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 -+++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 -@@ -106,17 +106,20 @@ - #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) - - /* useful for RGB-values */ -+#define PACKED8 __attribute__ ((packed,aligned(1))) -+#define PACKED16 __attribute__ ((packed,aligned(2))) -+ - typedef struct { - u_char Red; - u_char Green; - u_char Blue; --} RGBByteDef, *pRGBByteDef; -+} PACKED8 RGBByteDef, *pRGBByteDef; - - typedef struct { - u_short Red; - u_short Green; - u_short Blue; --} RGBUShortDef, *pRGBUShortDef; -+} PACKED16 RGBUShortDef, *pRGBUShortDef; - - typedef struct { - u_long Red; -@@ -126,22 +129,22 @@ - - typedef struct { - u_char a_bColor[3]; --} ColorByteDef, *pColorByteDef; -+} PACKED8 ColorByteDef, *pColorByteDef; - - typedef struct { - u_char bHi; - u_char bLo; --} HiLoDef, *pHiLoDef; -+} PACKED8 HiLoDef, *pHiLoDef; - - typedef union { - HiLoDef HiLo[3]; - u_short Colors[3]; --} ColorWordDef, *pColorWordDef; -+} PACKED16 ColorWordDef, *pColorWordDef; - - typedef union { - HiLoDef HiLo; - u_short Mono; --} MonoWordDef, *pMonoWordDef; -+} PACKED16 MonoWordDef, *pMonoWordDef; - - typedef union { - diff --git a/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd b/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd deleted file mode 100644 index f4e890fdbe..0000000000 --- a/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service sane-port -{ - socket_type = stream - server = /usr/sbin/saned - protocol = tcp - user = nobody - group = nogroup - wait = no - disable = no -} diff --git a/packages/nonworking/sane/sane-backends_1.0.17.bb b/packages/nonworking/sane/sane-backends_1.0.17.bb deleted file mode 100644 index 4854f4d10c..0000000000 --- a/packages/nonworking/sane/sane-backends_1.0.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Scanner drivers for SANE" -DEPENDS = "gphoto2 jpeg libusb" -LICENSE = "LGPL" - -PR = "r2" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ - file://Makefile.in.patch;patch=1 \ - file://saned.xinetd \ - " - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--disable-translations" - -do_install_append() { - install -d "${D}/${sysconfdir}/xinetd.d" - install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" - install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" -} - -PACKAGES =+ "libsane libsane-dev saned sane-utils" - -FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" -RRECOMMENDS_libsane = "saned sane-utils" -FILES_libsane-dev += "${libdir}/sane/*" - -RRECOMMENDS_saned = "xinetd" -FILES_saned = "${sbindir}/saned" - -FILES_sane-utils = "${bindir}/*" -FILES_${PN}-dbg += "${libdir}/sane/.debug" - - -CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" - -do_stage() { - autotools_stage_all -} - - - diff --git a/packages/nonworking/sane/sane-frontends_1.0.13.bb b/packages/nonworking/sane/sane-frontends_1.0.13.bb deleted file mode 100644 index f79cf9e508..0000000000 --- a/packages/nonworking/sane/sane-frontends_1.0.13.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Frontends for SANE" -DEPENDS = "virtual/libx11 gimp sane-backends" -LICENSE = "LGPL" - -PR = "r0" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \ - " - -inherit autotools - -EXTRA_OECONF = "--disable-translations" - -PACKAGES =+ "scanadf xcam xscanimage" - -FILES_scanadf = "${bindir}/scanadf" -FILES_xcam = "${bindir}/xcam" -FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane" - - diff --git a/packages/sane/.mtn2git_empty b/packages/sane/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/sane/sane-backends-1.0.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.17/Makefile.in.patch new file mode 100644 index 0000000000..d73a2f0fb5 --- /dev/null +++ b/packages/sane/sane-backends-1.0.17/Makefile.in.patch @@ -0,0 +1,11 @@ +--- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 ++++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 +@@ -33,7 +33,7 @@ + + @SET_MAKE@ + +-SUBDIRS = include lib sanei backend frontend tools doc po ++SUBDIRS = include lib sanei backend frontend tools po + + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ + ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.17/sane-plustek.patch new file mode 100644 index 0000000000..f6920c6e22 --- /dev/null +++ b/packages/sane/sane-backends-1.0.17/sane-plustek.patch @@ -0,0 +1,52 @@ +--- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 ++++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 +@@ -106,17 +106,20 @@ + #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) + + /* useful for RGB-values */ ++#define PACKED8 __attribute__ ((packed,aligned(1))) ++#define PACKED16 __attribute__ ((packed,aligned(2))) ++ + typedef struct { + u_char Red; + u_char Green; + u_char Blue; +-} RGBByteDef, *pRGBByteDef; ++} PACKED8 RGBByteDef, *pRGBByteDef; + + typedef struct { + u_short Red; + u_short Green; + u_short Blue; +-} RGBUShortDef, *pRGBUShortDef; ++} PACKED16 RGBUShortDef, *pRGBUShortDef; + + typedef struct { + u_long Red; +@@ -126,22 +129,22 @@ + + typedef struct { + u_char a_bColor[3]; +-} ColorByteDef, *pColorByteDef; ++} PACKED8 ColorByteDef, *pColorByteDef; + + typedef struct { + u_char bHi; + u_char bLo; +-} HiLoDef, *pHiLoDef; ++} PACKED8 HiLoDef, *pHiLoDef; + + typedef union { + HiLoDef HiLo[3]; + u_short Colors[3]; +-} ColorWordDef, *pColorWordDef; ++} PACKED16 ColorWordDef, *pColorWordDef; + + typedef union { + HiLoDef HiLo; + u_short Mono; +-} MonoWordDef, *pMonoWordDef; ++} PACKED16 MonoWordDef, *pMonoWordDef; + + typedef union { + diff --git a/packages/sane/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.17/saned.xinetd new file mode 100644 index 0000000000..f4e890fdbe --- /dev/null +++ b/packages/sane/sane-backends-1.0.17/saned.xinetd @@ -0,0 +1,10 @@ +service sane-port +{ + socket_type = stream + server = /usr/sbin/saned + protocol = tcp + user = nobody + group = nogroup + wait = no + disable = no +} diff --git a/packages/sane/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.17.bb new file mode 100644 index 0000000000..4854f4d10c --- /dev/null +++ b/packages/sane/sane-backends_1.0.17.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Scanner drivers for SANE" +DEPENDS = "gphoto2 jpeg libusb" +LICENSE = "LGPL" + +PR = "r2" + +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ + file://Makefile.in.patch;patch=1 \ + file://saned.xinetd \ + " + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--disable-translations" + +do_install_append() { + install -d "${D}/${sysconfdir}/xinetd.d" + install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" + install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" +} + +PACKAGES =+ "libsane libsane-dev saned sane-utils" + +FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" +RRECOMMENDS_libsane = "saned sane-utils" +FILES_libsane-dev += "${libdir}/sane/*" + +RRECOMMENDS_saned = "xinetd" +FILES_saned = "${sbindir}/saned" + +FILES_sane-utils = "${bindir}/*" +FILES_${PN}-dbg += "${libdir}/sane/.debug" + + +CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" + +do_stage() { + autotools_stage_all +} + + + diff --git a/packages/sane/sane-frontends_1.0.13.bb b/packages/sane/sane-frontends_1.0.13.bb new file mode 100644 index 0000000000..f79cf9e508 --- /dev/null +++ b/packages/sane/sane-frontends_1.0.13.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Frontends for SANE" +DEPENDS = "virtual/libx11 gimp sane-backends" +LICENSE = "LGPL" + +PR = "r0" + +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \ + " + +inherit autotools + +EXTRA_OECONF = "--disable-translations" + +PACKAGES =+ "scanadf xcam xscanimage" + +FILES_scanadf = "${bindir}/scanadf" +FILES_xcam = "${bindir}/xcam" +FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane" + + -- cgit v1.2.3 From bcbaf180430454102b5105e21f5db1e83596ab7b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Aug 2008 15:46:57 +0000 Subject: disapproval of revision '8f11add2be832596eef0720d2ab23e1cc7a840b4' --- packages/libexif/.mtn2git_empty | 0 packages/libexif/libexif_0.5.12.bb | 16 ++++++++++++++++ packages/libexif/libexif_0.6.13.bb | 19 +++++++++++++++++++ packages/libexif/libexif_0.6.16.bb | 18 ++++++++++++++++++ packages/libexif/libexif_0.6.9.bb | 19 +++++++++++++++++++ packages/nonworking/libexif/.mtn2git_empty | 0 packages/nonworking/libexif/libexif_0.5.12.bb | 16 ---------------- packages/nonworking/libexif/libexif_0.6.13.bb | 19 ------------------- packages/nonworking/libexif/libexif_0.6.16.bb | 18 ------------------ packages/nonworking/libexif/libexif_0.6.9.bb | 19 ------------------- 10 files changed, 72 insertions(+), 72 deletions(-) create mode 100644 packages/libexif/.mtn2git_empty create mode 100644 packages/libexif/libexif_0.5.12.bb create mode 100644 packages/libexif/libexif_0.6.13.bb create mode 100644 packages/libexif/libexif_0.6.16.bb create mode 100644 packages/libexif/libexif_0.6.9.bb delete mode 100644 packages/nonworking/libexif/.mtn2git_empty delete mode 100644 packages/nonworking/libexif/libexif_0.5.12.bb delete mode 100644 packages/nonworking/libexif/libexif_0.6.13.bb delete mode 100644 packages/nonworking/libexif/libexif_0.6.16.bb delete mode 100644 packages/nonworking/libexif/libexif_0.6.9.bb diff --git a/packages/libexif/.mtn2git_empty b/packages/libexif/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libexif/libexif_0.5.12.bb b/packages/libexif/libexif_0.5.12.bb new file mode 100644 index 0000000000..94f3bee856 --- /dev/null +++ b/packages/libexif/libexif_0.5.12.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +LICENSE = "LGPL" +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libexif + for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h + do + install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X + done +} diff --git a/packages/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb new file mode 100644 index 0000000000..8382de84f5 --- /dev/null +++ b/packages/libexif/libexif_0.6.13.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libexif/libexif_0.6.16.bb b/packages/libexif/libexif_0.6.16.bb new file mode 100644 index 0000000000..2f896352db --- /dev/null +++ b/packages/libexif/libexif_0.6.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb new file mode 100644 index 0000000000..d255f5d862 --- /dev/null +++ b/packages/libexif/libexif_0.6.9.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +LICENSE = "LGPL" +SECTION = "libs" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libexif + for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h + do + install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X + done +} diff --git a/packages/nonworking/libexif/.mtn2git_empty b/packages/nonworking/libexif/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/libexif/libexif_0.5.12.bb b/packages/nonworking/libexif/libexif_0.5.12.bb deleted file mode 100644 index 94f3bee856..0000000000 --- a/packages/nonworking/libexif/libexif_0.5.12.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -LICENSE = "LGPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done -} diff --git a/packages/nonworking/libexif/libexif_0.6.13.bb b/packages/nonworking/libexif/libexif_0.6.13.bb deleted file mode 100644 index 8382de84f5..0000000000 --- a/packages/nonworking/libexif/libexif_0.6.13.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPL" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/nonworking/libexif/libexif_0.6.16.bb b/packages/nonworking/libexif/libexif_0.6.16.bb deleted file mode 100644 index 2f896352db..0000000000 --- a/packages/nonworking/libexif/libexif_0.6.16.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/nonworking/libexif/libexif_0.6.9.bb b/packages/nonworking/libexif/libexif_0.6.9.bb deleted file mode 100644 index d255f5d862..0000000000 --- a/packages/nonworking/libexif/libexif_0.6.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -LICENSE = "LGPL" -SECTION = "libs" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done -} -- cgit v1.2.3 From 94cd4f50033cdad19ca8fc2b6ea149f60ffef7f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 22 Aug 2008 16:00:18 +0000 Subject: mango-lassi: fix build --- packages/avahi/mango-lassi_git.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/avahi/mango-lassi_git.bb b/packages/avahi/mango-lassi_git.bb index 99fd617ec9..5d240c2c14 100644 --- a/packages/avahi/mango-lassi_git.bb +++ b/packages/avahi/mango-lassi_git.bb @@ -1,16 +1,14 @@ -DESCRIPTION = "Input sharing, the avahi way" +ESCRIPTION = "Input sharing, the avahi way" DEPENDS = "avahi-ui libglade libnotify" -PV = "0.0+git${SRCDATE}" +SRCREV = "73638817126a68d62f1233f6e6859ce75a259e93" +PV = "0.0+${PR}+gitr${SRCREV}" SRC_URI = "git://git.0pointer.de/repos/mango-lassi.git/;protocol=http" +S = "${WORKDIR}/git" -S = "${WORKDIR}/${PN}" - -do_compile_prepend() { - export CFLAGS="-Wall -Wextra -W -O0 -g -pipe -Wno-unused-parameter `pkg-config --cflags dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-ui avahi-glib avahi-client libnotify libglade-2.0` `pkg-config --libs dbus-glib-1 glib-2.0 gtk+-2.0 xtst avahi-glib avahi-client avahi-ui libnotify libglade-2.0`" -} +inherit autotools do_install() { install -d ${D}${bindir} -- cgit v1.2.3 From f56aab883db4a1fde7bd23318ef64a0d6139b6af Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 16:17:04 +0000 Subject: libexif & co: it seems that after all, libexif was fine. Don't know why do_qa_staging bailed out for me yesterday. restoring all affected packages from nonworking. --- packages/gphoto2/.mtn2git_empty | 0 packages/gphoto2/gphoto2_2.1.4.bb | 9 ++++ packages/gphoto2/gphoto2_2.1.5.bb | 9 ++++ packages/gphoto2/gphoto2_2.1.6.bb | 9 ++++ packages/gphoto2/gphoto2_2.4.0.bb | 14 ++++++ packages/gphoto2/libgphoto2_2.1.4.bb | 29 ++++++++++++ packages/gphoto2/libgphoto2_2.1.5.bb | 32 +++++++++++++ packages/gphoto2/libgphoto2_2.1.6.bb | 36 +++++++++++++++ packages/gphoto2/libgphoto2_2.4.0.bb | 31 +++++++++++++ packages/libexif/.mtn2git_empty | 0 packages/libexif/libexif_0.5.12.bb | 16 +++++++ packages/libexif/libexif_0.6.13.bb | 19 ++++++++ packages/libexif/libexif_0.6.16.bb | 18 ++++++++ packages/libexif/libexif_0.6.9.bb | 19 ++++++++ packages/nonworking/gphoto2/.mtn2git_empty | 0 packages/nonworking/gphoto2/gphoto2_2.1.4.bb | 9 ---- packages/nonworking/gphoto2/gphoto2_2.1.5.bb | 9 ---- packages/nonworking/gphoto2/gphoto2_2.1.6.bb | 9 ---- packages/nonworking/gphoto2/gphoto2_2.4.0.bb | 14 ------ packages/nonworking/gphoto2/libgphoto2_2.1.4.bb | 29 ------------ packages/nonworking/gphoto2/libgphoto2_2.1.5.bb | 32 ------------- packages/nonworking/gphoto2/libgphoto2_2.1.6.bb | 36 --------------- packages/nonworking/gphoto2/libgphoto2_2.4.0.bb | 31 ------------- packages/nonworking/libexif/.mtn2git_empty | 0 packages/nonworking/libexif/libexif_0.5.12.bb | 16 ------- packages/nonworking/libexif/libexif_0.6.13.bb | 19 -------- packages/nonworking/libexif/libexif_0.6.16.bb | 18 -------- packages/nonworking/libexif/libexif_0.6.9.bb | 19 -------- packages/nonworking/sane/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 ----- .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ---------------------- .../sane/sane-backends-1.0.17/saned.xinetd | 10 ----- packages/nonworking/sane/sane-backends_1.0.17.bb | 42 ----------------- packages/nonworking/sane/sane-frontends_1.0.13.bb | 20 --------- packages/sane/.mtn2git_empty | 0 packages/sane/sane-backends-1.0.17/.mtn2git_empty | 0 .../sane/sane-backends-1.0.17/Makefile.in.patch | 11 +++++ .../sane/sane-backends-1.0.17/sane-plustek.patch | 52 ++++++++++++++++++++++ packages/sane/sane-backends-1.0.17/saned.xinetd | 10 +++++ packages/sane/sane-backends_1.0.17.bb | 42 +++++++++++++++++ packages/sane/sane-frontends_1.0.13.bb | 20 +++++++++ 42 files changed, 376 insertions(+), 376 deletions(-) create mode 100644 packages/gphoto2/.mtn2git_empty create mode 100644 packages/gphoto2/gphoto2_2.1.4.bb create mode 100644 packages/gphoto2/gphoto2_2.1.5.bb create mode 100644 packages/gphoto2/gphoto2_2.1.6.bb create mode 100644 packages/gphoto2/gphoto2_2.4.0.bb create mode 100644 packages/gphoto2/libgphoto2_2.1.4.bb create mode 100644 packages/gphoto2/libgphoto2_2.1.5.bb create mode 100644 packages/gphoto2/libgphoto2_2.1.6.bb create mode 100644 packages/gphoto2/libgphoto2_2.4.0.bb create mode 100644 packages/libexif/.mtn2git_empty create mode 100644 packages/libexif/libexif_0.5.12.bb create mode 100644 packages/libexif/libexif_0.6.13.bb create mode 100644 packages/libexif/libexif_0.6.16.bb create mode 100644 packages/libexif/libexif_0.6.9.bb delete mode 100644 packages/nonworking/gphoto2/.mtn2git_empty delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.4.bb delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.5.bb delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.1.6.bb delete mode 100644 packages/nonworking/gphoto2/gphoto2_2.4.0.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.4.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.5.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.1.6.bb delete mode 100644 packages/nonworking/gphoto2/libgphoto2_2.4.0.bb delete mode 100644 packages/nonworking/libexif/.mtn2git_empty delete mode 100644 packages/nonworking/libexif/libexif_0.5.12.bb delete mode 100644 packages/nonworking/libexif/libexif_0.6.13.bb delete mode 100644 packages/nonworking/libexif/libexif_0.6.16.bb delete mode 100644 packages/nonworking/libexif/libexif_0.6.9.bb delete mode 100644 packages/nonworking/sane/.mtn2git_empty delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch delete mode 100644 packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd delete mode 100644 packages/nonworking/sane/sane-backends_1.0.17.bb delete mode 100644 packages/nonworking/sane/sane-frontends_1.0.13.bb create mode 100644 packages/sane/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.17/.mtn2git_empty create mode 100644 packages/sane/sane-backends-1.0.17/Makefile.in.patch create mode 100644 packages/sane/sane-backends-1.0.17/sane-plustek.patch create mode 100644 packages/sane/sane-backends-1.0.17/saned.xinetd create mode 100644 packages/sane/sane-backends_1.0.17.bb create mode 100644 packages/sane/sane-frontends_1.0.13.bb diff --git a/packages/gphoto2/.mtn2git_empty b/packages/gphoto2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gphoto2/gphoto2_2.1.4.bb b/packages/gphoto2/gphoto2_2.1.4.bb new file mode 100644 index 0000000000..80d0ee0f27 --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools diff --git a/packages/gphoto2/gphoto2_2.1.5.bb b/packages/gphoto2/gphoto2_2.1.5.bb new file mode 100644 index 0000000000..0913b9743c --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.5.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r1" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/gphoto2/gphoto2_2.1.6.bb b/packages/gphoto2/gphoto2_2.1.6.bb new file mode 100644 index 0000000000..63dad91f14 --- /dev/null +++ b/packages/gphoto2/gphoto2_2.1.6.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" + +inherit autotools diff --git a/packages/gphoto2/gphoto2_2.4.0.bb b/packages/gphoto2/gphoto2_2.4.0.bb new file mode 100644 index 0000000000..6bc1a42f9e --- /dev/null +++ b/packages/gphoto2/gphoto2_2.4.0.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" +SECTION = "console/utils" +LICENSE = "GPL" +DEPENDS = "libgphoto2 popt" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' +} + diff --git a/packages/gphoto2/libgphoto2_2.1.4.bb b/packages/gphoto2/libgphoto2_2.1.4.bb new file mode 100644 index 0000000000..fed7c41e40 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.1.4.bb @@ -0,0 +1,29 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/gphoto2/libgphoto2_2.1.5.bb b/packages/gphoto2/libgphoto2_2.1.5.bb new file mode 100644 index 0000000000..67efc38785 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.1.5.bb @@ -0,0 +1,32 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r3" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} diff --git a/packages/gphoto2/libgphoto2_2.1.6.bb b/packages/gphoto2/libgphoto2_2.1.6.bb new file mode 100644 index 0000000000..ad57ba8cf1 --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.1.6.bb @@ -0,0 +1,36 @@ +SECTION = "libs" +DEPENDS = "jpeg libusb libexif" +RPEDENDS = "libusb" +DESCRIPTION = "libgphoto2 allows you to access digital cameras" +PR = "r6" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" + +EXTRA_OECONF = " --with-drivers=all" +EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" +LICENSE = "GPL" +inherit autotools pkgconfig + +do_stage() { + install -d ${STAGING_LIBDIR} + mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true + oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} + oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} + + install -d ${STAGING_LIBDIR}/gphoto2/2.0 + oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 + + install -d ${STAGING_INCDIR}/gphoto2 + for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h + do + install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X + done + for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h + do + install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X + done +} +PACKAGES =+ "libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" +RDEPENDS_libgphoto2 = "libgphoto2-camlibs" + diff --git a/packages/gphoto2/libgphoto2_2.4.0.bb b/packages/gphoto2/libgphoto2_2.4.0.bb new file mode 100644 index 0000000000..c6f63374cc --- /dev/null +++ b/packages/gphoto2/libgphoto2_2.4.0.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "libgphoto2 allows you to access digital cameras" + +SECTION = "libs" +LICENSE = "GPL" +DEPENDS = "libtool jpeg libusb libexif" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" + +inherit autotools pkgconfig lib_package + +OE_LT_RPATH_ALLOW=":${libdir}:" +OE_LT_RPATH_ALLOW[export]="1" + +EXTRA_OECONF = " --with-drivers=all" + +PACKAGES =+ "libgphotoport libgphoto2-camlibs" +FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" +RDEPENDS_${PN} = "libgphoto2-camlibs" + +FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" + +FILES_${PN} += "${libdir}/udev/*" +FILES_${PN}-dbg += "${libdir}/*/*/.debug" + +do_stage() { + autotools_stage_all +} + + diff --git a/packages/libexif/.mtn2git_empty b/packages/libexif/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/libexif/libexif_0.5.12.bb b/packages/libexif/libexif_0.5.12.bb new file mode 100644 index 0000000000..94f3bee856 --- /dev/null +++ b/packages/libexif/libexif_0.5.12.bb @@ -0,0 +1,16 @@ +SECTION = "libs" +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +LICENSE = "LGPL" +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libexif + for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h + do + install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X + done +} diff --git a/packages/libexif/libexif_0.6.13.bb b/packages/libexif/libexif_0.6.13.bb new file mode 100644 index 0000000000..8382de84f5 --- /dev/null +++ b/packages/libexif/libexif_0.6.13.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libexif/libexif_0.6.16.bb b/packages/libexif/libexif_0.6.16.bb new file mode 100644 index 0000000000..2f896352db --- /dev/null +++ b/packages/libexif/libexif_0.6.16.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +SECTION = "libs" +LICENSE = "LGPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" + +inherit autotools + +do_configure_append() { + sed -i s:doc\ binary:binary:g Makefile +} + +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +do_stage() { + autotools_stage_all +} diff --git a/packages/libexif/libexif_0.6.9.bb b/packages/libexif/libexif_0.6.9.bb new file mode 100644 index 0000000000..d255f5d862 --- /dev/null +++ b/packages/libexif/libexif_0.6.9.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" +HOMEPAGE = "http://sourceforge.net/projects/libexif" +LICENSE = "LGPL" +SECTION = "libs" +PR = "r2" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/libexif + for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h + do + install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X + done +} diff --git a/packages/nonworking/gphoto2/.mtn2git_empty b/packages/nonworking/gphoto2/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.4.bb b/packages/nonworking/gphoto2/gphoto2_2.1.4.bb deleted file mode 100644 index 80d0ee0f27..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.1.4.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" - -inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.5.bb b/packages/nonworking/gphoto2/gphoto2_2.1.5.bb deleted file mode 100644 index 0913b9743c..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.1.5.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" - -inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.1.6.bb b/packages/nonworking/gphoto2/gphoto2_2.1.6.bb deleted file mode 100644 index 63dad91f14..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.1.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.gz" - -inherit autotools diff --git a/packages/nonworking/gphoto2/gphoto2_2.4.0.bb b/packages/nonworking/gphoto2/gphoto2_2.4.0.bb deleted file mode 100644 index 6bc1a42f9e..0000000000 --- a/packages/nonworking/gphoto2/gphoto2_2.4.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "gphoto2 is a command-line utility to fetch pictures from digital cameras" -SECTION = "console/utils" -LICENSE = "GPL" -DEPENDS = "libgphoto2 popt" -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' -} - diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb deleted file mode 100644 index fed7c41e40..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.1.4.bb +++ /dev/null @@ -1,29 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb deleted file mode 100644 index 67efc38785..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.1.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} diff --git a/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb b/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb deleted file mode 100644 index ad57ba8cf1..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.1.6.bb +++ /dev/null @@ -1,36 +0,0 @@ -SECTION = "libs" -DEPENDS = "jpeg libusb libexif" -RPEDENDS = "libusb" -DESCRIPTION = "libgphoto2 allows you to access digital cameras" -PR = "r6" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.gz" - -EXTRA_OECONF = " --with-drivers=all" -EXTRA_OECONF_mnci = "--with-drivers=canon --without-serial" -LICENSE = "GPL" -inherit autotools pkgconfig - -do_stage() { - install -d ${STAGING_LIBDIR} - mv libgphoto2/.libs/libgphoto2.so.2.0.3T libgphoto2/.libs/libgphoto2.so.2.0.3 || true - oe_libinstall -so -C libgphoto2 libgphoto2 ${STAGING_LIBDIR} - oe_libinstall -so -C libgphoto2_port/libgphoto2_port libgphoto2_port ${STAGING_LIBDIR} - - install -d ${STAGING_LIBDIR}/gphoto2/2.0 - oe_libinstall -so -C camlibs/canon libgphoto2_canon.so ${STAGING_LIBDIR}/gphoto2/2.0 - - install -d ${STAGING_INCDIR}/gphoto2 - for X in gphoto2-abilities-list.h gphoto2-camera.h gphoto2-context.h gphoto2-file.h gphoto2-filesys.h gphoto2.h gphoto2-library.h gphoto2-list.h gphoto2-result.h gphoto2-setting.h gphoto2-version.h gphoto2-widget.h - do - install -m 0644 ${S}/libgphoto2/$X ${STAGING_INCDIR}/gphoto2/$X - done - for X in gphoto2-port.h gphoto2-port-info-list.h gphoto2-port-log.h gphoto2-port-version.h gphoto2-port-portability.h gphoto2-port-result.h - do - install -m 0644 ${S}/libgphoto2_port/libgphoto2_port/$X ${STAGING_INCDIR}/gphoto2/$X - done -} -PACKAGES =+ "libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "/usr/lib/gphoto2_port/ /usr/lib/gphoto2/" -RDEPENDS_libgphoto2 = "libgphoto2-camlibs" - diff --git a/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb b/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb deleted file mode 100644 index c6f63374cc..0000000000 --- a/packages/nonworking/gphoto2/libgphoto2_2.4.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "libgphoto2 allows you to access digital cameras" - -SECTION = "libs" -LICENSE = "GPL" -DEPENDS = "libtool jpeg libusb libexif" - -PR = "r0" - -SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2" - -inherit autotools pkgconfig lib_package - -OE_LT_RPATH_ALLOW=":${libdir}:" -OE_LT_RPATH_ALLOW[export]="1" - -EXTRA_OECONF = " --with-drivers=all" - -PACKAGES =+ "libgphotoport libgphoto2-camlibs" -FILES_libgphoto2-camlibs = "${libdir}/libgphoto2*/*/*.so*" -RDEPENDS_${PN} = "libgphoto2-camlibs" - -FILES_libgphotoport = "${libdir}/libgphoto2_port.so.*" - -FILES_${PN} += "${libdir}/udev/*" -FILES_${PN}-dbg += "${libdir}/*/*/.debug" - -do_stage() { - autotools_stage_all -} - - diff --git a/packages/nonworking/libexif/.mtn2git_empty b/packages/nonworking/libexif/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/libexif/libexif_0.5.12.bb b/packages/nonworking/libexif/libexif_0.5.12.bb deleted file mode 100644 index 94f3bee856..0000000000 --- a/packages/nonworking/libexif/libexif_0.5.12.bb +++ /dev/null @@ -1,16 +0,0 @@ -SECTION = "libs" -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -LICENSE = "LGPL" -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done -} diff --git a/packages/nonworking/libexif/libexif_0.6.13.bb b/packages/nonworking/libexif/libexif_0.6.13.bb deleted file mode 100644 index 8382de84f5..0000000000 --- a/packages/nonworking/libexif/libexif_0.6.13.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPL" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/nonworking/libexif/libexif_0.6.16.bb b/packages/nonworking/libexif/libexif_0.6.16.bb deleted file mode 100644 index 2f896352db..0000000000 --- a/packages/nonworking/libexif/libexif_0.6.16.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -SECTION = "libs" -LICENSE = "LGPL" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2" - -inherit autotools - -do_configure_append() { - sed -i s:doc\ binary:binary:g Makefile -} - -AUTOTOOLS_STAGE_PKGCONFIG = "1" - -do_stage() { - autotools_stage_all -} diff --git a/packages/nonworking/libexif/libexif_0.6.9.bb b/packages/nonworking/libexif/libexif_0.6.9.bb deleted file mode 100644 index d255f5d862..0000000000 --- a/packages/nonworking/libexif/libexif_0.6.9.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Library to read the extended image information (EXIF) from JPEG pictures" -HOMEPAGE = "http://sourceforge.net/projects/libexif" -LICENSE = "LGPL" -SECTION = "libs" -PR = "r2" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.gz" - -inherit autotools pkgconfig - -do_stage() { - oe_libinstall -a -so -C libexif libexif ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/libexif - for X in exif-byte-order.h exif-data.h exif-format.h exif-loader.h exif-tag.h exif-content.h exif-entry.h exif-ifd.h exif-result.h exif-utils.h exif-log.h exif-mnote-data.h _stdint.h - do - install -m 0644 ${S}/libexif/$X ${STAGING_INCDIR}/libexif/$X - done -} diff --git a/packages/nonworking/sane/.mtn2git_empty b/packages/nonworking/sane/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/nonworking/sane/sane-backends-1.0.17/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch deleted file mode 100644 index d73a2f0fb5..0000000000 --- a/packages/nonworking/sane/sane-backends-1.0.17/Makefile.in.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 -+++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 -@@ -33,7 +33,7 @@ - - @SET_MAKE@ - --SUBDIRS = include lib sanei backend frontend tools doc po -+SUBDIRS = include lib sanei backend frontend tools po - - DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ - ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch deleted file mode 100644 index f6920c6e22..0000000000 --- a/packages/nonworking/sane/sane-backends-1.0.17/sane-plustek.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 -+++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 -@@ -106,17 +106,20 @@ - #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) - - /* useful for RGB-values */ -+#define PACKED8 __attribute__ ((packed,aligned(1))) -+#define PACKED16 __attribute__ ((packed,aligned(2))) -+ - typedef struct { - u_char Red; - u_char Green; - u_char Blue; --} RGBByteDef, *pRGBByteDef; -+} PACKED8 RGBByteDef, *pRGBByteDef; - - typedef struct { - u_short Red; - u_short Green; - u_short Blue; --} RGBUShortDef, *pRGBUShortDef; -+} PACKED16 RGBUShortDef, *pRGBUShortDef; - - typedef struct { - u_long Red; -@@ -126,22 +129,22 @@ - - typedef struct { - u_char a_bColor[3]; --} ColorByteDef, *pColorByteDef; -+} PACKED8 ColorByteDef, *pColorByteDef; - - typedef struct { - u_char bHi; - u_char bLo; --} HiLoDef, *pHiLoDef; -+} PACKED8 HiLoDef, *pHiLoDef; - - typedef union { - HiLoDef HiLo[3]; - u_short Colors[3]; --} ColorWordDef, *pColorWordDef; -+} PACKED16 ColorWordDef, *pColorWordDef; - - typedef union { - HiLoDef HiLo; - u_short Mono; --} MonoWordDef, *pMonoWordDef; -+} PACKED16 MonoWordDef, *pMonoWordDef; - - typedef union { - diff --git a/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd b/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd deleted file mode 100644 index f4e890fdbe..0000000000 --- a/packages/nonworking/sane/sane-backends-1.0.17/saned.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service sane-port -{ - socket_type = stream - server = /usr/sbin/saned - protocol = tcp - user = nobody - group = nogroup - wait = no - disable = no -} diff --git a/packages/nonworking/sane/sane-backends_1.0.17.bb b/packages/nonworking/sane/sane-backends_1.0.17.bb deleted file mode 100644 index 4854f4d10c..0000000000 --- a/packages/nonworking/sane/sane-backends_1.0.17.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "Scanner drivers for SANE" -DEPENDS = "gphoto2 jpeg libusb" -LICENSE = "LGPL" - -PR = "r2" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ - file://Makefile.in.patch;patch=1 \ - file://saned.xinetd \ - " - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--disable-translations" - -do_install_append() { - install -d "${D}/${sysconfdir}/xinetd.d" - install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" - install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" -} - -PACKAGES =+ "libsane libsane-dev saned sane-utils" - -FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" -RRECOMMENDS_libsane = "saned sane-utils" -FILES_libsane-dev += "${libdir}/sane/*" - -RRECOMMENDS_saned = "xinetd" -FILES_saned = "${sbindir}/saned" - -FILES_sane-utils = "${bindir}/*" -FILES_${PN}-dbg += "${libdir}/sane/.debug" - - -CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" - -do_stage() { - autotools_stage_all -} - - - diff --git a/packages/nonworking/sane/sane-frontends_1.0.13.bb b/packages/nonworking/sane/sane-frontends_1.0.13.bb deleted file mode 100644 index f79cf9e508..0000000000 --- a/packages/nonworking/sane/sane-frontends_1.0.13.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Frontends for SANE" -DEPENDS = "virtual/libx11 gimp sane-backends" -LICENSE = "LGPL" - -PR = "r0" - -SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \ - " - -inherit autotools - -EXTRA_OECONF = "--disable-translations" - -PACKAGES =+ "scanadf xcam xscanimage" - -FILES_scanadf = "${bindir}/scanadf" -FILES_xcam = "${bindir}/xcam" -FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane" - - diff --git a/packages/sane/.mtn2git_empty b/packages/sane/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.17/.mtn2git_empty b/packages/sane/sane-backends-1.0.17/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/sane/sane-backends-1.0.17/Makefile.in.patch b/packages/sane/sane-backends-1.0.17/Makefile.in.patch new file mode 100644 index 0000000000..d73a2f0fb5 --- /dev/null +++ b/packages/sane/sane-backends-1.0.17/Makefile.in.patch @@ -0,0 +1,11 @@ +--- sane-backends/Makefile.in 2004-05-04 11:44:26.000000000 -0400 ++++ sane-backends-1.0.15/Makefile.in 2005-05-11 12:43:20.870000000 -0400 +@@ -33,7 +33,7 @@ + + @SET_MAKE@ + +-SUBDIRS = include lib sanei backend frontend tools doc po ++SUBDIRS = include lib sanei backend frontend tools po + + DISTFILES = AUTHORS COPYING ChangeLog ChangeLog-1.0.0 ChangeLog-1.0.1 \ + ChangeLog-1.0.2 ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 \ diff --git a/packages/sane/sane-backends-1.0.17/sane-plustek.patch b/packages/sane/sane-backends-1.0.17/sane-plustek.patch new file mode 100644 index 0000000000..f6920c6e22 --- /dev/null +++ b/packages/sane/sane-backends-1.0.17/sane-plustek.patch @@ -0,0 +1,52 @@ +--- sane-backends-1.0.15/backend/plustek-usb.h.orig 2005-07-06 00:45:43.000000000 +0200 ++++ sane-backends-1.0.15/backend/plustek-usb.h 2005-07-06 00:47:36.000000000 +0200 +@@ -106,17 +106,20 @@ + #define _PHILO2WORD(x) ((u_short)x->bHi * 256U + x->bLo) + + /* useful for RGB-values */ ++#define PACKED8 __attribute__ ((packed,aligned(1))) ++#define PACKED16 __attribute__ ((packed,aligned(2))) ++ + typedef struct { + u_char Red; + u_char Green; + u_char Blue; +-} RGBByteDef, *pRGBByteDef; ++} PACKED8 RGBByteDef, *pRGBByteDef; + + typedef struct { + u_short Red; + u_short Green; + u_short Blue; +-} RGBUShortDef, *pRGBUShortDef; ++} PACKED16 RGBUShortDef, *pRGBUShortDef; + + typedef struct { + u_long Red; +@@ -126,22 +129,22 @@ + + typedef struct { + u_char a_bColor[3]; +-} ColorByteDef, *pColorByteDef; ++} PACKED8 ColorByteDef, *pColorByteDef; + + typedef struct { + u_char bHi; + u_char bLo; +-} HiLoDef, *pHiLoDef; ++} PACKED8 HiLoDef, *pHiLoDef; + + typedef union { + HiLoDef HiLo[3]; + u_short Colors[3]; +-} ColorWordDef, *pColorWordDef; ++} PACKED16 ColorWordDef, *pColorWordDef; + + typedef union { + HiLoDef HiLo; + u_short Mono; +-} MonoWordDef, *pMonoWordDef; ++} PACKED16 MonoWordDef, *pMonoWordDef; + + typedef union { + diff --git a/packages/sane/sane-backends-1.0.17/saned.xinetd b/packages/sane/sane-backends-1.0.17/saned.xinetd new file mode 100644 index 0000000000..f4e890fdbe --- /dev/null +++ b/packages/sane/sane-backends-1.0.17/saned.xinetd @@ -0,0 +1,10 @@ +service sane-port +{ + socket_type = stream + server = /usr/sbin/saned + protocol = tcp + user = nobody + group = nogroup + wait = no + disable = no +} diff --git a/packages/sane/sane-backends_1.0.17.bb b/packages/sane/sane-backends_1.0.17.bb new file mode 100644 index 0000000000..4854f4d10c --- /dev/null +++ b/packages/sane/sane-backends_1.0.17.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "Scanner drivers for SANE" +DEPENDS = "gphoto2 jpeg libusb" +LICENSE = "LGPL" + +PR = "r2" + +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-backends-${PV}/sane-backends-${PV}.tar.gz \ + file://Makefile.in.patch;patch=1 \ + file://saned.xinetd \ + " + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--disable-translations" + +do_install_append() { + install -d "${D}/${sysconfdir}/xinetd.d" + install -m 755 "${S}/tools/.libs/sane-find-scanner" "${D}/${bindir}" + install -m 644 "${WORKDIR}/saned.xinetd" "${D}/${sysconfdir}/xinetd.d/saned" +} + +PACKAGES =+ "libsane libsane-dev saned sane-utils" + +FILES_libsane = "${libdir}/sane/*.so.* ${libdir}/lib*.so.* /etc" +RRECOMMENDS_libsane = "saned sane-utils" +FILES_libsane-dev += "${libdir}/sane/*" + +RRECOMMENDS_saned = "xinetd" +FILES_saned = "${sbindir}/saned" + +FILES_sane-utils = "${bindir}/*" +FILES_${PN}-dbg += "${libdir}/sane/.debug" + + +CONFFILES_libsane = "${sysconfdir}/sane.d/abaton.conf ${sysconfdir}/sane.d/agfafocus.conf ${sysconfdir}/sane.d/apple.conf ${sysconfdir}/sane.d/artec.conf ${sysconfdir}/sane.d/avision.conf ${sysconfdir}/sane.d/bh.conf ${sysconfdir}/sane.d/canon.conf ${sysconfdir}/sane.d/canon630u.conf ${sysconfdir}/sane.d/coolscan.conf ${sysconfdir}/sane.d/coolscan2.conf ${sysconfdir}/sane.d/dc25.conf ${sysconfdir}/sane.d/dmc.conf ${sysconfdir}/sane.d/epson.conf ${sysconfdir}/sane.d/fujitsu.conf ${sysconfdir}/sane.d/gt68xx.conf ${sysconfdir}/sane.d/hp.conf ${sysconfdir}/sane.d/leo.conf ${sysconfdir}/sane.d/matsushita.conf ${sysconfdir}/sane.d/microtek.conf ${sysconfdir}/sane.d/microtek2.conf ${sysconfdir}/sane.d/mustek.conf ${sysconfdir}/sane.d/mustek_usb.conf ${sysconfdir}/sane.d/nec.conf ${sysconfdir}/sane.d/pie.conf ${sysconfdir}/sane.d/plustek.conf ${sysconfdir}/sane.d/plustek_pp.conf ${sysconfdir}/sane.d/ricoh.conf ${sysconfdir}/sane.d/s9036.conf ${sysconfdir}/sane.d/sceptre.conf ${sysconfdir}/sane.d/sharp.conf ${sysconfdir}/sane.d/sp15c.conf ${sysconfdir}/sane.d/st400.conf ${sysconfdir}/sane.d/tamarack.conf ${sysconfdir}/sane.d/test.conf ${sysconfdir}/sane.d/teco1.conf ${sysconfdir}/sane.d/teco2.conf ${sysconfdir}/sane.d/teco3.conf ${sysconfdir}/sane.d/umax.conf ${sysconfdir}/sane.d/umax_pp.conf ${sysconfdir}/sane.d/umax1220u.conf ${sysconfdir}/sane.d/artec_eplus48u.conf ${sysconfdir}/sane.d/ma1509.conf ${sysconfdir}/sane.d/ibm.conf ${sysconfdir}/sane.d/hp5400.conf ${sysconfdir}/sane.d/u12.conf ${sysconfdir}/sane.d/snapscan.conf ${sysconfdir}/sane.d/dc210.conf ${sysconfdir}/sane.d/dc240.conf ${sysconfdir}/sane.d/gphoto2.conf ${sysconfdir}/sane.d/qcam.conf ${sysconfdir}/sane.d/v4l.conf ${sysconfdir}/sane.d/net.conf ${sysconfdir}/sane.d/dll.conf ${sysconfdir}/sane.d/saned.conf" + +do_stage() { + autotools_stage_all +} + + + diff --git a/packages/sane/sane-frontends_1.0.13.bb b/packages/sane/sane-frontends_1.0.13.bb new file mode 100644 index 0000000000..f79cf9e508 --- /dev/null +++ b/packages/sane/sane-frontends_1.0.13.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Frontends for SANE" +DEPENDS = "virtual/libx11 gimp sane-backends" +LICENSE = "LGPL" + +PR = "r0" + +SRC_URI = "ftp://ftp.sane-project.org/pub/sane/old-versions/sane-frontends-${PV}/sane-frontends-${PV}.tar.gz \ + " + +inherit autotools + +EXTRA_OECONF = "--disable-translations" + +PACKAGES =+ "scanadf xcam xscanimage" + +FILES_scanadf = "${bindir}/scanadf" +FILES_xcam = "${bindir}/xcam" +FILES_xscanimage = "${bindir}/xscanimage ${datadir}/sane" + + -- cgit v1.2.3 From a67cb0ff5cf6670a151b7583ac078b72b7ccb836 Mon Sep 17 00:00:00 2001 From: ant Date: Fri, 22 Aug 2008 16:56:50 +0000 Subject: apply latest u-boot-on-zaurus patch from bug #3738 --- packages/u-boot/u-boot-git/akita/.mtn2git_empty | 0 .../akita/akita-standard-partitioning.patch | 56 + packages/u-boot/u-boot-git/c7x0/.mtn2git_empty | 0 .../c7x0/corgi-standard-partitioning.patch | 56 + packages/u-boot/u-boot-git/pdaXrom-u-boot.patch | 2467 ++++++++++++++++++++ packages/u-boot/u-boot-git/spitz/.mtn2git_empty | 0 .../spitz/spitz-standard-partitioning.patch | 56 + .../u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch | 47 + packages/u-boot/u-boot_git.bb | 28 +- 9 files changed, 2709 insertions(+), 1 deletion(-) create mode 100644 packages/u-boot/u-boot-git/akita/.mtn2git_empty create mode 100644 packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch create mode 100644 packages/u-boot/u-boot-git/c7x0/.mtn2git_empty create mode 100644 packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch create mode 100644 packages/u-boot/u-boot-git/pdaXrom-u-boot.patch create mode 100644 packages/u-boot/u-boot-git/spitz/.mtn2git_empty create mode 100644 packages/u-boot/u-boot-git/spitz/spitz-standard-partitioning.patch create mode 100644 packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch diff --git a/packages/u-boot/u-boot-git/akita/.mtn2git_empty b/packages/u-boot/u-boot-git/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch b/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch new file mode 100644 index 0000000000..ad62e13d2e --- /dev/null +++ b/packages/u-boot/u-boot-git/akita/akita-standard-partitioning.patch @@ -0,0 +1,56 @@ +--- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000 ++++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000 +@@ -81,35 +81,35 @@ + "if testkey 101 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \ + "bootm; " \ + "fi; " \ + "if testkey 2 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \ + "bootm; " \ + "fi; " \ + "if testkey 18 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \ + "bootm; " \ + "fi; " \ + "if testkey 3 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \ + "bootm; " \ + "fi; " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \ + "bootm; " + #else + #define CONFIG_BOOTCOMMAND "" // "run boot_flash" + #endif + +-#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)" + #define CONFIG_SETUP_MEMORY_TAGS 1 + #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ + #define CONFIG_INITRD_TAG 1 +@@ -302,9 +302,9 @@ + /* Note: fake mtd_id used, no linux mtd map file */ + + #define CONFIG_JFFS2_CMDLINE +-#define MTDIDS_DEFAULT "nand0=laze-0" ++#define MTDIDS_DEFAULT "nand0=sharpsl-nand" + //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" +-#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" ++#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)" + + /* + * SHARP SL NAND logical partition diff --git a/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty b/packages/u-boot/u-boot-git/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch b/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch new file mode 100644 index 0000000000..7d25c0877c --- /dev/null +++ b/packages/u-boot/u-boot-git/c7x0/corgi-standard-partitioning.patch @@ -0,0 +1,56 @@ +--- git/include/configs/corgi.h 2007-12-26 17:57:00.000000000 +0000 ++++ git/include/configs/corgi.h 2007-12-26 18:07:47.000000000 +0000 +@@ -81,35 +81,35 @@ + "if testkey 101 ; " \ + "then " \ + "nand read.logical 0xa0800000 0x00060000 0x00540000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \ + "bootm; " \ + "fi; " \ + "if testkey 2 ; " \ + "then " \ + "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait; " \ + "bootm; " \ + "fi; " \ + "if testkey 18 ; " \ + "then " \ + "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait; " \ + "bootm; " \ + "fi; " \ + "if testkey 3 ; " \ + "then " \ + "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait; " \ + "bootm; " \ + "fi; " \ + "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \ + "bootm; " + #else + #define CONFIG_BOOTCOMMAND "" // "run boot_flash" + #endif + +-#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192 mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)" + #define CONFIG_SETUP_MEMORY_TAGS 1 + #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ + #define CONFIG_INITRD_TAG 1 +@@ -304,9 +304,9 @@ + /* Note: fake mtd_id used, no linux mtd map file */ + + #define CONFIG_JFFS2_CMDLINE +-#define MTDIDS_DEFAULT "nand0=laze-0" ++#define MTDIDS_DEFAULT "nand0=sharpsl-nand" + //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" +-#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" ++#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)" + + /* + * SHARP SL NAND logical partition diff --git a/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch b/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch new file mode 100644 index 0000000000..0bf071399d --- /dev/null +++ b/packages/u-boot/u-boot-git/pdaXrom-u-boot.patch @@ -0,0 +1,2467 @@ +diff -Nur u-boot-2006-04-18-1106/CREDITS u-boot-2006-04-18-1106-new/CREDITS +--- u-boot-2006-04-18-1106/CREDITS 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/CREDITS 2006-07-05 11:19:44.000000000 +0000 +@@ -93,6 +93,12 @@ + E: jonathan.debruyne@siemens.atea.be + D: Port to Siemens IAD210 board + ++N: Alexander Chukov ++E: sash@pdaXrom.org ++D: initial support for Sharp Zaurus SL-C1000/3100 ++D: initial support for Sharp Zaurus SL-C7x0/C860 ++W: http://www.pdaXrom.org ++ + N: Ken Chou + E: kchou@ieee.org + D: Support for A3000 SBC board +diff -Nur u-boot-2006-04-18-1106/MAINTAINERS u-boot-2006-04-18-1106-new/MAINTAINERS +--- u-boot-2006-04-18-1106/MAINTAINERS 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/MAINTAINERS 2006-07-05 11:19:44.000000000 +0000 +@@ -379,6 +379,11 @@ + + AT91RM9200DK at91rm9200 + ++Alexander Chukov ++ ++ akita xscale ++ corgi xscale ++ + George G. Davis + + assabet SA1100 +diff -Nur u-boot-2006-04-18-1106/MAKEALL u-boot-2006-04-18-1106-new/MAKEALL +--- u-boot-2006-04-18-1106/MAKEALL 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/MAKEALL 2006-07-05 11:19:44.000000000 +0000 +@@ -206,7 +206,7 @@ + adsvix cerf250 cradle csb226 \ + delta innokom lubbock pxa255_idp \ + wepep250 xaeniax xm250 xsengine \ +- zylonite \ ++ zylonite akita corgi \ + " + + LIST_ixp="ixdp425" +diff -Nur u-boot-2006-04-18-1106/Makefile u-boot-2006-04-18-1106-new/Makefile +--- u-boot-2006-04-18-1106/Makefile 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/Makefile 2006-07-05 11:19:44.000000000 +0000 +@@ -61,7 +61,7 @@ + CROSS_COMPILE = powerpc-linux- + endif + ifeq ($(ARCH),arm) +-CROSS_COMPILE = arm-linux- ++CROSS_COMPILE = armv5tel-linux- + endif + ifeq ($(ARCH),i386) + ifeq ($(HOSTARCH),i386) +@@ -1709,6 +1709,12 @@ + zylonite_config : + @./mkconfig $(@:_config=) arm pxa zylonite + ++akita_config : unconfig ++ @./mkconfig $(@:_config=) arm pxa akita ++ ++corgi_config : unconfig ++ @./mkconfig $(@:_config=) arm pxa corgi ++ + ######################################################################### + ## ARM1136 Systems + ######################################################################### +diff -Nur u-boot-2006-04-18-1106/README u-boot-2006-04-18-1106-new/README +--- u-boot-2006-04-18-1106/README 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/README 2006-07-05 11:19:44.000000000 +0000 +@@ -311,7 +311,8 @@ + CONFIG_KB9202, CONFIG_LART, CONFIG_LPD7A400, + CONFIG_LUBBOCK, CONFIG_OSK_OMAP5912, CONFIG_OMAP2420H4, + CONFIG_SHANNON, CONFIG_P2_OMAP730, CONFIG_SMDK2400, +- CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9 ++ CONFIG_SMDK2410, CONFIG_TRAB, CONFIG_VCMA9, ++ CONFIG_AKITA, CONFIG_CORGI + + MicroBlaze based boards: + ------------------------ +diff -Nur u-boot-2006-04-18-1106/board/akita/Makefile u-boot-2006-04-18-1106-new/board/akita/Makefile +--- u-boot-2006-04-18-1106/board/akita/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/Makefile 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,51 @@ ++# ++# board/akita/Makefile ++# ++# (C) Copyright 2006 Alexander Chukov ++# ++# (C) Copyright 2000 ++# Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = lib$(BOARD).a ++ ++OBJS := akita.o nand.o kbd.o ++SOBJS := lowlevel_init.o ++ ++$(LIB): $(OBJS) $(SOBJS) ++ $(AR) crv $@ $(OBJS) $(SOBJS) ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak .depend ++ ++######################################################################### ++ ++.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) ++ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ ++ ++-include .depend ++ ++######################################################################### +diff -Nur u-boot-2006-04-18-1106/board/akita/akita.c u-boot-2006-04-18-1106-new/board/akita/akita.c +--- u-boot-2006-04-18-1106/board/akita/akita.c 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/akita.c 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,89 @@ ++/* ++ * board/akita/akita.c ++ * ++ * Configuration settings for the Sharp Zaurus SL-Cxx00. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from adsvix board configuration: ++ * (C) Copyright 2004 ++ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net ++ * (C) Copyright 2002 ++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net ++ * (C) Copyright 2002 ++ * Sysgo Real-Time Solutions, GmbH ++ * Marius Groeger ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++ ++void set_turbo_mode(void); ++ ++/* ------------------------------------------------------------------------- */ ++ ++/* ++ * Miscellaneous platform dependent initialisations ++ */ ++ ++int board_init (void) ++{ ++ DECLARE_GLOBAL_DATA_PTR; ++ ++ /* memory and cpu-speed are setup before relocation */ ++ /* so we do _nothing_ here */ ++ ++ /* arch number of Sharp Zaurus Akita : MACH_TYPE_AKITA */ ++ gd->bd->bi_arch_number = 744; ++ ++ /* adress of boot parameters */ ++ gd->bd->bi_boot_params = 0xa0000100; ++ ++ /* set cpu turbo mode */ ++ set_turbo_mode(); ++ ++ spitzkbd_init(); ++ ++ return 0; ++} ++ ++int board_late_init(void) ++{ ++ setenv("stdout", "serial"); ++ setenv("stderr", "serial"); ++ return 0; ++} ++ ++ ++int dram_init (void) ++{ ++ DECLARE_GLOBAL_DATA_PTR; ++ ++ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; ++ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; ++ gd->bd->bi_dram[1].start = PHYS_SDRAM_2; ++ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; ++ gd->bd->bi_dram[2].start = PHYS_SDRAM_3; ++ gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; ++ gd->bd->bi_dram[3].start = PHYS_SDRAM_4; ++ gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; ++ ++ return 0; ++} +diff -Nur u-boot-2006-04-18-1106/board/akita/config.mk u-boot-2006-04-18-1106-new/board/akita/config.mk +--- u-boot-2006-04-18-1106/board/akita/config.mk 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/config.mk 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1 @@ ++TEXT_BASE = 0xa3000000 +diff -Nur u-boot-2006-04-18-1106/board/akita/kbd.c u-boot-2006-04-18-1106-new/board/akita/kbd.c +--- u-boot-2006-04-18-1106/board/akita/kbd.c 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/kbd.c 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,261 @@ ++/* ++ * board/akita/kbd.c ++ * ++ * Keyboard driver for the Sharp Zaurus SL-Cxx00. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from: ++ * ++ * linux/drivers/input/keyboard/spitzkbd.c ++ * ++ * Keyboard driver for Sharp Spitz, Borzoi and Akita (SL-Cxx00 series) ++ * ++ * Copyright (C) 2005 Richard Purdie ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define GPIO_DFLT_LOW 0x400 ++#define GPIO_DFLT_HIGH 0x800 ++ ++void pxa_gpio_mode(int gpio_mode) ++{ ++ int gpio = gpio_mode & GPIO_MD_MASK_NR; ++ int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; ++ int gafr; ++ ++ if (gpio_mode & GPIO_DFLT_LOW) ++ GPCR(gpio) = GPIO_bit(gpio); ++ else if (gpio_mode & GPIO_DFLT_HIGH) ++ GPSR(gpio) = GPIO_bit(gpio); ++ if (gpio_mode & GPIO_MD_MASK_DIR) ++ GPDR(gpio) |= GPIO_bit(gpio); ++ else ++ GPDR(gpio) &= ~GPIO_bit(gpio); ++ gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); ++ GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); ++} ++ ++#define SPITZ_KEY_STROBE_NUM (11) ++#define SPITZ_KEY_SENSE_NUM (7) ++ ++#define SPITZ_GPIO_G0_STROBE_BIT 0x0f800000 ++#define SPITZ_GPIO_G1_STROBE_BIT 0x00100000 ++#define SPITZ_GPIO_G2_STROBE_BIT 0x01000000 ++#define SPITZ_GPIO_G3_STROBE_BIT 0x00041880 ++#define SPITZ_GPIO_G0_SENSE_BIT 0x00021000 ++#define SPITZ_GPIO_G1_SENSE_BIT 0x000000d4 ++#define SPITZ_GPIO_G2_SENSE_BIT 0x08000000 ++#define SPITZ_GPIO_G3_SENSE_BIT 0x00000000 ++ ++#define SPITZ_GPIO_KEY_STROBE0 88 ++#define SPITZ_GPIO_KEY_STROBE1 23 ++#define SPITZ_GPIO_KEY_STROBE2 24 ++#define SPITZ_GPIO_KEY_STROBE3 25 ++#define SPITZ_GPIO_KEY_STROBE4 26 ++#define SPITZ_GPIO_KEY_STROBE5 27 ++#define SPITZ_GPIO_KEY_STROBE6 52 ++#define SPITZ_GPIO_KEY_STROBE7 103 ++#define SPITZ_GPIO_KEY_STROBE8 107 ++#define SPITZ_GPIO_KEY_STROBE9 108 ++#define SPITZ_GPIO_KEY_STROBE10 114 ++ ++#define SPITZ_GPIO_KEY_SENSE0 12 ++#define SPITZ_GPIO_KEY_SENSE1 17 ++#define SPITZ_GPIO_KEY_SENSE2 91 ++#define SPITZ_GPIO_KEY_SENSE3 34 ++#define SPITZ_GPIO_KEY_SENSE4 36 ++#define SPITZ_GPIO_KEY_SENSE5 38 ++#define SPITZ_GPIO_KEY_SENSE6 39 ++ ++#define SPITZ_GPIO_ON_KEY (95) ++ ++#define KB_ROWS 7 ++#define KB_COLS 11 ++#define KB_ROWMASK(r) (1 << (r)) ++#define SCANCODE(r,c) (((r)<<4) + (c) + 1) ++#define NR_SCANCODES ((KB_ROWS<<4) + 1) ++ ++#define SCAN_INTERVAL (50) /* ms */ ++#define HINGE_SCAN_INTERVAL (150) /* ms */ ++ ++#define KB_DISCHARGE_DELAY 10 ++#define KB_ACTIVATE_DELAY 10 ++ ++static int spitz_strobes[] = { ++ SPITZ_GPIO_KEY_STROBE0, ++ SPITZ_GPIO_KEY_STROBE1, ++ SPITZ_GPIO_KEY_STROBE2, ++ SPITZ_GPIO_KEY_STROBE3, ++ SPITZ_GPIO_KEY_STROBE4, ++ SPITZ_GPIO_KEY_STROBE5, ++ SPITZ_GPIO_KEY_STROBE6, ++ SPITZ_GPIO_KEY_STROBE7, ++ SPITZ_GPIO_KEY_STROBE8, ++ SPITZ_GPIO_KEY_STROBE9, ++ SPITZ_GPIO_KEY_STROBE10, ++}; ++ ++static int spitz_senses[] = { ++ SPITZ_GPIO_KEY_SENSE0, ++ SPITZ_GPIO_KEY_SENSE1, ++ SPITZ_GPIO_KEY_SENSE2, ++ SPITZ_GPIO_KEY_SENSE3, ++ SPITZ_GPIO_KEY_SENSE4, ++ SPITZ_GPIO_KEY_SENSE5, ++ SPITZ_GPIO_KEY_SENSE6, ++}; ++ ++static inline void spitzkbd_discharge_all(void) ++{ ++ /* STROBE All HiZ */ ++ GPCR0 = SPITZ_GPIO_G0_STROBE_BIT; ++ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; ++ GPCR1 = SPITZ_GPIO_G1_STROBE_BIT; ++ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; ++ GPCR2 = SPITZ_GPIO_G2_STROBE_BIT; ++ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; ++ GPCR3 = SPITZ_GPIO_G3_STROBE_BIT; ++ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; ++} ++ ++static inline void spitzkbd_activate_all(void) ++{ ++ /* STROBE ALL -> High */ ++ GPSR0 = SPITZ_GPIO_G0_STROBE_BIT; ++ GPDR0 |= SPITZ_GPIO_G0_STROBE_BIT; ++ GPSR1 = SPITZ_GPIO_G1_STROBE_BIT; ++ GPDR1 |= SPITZ_GPIO_G1_STROBE_BIT; ++ GPSR2 = SPITZ_GPIO_G2_STROBE_BIT; ++ GPDR2 |= SPITZ_GPIO_G2_STROBE_BIT; ++ GPSR3 = SPITZ_GPIO_G3_STROBE_BIT; ++ GPDR3 |= SPITZ_GPIO_G3_STROBE_BIT; ++ ++ udelay(KB_DISCHARGE_DELAY); ++} ++ ++static inline void spitzkbd_activate_col(int col) ++{ ++ int gpio = spitz_strobes[col]; ++ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; ++ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; ++ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; ++ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; ++ GPSR(gpio) = GPIO_bit(gpio); ++ GPDR(gpio) |= GPIO_bit(gpio); ++} ++ ++static inline void spitzkbd_reset_col(int col) ++{ ++ int gpio = spitz_strobes[col]; ++ GPDR0 &= ~SPITZ_GPIO_G0_STROBE_BIT; ++ GPDR1 &= ~SPITZ_GPIO_G1_STROBE_BIT; ++ GPDR2 &= ~SPITZ_GPIO_G2_STROBE_BIT; ++ GPDR3 &= ~SPITZ_GPIO_G3_STROBE_BIT; ++ GPCR(gpio) = GPIO_bit(gpio); ++ GPDR(gpio) |= GPIO_bit(gpio); ++} ++ ++static inline int spitzkbd_get_row_status(int col) ++{ ++ return ((GPLR0 >> 12) & 0x01) | ((GPLR0 >> 16) & 0x02) ++ | ((GPLR2 >> 25) & 0x04) | ((GPLR1 << 1) & 0x08) ++ | ((GPLR1 >> 0) & 0x10) | ((GPLR1 >> 1) & 0x60); ++} ++ ++static int spitzkbd_scankeyboard(void) ++{ ++ unsigned int row, col, rowd; ++ unsigned int num_pressed, pwrkey = ((GPLR(SPITZ_GPIO_ON_KEY) & GPIO_bit(SPITZ_GPIO_ON_KEY)) != 0); ++ int ret = -1; ++ ++ num_pressed = 0; ++ for (col = 0; col < KB_COLS; col++) { ++ spitzkbd_discharge_all(); ++ udelay(KB_DISCHARGE_DELAY); ++ ++ spitzkbd_activate_col(col); ++ udelay(KB_ACTIVATE_DELAY); ++ ++ rowd = spitzkbd_get_row_status(col); ++ for (row = 0; row < KB_ROWS; row++) { ++ unsigned int scancode, pressed; ++ ++ scancode = SCANCODE(row, col); ++ pressed = rowd & KB_ROWMASK(row); ++ ++ if (pressed) ++ ret = scancode; ++ } ++ spitzkbd_reset_col(col); ++ } ++ ++ spitzkbd_activate_all(); ++ ++ if (pwrkey) ++ return -2; ++ ++ return ret; ++} ++ ++void spitzkbd_init(void) ++{ ++ int i; ++ ++ /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ ++ for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) ++ pxa_gpio_mode(spitz_senses[i] | GPIO_IN); ++ ++ /* Set Strobe lines as outputs - set high */ ++ for (i = 0; i < SPITZ_KEY_STROBE_NUM; i++) ++ pxa_gpio_mode(spitz_strobes[i] | GPIO_OUT | GPIO_DFLT_HIGH); ++ ++ pxa_gpio_mode(SPITZ_GPIO_ON_KEY | GPIO_IN); ++} ++ ++int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ++{ ++ int scan; ++ ++ if (argc < 2) ++ return 1; ++ ++ scan = spitzkbd_scankeyboard(); ++ ++ ++// if (scan >= 0) ++// printf("Scan = %d\n", scan); ++// else ++// printf("Nothing!\n"); ++ ++ return !(simple_strtol(argv[1], NULL, 10) == scan); ++} ++ ++U_BOOT_CMD( ++ testkey, 2, 1, do_testkey, ++ "testkey - compare pressed key with arg\n", ++ "" ++); +diff -Nur u-boot-2006-04-18-1106/board/akita/lowlevel_init.S u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S +--- u-boot-2006-04-18-1106/board/akita/lowlevel_init.S 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/lowlevel_init.S 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,135 @@ ++/* ++ * board/akita/lowlevel_init.S ++ * ++ * Configuration settings for the Sharp Zaurus SL-Cxx00. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * This was originally from the Lubbock u-boot port and from BLOB with cleanup ++ * ++ * NOTE: I haven't clean this up considerably, just enough to get it ++ * running. See hal_platform_setup.h for the source. See ++ * board/cradle/lowlevel_init.S for another PXA250 setup that is ++ * much cleaner. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++ ++/* wait for coprocessor write complete */ ++ .macro CPWAIT reg ++ mrc p15,0,\reg,c2,c0,0 ++ mov \reg,\reg ++ sub pc,pc,#4 ++ .endm ++ ++/*********** Write out to HEX 7 segment leds *********/ ++ ++#undef DEBUG_HEXLOG ++ ++#ifdef DEBUG_HEXLOG ++#define LEDCTL 0x08000040 ++#define LEDDAT1 0x08000010 ++#define LEDDAT2 0x08000014 ++ ++.macro wait, count ++ mov r10, \count ++0: ++ subs r10, r10, #1 ++ bne 0b ++.endm ++ ++.macro hexlog_init ++ ldr r11, =LEDCTL ++ mov r10, #0xff ++ str r10, [r11] ++ ldr r11, =LEDDAT2 ++ mov r10, #0xFFFFFFFF ++ str r10, [r11] ++ ldr r11, =LEDDAT1 ++ mov r10, #0x0 ++ str r10, [r11] ++.endm ++ ++.macro hexlog, val ++ ldr r11, =LEDCTL ++ mov r10, #0xff ++ str r10, [r11] ++ ldr r11, =LEDDAT2 ++ mov r10, #0xFFFFFFFF ++ str r10, [r11] ++ ++ ldr r11, =LEDDAT1 ++ mov r10, \val ++ str r10, [r11] ++ ++ wait #0x400000 ++.endm ++ ++#else ++ ++.macro hexlog_init ++ nop ++.endm ++ ++.macro hexlog, val ++ nop ++.endm ++ ++#endif ++ ++/***********************************/ ++ ++/* ++ * Memory setup ++ */ ++ ++.globl lowlevel_init ++lowlevel_init: ++ ++ mov pc, lr ++ ++.globl set_turbo_mode ++ ++set_turbo_mode: ++ /* Turn on turbo mode */ ++ mrc p14, 0, r2, c6, c0, 0 ++ orr r2, r2, #0xB /* Turbo, Fast-Bus, Freq change**/ ++ mcr p14, 0, r2, c6, c0, 0 ++ ++ /* Setup vectors */ ++ ldr r0, =TEXT_BASE ++ ldr r1, =TEXT_BASE+0x40 ++ ldr r2, =0x0 ++1: ++ ldr r3, [r0] ++ str r3, [r2] ++ add r0, r0, #4 ++ add r2, r2, #4 ++ cmp r0, r1 ++ bne 1b ++ ++ ldr r0, =0x0 ++ ldr r1, [r0, #4] ++ str r1, [r0] ++ ++ mov pc, lr +diff -Nur u-boot-2006-04-18-1106/board/akita/nand.c u-boot-2006-04-18-1106-new/board/akita/nand.c +--- u-boot-2006-04-18-1106/board/akita/nand.c 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/nand.c 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,169 @@ ++/* ++ * board/akita/nand.c ++ * ++ * NAND driver for the Sharp Zaurus SL-Cxx00. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from mtd nand driver: ++ * ++ * drivers/mtd/nand/sharpsl.c ++ * ++ * Copyright (C) 2004 Richard Purdie ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++ ++ ++#if (CONFIG_COMMANDS & CFG_CMD_NAND) ++ ++#include ++#include ++ ++static int sharpsl_io_base = CFG_NAND_BASE; ++ ++/* register offset */ ++#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */ ++#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */ ++#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */ ++#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */ ++#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */ ++#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */ ++#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */ ++ ++/* Flash control bit */ ++#define FLRYBY (1 << 5) ++#define FLCE1 (1 << 4) ++#define FLWP (1 << 3) ++#define FLALE (1 << 2) ++#define FLCLE (1 << 1) ++#define FLCE0 (1 << 0) ++ ++#define readb(address) *((volatile unsigned char *)(address)) ++#define writeb(v, address) *((volatile unsigned char *)(address))=v ++ ++/* ++ * hardware specific access to control-lines ++ */ ++static void ++sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd) ++{ ++ switch (cmd) { ++ case NAND_CTL_SETCLE: ++ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL); ++ break; ++ case NAND_CTL_CLRCLE: ++ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL); ++ break; ++ ++ case NAND_CTL_SETALE: ++ writeb(readb(FLASHCTL) | FLALE, FLASHCTL); ++ break; ++ case NAND_CTL_CLRALE: ++ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL); ++ break; ++ ++ case NAND_CTL_SETNCE: ++ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL); ++ break; ++ case NAND_CTL_CLRNCE: ++ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL); ++ break; ++ } ++} ++ ++static int ++sharpsl_nand_dev_ready(struct mtd_info* mtd) ++{ ++ return !((readb(FLASHCTL) & FLRYBY) == 0); ++} ++ ++static void ++sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode) ++{ ++ writeb(0 ,ECCCLRR); ++} ++ ++static int ++sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat, ++ u_char* ecc_code) ++{ ++ ecc_code[0] = ~readb(ECCLPUB); ++ ecc_code[1] = ~readb(ECCLPLB); ++ ecc_code[2] = (~readb(ECCCP) << 2) | 0x03; ++ return readb(ECCCNTR) != 0; ++} ++ ++static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; ++ ++static struct nand_bbt_descr sharpsl_akita_bbt = { ++ .options = 0, ++ .offs = 4, ++ .len = 1, ++ .pattern = scan_ff_pattern ++}; ++ ++static struct nand_oobinfo akita_oobinfo = { ++ .useecc = MTD_NANDECC_AUTOPLACE, ++ .eccbytes = 24, ++ .eccpos = { ++ 0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11, ++ 0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23, ++ 0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37}, ++ .oobfree = { {0x08, 0x09} } ++}; ++ ++/* ++ * Board-specific NAND initialization. The following members of the ++ * argument are board-specific (per include/linux/mtd/nand.h): ++ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device ++ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device ++ * - hwcontrol: hardwarespecific function for accesing control-lines ++ * - dev_ready: hardwarespecific function for accesing device ready/busy line ++ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must ++ * only be provided if a hardware ECC is available ++ * - eccmode: mode of ecc, see defines ++ * - chip_delay: chip dependent delay for transfering data from array to ++ * read regs (tR) ++ * - options: various chip options. They can partly be set to inform ++ * nand_scan about special functionality. See the defines for further ++ * explanation ++ * Members with a "?" were not set in the merged testing-NAND branch, ++ * so they are not set here either. ++ */ ++void board_nand_init(struct nand_chip *nand) ++{ ++ writeb(readb(FLASHCTL) | FLWP, FLASHCTL); ++ ++ nand->IO_ADDR_R = FLASHIO; ++ nand->IO_ADDR_W = FLASHIO; ++ nand->hwcontrol = sharpsl_nand_hwcontrol; ++ nand->dev_ready = sharpsl_nand_dev_ready; ++ nand->eccmode = NAND_ECC_HW3_256; ++ nand->chip_delay = 15; ++ nand->options = NAND_SAMSUNG_LP_OPTIONS; ++ nand->badblock_pattern = &sharpsl_akita_bbt; ++ nand->autooob = &akita_oobinfo; ++ nand->enable_hwecc = sharpsl_nand_enable_hwecc; ++ nand->calculate_ecc = sharpsl_nand_calculate_ecc; ++ nand->correct_data = nand_correct_data; ++} ++#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ +diff -Nur u-boot-2006-04-18-1106/board/akita/u-boot.lds u-boot-2006-04-18-1106-new/board/akita/u-boot.lds +--- u-boot-2006-04-18-1106/board/akita/u-boot.lds 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/akita/u-boot.lds 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,56 @@ ++/* ++ * (C) Copyright 2000 ++ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ++OUTPUT_ARCH(arm) ++ENTRY(_start) ++SECTIONS ++{ ++ . = 0x00000000; ++ ++ . = ALIGN(4); ++ .text : ++ { ++ cpu/pxa/start.o (.text) ++ *(.text) ++ } ++ ++ . = ALIGN(4); ++ .rodata : { *(.rodata) } ++ ++ . = ALIGN(4); ++ .data : { *(.data) } ++ ++ . = ALIGN(4); ++ .got : { *(.got) } ++ ++ . = .; ++ __u_boot_cmd_start = .; ++ .u_boot_cmd : { *(.u_boot_cmd) } ++ __u_boot_cmd_end = .; ++ ++ . = ALIGN(4); ++ __bss_start = .; ++ .bss : { *(.bss) } ++ _end = .; ++} +diff -Nur u-boot-2006-04-18-1106/board/corgi/Makefile u-boot-2006-04-18-1106-new/board/corgi/Makefile +--- u-boot-2006-04-18-1106/board/corgi/Makefile 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/Makefile 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,51 @@ ++# ++# board/corgi/Makefile ++# ++# (C) Copyright 2006 Alexander Chukov ++# ++# (C) Copyright 2000 ++# Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++# ++# See file CREDITS for list of people who contributed to this ++# project. ++# ++# This program is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++# MA 02111-1307 USA ++# ++ ++include $(TOPDIR)/config.mk ++ ++LIB = lib$(BOARD).a ++ ++OBJS := corgi.o nand.o kbd.o ++SOBJS := lowlevel_init.o ++ ++$(LIB): $(OBJS) $(SOBJS) ++ $(AR) crv $@ $(OBJS) $(SOBJS) ++ ++clean: ++ rm -f $(SOBJS) $(OBJS) ++ ++distclean: clean ++ rm -f $(LIB) core *.bak .depend ++ ++######################################################################### ++ ++.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) ++ $(CC) -M $(CPPFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ ++ ++-include .depend ++ ++######################################################################### +diff -Nur u-boot-2006-04-18-1106/board/corgi/config.mk u-boot-2006-04-18-1106-new/board/corgi/config.mk +--- u-boot-2006-04-18-1106/board/corgi/config.mk 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/config.mk 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1 @@ ++TEXT_BASE = 0xa1000000 +diff -Nur u-boot-2006-04-18-1106/board/corgi/corgi.c u-boot-2006-04-18-1106-new/board/corgi/corgi.c +--- u-boot-2006-04-18-1106/board/corgi/corgi.c 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/corgi.c 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,87 @@ ++/* ++ * board/corgi/corgi.c ++ * ++ * Configuration settings for the Sharp Zaurus SL-C7x0/860. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from adsvix board configuration: ++ * (C) Copyright 2004 ++ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net ++ * (C) Copyright 2002 ++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net ++ * (C) Copyright 2002 ++ * Sysgo Real-Time Solutions, GmbH ++ * Marius Groeger ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++ ++/* ------------------------------------------------------------------------- */ ++ ++/* ++ * Miscellaneous platform dependent initialisations ++ */ ++ ++int board_init (void) ++{ ++ DECLARE_GLOBAL_DATA_PTR; ++ ++ /* memory and cpu-speed are setup before relocation */ ++ /* so we do _nothing_ here */ ++ ++ /* arch number of Sharp Zaurus Corgi : MACH_TYPE_CORGI */ ++ gd->bd->bi_arch_number = 423; ++ ++ /* adress of boot parameters */ ++ gd->bd->bi_boot_params = 0xa0000100; ++ ++ /* set cpu turbo mode */ ++ set_turbo_mode(); ++ ++ corgikbd_init(); ++ ++ return 0; ++} ++ ++int board_late_init(void) ++{ ++ setenv("stdout", "serial"); ++ setenv("stderr", "serial"); ++ return 0; ++} ++ ++ ++int dram_init (void) ++{ ++ DECLARE_GLOBAL_DATA_PTR; ++ ++ gd->bd->bi_dram[0].start = PHYS_SDRAM_1; ++ gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; ++ gd->bd->bi_dram[1].start = PHYS_SDRAM_2; ++ gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; ++ gd->bd->bi_dram[2].start = PHYS_SDRAM_3; ++ gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; ++ gd->bd->bi_dram[3].start = PHYS_SDRAM_4; ++ gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; ++ ++ return 0; ++} +diff -Nur u-boot-2006-04-18-1106/board/corgi/kbd.c u-boot-2006-04-18-1106-new/board/corgi/kbd.c +--- u-boot-2006-04-18-1106/board/corgi/kbd.c 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/kbd.c 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,202 @@ ++/* ++ * board/corgi/kbd.c ++ * ++ * Keyboard driver for the Sharp Zaurus SL-C7x0/860. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from: ++ * ++ * linux/drivers/input/keyboard/spitzkbd.c ++ * ++ * Keyboard driver for Sharp Corgi models (SL-C7xx) ++ * ++ * Copyright (C) 2005 Richard Purdie ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define GPIO_DFLT_LOW 0x400 ++#define GPIO_DFLT_HIGH 0x800 ++ ++void pxa_gpio_mode(int gpio_mode) ++{ ++ int gpio = gpio_mode & GPIO_MD_MASK_NR; ++ int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8; ++ int gafr; ++ ++ if (gpio_mode & GPIO_DFLT_LOW) ++ GPCR(gpio) = GPIO_bit(gpio); ++ else if (gpio_mode & GPIO_DFLT_HIGH) ++ GPSR(gpio) = GPIO_bit(gpio); ++ if (gpio_mode & GPIO_MD_MASK_DIR) ++ GPDR(gpio) |= GPIO_bit(gpio); ++ else ++ GPDR(gpio) &= ~GPIO_bit(gpio); ++ gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2)); ++ GAFR(gpio) = gafr | (fn << (((gpio) & 0xf)*2)); ++} ++ ++/* ++ * Corgi Keyboard Definitions ++ */ ++#define CORGI_KEY_STROBE_NUM (12) ++#define CORGI_KEY_SENSE_NUM (8) ++#define CORGI_GPIO_ALL_STROBE_BIT (0x00003ffc) ++#define CORGI_GPIO_HIGH_SENSE_BIT (0xfc000000) ++#define CORGI_GPIO_HIGH_SENSE_RSHIFT (26) ++#define CORGI_GPIO_LOW_SENSE_BIT (0x00000003) ++#define CORGI_GPIO_LOW_SENSE_LSHIFT (6) ++#define CORGI_GPIO_STROBE_BIT(a) GPIO_bit(66+(a)) ++#define CORGI_GPIO_SENSE_BIT(a) GPIO_bit(58+(a)) ++#define CORGI_GAFR_ALL_STROBE_BIT (0x0ffffff0) ++#define CORGI_GAFR_HIGH_SENSE_BIT (0xfff00000) ++#define CORGI_GAFR_LOW_SENSE_BIT (0x0000000f) ++#define CORGI_GPIO_KEY_SENSE(a) (58+(a)) ++#define CORGI_GPIO_KEY_STROBE(a) (66+(a)) ++ ++#define CORGI_GPIO_AK_INT (4) /* Headphone Jack Control Interrupt */ ++ ++#define KB_ROWS 8 ++#define KB_COLS 12 ++#define KB_ROWMASK(r) (1 << (r)) ++#define SCANCODE(r,c) ( ((r)<<4) + (c) + 1 ) ++/* zero code, 124 scancodes */ ++#define NR_SCANCODES ( SCANCODE(KB_ROWS-1,KB_COLS-1) +1 +1 ) ++ ++#define SCAN_INTERVAL (50) /* ms */ ++#define HINGE_SCAN_INTERVAL (250) /* ms */ ++ ++#define KB_DISCHARGE_DELAY 10 ++#define KB_ACTIVATE_DELAY 10 ++ ++static inline void corgikbd_discharge_all(void) ++{ ++ /* STROBE All HiZ */ ++ GPCR2 = CORGI_GPIO_ALL_STROBE_BIT; ++ GPDR2 &= ~CORGI_GPIO_ALL_STROBE_BIT; ++} ++ ++static inline void corgikbd_activate_all(void) ++{ ++ /* STROBE ALL -> High */ ++ GPSR2 = CORGI_GPIO_ALL_STROBE_BIT; ++ GPDR2 |= CORGI_GPIO_ALL_STROBE_BIT; ++ ++ udelay(KB_DISCHARGE_DELAY); ++ ++ /* Clear any interrupts we may have triggered when altering the GPIO lines */ ++ GEDR1 = CORGI_GPIO_HIGH_SENSE_BIT; ++ GEDR2 = CORGI_GPIO_LOW_SENSE_BIT; ++} ++ ++static inline void corgikbd_activate_col(int col) ++{ ++ /* STROBE col -> High, not col -> HiZ */ ++ GPSR2 = CORGI_GPIO_STROBE_BIT(col); ++ GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col); ++} ++ ++static inline void corgikbd_reset_col(int col) ++{ ++ /* STROBE col -> Low */ ++ GPCR2 = CORGI_GPIO_STROBE_BIT(col); ++ /* STROBE col -> out, not col -> HiZ */ ++ GPDR2 = (GPDR2 & ~CORGI_GPIO_ALL_STROBE_BIT) | CORGI_GPIO_STROBE_BIT(col); ++} ++ ++#define GET_ROWS_STATUS(c) (((GPLR1 & CORGI_GPIO_HIGH_SENSE_BIT) >> CORGI_GPIO_HIGH_SENSE_RSHIFT) | ((GPLR2 & CORGI_GPIO_LOW_SENSE_BIT) << CORGI_GPIO_LOW_SENSE_LSHIFT)) ++ ++static int corgikbd_scankeyboard(void) ++{ ++ unsigned int row, col, rowd; ++ unsigned int num_pressed; ++ int ret = -1; ++ ++ num_pressed = 0; ++ for (col = 0; col < KB_COLS; col++) { ++ corgikbd_discharge_all(); ++ udelay(KB_DISCHARGE_DELAY); ++ ++ corgikbd_activate_col(col); ++ udelay(KB_ACTIVATE_DELAY); ++ ++ rowd = GET_ROWS_STATUS(col); ++ for (row = 0; row < KB_ROWS; row++) { ++ unsigned int scancode, pressed; ++ ++ scancode = SCANCODE(row, col); ++ pressed = rowd & KB_ROWMASK(row); ++ ++ if (pressed) ++ ret = scancode; ++ } ++ corgikbd_reset_col(col); ++ } ++ ++ corgikbd_activate_all(); ++ ++ return ret; ++} ++ ++void corgikbd_init(void) ++{ ++ int i; ++ ++ /* Setup sense interrupts - RisingEdge Detect, sense lines as inputs */ ++ for (i = 0; i < CORGI_KEY_SENSE_NUM; i++) ++ pxa_gpio_mode(CORGI_GPIO_KEY_SENSE(i) | GPIO_IN); ++ ++ /* Set Strobe lines as outputs - set high */ ++ for (i = 0; i < CORGI_KEY_STROBE_NUM; i++) ++ pxa_gpio_mode(CORGI_GPIO_KEY_STROBE(i) | GPIO_OUT | GPIO_DFLT_HIGH); ++ ++ /* Setup the headphone jack as an input */ ++ pxa_gpio_mode(CORGI_GPIO_AK_INT | GPIO_IN); ++} ++ ++int do_testkey(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) ++{ ++ int scan; ++ ++ if (argc < 2) ++ return 1; ++ ++ scan = corgikbd_scankeyboard(); ++ ++ ++// if (scan >= 0) ++// printf("Scan = %d\n", scan); ++// else ++// printf("Nothing!\n"); ++ ++ return !(simple_strtol(argv[1], NULL, 10) == scan); ++} ++ ++U_BOOT_CMD( ++ testkey, 2, 1, do_testkey, ++ "testkey - compare pressed key with arg\n", ++ "" ++); +diff -Nur u-boot-2006-04-18-1106/board/corgi/lowlevel_init.S u-boot-2006-04-18-1106-new/board/corgi/lowlevel_init.S +--- u-boot-2006-04-18-1106/board/corgi/lowlevel_init.S 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/lowlevel_init.S 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,136 @@ ++/* ++ * board/corgi/lowlevel_init.S ++ * ++ * Configuration settings for the Sharp Zaurus SL-C7x0/860. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * This was originally from the Lubbock u-boot port and from BLOB with cleanup ++ * ++ * NOTE: I haven't clean this up considerably, just enough to get it ++ * running. See hal_platform_setup.h for the source. See ++ * board/cradle/lowlevel_init.S for another PXA250 setup that is ++ * much cleaner. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++#include ++#include ++ ++/* wait for coprocessor write complete */ ++ .macro CPWAIT reg ++ mrc p15,0,\reg,c2,c0,0 ++ mov \reg,\reg ++ sub pc,pc,#4 ++ .endm ++ ++/*********** Write out to HEX 7 segment leds *********/ ++ ++#undef DEBUG_HEXLOG ++ ++#ifdef DEBUG_HEXLOG ++#define LEDCTL 0x08000040 ++#define LEDDAT1 0x08000010 ++#define LEDDAT2 0x08000014 ++ ++.macro wait, count ++ mov r10, \count ++0: ++ subs r10, r10, #1 ++ bne 0b ++.endm ++ ++.macro hexlog_init ++ ldr r11, =LEDCTL ++ mov r10, #0xff ++ str r10, [r11] ++ ldr r11, =LEDDAT2 ++ mov r10, #0xFFFFFFFF ++ str r10, [r11] ++ ldr r11, =LEDDAT1 ++ mov r10, #0x0 ++ str r10, [r11] ++.endm ++ ++.macro hexlog, val ++ ldr r11, =LEDCTL ++ mov r10, #0xff ++ str r10, [r11] ++ ldr r11, =LEDDAT2 ++ mov r10, #0xFFFFFFFF ++ str r10, [r11] ++ ++ ldr r11, =LEDDAT1 ++ mov r10, \val ++ str r10, [r11] ++ ++ wait #0x400000 ++.endm ++ ++#else ++ ++.macro hexlog_init ++ nop ++.endm ++ ++.macro hexlog, val ++ nop ++.endm ++ ++#endif ++ ++/***********************************/ ++ ++/* ++ * Memory setup ++ */ ++ ++.globl lowlevel_init ++lowlevel_init: ++ ++ mov pc, lr ++ ++.globl set_turbo_mode ++ ++set_turbo_mode: ++ /* Turn on turbo mode */ ++ mrc p14, 0, r2, c6, c0, 0 ++ orr r2, r2, #0x3 /* Turbo, Freq change */ ++ mcr p14, 0, r2, c6, c0, 0 ++ ++ ++ /* Setup vectors */ ++ ldr r0, =TEXT_BASE ++ ldr r1, =TEXT_BASE+0x40 ++ ldr r2, =0x0 ++1: ++ ldr r3, [r0] ++ str r3, [r2] ++ add r0, r0, #4 ++ add r2, r2, #4 ++ cmp r0, r1 ++ bne 1b ++ ++ ldr r0, =0x0 ++ ldr r1, [r0, #4] ++ str r1, [r0] ++ ++ mov pc, lr +diff -Nur u-boot-2006-04-18-1106/board/corgi/nand.c u-boot-2006-04-18-1106-new/board/corgi/nand.c +--- u-boot-2006-04-18-1106/board/corgi/nand.c 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/nand.c 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,157 @@ ++/* ++ * board/corgi/nand.c ++ * ++ * NAND driver for the Sharp Zaurus SL-C7x0/860. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from mtd nand driver: ++ * ++ * drivers/mtd/nand/sharpsl.c ++ * ++ * Copyright (C) 2004 Richard Purdie ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#include ++ ++ ++#if (CONFIG_COMMANDS & CFG_CMD_NAND) ++ ++#include ++#include ++ ++static int sharpsl_io_base = CFG_NAND_BASE; ++ ++/* register offset */ ++#define ECCLPLB sharpsl_io_base+0x00 /* line parity 7 - 0 bit */ ++#define ECCLPUB sharpsl_io_base+0x04 /* line parity 15 - 8 bit */ ++#define ECCCP sharpsl_io_base+0x08 /* column parity 5 - 0 bit */ ++#define ECCCNTR sharpsl_io_base+0x0C /* ECC byte counter */ ++#define ECCCLRR sharpsl_io_base+0x10 /* cleare ECC */ ++#define FLASHIO sharpsl_io_base+0x14 /* Flash I/O */ ++#define FLASHCTL sharpsl_io_base+0x18 /* Flash Control */ ++ ++/* Flash control bit */ ++#define FLRYBY (1 << 5) ++#define FLCE1 (1 << 4) ++#define FLWP (1 << 3) ++#define FLALE (1 << 2) ++#define FLCLE (1 << 1) ++#define FLCE0 (1 << 0) ++ ++#define readb(address) *((volatile unsigned char *)(address)) ++#define writeb(v, address) *((volatile unsigned char *)(address))=v ++ ++/* ++ * hardware specific access to control-lines ++ */ ++static void ++sharpsl_nand_hwcontrol(struct mtd_info* mtd, int cmd) ++{ ++ switch (cmd) { ++ case NAND_CTL_SETCLE: ++ writeb(readb(FLASHCTL) | FLCLE, FLASHCTL); ++ break; ++ case NAND_CTL_CLRCLE: ++ writeb(readb(FLASHCTL) & ~FLCLE, FLASHCTL); ++ break; ++ ++ case NAND_CTL_SETALE: ++ writeb(readb(FLASHCTL) | FLALE, FLASHCTL); ++ break; ++ case NAND_CTL_CLRALE: ++ writeb(readb(FLASHCTL) & ~FLALE, FLASHCTL); ++ break; ++ ++ case NAND_CTL_SETNCE: ++ writeb(readb(FLASHCTL) & ~(FLCE0|FLCE1), FLASHCTL); ++ break; ++ case NAND_CTL_CLRNCE: ++ writeb(readb(FLASHCTL) | (FLCE0|FLCE1), FLASHCTL); ++ break; ++ } ++} ++ ++static int ++sharpsl_nand_dev_ready(struct mtd_info* mtd) ++{ ++ return !((readb(FLASHCTL) & FLRYBY) == 0); ++} ++ ++static void ++sharpsl_nand_enable_hwecc(struct mtd_info* mtd, int mode) ++{ ++ writeb(0 ,ECCCLRR); ++} ++ ++static int ++sharpsl_nand_calculate_ecc(struct mtd_info* mtd, const u_char* dat, ++ u_char* ecc_code) ++{ ++ ecc_code[0] = ~readb(ECCLPUB); ++ ecc_code[1] = ~readb(ECCLPLB); ++ ecc_code[2] = (~readb(ECCCP) << 2) | 0x03; ++ return readb(ECCCNTR) != 0; ++} ++ ++static uint8_t scan_ff_pattern[] = { 0xff, 0xff }; ++ ++static struct nand_bbt_descr sharpsl_bbt = { ++ .options = 0, ++ .offs = 4, ++ .len = 2, ++ .pattern = scan_ff_pattern ++}; ++ ++/* ++ * Board-specific NAND initialization. The following members of the ++ * argument are board-specific (per include/linux/mtd/nand.h): ++ * - IO_ADDR_R?: address to read the 8 I/O lines of the flash device ++ * - IO_ADDR_W?: address to write the 8 I/O lines of the flash device ++ * - hwcontrol: hardwarespecific function for accesing control-lines ++ * - dev_ready: hardwarespecific function for accesing device ready/busy line ++ * - enable_hwecc?: function to enable (reset) hardware ecc generator. Must ++ * only be provided if a hardware ECC is available ++ * - eccmode: mode of ecc, see defines ++ * - chip_delay: chip dependent delay for transfering data from array to ++ * read regs (tR) ++ * - options: various chip options. They can partly be set to inform ++ * nand_scan about special functionality. See the defines for further ++ * explanation ++ * Members with a "?" were not set in the merged testing-NAND branch, ++ * so they are not set here either. ++ */ ++void board_nand_init(struct nand_chip *nand) ++{ ++ writeb(readb(FLASHCTL) | FLWP, FLASHCTL); ++ ++ nand->IO_ADDR_R = FLASHIO; ++ nand->IO_ADDR_W = FLASHIO; ++ nand->hwcontrol = sharpsl_nand_hwcontrol; ++ nand->dev_ready = sharpsl_nand_dev_ready; ++ nand->eccmode = NAND_ECC_HW3_256; ++ nand->chip_delay = 15; ++ nand->badblock_pattern = &sharpsl_bbt; ++ nand->enable_hwecc = sharpsl_nand_enable_hwecc; ++ nand->calculate_ecc = sharpsl_nand_calculate_ecc; ++ nand->correct_data = nand_correct_data; ++} ++#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) */ +diff -Nur u-boot-2006-04-18-1106/board/corgi/u-boot.lds u-boot-2006-04-18-1106-new/board/corgi/u-boot.lds +--- u-boot-2006-04-18-1106/board/corgi/u-boot.lds 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/board/corgi/u-boot.lds 2006-07-05 11:19:44.000000000 +0000 +@@ -0,0 +1,56 @@ ++/* ++ * (C) Copyright 2000 ++ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ++OUTPUT_ARCH(arm) ++ENTRY(_start) ++SECTIONS ++{ ++ . = 0x00000000; ++ ++ . = ALIGN(4); ++ .text : ++ { ++ cpu/pxa/start.o (.text) ++ *(.text) ++ } ++ ++ . = ALIGN(4); ++ .rodata : { *(.rodata) } ++ ++ . = ALIGN(4); ++ .data : { *(.data) } ++ ++ . = ALIGN(4); ++ .got : { *(.got) } ++ ++ . = .; ++ __u_boot_cmd_start = .; ++ .u_boot_cmd : { *(.u_boot_cmd) } ++ __u_boot_cmd_end = .; ++ ++ . = ALIGN(4); ++ __bss_start = .; ++ .bss : { *(.bss) } ++ _end = .; ++} +diff -Nur u-boot-2006-04-18-1106/common/cmd_nand.c u-boot-2006-04-18-1106-new/common/cmd_nand.c +--- u-boot-2006-04-18-1106/common/cmd_nand.c 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/common/cmd_nand.c 2006-07-05 11:19:44.000000000 +0000 +@@ -81,6 +81,63 @@ + return 0; + } + ++#ifdef NAND_LOGICAL ++///////////////////////////////////////////////////////////////////// ++// oob structure ++///////////////////////////////////////////////////////////////////// ++ ++#define NAND_NOOB_LOGADDR_00 8 ++#define NAND_NOOB_LOGADDR_01 9 ++#define NAND_NOOB_LOGADDR_10 10 ++#define NAND_NOOB_LOGADDR_11 11 ++#define NAND_NOOB_LOGADDR_20 12 ++#define NAND_NOOB_LOGADDR_21 13 ++ ++static uint nand_get_logical_no(unsigned char *oob) ++{ ++ unsigned short us,bit; ++ int par; ++ int good0, good1; ++ ++ if(oob[NAND_NOOB_LOGADDR_00] == oob[NAND_NOOB_LOGADDR_10] && ++ oob[NAND_NOOB_LOGADDR_01] == oob[NAND_NOOB_LOGADDR_11]){ ++ good0 = NAND_NOOB_LOGADDR_00; ++ good1 = NAND_NOOB_LOGADDR_01; ++ }else ++ if(oob[NAND_NOOB_LOGADDR_10] == oob[NAND_NOOB_LOGADDR_20] && ++ oob[NAND_NOOB_LOGADDR_11] == oob[NAND_NOOB_LOGADDR_21]){ ++ good0 = NAND_NOOB_LOGADDR_10; ++ good1 = NAND_NOOB_LOGADDR_11; ++ }else ++ if(oob[NAND_NOOB_LOGADDR_20] == oob[NAND_NOOB_LOGADDR_00] && ++ oob[NAND_NOOB_LOGADDR_21] == oob[NAND_NOOB_LOGADDR_01]){ ++ good0 = NAND_NOOB_LOGADDR_20; ++ good1 = NAND_NOOB_LOGADDR_21; ++ }else{ ++ return (uint)-1; ++ } ++ ++ us = (((unsigned short)(oob[good0]) & 0x00ff) << 0) | ++ (((unsigned short)(oob[good1]) & 0x00ff) << 8); ++ ++ par = 0; ++ for(bit = 0x0001; bit != 0; bit <<= 1){ ++ if(us & bit){ ++ par++; ++ } ++ } ++ if(par & 1){ ++ return (uint)-2; ++ } ++ ++ if(us == 0xffff){ ++ return 0xffff; ++ }else{ ++ return ((us & 0x07fe) >> 1); ++ } ++} ++#endif ++ + /* ------------------------------------------------------------------------- */ + + static void +@@ -245,6 +302,55 @@ + if (off == 0 && size == 0) + return 1; + ++#ifdef NAND_LOGICAL ++ s = strchr(cmd, '.'); ++ if (s != NULL) { ++ if (strcmp(s, ".logical") == 0) { ++ int blocks = NAND_LOGICAL_SIZE / nand->erasesize; ++ ulong *log2phy = malloc(blocks * sizeof(ulong)); ++ u_char *oobuf = malloc(nand->oobblock + nand->oobsize); ++ int i; ++ ulong offset; ++ ret = 1; ++ for (i = 0; i < blocks; i++) ++ log2phy[i] = (uint) -1; ++ offset = 0; ++ for (i = 0; i < blocks; i++) { ++ ret = nand_read_raw(nand, oobuf, offset, nand->oobblock, nand->oobsize); ++ if (!ret) { ++ int log_no = nand_get_logical_no(oobuf + nand->oobblock); ++ if (((int)log_no >= 0) && (log_no < blocks)) { ++ log2phy[log_no] = offset; ++ //printf("NAND logical - %08X -> %04X\n", offset, log_no); ++ } ++ } ++ offset += nand->erasesize; ++ } ++ ++ for (i = 0; i < size / nand->erasesize; i++) { ++ ulong sz = nand->erasesize; ++ offset = log2phy[off / nand->erasesize]; ++ if ((int)offset < 0) { ++ printf("NAND logical - offset %08X not found\n", off); ++ return 1; ++ } ++ //printf("NAND logical - %04X -> %08X\n", off / nand->erasesize, offset); ++ ret = nand_read(nand, offset, &sz, (u_char *)addr); ++ if (ret) { ++ printf("NAND logical - offset %08X, read error\n", off); ++ return 1; ++ } ++ off += nand->erasesize; ++ addr += nand->erasesize; ++ } ++ printf(" %d bytes read from NAND logical\n", size); ++ free(oobuf); ++ free(log2phy); ++ return ret == 0 ? 0 : 1; ++ } ++ } ++#endif ++ + i = strncmp(cmd, "read", 4) == 0; /* 1 = read, 0 = write */ + printf("\nNAND %s: device %d offset %u, size %u ... ", + i ? "read" : "write", nand_curr_device, off, size); +diff -Nur u-boot-2006-04-18-1106/cpu/pxa/config.mk u-boot-2006-04-18-1106-new/cpu/pxa/config.mk +--- u-boot-2006-04-18-1106/cpu/pxa/config.mk 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/cpu/pxa/config.mk 2006-07-05 11:19:44.000000000 +0000 +@@ -22,8 +22,7 @@ + # MA 02111-1307 USA + # + +-PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ +- -msoft-float ++PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 -fomit-frame-pointer + + #PLATFORM_CPPFLAGS += -mapcs-32 -march=armv4 -mtune=strongarm1100 + PLATFORM_CPPFLAGS += -march=armv5 -mtune=xscale +@@ -32,5 +31,5 @@ + # Supply options according to compiler version + # + # ======================================================================== +-PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) ++#PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) + PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) +diff -Nur u-boot-2006-04-18-1106/cpu/pxa/start.S u-boot-2006-04-18-1106-new/cpu/pxa/start.S +--- u-boot-2006-04-18-1106/cpu/pxa/start.S 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/cpu/pxa/start.S 2006-07-05 11:19:44.000000000 +0000 +@@ -42,6 +42,7 @@ + ldr pc, _irq + ldr pc, _fiq + ++_reset: .word reset + _undefined_instruction: .word undefined_instruction + _software_interrupt: .word software_interrupt + _prefetch_abort: .word prefetch_abort +diff -Nur u-boot-2006-04-18-1106/fs/cramfs/cramfs.c u-boot-2006-04-18-1106-new/fs/cramfs/cramfs.c +--- u-boot-2006-04-18-1106/fs/cramfs/cramfs.c 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/fs/cramfs/cramfs.c 2006-07-05 11:19:44.000000000 +0000 +@@ -44,8 +44,13 @@ + + /* CPU address space offset calculation macro, struct part_info offset is + * device address space offset, so we need to shift it by a device start address. */ ++#if (CONFIG_COMMANDS & CFG_CMD_FLASH) + extern flash_info_t flash_info[]; + #define PART_OFFSET(x) (x->offset + flash_info[x->dev->id->num].start[0]) ++#else ++static struct cramfs_super super_fake; ++#define PART_OFFSET(x) (&super_fake) ++#endif + + static int cramfs_read_super (struct part_info *info) + { +diff -Nur u-boot-2006-04-18-1106/include/asm-arm/arch-pxa/pxa-regs.h u-boot-2006-04-18-1106-new/include/asm-arm/arch-pxa/pxa-regs.h +--- u-boot-2006-04-18-1106/include/asm-arm/arch-pxa/pxa-regs.h 2006-04-18 09:05:03.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/include/asm-arm/arch-pxa/pxa-regs.h 2006-07-05 11:19:44.000000000 +0000 +@@ -1269,15 +1269,16 @@ + #define _GEDR(x) __REG2(0x40E00048, ((x) & 0x60) >> 3) + #define _GAFR(x) __REG2(0x40E00054, ((x) & 0x70) >> 2) + +-#define GPLR(x) ((((x) & 0x7f) < 96) ? _GPLR(x) : GPLR3) +-#define GPDR(x) ((((x) & 0x7f) < 96) ? _GPDR(x) : GPDR3) +-#define GPSR(x) ((((x) & 0x7f) < 96) ? _GPSR(x) : GPSR3) +-#define GPCR(x) ((((x) & 0x7f) < 96) ? _GPCR(x) : GPCR3) +-#define GRER(x) ((((x) & 0x7f) < 96) ? _GRER(x) : GRER3) +-#define GFER(x) ((((x) & 0x7f) < 96) ? _GFER(x) : GFER3) +-#define GEDR(x) ((((x) & 0x7f) < 96) ? _GEDR(x) : GEDR3) +-#define GAFR(x) ((((x) & 0x7f) < 96) ? _GAFR(x) : \ +- ((((x) & 0x7f) < 112) ? GAFR3_L : GAFR3_U)) ++#define GPLR(x) (*((((x) & 0x7f) < 96) ? &_GPLR(x) : &GPLR3)) ++#define GPDR(x) (*((((x) & 0x7f) < 96) ? &_GPDR(x) : &GPDR3)) ++#define GPSR(x) (*((((x) & 0x7f) < 96) ? &_GPSR(x) : &GPSR3)) ++#define GPCR(x) (*((((x) & 0x7f) < 96) ? &_GPCR(x) : &GPCR3)) ++#define GRER(x) (*((((x) & 0x7f) < 96) ? &_GRER(x) : &GRER3)) ++#define GFER(x) (*((((x) & 0x7f) < 96) ? &_GFER(x) : &GFER3)) ++#define GEDR(x) (*((((x) & 0x7f) < 96) ? &_GEDR(x) : &GEDR3)) ++#define GAFR(x) (*((((x) & 0x7f) < 96) ? &_GAFR(x) : \ ++ ((((x) & 0x7f) < 112) ? &GAFR3_L : &GAFR3_U))) ++ + #else + + #define GPLR(x) __REG2(0x40E00000, ((x) & 0x60) >> 3) +diff -Nur u-boot-2006-04-18-1106/include/configs/akita.h u-boot-2006-04-18-1106-new/include/configs/akita.h +--- u-boot-2006-04-18-1106/include/configs/akita.h 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/include/configs/akita.h 2006-07-13 11:00:46.000000000 +0000 +@@ -0,0 +1,324 @@ ++/* ++ * include/configs/akita.h ++ * ++ * Configuration settings for the Sharp Zaurus SL-C1000/C3100. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from adsvix board configuration: ++ * (C) Copyright 2004 ++ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net ++ * (C) Copyright 2002 ++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net ++ * (C) Copyright 2002 ++ * Sysgo Real-Time Solutions, GmbH ++ * Marius Groeger ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++ ++#define CONFIG_SKIP_LOWLEVEL_INIT ++ ++#undef SKIP_CONFIG_RELOCATE_UBOOT ++ ++#undef CONFIG_HARD_I2C ++ ++/* ++ * High Level Configuration Options ++ * (easy to change) ++ */ ++#define CONFIG_PXA27X 1 /* This is an PXA27x CPU */ ++#define CONFIG_AKITA 1 /* on Sharp Zaurus Akita */ ++//#define CONFIG_MMC 1 ++#define BOARD_LATE_INIT 1 ++ ++#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ ++ ++#define RTC 1 ++ ++/* ++ * Size of malloc() pool ++ */ ++//#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) ++#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) ++#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ ++ ++/* ++ * select serial console configuration ++ */ ++#define CONFIG_FFUART 1 /* we use FFUART on Mainstone */ ++ ++/* allow to overwrite serial and ethaddr */ ++#define CONFIG_BAUDRATE 115200 ++//#define CONFIG_DOS_PARTITION 1 ++ ++#undef CONFIG_SHOW_BOOT_PROGRESS ++ ++#if 1 ++#define CONFIG_BOOTDELAY 1 ++#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" ++ ++#define CONFIG_BOOTCOMMAND \ ++ "if testkey 101 ; " \ ++ "then " \ ++ "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ ++ "bootm; " \ ++ "fi; " \ ++ "if testkey 2 ; " \ ++ "then " \ ++ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ ++ "bootm; " \ ++ "fi; " \ ++ "if testkey 18 ; " \ ++ "then " \ ++ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ ++ "bootm; " \ ++ "fi; " \ ++ "if testkey 3 ; " \ ++ "then " \ ++ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ ++ "bootm; " \ ++ "fi; " \ ++ "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ ++ "bootm; " ++#else ++#define CONFIG_BOOTCOMMAND "" // "run boot_flash" ++#endif ++ ++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" ++#define CONFIG_SETUP_MEMORY_TAGS 1 ++#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ ++#define CONFIG_INITRD_TAG 1 ++ ++#define CONFIG_COMMANDS (( \ ++ CONFIG_CMD_DFL | \ ++ CFG_CMD_NAND | \ ++ CFG_CMD_JFFS2 \ ++ ) & ~( \ ++ CFG_CMD_NET | \ ++ CFG_CMD_FLASH | \ ++ CFG_CMD_IMLS \ ++ )) ++ ++// CFG_CMD_ENV ++ ++/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ ++#include ++ ++ ++#if (CONFIG_COMMANDS & CFG_CMD_KGDB) ++#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ ++#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ ++#endif ++ ++/* ++ * Miscellaneous configurable options ++ */ ++#define CFG_HUSH_PARSER 1 ++#define CFG_PROMPT_HUSH_PS2 "> " ++ ++#define CFG_LONGHELP /* undef to save memory */ ++#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ ++ ++#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ ++#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ ++#define CFG_MAXARGS 16 /* max number of command args */ ++#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ ++#define CFG_DEVICE_NULLDEV 1 ++ ++#define CFG_MEMTEST_START 0xa0400000 /* memtest works on */ ++#define CFG_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ ++ ++#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ ++ ++#define CFG_LOAD_ADDR 0xa1000000 /* default load address */ ++ ++#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ ++#define CFG_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ ++ ++ /* valid baudrates */ ++#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } ++ ++#define CFG_MMC_BASE 0xF0000000 ++ ++/* ++ * Stack sizes ++ * ++ * The stack sizes are set up in start.S using the settings below ++ */ ++#define CONFIG_STACKSIZE (128*1024) /* regular stack */ ++#ifdef CONFIG_USE_IRQ ++#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ ++#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ ++#endif ++ ++/* ++ * Physical Memory Map ++ */ ++#define CONFIG_NR_DRAM_BANKS 4 /* we have 2 banks of DRAM */ ++#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ ++#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ ++#define PHYS_SDRAM_2 0xa4000000 /* SDRAM Bank #2 */ ++#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 MB */ ++#define PHYS_SDRAM_3 0xa8000000 /* SDRAM Bank #3 */ ++#define PHYS_SDRAM_3_SIZE 0x00000000 /* 0 MB */ ++#define PHYS_SDRAM_4 0xac000000 /* SDRAM Bank #4 */ ++#define PHYS_SDRAM_4_SIZE 0x00000000 /* 0 MB */ ++ ++#define PHYS_FLASH_1 0xd4000000 /* Flash Bank #1 */ ++ ++#define CFG_DRAM_BASE 0xa0000000 ++#define CFG_DRAM_SIZE 0x04000000 ++ ++#define CFG_FLASH_BASE PHYS_FLASH_1 ++ ++/* ++ * GPIO settings for Mainstone ++ */ ++ ++#define CFG_GPSR0_VAL 0x00708800 ++#define CFG_GPSR1_VAL 0x03cf0002 ++#define CFG_GPSR2_VAL 0x0021FC00 ++#define CFG_GPSR3_VAL 0x00000000 ++ ++#define CFG_GPCR0_VAL 0x00001000 ++#define CFG_GPCR1_VAL 0x00000000 ++#define CFG_GPCR2_VAL 0x00000000 ++#define CFG_GPCR3_VAL 0x00000000 ++ ++#define CFG_GPDR0_VAL 0xC27B9C04 ++#define CFG_GPDR1_VAL 0x00EFAA83 ++#define CFG_GPDR2_VAL 0x0E23FC00 ++#define CFG_GPDR3_VAL 0x001E1F81 ++ ++#define CFG_GAFR0_L_VAL 0x94F00000 ++#define CFG_GAFR0_U_VAL 0x015A859A ++#define CFG_GAFR1_L_VAL 0x999A955A ++#define CFG_GAFR1_U_VAL 0x0005A4AA ++#define CFG_GAFR2_L_VAL 0x6AA00000 ++#define CFG_GAFR2_U_VAL 0x55A8041A ++#define CFG_GAFR3_L_VAL 0x56AA955A ++#define CFG_GAFR3_U_VAL 0x00000001 ++ ++#define CFG_PSSR_VAL 0x20 // ??????????? ++ ++/* ++ * PCMCIA and CF Interfaces ++ */ ++#define CFG_MECR_VAL 0x00000001 ++#define CFG_MCMEM0_VAL 0x00010204 ++#define CFG_MCMEM1_VAL 0x00010204 ++#define CFG_MCATT0_VAL 0x00010204 ++#define CFG_MCATT1_VAL 0x00010204 ++#define CFG_MCIO0_VAL 0x0000c108 ++#define CFG_MCIO1_VAL 0x0001c108 ++ ++//#define CONFIG_PXA_PCMCIA 1 ++//#define CONFIG_PXA_IDE 1 ++ ++#define CONFIG_PCMCIA_SLOT_A 1 ++/* just to keep build system happy */ ++ ++#define CFG_PCMCIA_MEM_ADDR 0x28000000 ++#define CFG_PCMCIA_MEM_SIZE 0x04000000 ++ ++#define CFG_IDE_MAXBUS 1 ++/* max. 1 IDE bus */ ++#define CFG_IDE_MAXDEVICE 1 ++/* max. 1 drive per IDE bus */ ++ ++#define CFG_ATA_IDE0_OFFSET 0x0000 ++ ++#define CFG_ATA_BASE_ADDR 0x20000000 ++ ++/* Offset for data I/O */ ++#define CFG_ATA_DATA_OFFSET 0x1f0 ++ ++/* Offset for normal register accesses */ ++#define CFG_ATA_REG_OFFSET 0x1f0 ++ ++/* Offset for alternate registers */ ++#define CFG_ATA_ALT_OFFSET 0x3f0 ++ ++#define CFG_NO_FLASH 1 ++#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ ++#define CFG_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ ++ ++/*----------------------------------------------------------------------- ++ * NAND-FLASH stuff ++ *----------------------------------------------------------------------- ++ */ ++#undef CFG_NAND_LEGACY ++ ++/* NAND debugging */ ++//#define CONFIG_MTD_DEBUG ++//#define CONFIG_MTD_DEBUG_VERBOSE 3 ++ ++#define CFG_NAND_BASE 0xd4000000 ++#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ ++#define NAND_MAX_CHIPS 1 ++ ++//#define CONFIG_MTD_NAND_VERIFY_WRITE 1 /* verify all writes!!! */ ++//#define CFG_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ ++ ++#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ ++#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ ++ ++/* ++ * JFFS2 partitions ++ * ++ */ ++/* No command line, one static partition */ ++//#undef CONFIG_JFFS2_CMDLINE ++//#define CONFIG_JFFS2_DEV "nand0" ++//#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF ++//#define CONFIG_JFFS2_PART_OFFSET 0x00060000 ++ ++/* mtdparts command line support */ ++/* Note: fake mtd_id used, no linux mtd map file */ ++ ++#define CONFIG_JFFS2_CMDLINE ++#define MTDIDS_DEFAULT "nand0=laze-0" ++//#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" ++#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" ++ ++/* ++ * SHARP SL NAND logical partition ++ */ ++#define NAND_LOGICAL 1 ++#define NAND_LOGICAL_SIZE 0x700000 ++ ++/* ++ * Environment ++ */ ++ ++#define CFG_ENV_IS_IN_NAND 1 ++#define CFG_ENV_OFFSET 0x40000 ++//#define CFG_ENV_OFFSET_REDUND 0x44000 ++#define CFG_ENV_SIZE 0x20000 ++ ++#endif /* __CONFIG_H */ +diff -Nur u-boot-2006-04-18-1106/include/configs/corgi.h u-boot-2006-04-18-1106-new/include/configs/corgi.h +--- u-boot-2006-04-18-1106/include/configs/corgi.h 1970-01-01 00:00:00.000000000 +0000 ++++ u-boot-2006-04-18-1106-new/include/configs/corgi.h 2006-07-13 11:19:04.000000000 +0000 +@@ -0,0 +1,326 @@ ++/* ++ * include/configs/corgi.h ++ * ++ * Configuration settings for the Sharp Zaurus SL-C7x0/C860. ++ * ++ * (C) Copyright 2006 Alexander Chukov ++ * ++ * portions from adsvix board configuration: ++ * (C) Copyright 2004 ++ * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net ++ * (C) Copyright 2002 ++ * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net ++ * (C) Copyright 2002 ++ * Sysgo Real-Time Solutions, GmbH ++ * Marius Groeger ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++ ++#define CONFIG_SKIP_LOWLEVEL_INIT ++ ++#undef SKIP_CONFIG_RELOCATE_UBOOT ++ ++#undef CONFIG_HARD_I2C ++ ++/* ++ * High Level Configuration Options ++ * (easy to change) ++ */ ++#define CONFIG_PXA250 1 /* This is an PXA255 CPU */ ++#define CONFIG_CORGI 1 /* on Sharp Zaurus Corgi */ ++//#define CONFIG_MMC 1 ++#define BOARD_LATE_INIT 1 ++ ++#undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */ ++ ++#define RTC 1 ++ ++/* ++ * Size of malloc() pool ++ */ ++//#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024) ++#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 256*1024) ++#define CFG_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */ ++ ++/* ++ * select serial console configuration ++ */ ++#define CONFIG_FFUART 1 /* we use FFUART on Mainstone */ ++ ++/* allow to overwrite serial and ethaddr */ ++#define CONFIG_BAUDRATE 115200 ++//#define CONFIG_DOS_PARTITION 1 ++ ++#undef CONFIG_SHOW_BOOT_PROGRESS ++ ++#if 1 ++#define CONFIG_BOOTDELAY 1 ++#define CONFIG_AUTOBOOT_PROMPT "Autobooting in %d seconds\n" ++ ++#define CONFIG_BOOTCOMMAND \ ++ "if testkey 101 ; " \ ++ "then " \ ++ "nand read.logical 0xa0800000 0x00060000 0x00540000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192; " \ ++ "bootm; " \ ++ "fi; " \ ++ "if testkey 2 ; " \ ++ "then " \ ++ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1; " \ ++ "bootm; " \ ++ "fi; " \ ++ "if testkey 18 ; " \ ++ "then " \ ++ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1; " \ ++ "bootm; " \ ++ "fi; " \ ++ "if testkey 3 ; " \ ++ "then " \ ++ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1; " \ ++ "bootm; " \ ++ "fi; " \ ++ "nand read.logical 0xa0800000 0x005a0000 0x00160000; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2; " \ ++ "bootm; " ++#else ++#define CONFIG_BOOTCOMMAND "" // "run boot_flash" ++#endif ++ ++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw ramdisk_size=8192" ++#define CONFIG_SETUP_MEMORY_TAGS 1 ++#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ ++#define CONFIG_INITRD_TAG 1 ++ ++#define CONFIG_COMMANDS (( \ ++ CONFIG_CMD_DFL | \ ++ CFG_CMD_NAND | \ ++ CFG_CMD_JFFS2 \ ++ ) & ~( \ ++ CFG_CMD_NET | \ ++ CFG_CMD_FLASH | \ ++ CFG_CMD_IMLS \ ++ )) ++ ++// CFG_CMD_ENV ++ ++/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ ++#include ++ ++ ++#if (CONFIG_COMMANDS & CFG_CMD_KGDB) ++#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ ++#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ ++#endif ++ ++/* ++ * Miscellaneous configurable options ++ */ ++#define CFG_HUSH_PARSER 1 ++#define CFG_PROMPT_HUSH_PS2 "> " ++ ++#define CFG_LONGHELP /* undef to save memory */ ++#define CFG_PROMPT "U-Boot> " /* Monitor Command Prompt */ ++ ++#define CFG_CBSIZE 256 /* Console I/O Buffer Size */ ++#define CFG_PBSIZE (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */ ++#define CFG_MAXARGS 16 /* max number of command args */ ++#define CFG_BARGSIZE CFG_CBSIZE /* Boot Argument Buffer Size */ ++#define CFG_DEVICE_NULLDEV 1 ++ ++#define CFG_MEMTEST_START 0xa0400000 /* memtest works on */ ++#define CFG_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ ++ ++#undef CFG_CLKS_IN_HZ /* everything, incl board info, in Hz */ ++ ++#define CFG_LOAD_ADDR 0xa0800000 /* default load address */ ++ ++#define CFG_HZ 3686400 /* incrementer freq: 3.6864 MHz */ ++#define CFG_CPUSPEED 0x207 /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */ ++ ++ /* valid baudrates */ ++#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } ++ ++#define CFG_MMC_BASE 0xF0000000 ++ ++/* ++ * Stack sizes ++ * ++ * The stack sizes are set up in start.S using the settings below ++ */ ++#define CONFIG_STACKSIZE (128*1024) /* regular stack */ ++#ifdef CONFIG_USE_IRQ ++#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ ++#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ ++#endif ++ ++/* ++ * Physical Memory Map ++ */ ++#define CONFIG_NR_DRAM_BANKS 4 /* we have 2 banks of DRAM */ ++#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ ++#define PHYS_SDRAM_1_SIZE 0x04000000 /* 64 MB */ ++#define PHYS_SDRAM_2 0xa4000000 /* SDRAM Bank #2 */ ++#define PHYS_SDRAM_2_SIZE 0x00000000 /* 0 MB */ ++#define PHYS_SDRAM_3 0xa8000000 /* SDRAM Bank #3 */ ++#define PHYS_SDRAM_3_SIZE 0x00000000 /* 0 MB */ ++#define PHYS_SDRAM_4 0xac000000 /* SDRAM Bank #4 */ ++#define PHYS_SDRAM_4_SIZE 0x00000000 /* 0 MB */ ++ ++#define PHYS_FLASH_1 0xd4000000 /* Flash Bank #1 */ ++ ++#define CFG_DRAM_BASE 0xa0000000 ++#define CFG_DRAM_SIZE 0x04000000 ++ ++#define CFG_FLASH_BASE PHYS_FLASH_1 ++ ++/* ++ * GPIO settings for Mainstone ++ */ ++ ++#define CFG_GPSR0_VAL 0x00708800 ++#define CFG_GPSR1_VAL 0x03cf0002 ++#define CFG_GPSR2_VAL 0x0021FC00 ++#define CFG_GPSR3_VAL 0x00000000 ++ ++#define CFG_GPCR0_VAL 0x00001000 ++#define CFG_GPCR1_VAL 0x00000000 ++#define CFG_GPCR2_VAL 0x00000000 ++#define CFG_GPCR3_VAL 0x00000000 ++ ++#define CFG_GPDR0_VAL 0xC27B9C04 ++#define CFG_GPDR1_VAL 0x00EFAA83 ++#define CFG_GPDR2_VAL 0x0E23FC00 ++#define CFG_GPDR3_VAL 0x001E1F81 ++ ++#define CFG_GAFR0_L_VAL 0x94F00000 ++#define CFG_GAFR0_U_VAL 0x015A859A ++#define CFG_GAFR1_L_VAL 0x999A955A ++#define CFG_GAFR1_U_VAL 0x0005A4AA ++#define CFG_GAFR2_L_VAL 0x6AA00000 ++#define CFG_GAFR2_U_VAL 0x55A8041A ++#define CFG_GAFR3_L_VAL 0x56AA955A ++#define CFG_GAFR3_U_VAL 0x00000001 ++ ++#define CFG_PSSR_VAL 0x20 // ??????????? ++ ++/* ++ * PCMCIA and CF Interfaces ++ */ ++#define CFG_MECR_VAL 0x00000001 ++#define CFG_MCMEM0_VAL 0x00010204 ++#define CFG_MCMEM1_VAL 0x00010204 ++#define CFG_MCATT0_VAL 0x00010204 ++#define CFG_MCATT1_VAL 0x00010204 ++#define CFG_MCIO0_VAL 0x0000c108 ++#define CFG_MCIO1_VAL 0x0001c108 ++ ++//#define CONFIG_PXA_PCMCIA 1 ++//#define CONFIG_PXA_IDE 1 ++ ++#define CONFIG_PCMCIA_SLOT_A 1 ++/* just to keep build system happy */ ++ ++#define CFG_PCMCIA_MEM_ADDR 0x28000000 ++#define CFG_PCMCIA_MEM_SIZE 0x04000000 ++ ++#define CFG_IDE_MAXBUS 1 ++/* max. 1 IDE bus */ ++#define CFG_IDE_MAXDEVICE 1 ++/* max. 1 drive per IDE bus */ ++ ++#define CFG_ATA_IDE0_OFFSET 0x0000 ++ ++#define CFG_ATA_BASE_ADDR 0x20000000 ++ ++/* Offset for data I/O */ ++#define CFG_ATA_DATA_OFFSET 0x1f0 ++ ++/* Offset for normal register accesses */ ++#define CFG_ATA_REG_OFFSET 0x1f0 ++ ++/* Offset for alternate registers */ ++#define CFG_ATA_ALT_OFFSET 0x3f0 ++ ++#define CFG_NO_FLASH 1 ++#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ ++#define CFG_MAX_FLASH_SECT 512 /* max number of sectors on one chip */ ++ ++/*----------------------------------------------------------------------- ++ * NAND-FLASH stuff ++ *----------------------------------------------------------------------- ++ */ ++#undef CFG_NAND_LEGACY ++ ++/* NAND debugging */ ++//#define CONFIG_MTD_DEBUG ++//#define CONFIG_MTD_DEBUG_VERBOSE 3 ++ ++#define CFG_NAND_BASE 0xd4000000 ++#define CFG_MAX_NAND_DEVICE 1 /* Max number of NAND devices */ ++#define NAND_MAX_CHIPS 1 ++ ++//#define CONFIG_MTD_NAND_VERIFY_WRITE 1 /* verify all writes!!! */ ++//#define CFG_NAND_SKIP_BAD_DOT_I 1 /* ".i" read skips bad blocks */ ++ ++#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ ++#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ ++ ++#define NAND_ALLOW_ERASE_ALL 1 ++ ++/* ++ * JFFS2 partitions ++ * ++ */ ++/* No command line, one static partition */ ++//#undef CONFIG_JFFS2_CMDLINE ++//#define CONFIG_JFFS2_DEV "nand0" ++//#define CONFIG_JFFS2_PART_SIZE 0xFFFFFFFF ++//#define CONFIG_JFFS2_PART_OFFSET 0x00060000 ++ ++/* mtdparts command line support */ ++/* Note: fake mtd_id used, no linux mtd map file */ ++ ++#define CONFIG_JFFS2_CMDLINE ++#define MTDIDS_DEFAULT "nand0=laze-0" ++//#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" ++#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" ++ ++/* ++ * SHARP SL NAND logical partition ++ */ ++#define NAND_LOGICAL 1 ++#define NAND_LOGICAL_SIZE 0x700000 ++ ++/* ++ * Environment ++ */ ++ ++#define CFG_ENV_IS_IN_NAND 1 ++#define CFG_ENV_OFFSET 0x40000 ++//#define CFG_ENV_OFFSET_REDUND 0x44000 ++#define CFG_ENV_SIZE 0x20000 ++ ++#endif /* __CONFIG_H */ +--- s/examples/Makefile.orig 2006-12-09 15:08:45.000000000 +0600 ++++ s/examples/Makefile 2006-12-09 15:09:00.000000000 +0600 +@@ -60,7 +60,7 @@ + include $(TOPDIR)/config.mk + + SREC = hello_world.srec +-BIN = hello_world.bin hello_world ++BIN = hello_world hello_world.bin + + ifeq ($(CPU),mpc8xx) + SREC = test_burst.srec +@@ -122,7 +122,7 @@ + + CPPFLAGS += -I.. + +-all: .depend $(OBJS) $(LIB) $(SREC) $(BIN) ++all: .depend $(OBJS) $(LIB) $(BIN) $(SREC) + + ######################################################################### + $(LIB): .depend $(LIBOBJS) diff --git a/packages/u-boot/u-boot-git/spitz/.mtn2git_empty b/packages/u-boot/u-boot-git/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/u-boot/u-boot-git/spitz/spitz-standard-partitioning.patch b/packages/u-boot/u-boot-git/spitz/spitz-standard-partitioning.patch new file mode 100644 index 0000000000..ad62e13d2e --- /dev/null +++ b/packages/u-boot/u-boot-git/spitz/spitz-standard-partitioning.patch @@ -0,0 +1,56 @@ +--- git/include/configs/akita.h 2007-12-26 17:57:00.000000000 +0000 ++++ git/include/configs/akita.h 2007-12-26 18:07:47.000000000 +0000 +@@ -81,35 +81,35 @@ + "if testkey 101 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x00060000 0x00540000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \ + "bootm; " \ + "fi; " \ + "if testkey 2 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mmcblk0p1 rootwait fbcon=rotate:1; " \ + "bootm; " \ + "fi; " \ + "if testkey 18 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hda1 rootwait fbcon=rotate:1; " \ + "bootm; " \ + "fi; " \ + "if testkey 3 ; " \ + "then " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/hdc1 rootwait fbcon=rotate:1; " \ + "bootm; " \ + "fi; " \ + "nand read.logical 0xa1000000 0x005a0000 0x00160000; " \ +- "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1; " \ ++ "setenv bootargs console=ttyS0,115200 console=tty1 root=/dev/mtdblock2 rootfstype=jffs2 fbcon=rotate:1 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home); " \ + "bootm; " + #else + #define CONFIG_BOOTCOMMAND "" // "run boot_flash" + #endif + +-#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192" ++#define CONFIG_BOOTARGS "console=ttyS0,115200 console=tty1 root=/dev/ram rw fbcon=rotate:1 ramdisk_size=8192 mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)" + #define CONFIG_SETUP_MEMORY_TAGS 1 + #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ + #define CONFIG_INITRD_TAG 1 +@@ -302,9 +302,9 @@ + /* Note: fake mtd_id used, no linux mtd map file */ + + #define CONFIG_JFFS2_CMDLINE +-#define MTDIDS_DEFAULT "nand0=laze-0" ++#define MTDIDS_DEFAULT "nand0=sharpsl-nand" + //#define MTDPARTS_DEFAULT "mtdparts=laze-0:256k(uboot),128k(env),-(jffs2)" +-#define MTDPARTS_DEFAULT "mtdparts=laze-0:7168k(Logical),-(JFFS2)" ++#define MTDPARTS_DEFAULT "mtdparts=sharpsl-nand-0:7168k(smf),ROOT_FLASH_SIZEM(root),-(home)" + + /* + * SHARP SL NAND logical partition diff --git a/packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch b/packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch new file mode 100644 index 0000000000..f4d039da72 --- /dev/null +++ b/packages/u-boot/u-boot-git/uboot-eabi-fix-HACK2.patch @@ -0,0 +1,47 @@ +Index: git/lib_arm/div0.c +=================================================================== +--- git.orig/lib_arm/div0.c ++++ git/lib_arm/div0.c +@@ -22,9 +22,3 @@ + */ + + /* Replacement (=dummy) for GNU/Linux division-by zero handler */ +-void __div0 (void) +-{ +- extern void hang (void); +- +- hang(); +-} +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -225,7 +225,7 @@ LIBS := $(addprefix $(obj),$(LIBS)) + .PHONY : $(LIBS) + + # Add GCC lib +-PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc ++PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -lgcc -lgcc_eh + + # The "tools" are needed early, so put this first + # Don't include stuff already done in $(LIBS) +--- git/board/akita/akita.c.orig 2007-12-26 17:52:33.000000000 +0000 ++++ git/board/akita/akita.c 2007-12-26 17:52:59.000000000 +0000 +@@ -87,3 +87,7 @@ + + return 0; + } ++ ++void raise() {} ++ ++void abort() {} +--- git/board/corgi/corgi.c.orig 2007-12-26 17:52:33.000000000 +0000 ++++ git/board/corgi/corgi.c 2007-12-26 17:52:59.000000000 +0000 +@@ -87,3 +87,7 @@ + + return 0; + } ++ ++void raise() {} ++ ++void abort() {} diff --git a/packages/u-boot/u-boot_git.bb b/packages/u-boot/u-boot_git.bb index 04eb7eb2e8..a5f6cca220 100644 --- a/packages/u-boot/u-boot_git.bb +++ b/packages/u-boot/u-boot_git.bb @@ -1,10 +1,13 @@ require u-boot.inc -PR="r16" +PR="r17" SRCREV_davinci-sffsdr = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_davinci-dvevm = "4b50cd12a3b3c644153c4cf393f4a4c12289e5aa" SRCREV_beagleboard = "9c1c36409b2cb4e81aab0bd9d0a69c68f4475aae" SRCREV_neuros-osd2 = "bc66414cd99154a40949db1bd2f45a62b8febca9" +SRCREV_akita = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" +SRCREV_spitz = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" +SRCREV_c7x0 = "9bf86baaa3b35b25baa2d664e2f7f6cafad689ee" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git " SRC_URI_sequoia = "git://www.denx.de/git/u-boot.git;protocol=git;tag=cf3b41e0c1111dbb865b6e34e9f3c3d3145a6093 " @@ -15,7 +18,30 @@ SRC_URI_beagleboard = "git://www.sakoman.net/git/u-boot-omap3.git;branch=test;pr " SRC_URI_neuros-osd2 += "file://Makefile-fix.patch;patch=1" +SRC_URI_append_akita = "file://pdaXrom-u-boot.patch;patch=1 \ + file://uboot-eabi-fix-HACK2.patch;patch=1 \ + file://akita-standard-partitioning.patch;patch=1 \ +SRC_URI_append_spitz = "file://pdaXrom-u-boot.patch;patch=1 \ + file://uboot-eabi-fix-HACK2.patch;patch=1 \ + file://spitz-standard-partitioning.patch;patch=1 \ + " +SRC_URI_append_c7x0 = "file://pdaXrom-u-boot.patch;patch=1 \ + file://uboot-eabi-fix-HACK2.patch;patch=1 \ + file://corgi-standard-partitioning.patch;patch=1 \ + " S = "${WORKDIR}/git" PACKAGE_ARCH = "${MACHINE_ARCH}" + +do_configure_prepend_akita() { + sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/akita.h +} + +do_configure_prepend_spitz() { + sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/akita.h +} + +do_configure_prepend_c7x0() { + sed -i s:ROOT_FLASH_SIZE:${ROOT_FLASH_SIZE}:g ${S}/include/configs/corgi.h +} -- cgit v1.2.3 From a946cedfaf47d6891a8aedf0983e1df877edacd6 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 17:12:26 +0000 Subject: gtk+-native: massage FILESPATH, so this recipe actually finds its files. * boy, do we really need this recipe? It must have been broken since the bk import * shouldn't it be renamed to gtk+-1.2-native_1.2.10.bb? --- packages/gtk+/gtk+-native-1.2_1.2.10.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/gtk+/gtk+-native-1.2_1.2.10.bb b/packages/gtk+/gtk+-native-1.2_1.2.10.bb index 232bfa4768..f5ad1a58ab 100644 --- a/packages/gtk+/gtk+-native-1.2_1.2.10.bb +++ b/packages/gtk+/gtk+-native-1.2_1.2.10.bb @@ -4,8 +4,10 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-1.2 jpeg libpng libxext" -PR = "r0" +PR = "r1" + +FILESPATH =+ "${FILE_DIRNAME}/gtk+-1.2-1.2.10:" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \ file://gtk+1.2-reconf-fix;patch=1 \ file://no-xwc;patch=1" -- cgit v1.2.3 From d20454c164c207fea9b53769c13e0222fa184093 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Fri, 22 Aug 2008 18:21:21 +0000 Subject: freetype: fix to add --tag=CC to libtool commands Thanks to Hans-Christoph Steiner of oe bug #4504 --- packages/freetype/freetype-2.3.6/libtool-tag.patch | 20 ++++++++++++++++++++ packages/freetype/freetype_2.3.6.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 packages/freetype/freetype-2.3.6/libtool-tag.patch diff --git a/packages/freetype/freetype-2.3.6/libtool-tag.patch b/packages/freetype/freetype-2.3.6/libtool-tag.patch new file mode 100644 index 0000000000..2f096cdd46 --- /dev/null +++ b/packages/freetype/freetype-2.3.6/libtool-tag.patch @@ -0,0 +1,20 @@ +--- freetype-2.3.6/builds/unix/unix-cc.in ++++ freetype-2.3.6/builds/unix/unix-cc.in +@@ -88,7 +88,7 @@ + # + # + CCraw := $(CC) +-CC := $(LIBTOOL) --mode=compile $(CCraw) ++CC := $(LIBTOOL) --tag=CC --mode=compile $(CCraw) + + # Linker flags. + # +@@ -105,7 +105,7 @@ + + # Library linking + # +-LINK_LIBRARY = $(LIBTOOL) --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ ++LINK_LIBRARY = $(LIBTOOL) --tag=CC --mode=link $(CCraw) -o $@ $(OBJECTS_LIST) \ + -rpath $(libdir) -version-info $(version_info) \ + $(LDFLAGS) -no-undefined \ + # -export-symbols $(EXPORTS_LIST) diff --git a/packages/freetype/freetype_2.3.6.bb b/packages/freetype/freetype_2.3.6.bb index 516354ad23..eca74c0ce2 100644 --- a/packages/freetype/freetype_2.3.6.bb +++ b/packages/freetype/freetype_2.3.6.bb @@ -7,6 +7,7 @@ SRC_URI = "\ ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://no-hardcode.patch;patch=1 \ file://fix-configure.patch;patch=1 \ + file://libtool-tag.patch;patch=1 \ " S = "${WORKDIR}/freetype-${PV}" -- cgit v1.2.3 From 506da3980bbbc87b833772fa01dbd762097b26a0 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 20:17:56 +0000 Subject: SlugOS 5.0 - make booting to a ramdisk (via turnup ram) work again; need to accomodate an inconsistency between find and busybox find. --- packages/slugos-init/files/boot/ram | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/slugos-init/files/boot/ram b/packages/slugos-init/files/boot/ram index a7c78b39ac..2583edf852 100644 --- a/packages/slugos-init/files/boot/ram +++ b/packages/slugos-init/files/boot/ram @@ -28,9 +28,12 @@ then # filter out boot (with zimage), linuxrc and anything # below /var, keep dev or the boot will fail (note that # nothing is mounted this early in the bootstrap). - find . -mount -print | + find . -xdev -print | sed '\@^./boot/@d;\@^./boot$@d;\@^./linuxrc@d;\@^./var/@d' | cpio -p -d -m -u /mnt + # busybox find with -xdev will not print the name of the + # mountpoint, so create the empty dir manually if required. + test -d /mnt/mnt || mkdir /mnt/mnt # checkmount checks for sh, init and no .recovery plus # either mnt or initrd, mnt must exist! if checkmount /mnt -- cgit v1.2.3 From 8fab03922cea4bcc67fed3bc01890b6017184936 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 20:20:25 +0000 Subject: SlugOS 5.0 - remove dependency on makedevs, as this is provided by busybox now. --- packages/initscripts/initscripts-slugos_1.0.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 242a55ad7a..b742ad5071 100644 --- a/packages/initscripts/initscripts-slugos_1.0.bb +++ b/packages/initscripts/initscripts-slugos_1.0.bb @@ -7,10 +7,16 @@ include initscripts_${PV}.bb RCONFLICTS = "initscripts" + +# SlugOS uses the busybox makedevs, so until that dependency gets virtualized +# the below lines serve to remove the dependency on the full makedevs package: +DEPENDS = "" +RDEPENDS = "" + # All other standard definitions inherited from initscripts # Except the PR which is hacked here. The format used is # a suffix -PR := "${PR}.13" +PR := "${PR}.14" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" -- cgit v1.2.3 From f7ad2050c8227602c2188cfd763932d5fa26c09e Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 20:40:53 +0000 Subject: module-init-tools-cross: remove the RDEPENDS that bleeds in from module-init-tools --- packages/module-init-tools/module-init-tools-cross_3.2.2.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb index 9e6bcd6eee..eb2027b384 100644 --- a/packages/module-init-tools/module-init-tools-cross_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools-cross_3.2.2.bb @@ -4,6 +4,10 @@ inherit cross DEFAULT_PREFERENCE = "0" PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" +# Remove the RDEPENDS we picked up from the "require"; +# it's simply extraneous for the cross package +RDEPENDS_${PN} = "" + EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX}" do_stage () { -- cgit v1.2.3 From 4233b8777c6473c9a31ea6ea5221bfa84732ced6 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 20:43:04 +0000 Subject: module-init-tools: bump PR --- packages/module-init-tools/module-init-tools_3.2.2.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/module-init-tools/module-init-tools_3.2.2.bb b/packages/module-init-tools/module-init-tools_3.2.2.bb index 1c1fa90b04..a56bac7a82 100644 --- a/packages/module-init-tools/module-init-tools_3.2.2.bb +++ b/packages/module-init-tools/module-init-tools_3.2.2.bb @@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." LICENSE = "GPL" SECTION = "base" -PR = "r4" +PR = "r5" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" -- cgit v1.2.3 From fc30bd137b5fadecd96f89098d42cb2ce26999bd Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Fri, 22 Aug 2008 20:45:30 +0000 Subject: SlugOS 5.0 - replace module-init-tools with busybox --- packages/tasks/task-slugos.bb | 7 +++++-- packages/update-modules/update-modules_1.0.bb | 9 ++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb index 186eab6d07..0a0dd65496 100644 --- a/packages/tasks/task-slugos.bb +++ b/packages/tasks/task-slugos.bb @@ -6,7 +6,7 @@ DESCRIPTION = "Task packages for the SlugOS distribution" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r19" +PR = "r20" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" ALLOW_EMPTY = "1" @@ -119,6 +119,8 @@ DISTRO_EXTRA_DEPENDS ?= "" DEPENDS += "${DISTRO_EXTRA_DEPENDS}" DISTRO_EXTRA_RDEPENDS ?= "" + +## This comment block is temporary, to be removed once SlugOS 5.0 stabilizes ##RDEPENDS += "\ ## kernel ixp4xx-npe \ ## base-files base-passwd netbase \ @@ -138,13 +140,14 @@ DISTRO_EXTRA_RDEPENDS ?= "" ## util-linux-* utilities are now replaced by busybox tools. Also, ipkg ## is replaced by a trimmed-down version of opkg (no package signatures, ## and it uses the busybox wget command instead of libcurl - MJW +## SlugOS 5.0 - module-init-tools replaced by busybox as well - MJW RDEPENDS += "\ kernel ixp4xx-npe \ base-files base-passwd netbase \ busybox initscripts-slugos slugos-init \ update-modules sysvinit udev \ - module-init-tools modutils-initscripts \ + modutils-initscripts \ opkg-collateral opkg-nogpg-nocurl \ libgcc \ beep \ diff --git a/packages/update-modules/update-modules_1.0.bb b/packages/update-modules/update-modules_1.0.bb index 17f9bb4f45..0c2d1894ac 100644 --- a/packages/update-modules/update-modules_1.0.bb +++ b/packages/update-modules/update-modules_1.0.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Script to manage module configuration files" LICENSE = "GPLv2" PACKAGE_ARCH = "all" RDEPENDS = "${@base_contains("MACHINE_FEATURES", "kernel26", "module-init-tools-depmod","modutils-depmod",d)} " -PR = "r7" +PR = "r8" SRC_URI = "file://update-modules" @@ -28,3 +28,10 @@ do_install() { # in both a 2.4 kernel distro and a 2.6 kernel distro. Really, it's # not worth the effort to do that, so just overlook the next line. RDEPENDS_unslung = "" + +# The SlugOS distro is testing the use of the busybox mod* utilities. +# If that works out, we should create a virtual/update-modules, and +# let the distros select if they want busybox, or some other package +# to provide it. Until then, the following line just removes the +# unwanted dependencies for SlugOS. +RDEPENDS_slugos = "" \ No newline at end of file -- cgit v1.2.3 From 7a958123b039f151f6e6c9e822b7ca8bef67b1d8 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 22:48:45 +0000 Subject: juce: add $PN to PACKAGES so the package won't depend on itself --- packages/juce/juce_1.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb index 59fd25f2b8..208e11fa74 100644 --- a/packages/juce/juce_1.29.bb +++ b/packages/juce/juce_1.29.bb @@ -28,6 +28,6 @@ do_install() { install -m 0655 demo/build/linux/build/jucedemo ${D}${bindir} } -PACKAGES = "${PN}-dbg jucedemo" +PACKAGES = "${PN}-dbg jucedemo ${PN}" FILES_jucedemo = "${bindir}" -- cgit v1.2.3 From 7e53d74be7bcb575d3d9aa20e90a28c4481bb318 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 22:52:56 +0000 Subject: qpf-bitstream-vera: make sure $PN is in PACKAGES --- packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb | 2 +- packages/qpf-fonts/qpf-bitstream-vera_1.10.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb index 8aaae9143e..98c9016ee4 100644 --- a/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb +++ b/packages/qpf-fonts/qpf-bitstream-vera-sans-mono_1.10.bb @@ -18,7 +18,7 @@ PACKAGES = "${PN}-dbg \ qpf-bitstream-vera-sans-mono-small \ qpf-bitstream-vera-sans-mono-large \ qpf-bitstream-vera-sans-mono-larger \ -qpf-bitstream-vera-sans-mono-huge" +qpf-bitstream-vera-sans-mono-huge ${PN}" FILES_qpf-bitstream-vera-sans-mono-small = "\ ${palmqtdir}/lib/fonts/verasansmono_10* \ diff --git a/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb index b23653e0d6..fc05ad99f6 100644 --- a/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb +++ b/packages/qpf-fonts/qpf-bitstream-vera_1.10.bb @@ -9,7 +9,7 @@ PROVIDES = "qpf-bitstream-vera-small qpf-bitstream-vera-large" SRC_URI = "http://openzaurus.org/mirror/vera-qpf_1.10-3.tar.gz" S = "${WORKDIR}/vera-qpf" -PACKAGES = "${PN}-dbg qpf-bitstream-vera-small qpf-bitstream-vera-large" +PACKAGES = "${PN}-dbg qpf-bitstream-vera-small qpf-bitstream-vera-large ${PN}" FILES_qpf-bitstream-vera-small = "${palmqtdir}/lib/fonts/vera_80_50* \ ${palmqtdir}/lib/fonts/vera_80_50i* ${palmqtdir}/lib/fonts/vera_80_75* ${palmqtdir}/lib/fonts/vera_80_75i* \ -- cgit v1.2.3 From 972009cac266e7ae4c9a42a6af1f50e664a2e03f Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 22:55:09 +0000 Subject: sphyrna: rename to sphyrna-python to make sure $PN is in PACKAGES --- packages/sphyrna/sphyrna-python_svn.bb | 20 ++++++++++++++++++++ packages/sphyrna/sphyrna_svn.bb | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) create mode 100644 packages/sphyrna/sphyrna-python_svn.bb delete mode 100644 packages/sphyrna/sphyrna_svn.bb diff --git a/packages/sphyrna/sphyrna-python_svn.bb b/packages/sphyrna/sphyrna-python_svn.bb new file mode 100644 index 0000000000..2e7fd432e9 --- /dev/null +++ b/packages/sphyrna/sphyrna-python_svn.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering" +HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna" +LICENSE = "GPLv2" +DEPENDS = "readline" +PV = "0.0+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna" + +S = "${WORKDIR}/${PN}" + +inherit autotools + +PACKAGES = "${PN}-dbg sphyrna-console sphyrna-python" + +FILES_sphyrna-console = "${bindir}/hhconsole" +FILES_sphyrna-python = "${bindir}/decode.py ${libdir}/python2.4/site-packages/sphyrna/*" + +PACKAGE_ARCH_sphyrna-python = "all" +RDEPENDS_sphyrna-python = "python-core python-re" diff --git a/packages/sphyrna/sphyrna_svn.bb b/packages/sphyrna/sphyrna_svn.bb deleted file mode 100644 index 2e7fd432e9..0000000000 --- a/packages/sphyrna/sphyrna_svn.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering" -HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna" -LICENSE = "GPLv2" -DEPENDS = "readline" -PV = "0.0+svnr${SRCREV}" -PR = "r0" - -SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna" - -S = "${WORKDIR}/${PN}" - -inherit autotools - -PACKAGES = "${PN}-dbg sphyrna-console sphyrna-python" - -FILES_sphyrna-console = "${bindir}/hhconsole" -FILES_sphyrna-python = "${bindir}/decode.py ${libdir}/python2.4/site-packages/sphyrna/*" - -PACKAGE_ARCH_sphyrna-python = "all" -RDEPENDS_sphyrna-python = "python-core python-re" -- cgit v1.2.3 From 2eef4fdb3485274514f57cab82aff96752712b71 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 23:19:56 +0000 Subject: (in)sane-srcrevs.inc: replace sphyrna entries with sphyrna-python --- conf/distro/include/insane-srcrevs.inc | 2 +- conf/distro/include/sane-srcrevs.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/insane-srcrevs.inc b/conf/distro/include/insane-srcrevs.inc index 337f305c7a..b0ee16f561 100644 --- a/conf/distro/include/insane-srcrevs.inc +++ b/conf/distro/include/insane-srcrevs.inc @@ -86,7 +86,7 @@ SRCREV_pn-opkg-native ?= "${AUTOREV}" SRCREV_pn-psplash ?= "${AUTOREV}" SRCREV_pn-settings-daemon ?= "${AUTOREV}" SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}" -SRCREV_pn-sphyrna ?= "${AUTOREV}" +SRCREV_pn-sphyrna-python ?= "${AUTOREV}" SRCREV_pn-webkit-gtk ?= "${AUTOREV}" SRCREV_pn-xoo ?= "${AUTOREV}" SRCREV_pn-mplayer ?= "${AUTOREV}" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 1447773296..51ab90a6bc 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -163,7 +163,7 @@ SRCREV_pn-s3c24xx-gpio ?= "4130" SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" -SRCREV_pn-sphyrna ?= "45" +SRCREV_pn-sphyrna-python ?= "45" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" -- cgit v1.2.3 From 219cf17436f5857a152ca26a26e10f7cf91110b5 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 22 Aug 2008 23:54:57 +0000 Subject: juce: fix and future-proof SRC_URI * download from openmoko mirror now. 1_29 is unavaible. source is now hosted on sf.net, but only 1_43+ --- packages/juce/juce_1.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb index 208e11fa74..3fa587f8f4 100644 --- a/packages/juce/juce_1.29.bb +++ b/packages/juce/juce_1.29.bb @@ -6,7 +6,7 @@ DEPENDS = "alsa-lib freetype virtual/libx11" PR = "r0" #FIXME the patches are a) HACKS and b) something's wrong with lineend conversion -SRC_URI = "http://www.rawmaterialsoftware.com/juce/downloads/juce_1_29.zip \ +SRC_URI = "http://downloads.openmoko.org/sources/${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}.zip \ file://remove-x86isms.patch;patch=1 \ file://no-opengl.patch;patch=1" S = "${WORKDIR}/juce" -- cgit v1.2.3 From 76e5aca75b0bd799c9f7611faf331d1187643e69 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:04:46 +0000 Subject: juce: I guess I forgot a very important part in that SRC_URI in my previous commit ;-) Should work now --- packages/juce/juce_1.29.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/juce/juce_1.29.bb b/packages/juce/juce_1.29.bb index 3fa587f8f4..6aca160262 100644 --- a/packages/juce/juce_1.29.bb +++ b/packages/juce/juce_1.29.bb @@ -6,7 +6,7 @@ DEPENDS = "alsa-lib freetype virtual/libx11" PR = "r0" #FIXME the patches are a) HACKS and b) something's wrong with lineend conversion -SRC_URI = "http://downloads.openmoko.org/sources/${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}.zip \ +SRC_URI = "http://downloads.openmoko.org/sources/juce_${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}.zip \ file://remove-x86isms.patch;patch=1 \ file://no-opengl.patch;patch=1" S = "${WORKDIR}/juce" -- cgit v1.2.3 From d821a941f2d1cbbb09909e792ae739d0415ce1b1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:14:19 +0000 Subject: boost-asio: drop incorrect and superfluous PACKAGES definition --- packages/boost-asio/boost-asio_0.3.7.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/boost-asio/boost-asio_0.3.7.bb b/packages/boost-asio/boost-asio_0.3.7.bb index a27001e576..94a29b700c 100644 --- a/packages/boost-asio/boost-asio_0.3.7.bb +++ b/packages/boost-asio/boost-asio_0.3.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://asio.sf.net/" SECTION = "libs" PRIORITY = "optional" LICENSE = "Boost Software License" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/asio/boost_asio_0_3_7.tar.bz2" @@ -32,5 +32,4 @@ do_stage() { cp -dpR boost ${STAGING_INCDIR} } -PACKAGES = "${PN}-dbg ${PN}-dev" FILES_${PN}-dev = "/usr/include" -- cgit v1.2.3 From a20f71c6929b7c73ce95b7ab6b8e107723eb44bb Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:21:24 +0000 Subject: inputpipe: add $PN to PACKAGES definition --- packages/inputpipe/inputpipe_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/inputpipe/inputpipe_svn.bb b/packages/inputpipe/inputpipe_svn.bb index 40d78f9139..c6e28c3e79 100644 --- a/packages/inputpipe/inputpipe_svn.bb +++ b/packages/inputpipe/inputpipe_svn.bb @@ -18,7 +18,7 @@ do_install() { install inputpipe-client ${D}${bindir} } -PACKAGES = "${PN}-dbg inputpipe-server inputpipe-client" +PACKAGES = "${PN}-dbg inputpipe-server inputpipe-client ${PN}" FILES_inputpipe-client = "${bindir}/inputpipe-client" FILES_inputpipe-server = "${bindir}/inputpipe-server" -- cgit v1.2.3 From 7aaa604941a80f3392fdf1e1809851ee4c6f2827 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:23:28 +0000 Subject: libdbi-drivers: add $PN to PACKAGES definition --- packages/libdbi/libdbi-drivers_0.7.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libdbi/libdbi-drivers_0.7.1.bb b/packages/libdbi/libdbi-drivers_0.7.1.bb index 2e3bc5cf16..eea45ca4bb 100644 --- a/packages/libdbi/libdbi-drivers_0.7.1.bb +++ b/packages/libdbi/libdbi-drivers_0.7.1.bb @@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libdbi-drivers/libdbi-drivers-${PV}.tar.gz" inherit autotools -PACKAGES = "${PN}-dbg libdbd-sqlite" +PACKAGES = "${PN}-dbg libdbd-sqlite ${PN}" EXTRA_OECONF = "--with-dbi-incdir=${STAGING_INCDIR} \ --with-sqlite \ -- cgit v1.2.3 From 62d71d9c5a832c8f60a926a519a647e9dc452275 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:24:43 +0000 Subject: libqanava: add $PN to PACKAGES definition --- packages/libqanava/libqanava_0.0.7.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/libqanava/libqanava_0.0.7.bb b/packages/libqanava/libqanava_0.0.7.bb index af1e8616f5..3b0dd2d3bf 100644 --- a/packages/libqanava/libqanava_0.0.7.bb +++ b/packages/libqanava/libqanava_0.0.7.bb @@ -41,7 +41,7 @@ do_install() { done } -PACKAGES = "${PN}-dbg libqanava-can libqanava-la libqanava-utl qanava-examples" +PACKAGES = "${PN}-dbg libqanava-can libqanava-la libqanava-utl qanava-examples ${PN}" FILES_libqanava-can = "${libdir}/libqanava_can*.so*" FILES_libqanava-la = "${libdir}/libqanava_la*.so*" FILES_libqanava-utl = "${libdir}/libqanava_utl*.so*" -- cgit v1.2.3 From 27c4835dc5f443a7bda4f6defbc22a10a5a6e423 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:29:48 +0000 Subject: sphyrna: fix $S --- packages/sphyrna/sphyrna-python_svn.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sphyrna/sphyrna-python_svn.bb b/packages/sphyrna/sphyrna-python_svn.bb index 2e7fd432e9..5dcab372e7 100644 --- a/packages/sphyrna/sphyrna-python_svn.bb +++ b/packages/sphyrna/sphyrna-python_svn.bb @@ -3,11 +3,11 @@ HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna" LICENSE = "GPLv2" DEPENDS = "readline" PV = "0.0+svnr${SRCREV}" -PR = "r0" +PR = "r1" SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna" -S = "${WORKDIR}/${PN}" +S = "${WORKDIR}/sphyrna" inherit autotools -- cgit v1.2.3 From b8870bc827512b9c3dc09fb473dc50537106e647 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 00:33:25 +0000 Subject: sphyrna: generalize FILES_sphyrna-python definition --- packages/sphyrna/sphyrna-python_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/sphyrna/sphyrna-python_svn.bb b/packages/sphyrna/sphyrna-python_svn.bb index 5dcab372e7..011c496fe4 100644 --- a/packages/sphyrna/sphyrna-python_svn.bb +++ b/packages/sphyrna/sphyrna-python_svn.bb @@ -14,7 +14,7 @@ inherit autotools PACKAGES = "${PN}-dbg sphyrna-console sphyrna-python" FILES_sphyrna-console = "${bindir}/hhconsole" -FILES_sphyrna-python = "${bindir}/decode.py ${libdir}/python2.4/site-packages/sphyrna/*" +FILES_sphyrna-python = "${bindir}/decode.py ${libdir}/python*/site-packages/sphyrna/*" PACKAGE_ARCH_sphyrna-python = "all" RDEPENDS_sphyrna-python = "python-core python-re" -- cgit v1.2.3 From 8cebec93aac57d8db35817a88a780a12de82b326 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 01:12:59 +0000 Subject: e-image: fix spelling mistake and comment out non-existant task. Closes 2752. --- packages/images/e-image.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb index 600b01d37b..9bf95e4231 100644 --- a/packages/images/e-image.bb +++ b/packages/images/e-image.bb @@ -5,9 +5,9 @@ DEPENDS += "task-e-x11-core task-gpe-base task-gpe-pim task-gpe-settings task-gp figment xhost gpe-soundserver gpe-confd xauth" IMAGE_INSTALL += "task-e-x11-core \ - ask-gpe-pim \ + task-gpe-pim \ task-gpe-settings \ - task-gpe-apps \ +# task-gpe-apps \ task-gpe-connectivity \ task-gpe-games \ task-apps-extra \ -- cgit v1.2.3 From 5a0cc14110ecec406d29ff2d419b3764d1c9c222 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 23 Aug 2008 01:40:43 +0000 Subject: This adds a package name alias virtual-libc-dev for libc-dev(uclibc) and libc6-dev (glibc,eglibc) packages. This helps in using the common name for tasks which do not care about the libc being used. This also fixes Bug 4509 -Khem --- packages/eglibc/eglibc_svn.bb | 5 ++--- packages/glibc/glibc_2.5.bb | 4 ++-- packages/glibc/glibc_2.6.1.bb | 4 ++-- packages/glibc/glibc_2.7.bb | 4 ++-- packages/tasks/task-native-sdk.bb | 7 ++++--- packages/uclibc/bfin-uclibc_svn.bb | 2 +- packages/uclibc/uclibc.inc | 2 +- packages/uclibc/uclibc_0.9.26.bb | 2 +- packages/uclibc/uclibc_0.9.27.bb | 2 +- packages/uclibc/uclibc_0.9.28.bb | 2 +- packages/uclibc/uclibc_0.9.29.bb | 2 +- packages/uclibc/uclibc_nptl.bb | 2 +- packages/uclibc/uclibc_svn.bb | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/eglibc/eglibc_svn.bb b/packages/eglibc/eglibc_svn.bb index a47e94ef2e..e23a13b5a2 100644 --- a/packages/eglibc/eglibc_svn.bb +++ b/packages/eglibc/eglibc_svn.bb @@ -3,7 +3,7 @@ require eglibc.inc # DEFAULT_PREFERENCE = "-1" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn" PV = "2.8+svnr${SRCREV}" -PR = "r9" +PR = "r10" SRC_URI = "svn://svn.eglibc.org;module=trunk \ file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \ file://etc/ld.so.conf \ @@ -12,7 +12,7 @@ S = "${WORKDIR}/trunk/libc" B = "${WORKDIR}/build-${TARGET_SYS}" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" PROVIDES_${PN}-dbg = "glibc-dbg" # the -isystem in bitbake.conf screws up glibc do_stage @@ -39,7 +39,6 @@ python __anonymous () { bb.data.getVar('TARGET_OS', d, 1)) } - EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile --disable-debug --without-gd \ --enable-clocale=gnu \ diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb index 701556d35a..a5908762ef 100644 --- a/packages/glibc/glibc_2.5.bb +++ b/packages/glibc/glibc_2.5.bb @@ -1,10 +1,10 @@ require glibc.inc -PR = "r16" +PR = "r17" ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_2.6.1.bb b/packages/glibc/glibc_2.6.1.bb index 6faa3df9af..6541dda197 100644 --- a/packages/glibc/glibc_2.6.1.bb +++ b/packages/glibc/glibc_2.6.1.bb @@ -1,8 +1,8 @@ require glibc.inc -PR = "r10" +PR = "r11" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/glibc/glibc_2.7.bb b/packages/glibc/glibc_2.7.bb index 0e5a96234b..b6c329091c 100644 --- a/packages/glibc/glibc_2.7.bb +++ b/packages/glibc/glibc_2.7.bb @@ -3,9 +3,9 @@ require glibc.inc ARM_INSTRUCTION_SET = "arm" PACKAGES_DYNAMIC = "libc6*" -RPROVIDES_${PN}-dev = "libc6-dev" +RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev" -PR = "r6" +PR = "r7" # the -isystem in bitbake.conf screws up glibc do_stage BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb index b840254176..61b6fc0279 100644 --- a/packages/tasks/task-native-sdk.bb +++ b/packages/tasks/task-native-sdk.bb @@ -1,10 +1,11 @@ DESCRIPTION = "Packages required for native (on-device) SDK" LICENSE = "MIT" -DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep" -RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \ +DEPENDS = "virtual/libc gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep" +RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \ + make virtual-libc-dev \ flex flex-dev bison gawk sed grep autoconf automake make \ patch patchutils diffstat diffutils libstdc++-dev" -PR = "r2" +PR = "r3" ALLOW_EMPTY = "1" PACKAGES = "${PN}" diff --git a/packages/uclibc/bfin-uclibc_svn.bb b/packages/uclibc/bfin-uclibc_svn.bb index cccb5d6527..4f83716e09 100644 --- a/packages/uclibc/bfin-uclibc_svn.bb +++ b/packages/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r2" +PR = "r3" PV = "${UCLIBC_BASE}+svnr${SRCREV}" require uclibc.inc diff --git a/packages/uclibc/uclibc.inc b/packages/uclibc/uclibc.inc index 544d760e99..5b0ef914dd 100644 --- a/packages/uclibc/uclibc.inc +++ b/packages/uclibc/uclibc.inc @@ -52,7 +52,7 @@ FILES_uclibc-utils = "${bindir} ${sbindir}" FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug" FILES_uclibc-gconv = "${libdir}/gconv" FILES_uclibc-thread-db = "/lib/libthread_db*" -RPROVIDES_uclibc-dev += "libc-dev" +RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev" # # This locale file gets copied into uClibc-${PV}/extra/locale/ prior to diff --git a/packages/uclibc/uclibc_0.9.26.bb b/packages/uclibc/uclibc_0.9.26.bb index 1c52500ee6..a39e3479a2 100644 --- a/packages/uclibc/uclibc_0.9.26.bb +++ b/packages/uclibc/uclibc_0.9.26.bb @@ -1,4 +1,4 @@ -PR = "r10" +PR = "r11" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.27.bb b/packages/uclibc/uclibc_0.9.27.bb index f730ad8a27..5236cb4d8a 100644 --- a/packages/uclibc/uclibc_0.9.27.bb +++ b/packages/uclibc/uclibc_0.9.27.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r10" +PR = "r11" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.28.bb b/packages/uclibc/uclibc_0.9.28.bb index 1b2fc325d5..0aed389df3 100644 --- a/packages/uclibc/uclibc_0.9.28.bb +++ b/packages/uclibc/uclibc_0.9.28.bb @@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1" -PR = "r14" +PR = "r15" require uclibc.inc diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb index 9c716b6237..f521490863 100644 --- a/packages/uclibc/uclibc_0.9.29.bb +++ b/packages/uclibc/uclibc_0.9.29.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PR = "r24" +PR = "r25" DEFAULT_PREFERENCE = "1" require uclibc.inc diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb index 6d6fc361c6..b9b17224ec 100644 --- a/packages/uclibc/uclibc_nptl.bb +++ b/packages/uclibc/uclibc_nptl.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r0" +PR = "r1" #DEFAULT_PREFERENCE = "2" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb index 5dfa1b243c..7363d09b7c 100644 --- a/packages/uclibc/uclibc_svn.bb +++ b/packages/uclibc/uclibc_svn.bb @@ -8,7 +8,7 @@ # UCLIBC_BASE ?= "0.9.29" PV = "${UCLIBC_BASE}+svnr${SRCREV}" -PR = "r13" +PR = "r14" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. -- cgit v1.2.3 From 014bcf955e8d3a5a892be55bdcd2fe45d2459356 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 23 Aug 2008 12:25:05 +0000 Subject: gpe-calendar: add 0.92 --- packages/gpe-calendar/gpe-calendar_0.92.bb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 packages/gpe-calendar/gpe-calendar_0.92.bb diff --git a/packages/gpe-calendar/gpe-calendar_0.92.bb b/packages/gpe-calendar/gpe-calendar_0.92.bb new file mode 100644 index 0000000000..534721b0b8 --- /dev/null +++ b/packages/gpe-calendar/gpe-calendar_0.92.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite." +SECTION = "gpe" +LICENSE = "GPL" + +DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen" +RDEPENDS = "gpe-icons" + +PR = "r0" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit autotools gpe + +do_configure () { + autotools_do_configure +} -- cgit v1.2.3 From 68c2f6a64ebf1cd9215886e21526961d9dca7f8a Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Sat, 23 Aug 2008 12:26:10 +0000 Subject: libqpe: fix argv double varname in qpeapplication.h --- packages/libqpe/libqpe-opie/argv.patch | 13 +++++++++++++ packages/libqpe/libqpe-opie_cvs.bb | 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 packages/libqpe/libqpe-opie/argv.patch diff --git a/packages/libqpe/libqpe-opie/argv.patch b/packages/libqpe/libqpe-opie/argv.patch new file mode 100644 index 0000000000..5926a8d000 --- /dev/null +++ b/packages/libqpe/libqpe-opie/argv.patch @@ -0,0 +1,13 @@ +Index: library/qpeapplication.h +=================================================================== +--- library.orig/qpeapplication.h 2008-06-12 01:18:24.548201862 +0200 ++++ library/qpeapplication.h 2008-06-12 01:18:30.861635469 +0200 +@@ -127,7 +127,7 @@ + static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL; + /* Merge setTempScreenSaverMode */ + #ifdef QTOPIA_INTERNAL_INITAPP +- void initApp( int argv, char **argv ); ++ void initApp( int argc, char **argv ); + #endif + + static void setKeepRunning(); diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb index e6bf737efa..0085003303 100644 --- a/packages/libqpe/libqpe-opie_cvs.bb +++ b/packages/libqpe/libqpe-opie_cvs.bb @@ -1,11 +1,12 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r2" +PR = "r3" SRC_URI = "${HANDHELDS_CVS};module=opie/library \ file://fix-titleheight.patch;patch=1 \ file://unbreak-logging.patch;patch=1 \ file://citytime-path.patch;patch=1 \ + file://argv.patch;patch=1 \ " -- cgit v1.2.3 From d5f008966e87b613761b697744d0f08af574b7ae Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 23 Aug 2008 12:28:34 +0000 Subject: gpe-contacts: add 0.49 --- packages/gpe-contacts/gpe-contacts_0.49.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/gpe-contacts/gpe-contacts_0.49.bb diff --git a/packages/gpe-contacts/gpe-contacts_0.49.bb b/packages/gpe-contacts/gpe-contacts_0.49.bb new file mode 100644 index 0000000000..dadb085f06 --- /dev/null +++ b/packages/gpe-contacts/gpe-contacts_0.49.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "GPE contacts manager" +LICENSE = "GPL" +SECTION = "gpe" + +DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib" +RDEPENDS = "gpe-icons" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools + +FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts" + -- cgit v1.2.3 From 361980fb1ccfbb4dcc263819d3ef4b2716a0bc49 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Sat, 23 Aug 2008 12:32:34 +0000 Subject: gpe-login: add 0.95 --- packages/gpe-login/gpe-login_0.95.bb | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 packages/gpe-login/gpe-login_0.95.bb diff --git a/packages/gpe-login/gpe-login_0.95.bb b/packages/gpe-login/gpe-login_0.95.bb new file mode 100644 index 0000000000..0b3f480e6e --- /dev/null +++ b/packages/gpe-login/gpe-login_0.95.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "GPE user login screen" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd" +RDEPENDS = "xkbd gpe-theme-clearlooks" +RPROVIDES_${PN} = "gpe-session-starter" +PR = "r0" + +SRC_URI_OVERRIDES_PACKAGE_ARCH = "1" + +GPE_TARBALL_SUFFIX = "bz2" + +inherit gpe autotools pkgconfig + + +SRC_URI += "file://removeblue-fontsize8.patch;patch=1" +SRC_URI += " file://chvt-keylaunch.patch;patch=1 " +SRC_URI += " file://c-locale.patch;patch=1 " + +SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1" +SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1" + + +CONFFILES_${PN} += " \ +${sysconfdir}/apm/suspend.d/S98lock-display \ +${sysconfdir}/gpe/gpe-login.conf \ +${sysconfdir}/gpe/locale.alias \ +${sysconfdir}/sysconfig/gpelogin \ +${sysconfdir}/X11/gpe-login.keylaunchrc \ +${sysconfdir}/X11/gpe-login.gtkrc \ +${sysconfdir}/X11/gpe-login.setup \ +${sysconfdir}/X11/gpe-login.pre-session \ +${sysconfdir}/X11/Xinit.d/99gpe-login \ +${sysconfdir}/X11/Xsession.d/50autolock \ +" -- cgit v1.2.3 From a0729f86dbe321f193a772066b257213655356cd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 13:04:31 +0000 Subject: kdepimpi: add $PN to PACKAGES definition --- packages/kdepimpi/kdepimpi-base.inc | 2 +- packages/kdepimpi/kdepimpi-qte.inc | 2 +- packages/kdepimpi/kdepimpi-x11.inc | 2 +- packages/kdepimpi/kdepimpi-x11_2.2.3.bb | 2 ++ packages/kdepimpi/kdepimpi_2.2.7.bb | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc index 250cab0614..d031a52900 100644 --- a/packages/kdepimpi/kdepimpi-base.inc +++ b/packages/kdepimpi/kdepimpi-base.inc @@ -150,7 +150,7 @@ do_install() { } -PACKAGES = "${PN}-dbg libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu" +PACKAGES = "${PN}-dbg libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu ${PN}" FILES_kopi = "${bindir}/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " FILES_kapi = "${bindir}/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" diff --git a/packages/kdepimpi/kdepimpi-qte.inc b/packages/kdepimpi/kdepimpi-qte.inc index 3fa8781658..da7f011eda 100644 --- a/packages/kdepimpi/kdepimpi-qte.inc +++ b/packages/kdepimpi/kdepimpi-qte.inc @@ -151,7 +151,7 @@ do_install() { } -PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu" +PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu ${PN}" FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" diff --git a/packages/kdepimpi/kdepimpi-x11.inc b/packages/kdepimpi/kdepimpi-x11.inc index 80c246ad7c..6cf0d3863d 100644 --- a/packages/kdepimpi/kdepimpi-x11.inc +++ b/packages/kdepimpi/kdepimpi-x11.inc @@ -58,7 +58,7 @@ do_install-broken() { done } -PACKAGES = "libmicrokcal-x11 libmicrokabc-x11 kopi-applet-x11 kopi-x11 kapi-x11 libmicrokdelibs-x11 kammu-x11 libmicrokammu-x11" +PACKAGES = "libmicrokcal-x11 libmicrokabc-x11 kopi-applet-x11 kopi-x11 kapi-x11 libmicrokdelibs-x11 kammu-x11 libmicrokammu-x11 ${PN}" FILES_kopi-x11 = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* " FILES_kapi-x11 = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*" diff --git a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb index 6c48baf266..b44471e9d6 100644 --- a/packages/kdepimpi/kdepimpi-x11_2.2.3.bb +++ b/packages/kdepimpi/kdepimpi-x11_2.2.3.bb @@ -8,3 +8,5 @@ file://nomail.patch;patch=1 \ include kdepimpi-base.inc include kdepimpi-x11.inc + +PR = "r1" diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb index b8e4345b46..f21aebb4f3 100644 --- a/packages/kdepimpi/kdepimpi_2.2.7.bb +++ b/packages/kdepimpi/kdepimpi_2.2.7.bb @@ -5,4 +5,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \ require kdepimpi-base.inc -PR = "r2" +PR = "r3" -- cgit v1.2.3 From 1bf407397b92080940f9530dfd2ed126d9744a0e Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 13:36:48 +0000 Subject: librcf: add $PN to PACKAGES --- packages/librcf/librcf_0.4.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/librcf/librcf_0.4.bb b/packages/librcf/librcf_0.4.bb index 7d767750c8..6b0612c86b 100644 --- a/packages/librcf/librcf_0.4.bb +++ b/packages/librcf/librcf_0.4.bb @@ -36,7 +36,7 @@ do_stage() { tar -C include --exclude='*.diff' -cvf - . | tar -C ${STAGING_INCDIR} -xvf - } -PACKAGES = "${PN}-dbg ${PN}-mt ${PN}-st ${PN}-dev" +PACKAGES = "${PN}-dbg ${PN}-mt ${PN}-st ${PN}-dev ${PN}" FILES_${PN}-mt = "/usr/lib/libRCFmt.so*" FILES_${PN}-st = "/usr/lib/libRCFst.so*" FILES_${PN}-dev = "/usr/lib/libRCF[sm]t.a /usr/include" -- cgit v1.2.3 From 54ca0d8d122f6dce830c778a5d3b20bc96f814f3 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 23 Aug 2008 14:54:15 +0000 Subject: firefox: use O2 instead of O1 --- packages/mozilla/firefox-3.0.1/mozconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mozilla/firefox-3.0.1/mozconfig b/packages/mozilla/firefox-3.0.1/mozconfig index 8032ea3a3b..cd097165ab 100644 --- a/packages/mozilla/firefox-3.0.1/mozconfig +++ b/packages/mozilla/firefox-3.0.1/mozconfig @@ -54,7 +54,7 @@ ac_add_options --enable-image-decoders=png,gif,jpeg # enable static build #ac_add_options --disable-shared #ac_add_options --enable-static -ac_add_options --enable-optimize=-O1 +ac_add_options --enable-optimize=-O2 # Use cairo from system ac_add_options --enable-system-cairo -- cgit v1.2.3 From bffa5676129e9c7ce25c0d1725c2a873ebead0e9 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 23 Aug 2008 14:58:08 +0000 Subject: elfkickers: add $PN to PACKAGES --- packages/elfkickers/elfkickers_2.0a.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elfkickers/elfkickers_2.0a.bb b/packages/elfkickers/elfkickers_2.0a.bb index b369b8690c..d7aab81504 100644 --- a/packages/elfkickers/elfkickers_2.0a.bb +++ b/packages/elfkickers/elfkickers_2.0a.bb @@ -11,7 +11,7 @@ S = "${WORKDIR}/ELFkickers" ELFPKGS = "ebfc elfls elftoc \ rebind sstrip" -PACKAGES = "${PN}-dbg ${ELFPKGS}" +PACKAGES = "${PN}-dbg ${ELFPKGS} ${PN}" FILES_ebfc = "${bindir}/ebfc" FILES_elfls = "${bindir}/elfls" FILES_elftoc = "${bindir}/elftoc" -- cgit v1.2.3 From 952d8ef8c386334cfc8aa6430aa82e9d4995a9ed Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Sat, 23 Aug 2008 15:36:02 +0000 Subject: opie-reader: add flite directory to include path so that it at least builds --- packages/opie-reader/opie-reader.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/opie-reader/opie-reader.inc b/packages/opie-reader/opie-reader.inc index 1d8301ed03..02408adbf2 100644 --- a/packages/opie-reader/opie-reader.inc +++ b/packages/opie-reader/opie-reader.inc @@ -13,7 +13,7 @@ PARALLEL_MAKE = "" inherit opie DEPENDS += " flite " -EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 " +EXTRA_QMAKEVARS_POST += " SUBDIRS+=FliteDyn SUBDIRS+=FliteDyn16 INCLUDEPATH+=${STAGING_INCDIR}/flite" do_install() { install -d ${D}${palmtopdir}/pics/${APPNAME}/ -- cgit v1.2.3 From 2f1d6b002c9c34c814d92e5b43cb716e19257827 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 23 Aug 2008 23:53:27 +0000 Subject: linux-rp-2.6.26: Build DM9601 USB ethernet adapter module. --- packages/linux/linux-rp-2.6.26/defconfig-akita | 2 +- packages/linux/linux-rp-2.6.26/defconfig-c7x0 | 2 +- packages/linux/linux-rp-2.6.26/defconfig-hx2000 | 2 +- packages/linux/linux-rp-2.6.26/defconfig-poodle | 2 +- packages/linux/linux-rp-2.6.26/defconfig-spitz | 2 +- packages/linux/linux-rp-2.6.26/defconfig-zylonite | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/linux/linux-rp-2.6.26/defconfig-akita b/packages/linux/linux-rp-2.6.26/defconfig-akita index 27f5dcb781..0106fa5710 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-akita +++ b/packages/linux/linux-rp-2.6.26/defconfig-akita @@ -773,7 +773,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set diff --git a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 b/packages/linux/linux-rp-2.6.26/defconfig-c7x0 index 4c3cbf499c..b9b653cc3b 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-c7x0 +++ b/packages/linux/linux-rp-2.6.26/defconfig-c7x0 @@ -789,7 +789,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set diff --git a/packages/linux/linux-rp-2.6.26/defconfig-hx2000 b/packages/linux/linux-rp-2.6.26/defconfig-hx2000 index d023ffecac..92fe72c2c0 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-hx2000 +++ b/packages/linux/linux-rp-2.6.26/defconfig-hx2000 @@ -772,7 +772,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set diff --git a/packages/linux/linux-rp-2.6.26/defconfig-poodle b/packages/linux/linux-rp-2.6.26/defconfig-poodle index 4d7acb382f..274789fe56 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-poodle +++ b/packages/linux/linux-rp-2.6.26/defconfig-poodle @@ -791,7 +791,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set diff --git a/packages/linux/linux-rp-2.6.26/defconfig-spitz b/packages/linux/linux-rp-2.6.26/defconfig-spitz index 5b5db16979..775efafc39 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-spitz +++ b/packages/linux/linux-rp-2.6.26/defconfig-spitz @@ -794,7 +794,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set diff --git a/packages/linux/linux-rp-2.6.26/defconfig-zylonite b/packages/linux/linux-rp-2.6.26/defconfig-zylonite index bdf6a3be8a..d34c79e062 100644 --- a/packages/linux/linux-rp-2.6.26/defconfig-zylonite +++ b/packages/linux/linux-rp-2.6.26/defconfig-zylonite @@ -789,7 +789,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m -# CONFIG_USB_NET_DM9601 is not set +CONFIG_USB_NET_DM9601=m # CONFIG_USB_NET_GL620A is not set CONFIG_USB_NET_NET1080=m # CONFIG_USB_NET_PLUSB is not set -- cgit v1.2.3 From c420b86d7346756083c9f426a21ed2ff004aa45c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 24 Aug 2008 03:28:56 +0000 Subject: Enable e300c2 and c3 support for gcc 4.3.1 Tested on (mpc8313e-rdb,angstrom) --- packages/gcc/gcc-4.3.1.inc | 2 +- packages/gcc/gcc-4.3.1/gcc-4.0.2-e300c2c3.patch | 82 ++++++++++++++----------- packages/gcc/gcc-cross-sdk_4.3.1.bb | 2 +- packages/gcc/gcc-cross_4.3.1.bb | 2 +- packages/gcc/gcc_4.3.1.bb | 2 +- 5 files changed, 49 insertions(+), 41 deletions(-) diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc index afbc395230..7a04be2401 100644 --- a/packages/gcc/gcc-4.3.1.inc +++ b/packages/gcc/gcc-4.3.1.inc @@ -51,7 +51,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \ file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \ file://cache-amnesia.patch;patch=1 \ file://gfortran.patch;patch=1 \ -# file://gcc-4.0.2-e300c2c3.patch;patch=1 \ + file://gcc-4.0.2-e300c2c3.patch;patch=1 \ # file://pr34130.patch;patch=1 \ # file://fortran-static-linking.patch;patch=1 \ # file://intermask-bigendian.patch;patch=1 \ diff --git a/packages/gcc/gcc-4.3.1/gcc-4.0.2-e300c2c3.patch b/packages/gcc/gcc-4.3.1/gcc-4.0.2-e300c2c3.patch index 736ac4b6b6..d1df8b2716 100644 --- a/packages/gcc/gcc-4.3.1/gcc-4.0.2-e300c2c3.patch +++ b/packages/gcc/gcc-4.3.1/gcc-4.0.2-e300c2c3.patch @@ -3,10 +3,18 @@ http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm Leon Woestenberg -Index: gcc-4.1.2/gcc/config/rs6000/e300c2c3.md +--- + gcc/config.gcc | 2 + gcc/config/rs6000/e300c2c3.md | 189 ++++++++++++++++++++++++++++++++++++++++++ + gcc/config/rs6000/rs6000.c | 24 +++++ + gcc/config/rs6000/rs6000.h | 4 + gcc/config/rs6000/rs6000.md | 3 + 5 files changed, 220 insertions(+), 2 deletions(-) + +Index: gcc-4.3.1/gcc/config/rs6000/e300c2c3.md =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.1.2/gcc/config/rs6000/e300c2c3.md 2007-10-18 15:32:51.000000000 +0200 ++++ gcc-4.3.1/gcc/config/rs6000/e300c2c3.md 2008-08-23 16:51:33.000000000 -0700 @@ -0,0 +1,189 @@ +;; Pipeline description for Motorola PowerPC e300c3 core. +;; Copyright (C) 2003 Free Software Foundation, Inc. @@ -197,12 +205,12 @@ Index: gcc-4.1.2/gcc/config/rs6000/e300c2c3.md + (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u") + (eq_attr "cpu" "ppce300c3")) + "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire") -Index: gcc-4.1.2/gcc/config/rs6000/rs6000.c +Index: gcc-4.3.1/gcc/config/rs6000/rs6000.c =================================================================== ---- gcc-4.1.2.orig/gcc/config/rs6000/rs6000.c 2006-12-16 20:24:56.000000000 +0100 -+++ gcc-4.1.2/gcc/config/rs6000/rs6000.c 2007-10-18 15:34:26.000000000 +0200 -@@ -557,6 +557,21 @@ - COSTS_N_INSNS (29), /* ddiv */ +--- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.c 2008-08-23 16:49:39.000000000 -0700 ++++ gcc-4.3.1/gcc/config/rs6000/rs6000.c 2008-08-23 16:54:25.000000000 -0700 +@@ -669,6 +669,21 @@ struct processor_costs ppc8540_cost = { + 1, /* prefetch streams /*/ }; +/* Instruction costs on E300C2 and E300C3 cores. */ @@ -223,16 +231,16 @@ Index: gcc-4.1.2/gcc/config/rs6000/rs6000.c /* Instruction costs on POWER4 and POWER5 processors. */ static const struct processor_costs power4_cost = { -@@ -1140,6 +1155,8 @@ +@@ -1420,6 +1435,8 @@ rs6000_override_options (const char *def + {"8540", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN}, /* 8548 has a dummy entry for now. */ - {"8548", PROCESSOR_PPC8540, - POWERPC_BASE_MASK | MASK_PPC_GFXOPT | MASK_STRICT_ALIGN}, -+ {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT}, -+ {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK}, + {"8548", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN}, ++ {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT}, ++ {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK}, {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT}, {"970", PROCESSOR_POWER4, POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64}, -@@ -1529,6 +1546,11 @@ +@@ -1845,6 +1862,11 @@ rs6000_override_options (const char *def rs6000_cost = &ppc8540_cost; break; @@ -244,68 +252,68 @@ Index: gcc-4.1.2/gcc/config/rs6000/rs6000.c case PROCESSOR_POWER4: case PROCESSOR_POWER5: rs6000_cost = &power4_cost; -@@ -16647,6 +16669,8 @@ - case CPU_PPC750: +@@ -18606,6 +18628,8 @@ rs6000_issue_rate (void) case CPU_PPC7400: case CPU_PPC8540: + case CPU_CELL: + case CPU_PPCE300C2: + case CPU_PPCE300C3: return 2; case CPU_RIOS2: case CPU_PPC604: -Index: gcc-4.1.2/gcc/config/rs6000/rs6000.h +Index: gcc-4.3.1/gcc/config/rs6000/rs6000.h =================================================================== ---- gcc-4.1.2.orig/gcc/config/rs6000/rs6000.h 2006-11-18 01:25:49.000000000 +0100 -+++ gcc-4.1.2/gcc/config/rs6000/rs6000.h 2007-10-18 15:32:51.000000000 +0200 -@@ -111,6 +111,8 @@ - %{mcpu=970: -mpower4 -maltivec} \ +--- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.h 2008-01-26 09:18:35.000000000 -0800 ++++ gcc-4.3.1/gcc/config/rs6000/rs6000.h 2008-08-23 16:55:30.000000000 -0700 +@@ -117,6 +117,8 @@ %{mcpu=G5: -mpower4 -maltivec} \ %{mcpu=8540: -me500} \ + %{mcpu=8548: -me500} \ +%{mcpu=e300c2: -mppc} \ +%{mcpu=e300c3: -mppc -mpmr} \ %{maltivec: -maltivec} \ -many" -@@ -211,6 +213,8 @@ +@@ -262,6 +264,8 @@ enum processor_type PROCESSOR_PPC7400, PROCESSOR_PPC7450, PROCESSOR_PPC8540, + PROCESSOR_PPCE300C2, + PROCESSOR_PPCE300C3, PROCESSOR_POWER4, - PROCESSOR_POWER5 - }; -Index: gcc-4.1.2/gcc/config/rs6000/rs6000.md + PROCESSOR_POWER5, + PROCESSOR_POWER6, +Index: gcc-4.3.1/gcc/config/rs6000/rs6000.md =================================================================== ---- gcc-4.1.2.orig/gcc/config/rs6000/rs6000.md 2006-12-16 20:24:56.000000000 +0100 -+++ gcc-4.1.2/gcc/config/rs6000/rs6000.md 2007-10-18 15:32:51.000000000 +0200 -@@ -103,7 +103,7 @@ +--- gcc-4.3.1.orig/gcc/config/rs6000/rs6000.md 2008-02-13 16:14:45.000000000 -0800 ++++ gcc-4.3.1/gcc/config/rs6000/rs6000.md 2008-08-23 16:57:29.000000000 -0700 +@@ -133,7 +133,7 @@ ;; Processor type -- this attribute must exactly match the processor_type ;; enumeration in rs6000.h. --(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5" -+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,power4,power5" +-(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell" ++(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5,power6,cell,ppce300c2,ppce300c3" (const (symbol_ref "rs6000_cpu_attr"))) - (automata_option "ndfa") -@@ -119,6 +119,7 @@ + +@@ -166,6 +166,7 @@ (include "7xx.md") (include "7450.md") (include "8540.md") +(include "e300c2c3.md") (include "power4.md") (include "power5.md") - -Index: gcc-4.1.2/gcc/config.gcc + (include "power6.md") +Index: gcc-4.3.1/gcc/config.gcc =================================================================== ---- gcc-4.1.2.orig/gcc/config.gcc 2007-10-18 15:26:23.000000000 +0200 -+++ gcc-4.1.2/gcc/config.gcc 2007-10-18 15:32:51.000000000 +0200 -@@ -2710,7 +2710,7 @@ +--- gcc-4.3.1.orig/gcc/config.gcc 2008-08-23 16:49:43.000000000 -0700 ++++ gcc-4.3.1/gcc/config.gcc 2008-08-23 17:03:55.000000000 -0700 +@@ -3144,7 +3144,7 @@ case "${target}" in | rios | rios1 | rios2 | rsc | rsc1 | rs64a \ | 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \ | 601 | 602 | 603 | 603e | ec603e | 604 \ - | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \ + | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \ - | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5) + | 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell) # OK ;; diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb index a326263c06..7380c26f13 100644 --- a/packages/gcc/gcc-cross-sdk_4.3.1.bb +++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r8" +PR = "r9" inherit sdk diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb index 24d628d7cb..fe44c73674 100644 --- a/packages/gcc/gcc-cross_4.3.1.bb +++ b/packages/gcc/gcc-cross_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r11" +PR = "r12" require gcc-${PV}.inc require gcc-cross4.inc diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb index abbde9ade4..1514b1ae0f 100644 --- a/packages/gcc/gcc_4.3.1.bb +++ b/packages/gcc/gcc_4.3.1.bb @@ -1,4 +1,4 @@ -PR = "r7" +PR = "r8" require gcc-${PV}.inc require gcc-configure-target.inc -- cgit v1.2.3 From 5f33e9306c4812d1c98921be591f8c3a6ded8e7e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 24 Aug 2008 08:46:00 +0000 Subject: ffmpeg git: bump SRCREV --- packages/ffmpeg/ffmpeg_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb index 76dd833418..b8bebebd0b 100644 --- a/packages/ffmpeg/ffmpeg_git.bb +++ b/packages/ffmpeg/ffmpeg_git.bb @@ -3,19 +3,19 @@ require ffmpeg.inc DEPENDS += "libgsm" PV = "0.4.9+${PR}+gitr${SRCREV}" -PR = "r27" +PR = "r29" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_armv5te = "1" DEFAULT_PREFERENCE_armv6 = "1" DEFAULT_PREFERENCE_armv7a = "1" -FFBRANCH_arm = "arm.qpel" +FFBRANCH_arm = "arm" FFBRANCH ?= "master" # When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a" -SRCREV_arm = "7c46803029e74a20ceb1327d1d599ae758aea58c" +SRCREV_arm = "2a56b3705935a53fb48d605340095fb462d6acc5" SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \ " -- cgit v1.2.3 From c4e8f04b905425b714041149e74fb7d3492e41a3 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Sun, 24 Aug 2008 10:15:33 +0000 Subject: packages/ffmpeg/ffmpeg_0.4.9-pre1.bb : Disable mmx for x86 Add core-utils to the depends list as build fails during ffmpeg's install/stip stage --- packages/ffmpeg/ffmpeg.inc | 2 +- packages/ffmpeg/ffmpeg_0.4.9-pre1.bb | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/ffmpeg/ffmpeg.inc b/packages/ffmpeg/ffmpeg.inc index aab2c62fa9..6316b4e26e 100644 --- a/packages/ffmpeg/ffmpeg.inc +++ b/packages/ffmpeg/ffmpeg.inc @@ -5,7 +5,7 @@ SECTION = "libs" PRIORITY = "optional" LICENSE = "LGPL" -DEPENDS = "zlib libogg libvorbis faac faad2 liba52 lame" +DEPENDS = "coreutils-native zlib libogg libvorbis faac faad2 liba52 lame" RSUGGESTS = "mplayer" inherit autotools pkgconfig diff --git a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb index 6df6d89ca0..f2d5a928aa 100644 --- a/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb +++ b/packages/ffmpeg/ffmpeg_0.4.9-pre1.bb @@ -1,11 +1,13 @@ require ffmpeg.inc -PR = "r3" +PR = "r5" SRC_URI = "${SOURCEFORGE_MIRROR}/ffmpeg/ffmpeg-${PV}.tar.gz \ file://configure.patch;patch=0 \ file://gcc4.patch;patch=1 \ file://soname.patch;patch=1 \ + file://libavformat-makefile.patch;patch=1 \ + file://Makefile-lame.patch;patch=1 \ " EXTRA_OECONF += " \ @@ -27,13 +29,18 @@ EXTRA_OECONF += " \ \ --cpu=${TARGET_ARCH} \ --tune=${PACKAGE_ARCH} \ - --extra-ldflags="-la52" \ + --extra-libs="-la52" \ + --extra-ldflags="-L${STAGING_LIBDIR}" \ \ --disable-audio-beos \ --disable-v4l \ --disable-dv1394 \ " +EXTRA_OECONF_append_x86 += " \ + --disable-mmx \ +" + do_stage() { oe_libinstall -a -so -C libavcodec libavcodec ${STAGING_LIBDIR} oe_libinstall -a -so -C libavformat libavformat ${STAGING_LIBDIR} -- cgit v1.2.3 From 33faa169a9e16ff6216f94865d717e4104c6736a Mon Sep 17 00:00:00 2001 From: Philip Balister Date: Sun, 24 Aug 2008 11:47:33 +0000 Subject: synergy : Add patch (from gentoo) to compile synergy with gcc 4.3. --- packages/synergy/files/.mtn2git_empty | 0 packages/synergy/files/synergy-1.3.1+gcc-4.3.patch | 161 +++++++++++++++++++++ packages/synergy/synergy_1.3.1.bb | 3 +- 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 packages/synergy/files/.mtn2git_empty create mode 100644 packages/synergy/files/synergy-1.3.1+gcc-4.3.patch diff --git a/packages/synergy/files/.mtn2git_empty b/packages/synergy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/synergy/files/synergy-1.3.1+gcc-4.3.patch b/packages/synergy/files/synergy-1.3.1+gcc-4.3.patch new file mode 100644 index 0000000000..c13a179cf7 --- /dev/null +++ b/packages/synergy/files/synergy-1.3.1+gcc-4.3.patch @@ -0,0 +1,161 @@ +Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp ++++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp +@@ -20,6 +20,8 @@ + #include + #include + ++#include ++ + // + // CArchDaemonUnix + // +Index: synergy-1.3.1/lib/arch/CMultibyte.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp ++++ synergy-1.3.1/lib/arch/CMultibyte.cpp +@@ -19,14 +19,12 @@ + #include "CArch.h" + #include + #include ++#include + #if HAVE_LOCALE_H + # include + #endif + #if HAVE_WCHAR_H || defined(_MSC_VER) + # include +-#elif __APPLE__ +- // wtf? Darwin puts mbtowc() et al. in stdlib +-# include + #else + // platform apparently has no wchar_t support. provide dummy + // implementations. hopefully at least the C++ compiler has +Index: synergy-1.3.1/lib/base/CStringUtil.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/base/CStringUtil.cpp ++++ synergy-1.3.1/lib/base/CStringUtil.cpp +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + + // +Index: synergy-1.3.1/lib/client/CClient.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/client/CClient.cpp ++++ synergy-1.3.1/lib/client/CClient.cpp +@@ -27,6 +27,9 @@ + #include "IEventQueue.h" + #include "TMethodEventJob.h" + ++#include ++#include ++ + // + // CClient + // +Index: synergy-1.3.1/lib/client/CServerProxy.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/client/CServerProxy.cpp ++++ synergy-1.3.1/lib/client/CServerProxy.cpp +@@ -24,6 +24,7 @@ + #include "TMethodEventJob.h" + #include "XBase.h" + #include ++#include + + // + // CServerProxy +Index: synergy-1.3.1/lib/net/CTCPSocket.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp ++++ synergy-1.3.1/lib/net/CTCPSocket.cpp +@@ -24,6 +24,7 @@ + #include "CArch.h" + #include "XArch.h" + #include ++#include + + // + // CTCPSocket +Index: synergy-1.3.1/lib/platform/CXWindowsScreen.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp ++++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp +@@ -27,6 +27,7 @@ + #include "IEventQueue.h" + #include "TMethodEventJob.h" + #include ++#include + #if X_DISPLAY_MISSING + # error X11 is required to build synergy + #else +Index: synergy-1.3.1/lib/server/CClientProxy1_3.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp ++++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp +@@ -18,6 +18,8 @@ + #include "IEventQueue.h" + #include "TMethodEventJob.h" + ++#include ++ + // + // CClientProxy1_3 + // +Index: synergy-1.3.1/lib/server/CServer.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/server/CServer.cpp ++++ synergy-1.3.1/lib/server/CServer.cpp +@@ -28,7 +28,8 @@ + #include "CLog.h" + #include "TMethodEventJob.h" + #include "CArch.h" +-#include ++#include ++#include + + // + // CServer +Index: synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp ++++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp +@@ -16,6 +16,7 @@ + #include "IEventQueue.h" + #include "CLock.h" + #include "TMethodEventJob.h" ++#include + + // + // CPacketStreamFilter +Index: synergy-1.3.1/lib/synergy/IKeyState.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp ++++ synergy-1.3.1/lib/synergy/IKeyState.cpp +@@ -13,7 +13,8 @@ + */ + + #include "IKeyState.h" +-#include ++#include ++#include + + // + // IKeyState +Index: synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp ++++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp +@@ -14,6 +14,8 @@ + + #include "IPrimaryScreen.h" + ++#include ++ + // + // IPrimaryScreen + // diff --git a/packages/synergy/synergy_1.3.1.bb b/packages/synergy/synergy_1.3.1.bb index 3a1199b385..d46cb47203 100644 --- a/packages/synergy/synergy_1.3.1.bb +++ b/packages/synergy/synergy_1.3.1.bb @@ -6,7 +6,8 @@ SECTION = "x11/utils" DEPENDS = "libx11 libxtst" PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz \ + file://synergy-1.3.1+gcc-4.3.patch;patch=1" do_configure_prepend() { grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' -- cgit v1.2.3 From 8b098e896c62d72deecdefdb29db62343ccec916 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 24 Aug 2008 11:54:46 +0000 Subject: xorg-fonts: set package arch to all for fonts --- packages/xorg-font/font-util_1.0.1.bb | 2 ++ packages/xorg-font/xfonts-xorg_6.8.bb | 2 ++ packages/xorg-font/xorg-font-common.inc | 2 ++ 3 files changed, 6 insertions(+) diff --git a/packages/xorg-font/font-util_1.0.1.bb b/packages/xorg-font/font-util_1.0.1.bb index 915c40cd5c..3ba1c05a29 100644 --- a/packages/xorg-font/font-util_1.0.1.bb +++ b/packages/xorg-font/font-util_1.0.1.bb @@ -1,5 +1,7 @@ require xorg-font-common.inc +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" + DESCRIPTION = "X font utils." DEPENDS = "encodings" diff --git a/packages/xorg-font/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb index f8a6a76964..78068e0534 100644 --- a/packages/xorg-font/xfonts-xorg_6.8.bb +++ b/packages/xorg-font/xfonts-xorg_6.8.bb @@ -3,6 +3,8 @@ PR = "r1" # XXX Is this true? These fonts are from X.org. LICENSE = "XFree86" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" + SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \ file://lexer.patch;patch=1" diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index c2977c8db9..09489b1cf8 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -22,6 +22,8 @@ do_stage() { autotools_stage_all } +PACKAGE_ARCH = "all" + pkg_postinst_${PN} () { set -x for fontdir in `find $D/usr/lib/X11/fonts -type d`; do -- cgit v1.2.3 From 48546b8dbfc9bd50e1c4057b90d5765fbbe86fd4 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 24 Aug 2008 16:21:30 +0000 Subject: Enlightenment Foundation Libraries MONSTER update courtesy Rasterman (mostly motivated by E switching their SCM) --- classes/e.bbclass | 2 +- classes/efl.bbclass | 2 +- conf/distro/include/sane-srcdates.inc | 63 ------------------ conf/distro/include/sane-srcrevs.inc | 65 +++++++++++++++++++ packages/e17/e-utils_cvs.bb | 12 ---- packages/e17/e-wm_cvs.bb | 68 -------------------- packages/e17/edje-editor_cvs.bb | 12 ---- packages/e17/edje-viewer_cvs.bb | 13 ---- packages/e17/enna_cvs.bb | 16 ----- packages/e17/entrance_0.9.0.010.bb | 2 +- packages/e17/examine_cvs.bb | 13 ---- packages/e17/exhibit_cvs.bb | 9 --- packages/e17/expedite_cvs.bb | 31 --------- packages/e17/exquisite_cvs.bb | 11 ---- packages/e17/rage_cvs.bb | 13 ---- packages/efl1/ecore-native_cvs.bb | 32 ---------- packages/efl1/ecore.inc | 4 +- packages/efl1/ecore_cvs.bb | 33 ---------- packages/efl1/edb_cvs.bb | 7 -- packages/efl1/edbus_cvs.bb | 22 ------- packages/efl1/edje-native_cvs.bb | 11 ---- packages/efl1/edje_cvs.bb | 14 ---- packages/efl1/eet-native_cvs.bb | 6 -- packages/efl1/eet_cvs.bb | 7 -- packages/efl1/eflpp_cvs.bb | 12 ---- packages/efl1/efreet_cvs.bb | 11 ---- packages/efl1/embryo-native_cvs.bb | 3 - packages/efl1/embryo_cvs.bb | 9 --- packages/efl1/emotion_cvs.bb | 14 ---- packages/efl1/engrave_cvs.bb | 7 -- packages/efl1/enhance_cvs.bb | 6 -- packages/efl1/epdf_cvs.bb | 23 ------- packages/efl1/epeg_cvs.bb | 7 -- packages/efl1/epsilon_cvs.bb | 15 ----- packages/efl1/esmart_cvs.bb | 27 -------- packages/efl1/etk-native_cvs.bb | 5 -- packages/efl1/etk_cvs.bb | 33 ---------- packages/efl1/evas-native_cvs.bb | 116 ---------------------------------- packages/efl1/evas.inc | 6 +- packages/efl1/evas_cvs.bb | 62 ------------------ packages/efl1/evolve-native_cvs.bb | 6 -- packages/efl1/evolve_cvs.bb | 7 -- packages/efl1/ewl_cvs.bb | 32 ---------- packages/efl1/exml_cvs.bb | 8 --- packages/efl1/imlib2_cvs.bb | 30 --------- packages/python/python-ecore_cvs.bb | 9 --- packages/python/python-edbus_cvs.bb | 9 --- packages/python/python-edje_cvs.bb | 9 --- packages/python/python-efl.inc | 2 +- packages/python/python-emotion_cvs.bb | 4 -- packages/python/python-epsilon_cvs.bb | 5 -- packages/python/python-evas_cvs.bb | 8 --- 52 files changed, 74 insertions(+), 879 deletions(-) delete mode 100644 packages/e17/e-utils_cvs.bb delete mode 100644 packages/e17/e-wm_cvs.bb delete mode 100644 packages/e17/edje-editor_cvs.bb delete mode 100644 packages/e17/edje-viewer_cvs.bb delete mode 100644 packages/e17/enna_cvs.bb delete mode 100644 packages/e17/examine_cvs.bb delete mode 100644 packages/e17/exhibit_cvs.bb delete mode 100644 packages/e17/expedite_cvs.bb delete mode 100644 packages/e17/exquisite_cvs.bb delete mode 100644 packages/e17/rage_cvs.bb delete mode 100644 packages/efl1/ecore-native_cvs.bb delete mode 100644 packages/efl1/ecore_cvs.bb delete mode 100644 packages/efl1/edb_cvs.bb delete mode 100644 packages/efl1/edbus_cvs.bb delete mode 100644 packages/efl1/edje-native_cvs.bb delete mode 100644 packages/efl1/edje_cvs.bb delete mode 100644 packages/efl1/eet-native_cvs.bb delete mode 100644 packages/efl1/eet_cvs.bb delete mode 100644 packages/efl1/eflpp_cvs.bb delete mode 100644 packages/efl1/efreet_cvs.bb delete mode 100644 packages/efl1/embryo-native_cvs.bb delete mode 100644 packages/efl1/embryo_cvs.bb delete mode 100644 packages/efl1/emotion_cvs.bb delete mode 100644 packages/efl1/engrave_cvs.bb delete mode 100644 packages/efl1/enhance_cvs.bb delete mode 100644 packages/efl1/epdf_cvs.bb delete mode 100644 packages/efl1/epeg_cvs.bb delete mode 100644 packages/efl1/epsilon_cvs.bb delete mode 100644 packages/efl1/esmart_cvs.bb delete mode 100644 packages/efl1/etk-native_cvs.bb delete mode 100644 packages/efl1/etk_cvs.bb delete mode 100644 packages/efl1/evas-native_cvs.bb delete mode 100644 packages/efl1/evas_cvs.bb delete mode 100644 packages/efl1/evolve-native_cvs.bb delete mode 100644 packages/efl1/evolve_cvs.bb delete mode 100644 packages/efl1/ewl_cvs.bb delete mode 100644 packages/efl1/exml_cvs.bb delete mode 100644 packages/efl1/imlib2_cvs.bb delete mode 100644 packages/python/python-ecore_cvs.bb delete mode 100644 packages/python/python-edbus_cvs.bb delete mode 100644 packages/python/python-edje_cvs.bb delete mode 100644 packages/python/python-emotion_cvs.bb delete mode 100644 packages/python/python-epsilon_cvs.bb delete mode 100644 packages/python/python-evas_cvs.bb diff --git a/classes/e.bbclass b/classes/e.bbclass index 3fb2355bc9..14199aaf0d 100644 --- a/classes/e.bbclass +++ b/classes/e.bbclass @@ -1,6 +1,6 @@ HOMEPAGE = "http://www.enlightenment.org" SECTION = "e/apps" -SRC_URI = "${E_CVS};module=e17/apps/${SRCNAME}" +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http" S = "${WORKDIR}/${SRCNAME}" inherit autotools pkgconfig binconfig diff --git a/classes/efl.bbclass b/classes/efl.bbclass index ab73a3cf01..bc4d9fe84b 100644 --- a/classes/efl.bbclass +++ b/classes/efl.bbclass @@ -2,7 +2,7 @@ SECTION = "e/libs" HOMEPAGE = "http://www.enlightenment.org" LICENSE = "MIT BSD" SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}" -SRC_URI = "${E_CVS};module=e17/libs/${SRCNAME}" +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http" S = "${WORKDIR}/${SRCNAME}" DEPENDS += "pkgconfig-native" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index c63a202629..f6888e760f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -50,69 +50,6 @@ SRCDATE_gpesyncd ?= "20070701" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" -# Enlightenment Foundation Libraries -# Caution: This is not alphabetically, but (roughly) dependency-sorted. -# Please leave it like that. -EFL_SRCDATE ?= "20080802" -SRCDATE_edb-native ?= "${EFL_SRCDATE}" -SRCDATE_edb ?= "${EFL_SRCDATE}" -SRCDATE_eet-native ?= "${EFL_SRCDATE}" -SRCDATE_eet ?= "${EFL_SRCDATE}" -SRCDATE_evas-native ?= "${EFL_SRCDATE}" -SRCDATE_evas ?= "${EFL_SRCDATE}" -SRCDATE_ecore-native ?= "${EFL_SRCDATE}" -SRCDATE_ecore ?= "${EFL_SRCDATE}" -SRCDATE_edbus ?= "${EFL_SRCDATE}" -SRCDATE_embryo-native ?= "${EFL_SRCDATE}" -SRCDATE_embryo ?= "${EFL_SRCDATE}" -SRCDATE_edje-native ?= "${EFL_SRCDATE}" -SRCDATE_edje ?= "${EFL_SRCDATE}" -SRCDATE_emotion ?= "${EFL_SRCDATE}" -SRCDATE_etk-native ?= "${EFL_SRCDATE}" -SRCDATE_etk ?= "${EFL_SRCDATE}" -SRCDATE_ewl ?= "${EFL_SRCDATE}" -SRCDATE_epeg ?= "${EFL_SRCDATE}" -SRCDATE_epsilon ?= "${EFL_SRCDATE}" -SRCDATE_epdf ?= "${EFL_SRCDATE}" -SRCDATE_esmart ?= "${EFL_SRCDATE}" -SRCDATE_efreet ?= "${EFL_SRCDATE}" -SRCDATE_exml ?= "${EFL_SRCDATE}" -SRCDATE_enhance ?= "${EFL_SRCDATE}" -SRCDATE_engrave ?= "${EFL_SRCDATE}" -SRCDATE_evolve-native ?= "${EFL_SRCDATE}" -SRCDATE_evolve ?= "${EFL_SRCDATE}" -SRCDATE_exquisite ?= "${EFL_SRCDATE}" -SRCDATE_gevas2 ?= "${EFL_SRCDATE}" -SRCDATE_imlib2 ?= "${EFL_SRCDATE}" - -# Enlightenment Bindings -SRCDATE_eflpp ?= "${EFL_SRCDATE}" -SRCDATE_python-evas ?= "${EFL_SRCDATE}" -SRCDATE_python-ecore ?= "${EFL_SRCDATE}" -SRCDATE_python-edje ?= "${EFL_SRCDATE}" -SRCDATE_python-edbus ?= "${EFL_SRCDATE}" -SRCDATE_python-emotion ?= "${EFL_SRCDATE}" -SRCDATE_python-epsilon ?= "${EFL_SRCDATE}" -SRCDATE_python-ewl ?= "${EFL_SRCDATE}" -SRCDATE_python-etk ?= "${EFL_SRCDATE}" - -# Enlightenment Applications -SRCDATE_edje-viewer ?= "${EFL_SRCDATE}" -SRCDATE_edje-editor ?= "${EFL_SRCDATE}" -SRCDATE_emphasis ?= "${EFL_SRCDATE}" -SRCDATE_ephoto ?= "${EFL_SRCDATE}" -SRCDATE_examine ?= "${EFL_SRCDATE}" -SRCDATE_exhibit ?= "${EFL_SRCDATE}" -SRCDATE_expedite ?= "${EFL_SRCDATE}" -SRCDATE_elitaire ?= "${EFL_SRCDATE}" -SRCDATE_entice ?= "${EFL_SRCDATE}" -SRCDATE_entrance ?= "${EFL_SRCDATE}" -SRCDATE_e-utils ?= "${EFL_SRCDATE}" -SRCDATE_e-wm ?= "${EFL_SRCDATE}" -SRCDATE_enna ?= "${EFL_SRCDATE}" -SRCDATE_exquisite ?= "${EFL_SRCDATE}" -SRCDATE_rage ?= "${EFL_SRCDATE}" - # Misc packages, sorted by alphabet SRCDATE_avetanabt ?= "20060814" SRCDATE_bl ?= "20060814" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 51ab90a6bc..cf5aab27d8 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -178,3 +178,68 @@ SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-xoo ?= "1971" SRCREV_pn-xserver-kdrive-glamo ?= "4147f80c0bfedaff7749bccbd1e1d566dee0e04c" SRCREV_pn-zhone ?= "69e029bd85a1caaad4e5d61087836a8e1ea20dcc" + +# Enlightenment Foundation Libraries +# Caution: This is not alphabetically, but (roughly) dependency-sorted. +# Please leave it like that. +EFL_SRCREV ?= "35592" +SRCREV_pn-edb-native ?= "${EFL_SRCREV}" +SRCREV_pn-edb ?= "${EFL_SRCREV}" +SRCREV_pn-eet-native ?= "${EFL_SRCREV}" +SRCREV_pn-eet ?= "${EFL_SRCREV}" +SRCREV_pn-evas-native ?= "${EFL_SRCREV}" +SRCREV_pn-evas ?= "${EFL_SRCREV}" +SRCREV_pn-ecore-native ?= "${EFL_SRCREV}" +SRCREV_pn-ecore ?= "${EFL_SRCREV}" +SRCREV_pn-edbus ?= "${EFL_SRCREV}" +SRCREV_pn-embryo-native ?= "${EFL_SRCREV}" +SRCREV_pn-embryo ?= "${EFL_SRCREV}" +SRCREV_pn-edje-native ?= "${EFL_SRCREV}" +SRCREV_pn-edje ?= "${EFL_SRCREV}" +SRCREV_pn-emotion ?= "${EFL_SRCREV}" +SRCREV_pn-etk-native ?= "${EFL_SRCREV}" +SRCREV_pn-etk ?= "${EFL_SRCREV}" +SRCREV_pn-ewl ?= "${EFL_SRCREV}" +SRCREV_pn-epeg ?= "${EFL_SRCREV}" +SRCREV_pn-epsilon ?= "${EFL_SRCREV}" +SRCREV_pn-epdf ?= "${EFL_SRCREV}" +SRCREV_pn-esmart ?= "${EFL_SRCREV}" +SRCREV_pn-efreet ?= "${EFL_SRCREV}" +SRCREV_pn-exml ?= "${EFL_SRCREV}" +SRCREV_pn-enhance ?= "${EFL_SRCREV}" +SRCREV_pn-engrave ?= "${EFL_SRCREV}" +SRCREV_pn-evolve-native ?= "${EFL_SRCREV}" +SRCREV_pn-evolve ?= "${EFL_SRCREV}" +SRCREV_pn-gevas2 ?= "${EFL_SRCREV}" +SRCREV_pn-imlib2 ?= "${EFL_SRCREV}" + +# Enlightenment Bindings +SRCREV_pn-eflpp ?= "${EFL_SRCREV}" +SRCREV_pn-python-evas ?= "${EFL_SRCREV}" +SRCREV_pn-python-ecore ?= "${EFL_SRCREV}" +SRCREV_pn-python-edje ?= "${EFL_SRCREV}" +SRCREV_pn-python-edbus ?= "${EFL_SRCREV}" +SRCREV_pn-python-emotion ?= "${EFL_SRCREV}" +SRCREV_pn-python-epsilon ?= "${EFL_SRCREV}" +SRCREV_pn-python-ewl ?= "${EFL_SRCREV}" +SRCREV_pn-python-etk ?= "${EFL_SRCREV}" + +# Enlightenment Applications +SRCREV_pn-edje-viewer ?= "${EFL_SRCREV}" +SRCREV_pn-edje-editor ?= "${EFL_SRCREV}" +SRCREV_pn-emphasis ?= "${EFL_SRCREV}" +SRCREV_pn-ephoto ?= "${EFL_SRCREV}" +SRCREV_pn-examine ?= "${EFL_SRCREV}" +SRCREV_pn-exhibit ?= "${EFL_SRCREV}" +SRCREV_pn-expedite ?= "${EFL_SRCREV}" +SRCREV_pn-elitaire ?= "${EFL_SRCREV}" +SRCREV_pn-entice ?= "${EFL_SRCREV}" +SRCREV_pn-entrance ?= "${EFL_SRCREV}" +SRCREV_pn-e-utils ?= "${EFL_SRCREV}" +SRCREV_pn-e-wm ?= "${EFL_SRCREV}" +SRCREV_pn-enna ?= "${EFL_SRCREV}" +SRCREV_pn-exquisite ?= "${EFL_SRCREV}" +SRCREV_pn-rage ?= "${EFL_SRCREV}" + +# Illume module +SRCREV_pn-illume ?= "${EFL_SRCREV}" diff --git a/packages/e17/e-utils_cvs.bb b/packages/e17/e-utils_cvs.bb deleted file mode 100644 index 6335f03b43..0000000000 --- a/packages/e17/e-utils_cvs.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Enlightenment Window Manager Utilities" -DEPENDS = "eet evas ecore edje esmart ewl engrave" -LICENSE = "MIT BSD" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" - -inherit e - -SRC_URI = "${E_CVS};module=e17/apps/e_utils" -S = "${WORKDIR}/e_utils" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-wm_cvs.bb b/packages/e17/e-wm_cvs.bb deleted file mode 100644 index b3a4201bcf..0000000000 --- a/packages/e17/e-wm_cvs.bb +++ /dev/null @@ -1,68 +0,0 @@ -DESCRIPTION = "The Enlightenment Window Mananger Version 17" -DEPENDS = "eet evas ecore edje efreet edbus" -LICENSE = "MIT BSD" -PV = "0.16.999.042+cvs${SRCDATE}" -PR = "r9" - -inherit e update-alternatives - -RDEPENDS += "shared-mime-info mime-support" - -SRC_URI = "${E_CVS};module=e17/apps/e \ - file://disable-e-cursor.patch;patch=1 \ - file://pkgconfig-fix.patch;patch=1;pnum=0;mindate=20080328;maxdate=20080401 \ - file://profile-search.patch;patch=1;mindate=20080328;maxdate=20080401 \ - file://enlightenment_start.oe \ - file://applications.menu \ -" -S = "${WORKDIR}/e" - -EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ -" - -do_configure_prepend() { - autopoint -} - -do_stage() { - autotools_stage_all - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done - for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done -} - -do_install_append() { - # customising - should rather make this simple upstream - install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir} - install -d ${D}/${sysconfdir}/xdg/menus - install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ -} - -FILES_${PN} = "\ - ${bindir}/* \ - ${libdir}/enlightenment/modules/*/*.* \ - ${libdir}/enlightenment/modules/*/*/* \ - ${libdir}/enlightenment/preload/*.so \ - ${datadir} \ - ${sysconfdir} \ -" -FILES_${PN}-dbg += "\ - ${libdir}/enlightenment/modules/*/*/.debug/ \ - ${libdir}/enlightenment/preload/.debug/ \ -" - -FILES_${PN}-dev += "\ - ${libdir}/enlightenment/preload/*.?a \ -" - -CONFFILES_${PN} = "/etc/xdg/menus/applications.menu" - -ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe" -ALTERNATIVE_NAME = "x-window-manager" -ALTERNATIVE_LINK = "${bindir}/x-window-manager" -ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/edje-editor_cvs.bb b/packages/e17/edje-editor_cvs.bb deleted file mode 100644 index 62cda08e14..0000000000 --- a/packages/e17/edje-editor_cvs.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "Edje-Editor is just that." -LICENSE = "MIT BSD" -DEPENDS = "etk" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" - -inherit e - -SRC_URI = "${E_CVS};module=e17/proto/edje_editor" -S = "${WORKDIR}/edje_editor" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/edje-viewer_cvs.bb b/packages/e17/edje-viewer_cvs.bb deleted file mode 100644 index df023ad0aa..0000000000 --- a/packages/e17/edje-viewer_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Edje_Viewer is just that." -DEPENDS = "etk" -LICENSE = "MIT BSD" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" - -inherit e - -SRC_URI = "${E_CVS};module=e17/apps/edje_viewer \ - file://no-minimal-size.patch;patch=1" -S = "${WORKDIR}/edje_viewer" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/enna_cvs.bb b/packages/e17/enna_cvs.bb deleted file mode 100644 index f87f08d06e..0000000000 --- a/packages/e17/enna_cvs.bb +++ /dev/null @@ -1,16 +0,0 @@ -DESCRIPTION = "Enna is a media center application based on EFL" -LICENSE = "GPL" -DEPENDS = "curl dbus eet evas edje ecore edbus emotion" -DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib" -SECTION = "x11/multimedia" -PV = "0.2.0+cvs${SRCDATE}" -PR = "r0" - -inherit e - -SRC_URI = "${E_CVS};module=misc/enna" -S = "${WORKDIR}/enna" - -do_configure_prepend() { - autopoint -} diff --git a/packages/e17/entrance_0.9.0.010.bb b/packages/e17/entrance_0.9.0.010.bb index a831a1515b..a1ffe80023 100644 --- a/packages/e17/entrance_0.9.0.010.bb +++ b/packages/e17/entrance_0.9.0.010.bb @@ -3,7 +3,7 @@ LICENSE = "MIT BSD" # can also use pam and crypt DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager" RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes" -PR = "r0" +PR = "r1" inherit e diff --git a/packages/e17/examine_cvs.bb b/packages/e17/examine_cvs.bb deleted file mode 100644 index 750cdb3e09..0000000000 --- a/packages/e17/examine_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Examine, the program configurator" -LICENSE = "MIT BSD" -DEPENDS = "ewl" -PV = "0.0.1+cvs${SRCDATE}" -PR = "r0" - -SRCNAME = "examine" - -inherit e - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/exhibit_cvs.bb b/packages/e17/exhibit_cvs.bb deleted file mode 100644 index 94bce42af5..0000000000 --- a/packages/e17/exhibit_cvs.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Exhibit is the ETK picture viewer" -LICENSE = "MIT BSD" -DEPENDS = "evas ecore epsilon edje eet etk efreet" -PV = "0.1.1+cvs${SRCDATE}" -PR = "r0" - -SRCNAME = "exhibit" - -inherit e diff --git a/packages/e17/expedite_cvs.bb b/packages/e17/expedite_cvs.bb deleted file mode 100644 index df34529df6..0000000000 --- a/packages/e17/expedite_cvs.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" -DEPENDS = "eet evas" -RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png" -LICENSE = "MIT BSD" -PV = "0.6.0+cvs${SRCDATE}" -PR = "r0" - -inherit autotools - -EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ -\ - --disable-opengl-glew \ - --disable-opengl-x11 \ - --enable-software-x11 \ - --enable-xrender-x11 \ - --enable-software-16-x11 \ - --enable-fb \ - --disable-software-ddraw \ - --disable-software-16-ddraw \ - --disable-direct3d \ - --disable-software-sdl \ -" - -do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g -} - -FILES_${PN} += "${datadir}" diff --git a/packages/e17/exquisite_cvs.bb b/packages/e17/exquisite_cvs.bb deleted file mode 100644 index 7f2d32f83b..0000000000 --- a/packages/e17/exquisite_cvs.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "A psplash replacement for display" -LICENSE = "MIT BSD" -DEPENDS = "eet evas ecore embryo edje" -PV = "0.0.1+cvs${SRCDATE}" -PR = "r0" - -SRCNAME = "exquisite" - -inherit e - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" diff --git a/packages/e17/rage_cvs.bb b/packages/e17/rage_cvs.bb deleted file mode 100644 index 3b7bed7a11..0000000000 --- a/packages/e17/rage_cvs.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Rage is a media center application based on EFL" -AUTHOR = "Carsten 'The Rasterman' Heitzler" -HOMEPAGE = "http://www.rasterman.com" -LICENSE = "MIT BSD" -DEPENDS = "evas ecore edje" -SECTION = "x11/multimedia" -PV = "0.3.0.042+cvs${SRCDATE}" - -inherit autotools - -SRC_URI = "${E_CVS};module=misc/rage" -S = "${WORKDIR}/rage" - diff --git a/packages/efl1/ecore-native_cvs.bb b/packages/efl1/ecore-native_cvs.bb deleted file mode 100644 index f21ba5075a..0000000000 --- a/packages/efl1/ecore-native_cvs.bb +++ /dev/null @@ -1,32 +0,0 @@ -require ecore.inc -inherit native -DEPENDS = "eet-native evas-native" -PR = "r0" - -EXTRA_OECONF = "\ - --enable-ecore-txt \ - --disable-ecore-config \ - --disable-ecore-x-xcb \ - --disable-ecore-x \ - --enable-ecore-job \ - --disable-ecore-directfb \ - --disable-ecore-sdl \ - --enable-ecore-fb \ - --enable-ecore-evas \ - --enable-ecore-evas-fb \ - --disable-ecore-evas-x11-gl \ - --disable-ecore-evas-xrender \ - --disable-ecore-evas-dfb \ - --disable-ecore-evas-sdl \ - --disable-openssl \ - --enable-abstract-sockets \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-file \ - --enable-inotify \ - --disable-poll \ - --disable-curl \ - --disable-ecore-desktop \ - --disable-ecore-imf \ - --disable-ecore-imf_evas \ -" diff --git a/packages/efl1/ecore.inc b/packages/efl1/ecore.inc index a0d040888d..aa3962eda8 100644 --- a/packages/efl1/ecore.inc +++ b/packages/efl1/ecore.inc @@ -1,9 +1,9 @@ DESCRIPTION = "Ecore is the Enlightenment application framework library" LICENSE = "MIT BSD" -DEPENDS = "curl eet evas tslib libxtst libxscrnsaver" +DEPENDS = "curl eet evas tslib libxtst libxscrnsaver libxdamage libxrandr libxcursor" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" -PV = "0.9.9.043+cvs${SRCDATE}" +PV = "0.9.9.043+svnr${SRCREV}" inherit efl diff --git a/packages/efl1/ecore_cvs.bb b/packages/efl1/ecore_cvs.bb deleted file mode 100644 index f36cc737bf..0000000000 --- a/packages/efl1/ecore_cvs.bb +++ /dev/null @@ -1,33 +0,0 @@ -require ecore.inc -PR = "r1" - -EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ -\ - --enable-ecore-txt \ - --enable-ecore-config \ - --disable-ecore-x-xcb \ - --enable-ecore-x \ - --enable-ecore-job \ - --disable-ecore-directfb \ - --disable-ecore-sdl \ - --enable-ecore-fb \ - --enable-ecore-evas \ - --enable-ecore-evas-x11-16 \ - --enable-ecore-evas-16-x11 \ - --disable-ecore-evas-x11-gl \ - --enable-ecore-evas-xrender \ - --disable-ecore-evas-dfb \ - --disable-ecore-evas-sdl \ - --disable-openssl \ - --enable-abstract-sockets \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-file \ - --enable-inotify \ - --disable-poll \ - --enable-curl \ - --disable-ecore-desktop \ -" diff --git a/packages/efl1/edb_cvs.bb b/packages/efl1/edb_cvs.bb deleted file mode 100644 index 9158590b03..0000000000 --- a/packages/efl1/edb_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Edb is the Enlightenment database library" -LICENSE = "MIT BSD" -DEPENDS = "zlib" -PV = "1.0.5.043+cvs${SRCDATE}" -PR = "r0" - -inherit efl diff --git a/packages/efl1/edbus_cvs.bb b/packages/efl1/edbus_cvs.bb deleted file mode 100644 index 8574d9f29e..0000000000 --- a/packages/efl1/edbus_cvs.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "DBus and HAL convenience wrappers for EFL" -DEPENDS = "dbus ecore" -LICENSE = "MIT BSD" -PV = "0.5.0.043+cvs${SRCDATE}" -PR = "r1" - -inherit efl - -SRC_URI = "\ - ${E_CVS};module=e17/libs/e_dbus \ - http://people.openmoko.org/stefan/e_nm-big-hack.patch;patch=1;pnum=1;mindate=20080330;maxdate=20080501 \ -" -S = "${WORKDIR}/e_dbus" - -EXTRA_OECONF = "--enable-build-test-gui" - -PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-test-gui" -FILES_${PN}-enotify = "${libdir}/libenotify.so.*" -FILES_${PN}-edbus = "${libdir}/libedbus.so.*" -FILES_${PN}-enm = "${libdir}/libenm.so.*" -FILES_${PN}-ehal = "${libdir}/libehal.so.*" -FILES_${PN}-test-gui = "${bindir}/e_dbus_hal" diff --git a/packages/efl1/edje-native_cvs.bb b/packages/efl1/edje-native_cvs.bb deleted file mode 100644 index 519476be72..0000000000 --- a/packages/efl1/edje-native_cvs.bb +++ /dev/null @@ -1,11 +0,0 @@ -require edje_${PV}.bb -inherit native -PR = "r0" - -DEPENDS = "evas-native ecore-native eet-native embryo-native" - -do_configure_prepend() { - sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c - sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c - sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c -} diff --git a/packages/efl1/edje_cvs.bb b/packages/efl1/edje_cvs.bb deleted file mode 100644 index 757b643e75..0000000000 --- a/packages/efl1/edje_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" -DEPENDS = "eet evas ecore embryo edje-native" -LICENSE = "MIT BSD" -PV = "0.9.9.043+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -PACKAGES =+ "${PN}-utils" -DEBIAN_NOAUTONAME_${PN}-utils = "1" -FILES_${PN}-utils = "\ - ${bindir}/edje_* \ - ${datadir}/edje/include/edje.inc \ -" diff --git a/packages/efl1/eet-native_cvs.bb b/packages/efl1/eet-native_cvs.bb deleted file mode 100644 index 096fd02524..0000000000 --- a/packages/efl1/eet-native_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -require eet_cvs.bb -inherit native -DEPENDS = "zlib-native jpeg-native" -# we no longer inherit pkgconfig, so we need to state this explicitly -# (see explanation in efl.bbclass and autotools.bbclass) -DEPENDS += "pkgconfig-native" diff --git a/packages/efl1/eet_cvs.bb b/packages/efl1/eet_cvs.bb deleted file mode 100644 index 9ed58e100a..0000000000 --- a/packages/efl1/eet_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "EET is the Enlightenment data storage library" -DEPENDS = "zlib jpeg" -LICENSE = "MIT BSD" -PV = "1.0.1+cvs${SRCDATE}" -PR = "r0" - -inherit efl diff --git a/packages/efl1/eflpp_cvs.bb b/packages/efl1/eflpp_cvs.bb deleted file mode 100644 index 19db2ef41e..0000000000 --- a/packages/efl1/eflpp_cvs.bb +++ /dev/null @@ -1,12 +0,0 @@ -DESCRIPTION = "EFLpp are C++ bindings to the EFL" -AUTHOR = "Michael 'Mickey' Lauer " -HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/" -LICENSE = "LGPL" -DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0" -PV = "0.1.0+cvs${SRCDATE}" - -inherit efl - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME}" diff --git a/packages/efl1/efreet_cvs.bb b/packages/efl1/efreet_cvs.bb deleted file mode 100644 index 36a3bdf3cf..0000000000 --- a/packages/efl1/efreet_cvs.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "The Enlightenment freedesktop.org library" -DEPENDS = "ecore" -LICENSE = "MIT BSD" -PV = "0.5.0.043+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -PACKAGES =+ "${PN}-mime" -FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*" - diff --git a/packages/efl1/embryo-native_cvs.bb b/packages/efl1/embryo-native_cvs.bb deleted file mode 100644 index 2fc3faddfd..0000000000 --- a/packages/efl1/embryo-native_cvs.bb +++ /dev/null @@ -1,3 +0,0 @@ -require embryo_${PV}.bb -inherit native - diff --git a/packages/efl1/embryo_cvs.bb b/packages/efl1/embryo_cvs.bb deleted file mode 100644 index 02385e9ec7..0000000000 --- a/packages/efl1/embryo_cvs.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "The Enlightenment C-like scripting language for Edje" -LICENSE = "MIT BSD" -PV = "0.9.9.043+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug -#FULL_OPTIMIZATION_arm =+ "-O0" diff --git a/packages/efl1/emotion_cvs.bb b/packages/efl1/emotion_cvs.bb deleted file mode 100644 index 960d10ad31..0000000000 --- a/packages/efl1/emotion_cvs.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "The Enlightenment multimedia library" -LICENSE = "MIT BSD" -# we no longer build the libxine backend, since the gstreamer backend seems more promising -DEPENDS = "libxcursor libxinerama eet evas ecore edje gstreamer gst-plugins-base" -PV = "0.1.0+cvs${SRCDATE}" -PR = "r1" - -inherit efl - -EXTRA_OECONF = "--disable-xine --enable-gstreamer" - -PACKAGES =+ "emotion-backend-gstreamer" -FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so" -RRECOMMENDS_${PN} = "emotion-backend-gstreamer" diff --git a/packages/efl1/engrave_cvs.bb b/packages/efl1/engrave_cvs.bb deleted file mode 100644 index ec39189410..0000000000 --- a/packages/efl1/engrave_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Engrave is an Edje Editing Library" -LICENSE = "MIT" -# also requires yacc and lex on host -DEPENDS = "evas ecore" -PV = "0.0.0+cvs${SRCDATE}" - -inherit efl diff --git a/packages/efl1/enhance_cvs.bb b/packages/efl1/enhance_cvs.bb deleted file mode 100644 index 8c73fbe1d8..0000000000 --- a/packages/efl1/enhance_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -DESCRIPTION = "Enhance translates between glade .xml files and ETK" -LICENSE = "MIT" -DEPENDS = "exml" -PV = "0.0.0+cvs${SRCDATE}" - -inherit efl diff --git a/packages/efl1/epdf_cvs.bb b/packages/efl1/epdf_cvs.bb deleted file mode 100644 index e48c36606e..0000000000 --- a/packages/efl1/epdf_cvs.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "Epdf is the glue between EFL and libpoppler" -LICENSE = "MIT BSD" -DEPENDS = "poppler evas ecore etk ewl" -PV = "0.1.0+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -SRC_URI = "${E_CVS};module=e17/proto/${SRCNAME} \ - file://fix-plugin-path-check.patch;HACK=1;patch=1" - -# add ewl additions -FILES_${PN}-dev += "${libdir}/ewl/tests/*.a ${libdir}/ewl/tests/*.la" -FILES_${PN}-dbg += "${libdir}/ewl/tests/.debug" - -# add epsilon additions -FILES_${PN}-dev += "${libdir}/epsilon/plugins/epdf_thumbnailer.a ${libdir}/epsilon/plugins/epdf_thumbnailer.la" -FILES_${PN}-dbg += "${libdir}/epsilon/plugins/.debug" - -PACKAGES += "${PN}-ewl-widget epsilon-plugin-${PN}" -FILES_${PN}-ewl-widget = "${libdir}/ewl/tests/libewl_pdf*.so*" -FILES_epsilon-plugin-${PN} = "${libdir}/epsilon/plugins/epdf_thumbnailer.so*" - diff --git a/packages/efl1/epeg_cvs.bb b/packages/efl1/epeg_cvs.bb deleted file mode 100644 index 16d1c333a9..0000000000 --- a/packages/efl1/epeg_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Epeg is a small library for handling thumbnails." -LICENSE = "MIT" -DEPENDS = "jpeg" -PV = "0.9.0+cvs${SRCDATE}" -PR = "r0" - -inherit efl diff --git a/packages/efl1/epsilon_cvs.bb b/packages/efl1/epsilon_cvs.bb deleted file mode 100644 index b8b3033b99..0000000000 --- a/packages/efl1/epsilon_cvs.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \ -that is compliant with the freedesktop.org Thumbnail Managing Standard." -LICENSE = "MIT BSD" -# can also depend on xine for movie thumbnails -DEPENDS = "libpng evas ecore edje perl-native" -PV = "0.3.0.012+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -# a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well -EXTRA_OECONF = "--disable-xine" - -FILES_${PN}-dev += "${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la" -FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug/*.so" diff --git a/packages/efl1/esmart_cvs.bb b/packages/efl1/esmart_cvs.bb deleted file mode 100644 index 5a363655c3..0000000000 --- a/packages/efl1/esmart_cvs.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "ESmart is a collection of smart Evas objects" -LICENSE = "MIT BSD" -DEPENDS = "evas ecore edje imlib2 epsilon libtool" -PV = "0.9.0.043+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" - -PACKAGES =+ "${PN}-textentry \ - ${PN}-thumb \ - ${PN}-container \ - ${PN}-container-plugins \ - ${PN}-file-dialog \ - ${PN}-draggies \ - ${PN}-trans-x11" - -FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/" -FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*" -FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*" -FILES_${PN}-container = "${libdir}/libesmart_container*" -DEPENDS_${PN}-container += "${PN}-container-plugins" -FILES_${PN}-container-plugins = "${libdir}/esmart/layout/*.so" -FILES_${PN}-file-dialog = "${libdir}/libesmart_file_dialog*.so*" -FILES_${PN}-draggies = "${libdir}/libesmart_draggies*.so*" -FILES_${PN}-trans-x11 = "${libdir}/libesmart_trans_x11*.so*" diff --git a/packages/efl1/etk-native_cvs.bb b/packages/efl1/etk-native_cvs.bb deleted file mode 100644 index eedb832141..0000000000 --- a/packages/efl1/etk-native_cvs.bb +++ /dev/null @@ -1,5 +0,0 @@ -require etk_cvs.bb -inherit native -DEPENDS = "evas-native ecore-native edje-native" - -SRC_URI += "file://no-tests.patch;patch=1" diff --git a/packages/efl1/etk_cvs.bb b/packages/efl1/etk_cvs.bb deleted file mode 100644 index 1f374e4f52..0000000000 --- a/packages/efl1/etk_cvs.bb +++ /dev/null @@ -1,33 +0,0 @@ -DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." -DEPENDS = "evas ecore edje" -LICENSE = "MIT" -PV = "0.1.0.042+cvs${SRCDATE}" -PR = "r1" - -inherit efl - -RRECOMMENDS_${PN} = "\ - etk-engines-software-x11 \ - etk-engines-evas \ - etk-engines-fb \ - etk-engines-x11 \ - etk-engines-software-x11-16 \ -" - -PACKAGES += "etk-engines-software-x11" -FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so" - -PACKAGES =+ "etk-engines-gl-x11" -FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so" - -PACKAGES =+ "etk-engines-evas" -FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so" - -PACKAGES =+ "etk-engines-fb" -FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so" - -PACKAGES =+ "etk-engines-x11" -FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so" - -PACKAGES =+ "etk-engines-software-x11-16" -FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so" diff --git a/packages/efl1/evas-native_cvs.bb b/packages/efl1/evas-native_cvs.bb deleted file mode 100644 index b2a235262d..0000000000 --- a/packages/efl1/evas-native_cvs.bb +++ /dev/null @@ -1,116 +0,0 @@ -require evas.inc -inherit native -DEPENDS = "freetype-native libpng-native jpeg-native eet-native" -PR = "r0" - -EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-fb \ - --disable-directfb \ - --disable-sdl \ - --enable-buffer \ - --disable-software-ddraw \ - --disable-software-qtopia \ - --disable-software-x11 \ - --disable-software-16-x11 \ - --disable-software-xcb \ - --disable-gl-x11 \ - --disable-xrender-x11 \ - --disable-xrender-xcb \ - --disable-glitz-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --disable-image-loader-gif \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-image-loader-tiff \ - --enable-image-loader-xpm \ - --disable-image-loader-svg \ - --enable-cpu-c \ - --enable-fontconfig \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --enable-small-dither-mask \ - --disable-no-dither-mask \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --disable-convert-16-rgb-rot-90 \ - --enable-convert-16-rgb-rot-270 \ - --disable-convert-24-rgb-888 \ - --disable-convert-24-bgr-888 \ - --disable-convert-32-rgb-8888 \ - --disable-convert-32-rgbx-8888 \ - --disable-convert-32-bgr-8888 \ - --disable-convert-32-bgrx-8888 \ - --disable-convert-32-rgb-rot-0 \ - --disable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-270" - - -# evas needs a different oe_libinstall, so copy/paste autotools_stage_all -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install - autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} - if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then - autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} - autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} - autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} - autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} - fi - if [ -d ${STAGE_TEMP}/${libdir} ] - then - olddir=`pwd` - cd ${STAGE_TEMP}/${libdir} - las=$(find . -name \*.la -type f) - cd $olddir - echo "Found la files: $las" - if [ -n "$las" ]; then - # If there are .la files then libtool was used in the - # build, so install them with magic mangling. - for i in $las - do - dir=$(dirname $i) - echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" - oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} - done - else - # Otherwise libtool wasn't used, and lib/ can be copied - # directly. - echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" - cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} - fi - - fi - # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files, - # however some packages rely on the presence of .pc files to enable/disable - # their configurataions in which case we better should not install everything - # unconditionally, but rather depend on the actual results of make install. - # The good news though: a) there are not many packages doing this and - # b) packaged staging will fix that anyways. :M: - if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] - then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ - fi - rm -rf ${STAGE_TEMP}/${mandir} || true - rm -rf ${STAGE_TEMP}/${infodir} || true - autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR} - rm -rf ${STAGE_TEMP} - -} diff --git a/packages/efl1/evas.inc b/packages/efl1/evas.inc index 10dd8ad529..243dc55439 100644 --- a/packages/efl1/evas.inc +++ b/packages/efl1/evas.inc @@ -1,8 +1,8 @@ DESCRIPTION = "Evas is the Enlightenment canvas API" LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb -DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender" -PV = "0.9.9.043+cvs${SRCDATE}" +DEPENDS = "eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig" +PV = "0.9.9.043+svnr${SRCREV}" inherit efl @@ -21,7 +21,7 @@ python populate_packages_prepend () { } do_install_append() { - find "${D}" -name .debug -type d | xargs -iBLAH rm -rf "BLAH" + find "${D}" -name .debug -type d -exec rm -rf {} \; } FILES_${PN}-dev += "${libdir}/evas/modules/*/*/*/*.a ${libdir}/evas/modules/*/*/*/*.la" diff --git a/packages/efl1/evas_cvs.bb b/packages/efl1/evas_cvs.bb deleted file mode 100644 index ebe604ec2b..0000000000 --- a/packages/efl1/evas_cvs.bb +++ /dev/null @@ -1,62 +0,0 @@ -require evas.inc -PR = "r0" - -EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-fb \ - --disable-directfb \ - --disable-sdl \ - --enable-buffer \ - --disable-software-ddraw \ - --disable-software-qtopia \ - --enable-simple-x11 \ - --enable-software-x11 \ - --enable-software-16-x11 \ - --disable-software-xcb \ - --disable-gl-x11 \ - --enable-xrender-x11 \ - --disable-xrender-xcb \ - --disable-glitz-x11 \ - --enable-image-loader-eet \ - --disable-image-loader-edb \ - --disable-image-loader-gif \ - --enable-image-loader-png \ - --enable-image-loader-jpeg \ - --enable-image-loader-tiff \ - --enable-image-loader-xpm \ - --enable-image-loader-svg \ - --enable-cpu-c \ - --enable-fontconfig \ - --enable-font-loader-eet \ - --enable-scale-sample \ - --enable-scale-smooth \ - --enable-convert-yuv \ - --enable-small-dither-mask \ - --disable-no-dither-mask \ - --disable-convert-8-rgb-332 \ - --disable-convert-8-rgb-666 \ - --disable-convert-8-rgb-232 \ - --disable-convert-8-rgb-222 \ - --disable-convert-8-rgb-221 \ - --disable-convert-8-rgb-121 \ - --disable-convert-8-rgb-111 \ - --enable-convert-16-rgb-565 \ - --disable-convert-16-rgb-555 \ - --disable-convert-16-rgb-444 \ - --disable-convert-16-rgb-ipq \ - --enable-convert-16-rgb-rot-0 \ - --enable-convert-16-rgb-rot-90 \ - --disable-convert-16-rgb-rot-180 \ - --enable-convert-16-rgb-rot-270 \ - --enable-convert-24-rgb-888 \ - --enable-convert-24-bgr-888 \ - --enable-convert-32-rgb-8888 \ - --enable-convert-32-rgbx-8888 \ - --enable-convert-32-bgr-8888 \ - --enable-convert-32-bgrx-8888 \ - --enable-convert-32-rgb-rot-0 \ - --enable-convert-32-rgb-rot-90 \ - --disable-convert-32-rgb-rot-180 \ - --enable-convert-32-rgb-rot-270" - diff --git a/packages/efl1/evolve-native_cvs.bb b/packages/efl1/evolve-native_cvs.bb deleted file mode 100644 index 8478b6b0d8..0000000000 --- a/packages/efl1/evolve-native_cvs.bb +++ /dev/null @@ -1,6 +0,0 @@ -require evolve_cvs.bb -inherit native -DEPENDS = "etk-native" - -# needs ecore-x :/ -BROKEN = "1" diff --git a/packages/efl1/evolve_cvs.bb b/packages/efl1/evolve_cvs.bb deleted file mode 100644 index 3a0cf28d4a..0000000000 --- a/packages/efl1/evolve_cvs.bb +++ /dev/null @@ -1,7 +0,0 @@ -DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language" -LICENSE = "MIT" -DEPENDS = "etk evolve-native" -PV = "0.0.0+cvs${SRCDATE}" -PR = "r0" - -inherit efl diff --git a/packages/efl1/ewl_cvs.bb b/packages/efl1/ewl_cvs.bb deleted file mode 100644 index eb00215891..0000000000 --- a/packages/efl1/ewl_cvs.bb +++ /dev/null @@ -1,32 +0,0 @@ -DESCRIPTION = "The Enlightened Widget Library" -DEPENDS = "evas ecore edje emotion efreet epsilon" -LICENSE = "MIT BSD" -PV = "0.5.2.042+cvs${SRCDATE}" -PR = "r0" - -inherit efl - -EXTRA_OECONF = "\ - --enable-software-x11 \ - --enable-software-16-x11 \ - --enable-xrender-x11 \ - --disable-opengl-x11 \ - --disable-software-xcb \ - --disable-software-sdl \ - --enable-framebuffer \ - --enable-software-buffer \ - --disable-opengl-glew \ -" - -# TODO package engines more granular -PACKAGES += "${PN}-plugins ${PN}-engines" - -FILES_${PN} += "${sysconfdir}/ewl/*" -FILES_${PN}-tests += "${libdir}/ewl/tests/*.so*" -FILES_${PN}-dev += "${libdir}/ewl/*/*.a ${libdir}/ewl/*/*.la" -FILES_${PN}-dbg += "${libdir}/ewl/*/.debug" - -FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*" -FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*" - -RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes" diff --git a/packages/efl1/exml_cvs.bb b/packages/efl1/exml_cvs.bb deleted file mode 100644 index 5a017569b7..0000000000 --- a/packages/efl1/exml_cvs.bb +++ /dev/null @@ -1,8 +0,0 @@ -DESCRIPTION = "Exml is a generic XML parser wrapper." -LICENSE = "MIT" -DEPENDS = "libxml2 libxslt ecore" -PV = "0.1.1+cvs${SRCDATE}" -PR = "r0" - -inherit efl - diff --git a/packages/efl1/imlib2_cvs.bb b/packages/efl1/imlib2_cvs.bb deleted file mode 100644 index 6fd9b4ce36..0000000000 --- a/packages/efl1/imlib2_cvs.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." -LICENSE = "BSD" -# can also depend on tiff34, ungif or gif, z, bz2, id3tag -DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" -PROVIDES = "virtual/imlib2" -PV = "1.4.1.000+cvs${SRCDATE}" -PR = "r2" - -inherit efl - -# The original patch was out of date in 20080420 -SRC_URI += "file://remove-local-includes.patch;patch=1;maxdate=20080420 \ - file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 " - -EXTRA_OECONF = "--with-x" - -# TODO: Use more fine granular version -#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" -OE_LT_RPATH_ALLOW = "any" -OE_LT_RPATH_ALLOW[export]="1" - -PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/" -FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_${PN}-bin = "${bindir}" -FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/python/python-ecore_cvs.bb b/packages/python/python-ecore_cvs.bb deleted file mode 100644 index 663551f3a4..0000000000 --- a/packages/python/python-ecore_cvs.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-efl.inc -DEPENDS += "python-evas ecore" -RDEPENDS += "python-evas" -PV = "0.2.1+cvs${SRCDATE}" -PR = "r1" - -do_stage() { - distutils_stage_all -} diff --git a/packages/python/python-edbus_cvs.bb b/packages/python/python-edbus_cvs.bb deleted file mode 100644 index 75bdc7ff80..0000000000 --- a/packages/python/python-edbus_cvs.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-efl.inc -DEPENDS += "edbus python-dbus" -RDEPENDS += "python-dbus" -PV = "0.1.1+cvs${SRCDATE}" -PR = "r1" - -SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus" -S = "${WORKDIR}/python-e_dbus" - diff --git a/packages/python/python-edje_cvs.bb b/packages/python/python-edje_cvs.bb deleted file mode 100644 index a0665e8b09..0000000000 --- a/packages/python/python-edje_cvs.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-efl.inc - -DEPENDS += "edje python-evas" -RDEPENDS += "python-evas" - -SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1" - -PV = "0.2.1+cvs${SRCDATE}" -PR = "r3" diff --git a/packages/python/python-efl.inc b/packages/python/python-efl.inc index 0147813115..130aee4a84 100644 --- a/packages/python/python-efl.inc +++ b/packages/python/python-efl.inc @@ -9,7 +9,7 @@ RDEPENDS += "python-lang" inherit setuptools -SRC_URI = "${E_CVS};module=e17/proto/python-efl/${PN}" +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=${PN};proto=http" S = "${WORKDIR}/${PN}" do_install_append() { diff --git a/packages/python/python-emotion_cvs.bb b/packages/python/python-emotion_cvs.bb deleted file mode 100644 index cc79ad51e6..0000000000 --- a/packages/python/python-emotion_cvs.bb +++ /dev/null @@ -1,4 +0,0 @@ -require python-efl.inc -DEPENDS += "emotion python-evas" -PV = "0.2.1+cvs${SRCDATE}" -PR = "r0" diff --git a/packages/python/python-epsilon_cvs.bb b/packages/python/python-epsilon_cvs.bb deleted file mode 100644 index 55ba0c1346..0000000000 --- a/packages/python/python-epsilon_cvs.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-efl.inc -DEPENDS += "epsilon python-ecore" -RDEPENDS += "python-ecore" -PV = "0.2.1+cvs${SRCDATE}" -PR = "r1" diff --git a/packages/python/python-evas_cvs.bb b/packages/python/python-evas_cvs.bb deleted file mode 100644 index 92f4466a24..0000000000 --- a/packages/python/python-evas_cvs.bb +++ /dev/null @@ -1,8 +0,0 @@ -require python-efl.inc -DEPENDS += "evas" -PV = "0.2.1+cvs${SRCDATE}" -PR = "r0" - -do_stage() { - distutils_stage_all -} -- cgit v1.2.3 From 075e8137a4a631f6e462ebf9c0f285fdc41b6892 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 24 Aug 2008 22:06:56 +0000 Subject: Enlightenment update: commit missing files (thanks Koen) --- packages/e17/e-utils_svn.bb | 12 ++++ packages/e17/e-wm_svn.bb | 70 ++++++++++++++++++++ packages/e17/edje-editor_svn.bb | 12 ++++ packages/e17/edje-viewer_svn.bb | 13 ++++ packages/e17/enna_svn.bb | 16 +++++ packages/e17/examine_svn.bb | 13 ++++ packages/e17/exhibit_svn.bb | 9 +++ packages/e17/expedite_svn.bb | 31 +++++++++ packages/e17/exquisite_svn.bb | 11 ++++ packages/e17/illume_svn.bb | 54 ++++++++++++++++ packages/e17/rage_svn.bb | 12 ++++ packages/efl1/ecore-native_svn.bb | 32 ++++++++++ packages/efl1/ecore_svn.bb | 33 ++++++++++ packages/efl1/edb_svn.bb | 9 +++ packages/efl1/edbus_svn.bb | 19 ++++++ packages/efl1/edje-native_svn.bb | 11 ++++ packages/efl1/edje_svn.bb | 14 ++++ packages/efl1/eet-native_svn.bb | 6 ++ packages/efl1/eet_svn.bb | 7 ++ packages/efl1/eflpp_svn.bb | 13 ++++ packages/efl1/efreet_svn.bb | 11 ++++ packages/efl1/embryo-native_svn.bb | 3 + packages/efl1/embryo_svn.bb | 9 +++ packages/efl1/emotion_svn.bb | 14 ++++ packages/efl1/engrave_svn.bb | 7 ++ packages/efl1/enhance_svn.bb | 6 ++ packages/efl1/epdf_svn.bb | 24 +++++++ packages/efl1/epeg_svn.bb | 9 +++ packages/efl1/epsilon_svn.bb | 15 +++++ packages/efl1/esmart_svn.bb | 27 ++++++++ packages/efl1/etk-native_svn.bb | 5 ++ packages/efl1/etk_svn.bb | 33 ++++++++++ packages/efl1/evas-native_svn.bb | 116 ++++++++++++++++++++++++++++++++++ packages/efl1/evas_svn.bb | 62 ++++++++++++++++++ packages/efl1/evolve-native_svn.bb | 6 ++ packages/efl1/evolve_svn.bb | 7 ++ packages/efl1/ewl_svn.bb | 32 ++++++++++ packages/efl1/exml_svn.bb | 8 +++ packages/efl1/imlib2_svn.bb | 28 ++++++++ packages/python/python-ecore_svn.bb | 9 +++ packages/python/python-edbus_svn.bb | 9 +++ packages/python/python-edje_svn.bb | 9 +++ packages/python/python-emotion_svn.bb | 5 ++ packages/python/python-epsilon_svn.bb | 5 ++ packages/python/python-evas_svn.bb | 8 +++ 45 files changed, 864 insertions(+) create mode 100644 packages/e17/e-utils_svn.bb create mode 100644 packages/e17/e-wm_svn.bb create mode 100644 packages/e17/edje-editor_svn.bb create mode 100644 packages/e17/edje-viewer_svn.bb create mode 100644 packages/e17/enna_svn.bb create mode 100644 packages/e17/examine_svn.bb create mode 100644 packages/e17/exhibit_svn.bb create mode 100644 packages/e17/expedite_svn.bb create mode 100644 packages/e17/exquisite_svn.bb create mode 100644 packages/e17/illume_svn.bb create mode 100644 packages/e17/rage_svn.bb create mode 100644 packages/efl1/ecore-native_svn.bb create mode 100644 packages/efl1/ecore_svn.bb create mode 100644 packages/efl1/edb_svn.bb create mode 100644 packages/efl1/edbus_svn.bb create mode 100644 packages/efl1/edje-native_svn.bb create mode 100644 packages/efl1/edje_svn.bb create mode 100644 packages/efl1/eet-native_svn.bb create mode 100644 packages/efl1/eet_svn.bb create mode 100644 packages/efl1/eflpp_svn.bb create mode 100644 packages/efl1/efreet_svn.bb create mode 100644 packages/efl1/embryo-native_svn.bb create mode 100644 packages/efl1/embryo_svn.bb create mode 100644 packages/efl1/emotion_svn.bb create mode 100644 packages/efl1/engrave_svn.bb create mode 100644 packages/efl1/enhance_svn.bb create mode 100644 packages/efl1/epdf_svn.bb create mode 100644 packages/efl1/epeg_svn.bb create mode 100644 packages/efl1/epsilon_svn.bb create mode 100644 packages/efl1/esmart_svn.bb create mode 100644 packages/efl1/etk-native_svn.bb create mode 100644 packages/efl1/etk_svn.bb create mode 100644 packages/efl1/evas-native_svn.bb create mode 100644 packages/efl1/evas_svn.bb create mode 100644 packages/efl1/evolve-native_svn.bb create mode 100644 packages/efl1/evolve_svn.bb create mode 100644 packages/efl1/ewl_svn.bb create mode 100644 packages/efl1/exml_svn.bb create mode 100644 packages/efl1/imlib2_svn.bb create mode 100644 packages/python/python-ecore_svn.bb create mode 100644 packages/python/python-edbus_svn.bb create mode 100644 packages/python/python-edje_svn.bb create mode 100644 packages/python/python-emotion_svn.bb create mode 100644 packages/python/python-epsilon_svn.bb create mode 100644 packages/python/python-evas_svn.bb diff --git a/packages/e17/e-utils_svn.bb b/packages/e17/e-utils_svn.bb new file mode 100644 index 0000000000..f90a118cdf --- /dev/null +++ b/packages/e17/e-utils_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Enlightenment Window Manager Utilities" +DEPENDS = "eet evas ecore edje esmart ewl engrave" +LICENSE = "MIT BSD" +PV = "0.0.0+svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=e_utils;proto=http" +S = "${WORKDIR}/e_utils" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}" diff --git a/packages/e17/e-wm_svn.bb b/packages/e17/e-wm_svn.bb new file mode 100644 index 0000000000..7c3e950569 --- /dev/null +++ b/packages/e17/e-wm_svn.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "The Enlightenment Window Mananger Version 17" +DEPENDS = "eet evas ecore edje efreet edbus" +LICENSE = "MIT BSD" +PV = "0.16.999.043+svnr${SRCREV}" +PR = "r11" + +inherit e update-alternatives + +SRC_URI = "\ + svn://svn.enlightenment.org/svn/e/trunk;module=e;proto=http \ + file://disable-e-cursor.patch;patch=1 \ + file://enlightenment_start.oe \ + file://applications.menu \ +" +S = "${WORKDIR}/e" + +EXTRA_OECONF = "\ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ +" + +do_configure_prepend() { + autopoint +} + +do_stage() { + autotools_stage_all + for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.la" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR}/enlightenment -name "*.a" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.la" -print`; do rm -f $I; done + for I in `find ${STAGING_LIBDIR_CROSS}/enlightenment -name "*.a" -print`; do rm -f $I; done +} + +do_install_append() { + # customising - should rather make this simple upstream + rm -rf ${D}${datadir}/enlightenment/data/backgrounds/* + rm -rf ${D}${datadir}/enlightenment/data/fonts/* + rm -rf ${D}${datadir}/enlightenment/data/other/* + install -m 755 ${WORKDIR}/enlightenment_start.oe ${D}/${bindir} + install -d ${D}/${sysconfdir}/xdg/menus + install -m 644 ${WORKDIR}/applications.menu ${D}/${sysconfdir}/xdg/menus/ +} + +RDEPENDS += "shared-mime-info mime-support" + +FILES_${PN} = "\ + ${bindir}/* \ + ${libdir}/enlightenment/modules/*/*.* \ + ${libdir}/enlightenment/modules/*/*/* \ + ${libdir}/enlightenment/preload/*.so \ + ${datadir} \ + ${sysconfdir} \ +" +FILES_${PN}-dbg += "\ + ${libdir}/enlightenment/modules/*/*/.debug/ \ + ${libdir}/enlightenment/preload/.debug/ \ +" + +FILES_${PN}-dev += "\ + ${libdir}/enlightenment/preload/*.?a \ +" + +CONFFILES_${PN} = "/etc/xdg/menus/applications.menu" + +ALTERNATIVE_PATH = "${bindir}/enlightenment_start.oe" +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PRIORITY = "16" diff --git a/packages/e17/edje-editor_svn.bb b/packages/e17/edje-editor_svn.bb new file mode 100644 index 0000000000..4cbbf19e9e --- /dev/null +++ b/packages/e17/edje-editor_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Edje-Editor is just that." +LICENSE = "MIT BSD" +DEPENDS = "etk" +PV = "0.0.0+svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_editor;proto=http" +S = "${WORKDIR}/edje_editor" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/edje-viewer_svn.bb b/packages/e17/edje-viewer_svn.bb new file mode 100644 index 0000000000..c9bbba783f --- /dev/null +++ b/packages/e17/edje-viewer_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Edje_Viewer is just that." +DEPENDS = "etk" +LICENSE = "MIT BSD" +PV = "0.0.0+svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=edje_viewer;proto=http \ + file://no-minimal-size.patch;patch=1" +S = "${WORKDIR}/edje_viewer" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/enna_svn.bb b/packages/e17/enna_svn.bb new file mode 100644 index 0000000000..6bfabbdee5 --- /dev/null +++ b/packages/e17/enna_svn.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Enna is a media center application based on EFL" +LICENSE = "GPL" +DEPENDS = "curl dbus eet evas edje ecore edbus emotion" +DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib" +SECTION = "x11/multimedia" +PV = "0.2.0+svnr${SRCREV}" +PR = "r1" + +inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/MISC;module=enna;proto=http" +S = "${WORKDIR}/enna" + +do_configure_prepend() { + autopoint +} diff --git a/packages/e17/examine_svn.bb b/packages/e17/examine_svn.bb new file mode 100644 index 0000000000..223d29ca25 --- /dev/null +++ b/packages/e17/examine_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Examine, the program configurator" +LICENSE = "MIT BSD" +DEPENDS = "ewl" +PV = "0.0.1+svnr${SRCREV}" +PR = "r1" + +SRCNAME = "examine" + +inherit e + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + +FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir} ${sysconfdir} ${sbindir}" diff --git a/packages/e17/exhibit_svn.bb b/packages/e17/exhibit_svn.bb new file mode 100644 index 0000000000..6ec34d6ff9 --- /dev/null +++ b/packages/e17/exhibit_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Exhibit is the ETK picture viewer" +LICENSE = "MIT BSD" +DEPENDS = "evas ecore epsilon edje eet etk efreet" +PV = "0.1.1+svnr${SRCREV}" +PR = "r1" + +SRCNAME = "exhibit" + +inherit e diff --git a/packages/e17/expedite_svn.bb b/packages/e17/expedite_svn.bb new file mode 100644 index 0000000000..2f3ef20e16 --- /dev/null +++ b/packages/e17/expedite_svn.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" +DEPENDS = "eet evas" +RDEPENDS = "libevas-engine-buffer libevas-engine-fb libevas-engine-software-generic libevas-engine-software-x11 libevas-loader-png" +LICENSE = "MIT BSD" +PV = "0.6.0+svnr${SRCREV}" +PR = "r1" + +inherit autotools + +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ +\ + --disable-opengl-glew \ + --disable-opengl-x11 \ + --enable-software-x11 \ + --enable-xrender-x11 \ + --enable-software-16-x11 \ + --enable-fb \ + --disable-software-ddraw \ + --disable-software-16-ddraw \ + --disable-direct3d \ + --disable-software-sdl \ +" + +do_configure_append() { + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g +} + +FILES_${PN} += "${datadir}" diff --git a/packages/e17/exquisite_svn.bb b/packages/e17/exquisite_svn.bb new file mode 100644 index 0000000000..4c0a5678c8 --- /dev/null +++ b/packages/e17/exquisite_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "A psplash replacement for display" +LICENSE = "MIT BSD" +DEPENDS = "eet evas ecore embryo edje" +PV = "0.0.1+svnr${SRCREV}" +PR = "r1" + +SRCNAME = "exquisite" + +inherit e + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" diff --git a/packages/e17/illume_svn.bb b/packages/e17/illume_svn.bb new file mode 100644 index 0000000000..c2ff6b889c --- /dev/null +++ b/packages/e17/illume_svn.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Illume - A mobile UI module for the Enlightenment Window Manager" +AUTHOR = "Rasterman" +LICENSE = "MIT/BSD" +DEPENDS = "e-wm eet evas ecore edje embryo efreet edbus edje-native embryo-native eet-native" +PV = "0.0+svnr${SRCREV}" +PR = "r13" + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=illume;proto=http" +S = "${WORKDIR}/${PN}" + +inherit autotools pkgconfig + +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ +" + +RRECOMMENDS_${PN} = "\ + wamerican \ + ${PN}-config \ + ${PN}-theme \ + ${PN}-dicts-english-us \ + ${PN}-keyboards-default \ + ${PN}-keyboards-numbers \ + ${PN}-keyboards-terminal \ +" + +PACKAGES =+ "\ + ${PN}-config \ + ${PN}-dicts-english-us \ + ${PN}-keyboards-default \ + ${PN}-keyboards-numbers \ + ${PN}-keyboards-terminal \ +" +PACKAGE_ARCH_${PN}-config = "all" +PACKAGE_ARCH_${PN}-dicts-english-us = "all" +PACKAGE_ARCH_${PN}-keyboards-default = "all" +PACKAGE_ARCH_${PN}-keyboards-numbers = "all" + +FILES_${PN}-config = "${datadir}/enlightenment/data/config/*/* ${datadir}/illume" +FILES_${PN}-dicts-english-us = "${libdir}/enlightenment/modules/illume/dicts/English_*.dic" +FILES_${PN}-keyboards-default = "${libdir}/enlightenment/modules/illume/keyboards/Default.kbd" +FILES_${PN}-keyboards-numbers = "${libdir}/enlightenment/modules/illume/keyboards/Numbers.kbd" +FILES_${PN}-keyboards-terminal = "${libdir}/enlightenment/modules/illume/keyboards/Terminal.kbd" + +FILES_${PN} = "\ + ${libdir}/enlightenment/modules/*/*.edj \ + ${libdir}/enlightenment/modules/*/*.desktop \ + ${libdir}/enlightenment/modules/*/*/* \ +" +FILES_${PN}-dbg += "${libdir}/enlightenment/modules/*/*/.debug/" diff --git a/packages/e17/rage_svn.bb b/packages/e17/rage_svn.bb new file mode 100644 index 0000000000..d351ffd2a4 --- /dev/null +++ b/packages/e17/rage_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Rage is a media center application based on EFL" +AUTHOR = "Carsten 'The Rasterman' Heitzler" +HOMEPAGE = "http://www.rasterman.com" +LICENSE = "MIT BSD" +DEPENDS = "evas ecore edje" +SECTION = "x11/multimedia" +PV = "0.3.0.042+svnr${SRCREV}" + +inherit autotools + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=rage;proto=http" +S = "${WORKDIR}/rage" diff --git a/packages/efl1/ecore-native_svn.bb b/packages/efl1/ecore-native_svn.bb new file mode 100644 index 0000000000..f84c6581d0 --- /dev/null +++ b/packages/efl1/ecore-native_svn.bb @@ -0,0 +1,32 @@ +require ecore.inc +inherit native +DEPENDS = "eet-native evas-native" +PR = "r1" + +EXTRA_OECONF = "\ + --enable-ecore-txt \ + --disable-ecore-config \ + --disable-ecore-x-xcb \ + --disable-ecore-x \ + --enable-ecore-job \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ + --enable-ecore-fb \ + --enable-ecore-evas \ + --enable-ecore-evas-fb \ + --disable-ecore-evas-x11-gl \ + --disable-ecore-evas-xrender \ + --disable-ecore-evas-dfb \ + --disable-ecore-evas-sdl \ + --disable-openssl \ + --enable-abstract-sockets \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-file \ + --enable-inotify \ + --disable-poll \ + --disable-curl \ + --disable-ecore-desktop \ + --disable-ecore-imf \ + --disable-ecore-imf_evas \ +" diff --git a/packages/efl1/ecore_svn.bb b/packages/efl1/ecore_svn.bb new file mode 100644 index 0000000000..6e581cda5d --- /dev/null +++ b/packages/efl1/ecore_svn.bb @@ -0,0 +1,33 @@ +require ecore.inc +PR = "r2" + +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ +\ + --enable-ecore-txt \ + --enable-ecore-config \ + --disable-ecore-x-xcb \ + --enable-ecore-x \ + --enable-ecore-job \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ + --enable-ecore-fb \ + --enable-ecore-evas \ + --enable-ecore-evas-x11-16 \ + --enable-ecore-evas-16-x11 \ + --disable-ecore-evas-x11-gl \ + --enable-ecore-evas-xrender \ + --disable-ecore-evas-dfb \ + --disable-ecore-evas-sdl \ + --disable-openssl \ + --enable-abstract-sockets \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-file \ + --enable-inotify \ + --disable-poll \ + --enable-curl \ + --disable-ecore-desktop \ +" diff --git a/packages/efl1/edb_svn.bb b/packages/efl1/edb_svn.bb new file mode 100644 index 0000000000..3c4cc9d0c2 --- /dev/null +++ b/packages/efl1/edb_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Edb is the Enlightenment database library" +LICENSE = "MIT BSD" +DEPENDS = "zlib" +PV = "1.0.5.043+svnr${SRCREV}" +PR = "r1" + +inherit efl + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=edb;proto=http" diff --git a/packages/efl1/edbus_svn.bb b/packages/efl1/edbus_svn.bb new file mode 100644 index 0000000000..d200054a39 --- /dev/null +++ b/packages/efl1/edbus_svn.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "DBus and HAL convenience wrappers for EFL" +DEPENDS = "dbus ecore" +LICENSE = "MIT BSD" +PV = "0.5.0.043+svnr${SRCREV}" +PR = "r2" + +inherit efl + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=e_dbus;proto=http" +S = "${WORKDIR}/e_dbus" + +EXTRA_OECONF = "--enable-build-test-gui" + +PACKAGES =+ "${PN}-enotify ${PN}-edbus ${PN}-enm ${PN}-ehal ${PN}-test-gui" +FILES_${PN}-enotify = "${libdir}/libenotify.so.*" +FILES_${PN}-edbus = "${libdir}/libedbus.so.*" +FILES_${PN}-enm = "${libdir}/libenm.so.*" +FILES_${PN}-ehal = "${libdir}/libehal.so.*" +FILES_${PN}-test-gui = "${bindir}/e_dbus_hal" diff --git a/packages/efl1/edje-native_svn.bb b/packages/efl1/edje-native_svn.bb new file mode 100644 index 0000000000..238bfd00dc --- /dev/null +++ b/packages/efl1/edje-native_svn.bb @@ -0,0 +1,11 @@ +require edje_${PV}.bb +inherit native +PR = "r1" + +DEPENDS = "evas-native ecore-native eet-native embryo-native" + +do_configure_prepend() { + sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c + sed -i 's:cpp -I:/usr/bin/cpp -I:' ${S}/src/bin/edje_cc_parse.c + sed -i 's:gcc -I:/usr/bin/gcc -I:' ${S}/src/bin/edje_cc_parse.c +} diff --git a/packages/efl1/edje_svn.bb b/packages/efl1/edje_svn.bb new file mode 100644 index 0000000000..11da120bd2 --- /dev/null +++ b/packages/efl1/edje_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" +DEPENDS = "eet evas ecore embryo edje-native" +LICENSE = "MIT BSD" +PV = "0.5.0.043+svnr${SRCREV}" +PR = "r1" + +inherit efl + +PACKAGES =+ "${PN}-utils" +DEBIAN_NOAUTONAME_${PN}-utils = "1" +FILES_${PN}-utils = "\ + ${bindir}/edje_* \ + ${datadir}/edje/include/edje.inc \ +" diff --git a/packages/efl1/eet-native_svn.bb b/packages/efl1/eet-native_svn.bb new file mode 100644 index 0000000000..0b0b5a4862 --- /dev/null +++ b/packages/efl1/eet-native_svn.bb @@ -0,0 +1,6 @@ +require eet_svn.bb +inherit native +DEPENDS = "zlib-native jpeg-native" +# we no longer inherit pkgconfig, so we need to state this explicitly +# (see explanation in efl.bbclass and autotools.bbclass) +DEPENDS += "pkgconfig-native" diff --git a/packages/efl1/eet_svn.bb b/packages/efl1/eet_svn.bb new file mode 100644 index 0000000000..2fa24cc0bd --- /dev/null +++ b/packages/efl1/eet_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "EET is the Enlightenment data storage library" +DEPENDS = "zlib jpeg" +LICENSE = "MIT BSD" +PV = "1.0.1+svnr${SRCREV}" +PR = "r1" + +inherit efl diff --git a/packages/efl1/eflpp_svn.bb b/packages/efl1/eflpp_svn.bb new file mode 100644 index 0000000000..ff12d72001 --- /dev/null +++ b/packages/efl1/eflpp_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "EFLpp are C++ bindings to the EFL" +AUTHOR = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/" +LICENSE = "LGPL" +DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0" +PV = "0.1.0+svnr${SRCREV}" + +inherit efl + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=cxx;proto=http" +S = "${WORKDIR}/cxx" diff --git a/packages/efl1/efreet_svn.bb b/packages/efl1/efreet_svn.bb new file mode 100644 index 0000000000..a802912730 --- /dev/null +++ b/packages/efl1/efreet_svn.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "The Enlightenment freedesktop.org library" +DEPENDS = "ecore" +LICENSE = "MIT BSD" +PV = "0.5.0.043+svnr${SRCREV}" +PR = "r1" + +inherit efl + +PACKAGES =+ "${PN}-mime ${PN}-trash" +FILES_${PN}-mime = "${libdir}/libefreet_mime.so.*" +FILES_${PN}-trash = "${libdir}/libefreet_trash.so.*" diff --git a/packages/efl1/embryo-native_svn.bb b/packages/efl1/embryo-native_svn.bb new file mode 100644 index 0000000000..2fc3faddfd --- /dev/null +++ b/packages/efl1/embryo-native_svn.bb @@ -0,0 +1,3 @@ +require embryo_${PV}.bb +inherit native + diff --git a/packages/efl1/embryo_svn.bb b/packages/efl1/embryo_svn.bb new file mode 100644 index 0000000000..42cb2f53a9 --- /dev/null +++ b/packages/efl1/embryo_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The Enlightenment C-like scripting language for Edje" +LICENSE = "MIT BSD" +PV = "0.9.9.043+svnr${SRCREV}" +PR = "r1" + +inherit efl + +# HACK alert: When compiling for VFP embryo emits bugs -- maybe gcc bug +#FULL_OPTIMIZATION_arm =+ "-O0" diff --git a/packages/efl1/emotion_svn.bb b/packages/efl1/emotion_svn.bb new file mode 100644 index 0000000000..e30239fc5d --- /dev/null +++ b/packages/efl1/emotion_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "The Enlightenment multimedia library" +LICENSE = "MIT BSD" +# we no longer build the libxine backend, since the gstreamer backend seems more promising +DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" +PV = "0.1.0+svnr${SRCREV}" +PR = "r2" + +inherit efl + +EXTRA_OECONF = "--disable-xine --enable-gstreamer" + +PACKAGES =+ "emotion-backend-gstreamer" +FILES_emotion-backend-gstreamer = "${libdir}/emotion/*.so" +RRECOMMENDS_${PN} = "emotion-backend-gstreamer" diff --git a/packages/efl1/engrave_svn.bb b/packages/efl1/engrave_svn.bb new file mode 100644 index 0000000000..cc90f5a48e --- /dev/null +++ b/packages/efl1/engrave_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Engrave is an Edje Editing Library" +LICENSE = "MIT" +# also requires yacc and lex on host +DEPENDS = "evas ecore" +PV = "0.0.0+svnr${SRCREV}" + +inherit efl diff --git a/packages/efl1/enhance_svn.bb b/packages/efl1/enhance_svn.bb new file mode 100644 index 0000000000..6bec1176d1 --- /dev/null +++ b/packages/efl1/enhance_svn.bb @@ -0,0 +1,6 @@ +DESCRIPTION = "Enhance translates between glade .xml files and ETK" +LICENSE = "MIT" +DEPENDS = "exml" +PV = "0.0.0+svnr${SRCREV}" + +inherit efl diff --git a/packages/efl1/epdf_svn.bb b/packages/efl1/epdf_svn.bb new file mode 100644 index 0000000000..eb4b91a8c2 --- /dev/null +++ b/packages/efl1/epdf_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Epdf is the glue between EFL and libpoppler" +LICENSE = "MIT BSD" +DEPENDS = "poppler evas ecore etk ewl" +PV = "0.1.0+svnr${SRCREV}" +PR = "r1" + +inherit efl + + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=epdf;proto=http \ + file://fix-plugin-path-check.patch;HACK=1;patch=1" + +# add ewl additions +FILES_${PN}-dev += "${libdir}/ewl/tests/*.a ${libdir}/ewl/tests/*.la" +FILES_${PN}-dbg += "${libdir}/ewl/tests/.debug" + +# add epsilon additions +FILES_${PN}-dev += "${libdir}/epsilon/plugins/epdf_thumbnailer.a ${libdir}/epsilon/plugins/epdf_thumbnailer.la" +FILES_${PN}-dbg += "${libdir}/epsilon/plugins/.debug" + +PACKAGES += "${PN}-ewl-widget epsilon-plugin-${PN}" +FILES_${PN}-ewl-widget = "${libdir}/ewl/tests/libewl_pdf*.so*" +FILES_epsilon-plugin-${PN} = "${libdir}/epsilon/plugins/epdf_thumbnailer.so*" + diff --git a/packages/efl1/epeg_svn.bb b/packages/efl1/epeg_svn.bb new file mode 100644 index 0000000000..61213fe599 --- /dev/null +++ b/packages/efl1/epeg_svn.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "Epeg is a small library for handling thumbnails." +LICENSE = "MIT" +DEPENDS = "jpeg" +PV = "0.9.0+svnr${SRCREV}" +PR = "r1" + +inherit efl + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD;module=epeg;proto=http" diff --git a/packages/efl1/epsilon_svn.bb b/packages/efl1/epsilon_svn.bb new file mode 100644 index 0000000000..055901b19d --- /dev/null +++ b/packages/efl1/epsilon_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Epsilon is a flexible and powerful image thumbnailing library \ +that is compliant with the freedesktop.org Thumbnail Managing Standard." +LICENSE = "MIT BSD" +# can also depend on xine for movie thumbnails +DEPENDS = "libpng evas ecore edje perl-native" +PV = "0.3.0.012+svnr${SRCREV}" +PR = "r1" + +inherit efl + +# a gstreamer thumbnailer would be nice now that we have emotion using gstreamer as well +EXTRA_OECONF = "--disable-xine" + +FILES_${PN}-dev += "${libdir}/${PN}/*/*.a ${libdir}/${PN}/*/*.la" +FILES_${PN}-dbg += "${libdir}/${PN}/plugins/.debug/*.so" diff --git a/packages/efl1/esmart_svn.bb b/packages/efl1/esmart_svn.bb new file mode 100644 index 0000000000..bb88310a5e --- /dev/null +++ b/packages/efl1/esmart_svn.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "ESmart is a collection of smart Evas objects" +LICENSE = "MIT BSD" +DEPENDS = "evas ecore edje imlib2 epsilon libtool" +PV = "0.9.0.043+svnr${SRCREV}" +PR = "r1" + +inherit efl + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + +PACKAGES =+ "${PN}-textentry \ + ${PN}-thumb \ + ${PN}-container \ + ${PN}-container-plugins \ + ${PN}-file-dialog \ + ${PN}-draggies \ + ${PN}-trans-x11" + +FILES_${PN}-dbg += "${libdir}/.debug/ ${libdir}/esmart/*/.debug/" +FILES_${PN}-textentry = "${libdir}/libesmart_text_entry*.so*" +FILES_${PN}-thumb = "${libdir}/libesmart_thumb*.so*" +FILES_${PN}-container = "${libdir}/libesmart_container*" +DEPENDS_${PN}-container += "${PN}-container-plugins" +FILES_${PN}-container-plugins = "${libdir}/esmart/layout/*.so" +FILES_${PN}-file-dialog = "${libdir}/libesmart_file_dialog*.so*" +FILES_${PN}-draggies = "${libdir}/libesmart_draggies*.so*" +FILES_${PN}-trans-x11 = "${libdir}/libesmart_trans_x11*.so*" diff --git a/packages/efl1/etk-native_svn.bb b/packages/efl1/etk-native_svn.bb new file mode 100644 index 0000000000..345802d25d --- /dev/null +++ b/packages/efl1/etk-native_svn.bb @@ -0,0 +1,5 @@ +require etk_svn.bb +inherit native +DEPENDS = "evas-native ecore-native edje-native" + +SRC_URI += "file://no-tests.patch;patch=1" diff --git a/packages/efl1/etk_svn.bb b/packages/efl1/etk_svn.bb new file mode 100644 index 0000000000..cf7520d6f0 --- /dev/null +++ b/packages/efl1/etk_svn.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." +DEPENDS = "evas ecore edje" +LICENSE = "MIT" +PV = "0.1.0.042+svnr${SRCREV}" +PR = "r2" + +inherit efl + +RRECOMMENDS_${PN} = "\ + etk-engines-software-x11 \ + etk-engines-evas \ + etk-engines-fb \ + etk-engines-x11 \ + etk-engines-software-x11-16 \ +" + +PACKAGES += "etk-engines-software-x11" +FILES_${PN}-engines-software-x11 = "${libdir}/etk/engines/ecore_evas_software_x11.so" + +PACKAGES =+ "etk-engines-gl-x11" +FILES_${PN}-engines-gl-x11 = "${libdir}/etk/engines/ecore_evas_gl_x11.so" + +PACKAGES =+ "etk-engines-evas" +FILES_${PN}-engines-evas = "${libdir}/etk/engines/ecore_evas.so" + +PACKAGES =+ "etk-engines-fb" +FILES_${PN}-engines-fb = "${libdir}/etk/engines/ecore_fb.so" + +PACKAGES =+ "etk-engines-x11" +FILES_${PN}-engines-x11 = "${libdir}/etk/engines/ecore_evas_x11.so" + +PACKAGES =+ "etk-engines-software-x11-16" +FILES_${PN}-engines-software-x11-16 = "${libdir}/etk/engines/ecore_evas_software_x11_16.so" diff --git a/packages/efl1/evas-native_svn.bb b/packages/efl1/evas-native_svn.bb new file mode 100644 index 0000000000..3ca8df9e41 --- /dev/null +++ b/packages/efl1/evas-native_svn.bb @@ -0,0 +1,116 @@ +require evas.inc +inherit native +DEPENDS = "freetype-native libpng-native jpeg-native eet-native" +PR = "r1" + +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-fb \ + --disable-directfb \ + --disable-sdl \ + --enable-buffer \ + --disable-software-ddraw \ + --disable-software-qtopia \ + --disable-software-x11 \ + --disable-software-16-x11 \ + --disable-software-xcb \ + --disable-gl-x11 \ + --disable-xrender-x11 \ + --disable-xrender-xcb \ + --disable-glitz-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --disable-image-loader-gif \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-image-loader-tiff \ + --enable-image-loader-xpm \ + --disable-image-loader-svg \ + --enable-cpu-c \ + --enable-fontconfig \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --enable-small-dither-mask \ + --disable-no-dither-mask \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --disable-convert-16-rgb-rot-90 \ + --enable-convert-16-rgb-rot-270 \ + --disable-convert-24-rgb-888 \ + --disable-convert-24-bgr-888 \ + --disable-convert-32-rgb-8888 \ + --disable-convert-32-rgbx-8888 \ + --disable-convert-32-bgr-8888 \ + --disable-convert-32-bgrx-8888 \ + --disable-convert-32-rgb-rot-0 \ + --disable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-270" + + +# evas needs a different oe_libinstall, so copy/paste autotools_stage_all +do_stage() { + rm -rf ${STAGE_TEMP} + mkdir -p ${STAGE_TEMP} + oe_runmake DESTDIR="${STAGE_TEMP}" install + autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR} + if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then + autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir} + autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir} + autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir} + autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir} + autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir} + fi + if [ -d ${STAGE_TEMP}/${libdir} ] + then + olddir=`pwd` + cd ${STAGE_TEMP}/${libdir} + las=$(find . -name \*.la -type f) + cd $olddir + echo "Found la files: $las" + if [ -n "$las" ]; then + # If there are .la files then libtool was used in the + # build, so install them with magic mangling. + for i in $las + do + dir=$(dirname $i) + echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}" + oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir} + done + else + # Otherwise libtool wasn't used, and lib/ can be copied + # directly. + echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" + cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + fi + + fi + # Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files, + # however some packages rely on the presence of .pc files to enable/disable + # their configurataions in which case we better should not install everything + # unconditionally, but rather depend on the actual results of make install. + # The good news though: a) there are not many packages doing this and + # b) packaged staging will fix that anyways. :M: + if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] + then + echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" + cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + fi + rm -rf ${STAGE_TEMP}/${mandir} || true + rm -rf ${STAGE_TEMP}/${infodir} || true + autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR} + rm -rf ${STAGE_TEMP} + +} diff --git a/packages/efl1/evas_svn.bb b/packages/efl1/evas_svn.bb new file mode 100644 index 0000000000..e7079615de --- /dev/null +++ b/packages/efl1/evas_svn.bb @@ -0,0 +1,62 @@ +require evas.inc +PR = "r1" + +EXTRA_OECONF = "\ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-fb \ + --disable-directfb \ + --disable-sdl \ + --enable-buffer \ + --disable-software-ddraw \ + --disable-software-qtopia \ + --enable-simple-x11 \ + --enable-software-x11 \ + --enable-software-16-x11 \ + --disable-software-xcb \ + --disable-gl-x11 \ + --enable-xrender-x11 \ + --disable-xrender-xcb \ + --disable-glitz-x11 \ + --enable-image-loader-eet \ + --disable-image-loader-edb \ + --disable-image-loader-gif \ + --enable-image-loader-png \ + --enable-image-loader-jpeg \ + --enable-image-loader-tiff \ + --enable-image-loader-xpm \ + --enable-image-loader-svg \ + --enable-cpu-c \ + --enable-fontconfig \ + --enable-font-loader-eet \ + --enable-scale-sample \ + --enable-scale-smooth \ + --enable-convert-yuv \ + --enable-small-dither-mask \ + --disable-no-dither-mask \ + --disable-convert-8-rgb-332 \ + --disable-convert-8-rgb-666 \ + --disable-convert-8-rgb-232 \ + --disable-convert-8-rgb-222 \ + --disable-convert-8-rgb-221 \ + --disable-convert-8-rgb-121 \ + --disable-convert-8-rgb-111 \ + --enable-convert-16-rgb-565 \ + --disable-convert-16-rgb-555 \ + --disable-convert-16-rgb-444 \ + --disable-convert-16-rgb-ipq \ + --enable-convert-16-rgb-rot-0 \ + --enable-convert-16-rgb-rot-90 \ + --disable-convert-16-rgb-rot-180 \ + --enable-convert-16-rgb-rot-270 \ + --enable-convert-24-rgb-888 \ + --enable-convert-24-bgr-888 \ + --enable-convert-32-rgb-8888 \ + --enable-convert-32-rgbx-8888 \ + --enable-convert-32-bgr-8888 \ + --enable-convert-32-bgrx-8888 \ + --enable-convert-32-rgb-rot-0 \ + --enable-convert-32-rgb-rot-90 \ + --disable-convert-32-rgb-rot-180 \ + --enable-convert-32-rgb-rot-270" + diff --git a/packages/efl1/evolve-native_svn.bb b/packages/efl1/evolve-native_svn.bb new file mode 100644 index 0000000000..5d57075498 --- /dev/null +++ b/packages/efl1/evolve-native_svn.bb @@ -0,0 +1,6 @@ +require evolve_svn.bb +inherit native +DEPENDS = "etk-native" + +# needs ecore-x :/ +BROKEN = "1" diff --git a/packages/efl1/evolve_svn.bb b/packages/efl1/evolve_svn.bb new file mode 100644 index 0000000000..fad6671675 --- /dev/null +++ b/packages/efl1/evolve_svn.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language" +LICENSE = "MIT" +DEPENDS = "etk evolve-native" +PV = "0.0.0+svnr${SRCREV}" +PR = "r1" + +inherit efl diff --git a/packages/efl1/ewl_svn.bb b/packages/efl1/ewl_svn.bb new file mode 100644 index 0000000000..af490dda46 --- /dev/null +++ b/packages/efl1/ewl_svn.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "The Enlightened Widget Library" +DEPENDS = "evas ecore edje emotion efreet epsilon" +LICENSE = "MIT BSD" +PV = "0.5.2.042+svnr${SRCREV}" +PR = "r1" + +inherit efl + +EXTRA_OECONF = "\ + --enable-software-x11 \ + --enable-software-16-x11 \ + --enable-xrender-x11 \ + --disable-opengl-x11 \ + --disable-software-xcb \ + --disable-software-sdl \ + --enable-framebuffer \ + --enable-software-buffer \ + --disable-opengl-glew \ +" + +# TODO package engines more granular +PACKAGES += "${PN}-plugins ${PN}-engines" + +FILES_${PN} += "${sysconfdir}/ewl/*" +FILES_${PN}-tests += "${libdir}/ewl/tests/*.so*" +FILES_${PN}-dev += "${libdir}/ewl/*/*.a ${libdir}/ewl/*/*.la" +FILES_${PN}-dbg += "${libdir}/ewl/*/.debug" + +FILES_${PN}-engines = "${libdir}/ewl/engines/*.so*" +FILES_${PN}-plugins = "${libdir}/ewl/plugins/*.so*" + +RRECOMMENDS_${PN} = "${PN}-engines ${PN}-plugins ewl-themes" diff --git a/packages/efl1/exml_svn.bb b/packages/efl1/exml_svn.bb new file mode 100644 index 0000000000..aaf37c7ca6 --- /dev/null +++ b/packages/efl1/exml_svn.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Exml is a generic XML parser wrapper." +LICENSE = "MIT" +DEPENDS = "libxml2 libxslt ecore" +PV = "0.1.1+svnr${SRCREV}" +PR = "r1" + +inherit efl + diff --git a/packages/efl1/imlib2_svn.bb b/packages/efl1/imlib2_svn.bb new file mode 100644 index 0000000000..39932d74fe --- /dev/null +++ b/packages/efl1/imlib2_svn.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "A graphic library for file loading, saving, rendering, and manipulation." +LICENSE = "BSD" +# can also depend on tiff34, ungif or gif, z, bz2, id3tag +DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" +PROVIDES = "virtual/imlib2" +PV = "1.4.1.001+svnr${SRCREV}" +PR = "r3" + +inherit efl + +SRC_URI += "file://remove-local-includes-20080421.patch;patch=1;mindate=20080420 " + +EXTRA_OECONF = "--with-x" + +# TODO: Use more fine granular version +#OE_LT_RPATH_ALLOW=":${libdir}/imlib2/loaders:${libdir}/imlib2/filters:" +OE_LT_RPATH_ALLOW = "any" +OE_LT_RPATH_ALLOW[export]="1" + +PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters" +FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/" +FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" +FILES_${PN}-bin = "${bindir}" +FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" +FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" +FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" +FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" diff --git a/packages/python/python-ecore_svn.bb b/packages/python/python-ecore_svn.bb new file mode 100644 index 0000000000..dacf5af3d8 --- /dev/null +++ b/packages/python/python-ecore_svn.bb @@ -0,0 +1,9 @@ +require python-efl.inc +DEPENDS += "python-evas ecore" +RDEPENDS += "python-evas" +PV = "0.2.1+svnr${SRCREV}" +PR = "r2" + +do_stage() { + distutils_stage_all +} diff --git a/packages/python/python-edbus_svn.bb b/packages/python/python-edbus_svn.bb new file mode 100644 index 0000000000..8c862e7e52 --- /dev/null +++ b/packages/python/python-edbus_svn.bb @@ -0,0 +1,9 @@ +require python-efl.inc +DEPENDS += "edbus python-dbus" +RDEPENDS += "python-dbus" +PV = "0.1.1+svnr${SRCREV}" +PR = "r2" + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=python-e_dbus;proto=http" +S = "${WORKDIR}/python-e_dbus" + diff --git a/packages/python/python-edje_svn.bb b/packages/python/python-edje_svn.bb new file mode 100644 index 0000000000..423357f7b7 --- /dev/null +++ b/packages/python/python-edje_svn.bb @@ -0,0 +1,9 @@ +require python-efl.inc + +DEPENDS += "edje python-evas" +RDEPENDS += "python-evas" + +SRC_URI += "file://0001-fix-unicode-conversion.patch;patch=1" + +PV = "0.2.1+svnr${SRCREV}" +PR = "r3" diff --git a/packages/python/python-emotion_svn.bb b/packages/python/python-emotion_svn.bb new file mode 100644 index 0000000000..b3d64d0f1a --- /dev/null +++ b/packages/python/python-emotion_svn.bb @@ -0,0 +1,5 @@ +require python-efl.inc +DEPENDS += "emotion python-evas" +RDEPENDS += "python-ecore" +PV = "0.2.1+svnr${SRCREV}" +PR = "r1" diff --git a/packages/python/python-epsilon_svn.bb b/packages/python/python-epsilon_svn.bb new file mode 100644 index 0000000000..53da7020f4 --- /dev/null +++ b/packages/python/python-epsilon_svn.bb @@ -0,0 +1,5 @@ +require python-efl.inc +DEPENDS += "epsilon python-ecore" +RDEPENDS += "python-ecore" +PV = "0.2.1+svnr${SRCREV}" +PR = "r2" diff --git a/packages/python/python-evas_svn.bb b/packages/python/python-evas_svn.bb new file mode 100644 index 0000000000..7c6fe457c5 --- /dev/null +++ b/packages/python/python-evas_svn.bb @@ -0,0 +1,8 @@ +require python-efl.inc +DEPENDS += "evas" +PV = "0.2.1+svnr${SRCREV}" +PR = "r1" + +do_stage() { + distutils_stage_all +} -- cgit v1.2.3 From dc10f3e60a09d1df1aa9d38c2508c60de5fe3d52 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 24 Aug 2008 22:17:42 +0000 Subject: illume svn catch up with new upstream location (patch by Rasterman) --- packages/openmoko-projects/illume/.mtn2git_empty | 0 .../illume/configure-keyboard.patch | 39 ---------------------- .../openmoko-projects/illume/module.illume.src | 17 ---------- 3 files changed, 56 deletions(-) delete mode 100644 packages/openmoko-projects/illume/.mtn2git_empty delete mode 100644 packages/openmoko-projects/illume/configure-keyboard.patch delete mode 100644 packages/openmoko-projects/illume/module.illume.src diff --git a/packages/openmoko-projects/illume/.mtn2git_empty b/packages/openmoko-projects/illume/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/openmoko-projects/illume/configure-keyboard.patch b/packages/openmoko-projects/illume/configure-keyboard.patch deleted file mode 100644 index 589fe53f38..0000000000 --- a/packages/openmoko-projects/illume/configure-keyboard.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (Revision 170) -+++ configure.in (Arbeitskopie) -@@ -95,6 +95,21 @@ - AC_SUBST(e_libs) - AC_SUBST(e_modules) - -+want_illume_virtual_keyboard=no -+AC_ARG_ENABLE(illume-keyboard, -+ AC_HELP_STRING( -+ [--enable-illume-keyboard], -+ [Enable the illume virtual keyboard.] -+ ), -+ [want_illume_virtual_keyboard=$enableval] -+ ) -+AC_MSG_CHECKING(whether the illume virtual keyboard is to be built in) -+AC_MSG_RESULT($want_illume_virtual_keyboard) -+ -+if test "x$want_illume_virtual_keyboard" = "xyes"; then -+ AC_DEFINE(BUILD_ILLUME_VIRTUAL_KEYBOARD, 1, [Build the virtual keyboard in]) -+fi -+ - AC_OUTPUT([ - Makefile - src/Makefile -Index: src/e_mod_win.c -=================================================================== ---- src/e_mod_win.c (Revision 170) -+++ src/e_mod_win.c (Arbeitskopie) -@@ -102,7 +102,7 @@ - e_module_dir_get(m), - e_module_dir_get(m)); - // FIXME: run kbd app or use internal --#if 0 -+#ifdef BUILD_ILLUME_VIRTUAL_KEYBOARD - //enable for now to test internal kbd - vkbd_int = e_kbd_int_new(e_module_dir_get(m), - e_module_dir_get(m), diff --git a/packages/openmoko-projects/illume/module.illume.src b/packages/openmoko-projects/illume/module.illume.src deleted file mode 100644 index 2657ca3dd8..0000000000 --- a/packages/openmoko-projects/illume/module.illume.src +++ /dev/null @@ -1,17 +0,0 @@ -group "Illume_Cfg" struct { - value "config_version" int: 1; - value "launcher.mode" int: 1; - value "launcher.icon_size" int: 120; - value "launcher.single_click" int: 1; - value "power.auto_suspend" int: 1; - value "power.auto_suspend_delay" int: 1; - value "performance.cache_level" int: 3; - value "performance.fps" int: 25; - value "slipshelf.main_gadget_size" int: 42; - value "slipshelf.extra_gagdet_size" int: 32; - value "sliding.slipshelf.duration" int: 1000; - value "sliding.kbd.duration" int: 1000; - value "sliding.busywin.duration" int: 1000; - value "sliding.layout.duration" int: 0; - value "kbd.use_internal" int: 1; -} -- cgit v1.2.3 From fc3b97418571ca401dfa3fda18bbbca9d9875914 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 24 Aug 2008 22:26:03 +0000 Subject: frameworkd git update revision to ms3 RC1, catch up framework configurations --- conf/distro/include/sane-srcrevs.inc | 2 +- .../freesmartphone/frameworkd/a780/frameworkd.conf | 7 ++++++- packages/freesmartphone/frameworkd/frameworkd.conf | 16 +++++++++------ .../frameworkd/magician/frameworkd.conf | 11 ++++++++--- .../frameworkd/om-gta01/frameworkd.conf | 14 +++++++++++-- .../frameworkd/om-gta02/frameworkd.conf | 23 ++++++++++++++++------ packages/freesmartphone/frameworkd_git.bb | 7 +++++++ 7 files changed, 61 insertions(+), 19 deletions(-) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index cf5aab27d8..a06fe7e5ed 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -37,7 +37,7 @@ SRCREV_pn-ezxd ?= "2074" SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7837" SRCREV_pn-fbgrab-viewer-native ?= "1943" -SRCREV_pn-frameworkd ?= "5b0878b69037b68e64f4048a51003416c9b1261b" +SRCREV_pn-frameworkd ?= "99c8433e0069eceb03497b09ea85bf609cd625fe" SRCREV_pn-fstests ?= "204" SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" diff --git a/packages/freesmartphone/frameworkd/a780/frameworkd.conf b/packages/freesmartphone/frameworkd/a780/frameworkd.conf index 4499acc47e..a619bf1c5a 100644 --- a/packages/freesmartphone/frameworkd/a780/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/a780/frameworkd.conf @@ -1,4 +1,5 @@ -[idlenotifier] +[frameworkd] +version = 1 [input] # keys (copied from Openmoko, need to adjust) @@ -13,3 +14,7 @@ modemtype = freescale_neptune [opreferencesd] rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml + diff --git a/packages/freesmartphone/frameworkd/frameworkd.conf b/packages/freesmartphone/frameworkd/frameworkd.conf index 3d0bbc3c1c..1cd9ddf904 100644 --- a/packages/freesmartphone/frameworkd/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/frameworkd.conf @@ -1,17 +1,18 @@ -[odeviced] +[frameworkd] +version = 1 -[kernel26] +[odeviced.kernel26] # set 1 to disable the module disable = 0 -[idlenotifier] +[odeviced.idlenotifier] # set 1 to disable the module disable = 0 -# add inut nodes to ignore for idle activity +# add input nodes to ignore for idle activity ignoreinput = 2,3,4 -[powercontrol-neo] -disable = 0 +[odeviced.powercontrol-neo] +disable = 1 [ogsmd] # specify your modemtype here @@ -19,3 +20,6 @@ modemtype = ti_calypso [opreferencesd] rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf index cbafb1925f..b7e40c0654 100644 --- a/packages/freesmartphone/frameworkd/magician/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf @@ -1,6 +1,7 @@ -[idlenotifier] +[frameworkd] +version = 1 -[input] +[odeviced.input] # magician doesn't have AUX, use the CAMERA key for now # (it's in about the same place as AUX on gta01/02) report1 = AUX,key,212,1 @@ -9,9 +10,13 @@ report2 = POWER,key,116,1 report3 = CHARGER,key,356,0 report4 = HEADSET,switch,2,0 -[ophoned] +[ogsmd] # Magician has TI Calypso modemtype = ti_calypso [opreferencesd] rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml + diff --git a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf index d985bb342e..c25805b36f 100644 --- a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf @@ -1,6 +1,13 @@ -[idlenotifier] +[frameworkd] +version = 1 -[input] +[odeviced.audio] +# set default alsa scenario +default_scenario = stereoout +# set path to alsa scenario files +scenario_dir = /usr/share/openmoko/scenarios + +[odeviced.input] # Keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 @@ -18,3 +25,6 @@ path = 6000 [opreferencesd] rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf index cbeedf3da7..45bb12f6a8 100644 --- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -1,13 +1,19 @@ -[idlenotifier] +[frameworkd] +version = 1 + +[odeviced.audio] +# set default alsa scenario +default_scenario = stereoout +# set path to alsa scenario files +scenario_dir = /usr/share/openmoko/scenarios + +[odeviced.idlenotifier] # don't read from accellerometers for GTA02 ignoreinput=2,3 -[input] +[odeviced.input] # don't read from accellerometers for GTA02 ignoreinput=2,3 - -# specify accellerometer type -accelerometer_type = gta02 # keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 @@ -15,8 +21,9 @@ report3 = CHARGER,key,356,0 report4 = HEADSET,switch,2,0 # disable accelerometer since it uses LOADS of CPU resources -[accelerometer] +[odeviced.accelerometer] disable = 1 +accelerometer_type = gta02 [ogsmd] # GTA02 has TI Calypso @@ -29,3 +36,7 @@ path = /dev/ttySAC1 [opreferencesd] rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences + +[oeventsd] +rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml + diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index 0f364c0dd7..fa669ced18 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -37,6 +37,13 @@ RDEPENDS_${PN} += "\ ${PN}-config \ " +RRECOMMENDS_${PN} += "\ + alsa-utils-amixer \ + ppp \ +" + +RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd" +RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd" PACKAGES =+ "${PN}-config" -- cgit v1.2.3 From fb1cee2982dbd566111e6dcd5766b7721583513b Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Sun, 24 Aug 2008 23:49:44 +0000 Subject: SlugOS 5 - replace "mount -U" with "mount UUID=" which works with both mount and busybox mount; also update boot/disk script to ensure that some key devices exist in the new /dev which will enable booting to a virgin nfsroot. --- packages/slugos-init/files/boot/disk | 9 +++++---- packages/slugos-init/files/functions | 13 +++++++++++++ packages/slugos-init/files/turnup | 6 +++--- packages/slugos-init/slugos-init_5.0.bb | 2 +- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/packages/slugos-init/files/boot/disk b/packages/slugos-init/files/boot/disk index d47be54c37..63370ce340 100644 --- a/packages/slugos-init/files/boot/disk +++ b/packages/slugos-init/files/boot/disk @@ -38,12 +38,13 @@ then # is attempted. if test -n "$UUID" && mount "$@" UUID="$UUID" /mnt || - mount "$@" -U "$UUID" /mnt || mount "$@" "$device" /mnt then - # checkmount checks for sh, chroot, init - # and /mnt (i.e. /mnt/mnt in this case) - if checkmount /mnt + # checkmount checks for sh, chroot, init, /dev + # and /mnt (i.e. /mnt/mnt in this case). + # minimaldevnodes checks (and creates if required) + # a few mandatory /dev nodes we may need. + if checkmount /mnt && minimaldevnodes /mnt then # pivot to /initrd if available, else /mnt cd / diff --git a/packages/slugos-init/files/functions b/packages/slugos-init/files/functions index 18f4009ee7..5b6b40b091 100644 --- a/packages/slugos-init/files/functions +++ b/packages/slugos-init/files/functions @@ -173,6 +173,7 @@ checkmount(){ # basic test for init (the kernel will try to load this) # but require a shell in bin/sh too test \( -d "$1/mnt" \) -a \ + \( -d "$1/dev" \) -a \ \( -x "$1/bin/sh" -o -h "$1/bin/sh" \) -a \ \( -x "$1/usr/sbin/chroot" -o -h "$1/usr/sbin/chroot" -o \ -x "$1/sbin/chroot" -o -h "$1/sbin/chroot" \) -a \ @@ -181,6 +182,18 @@ checkmount(){ -x "$1/bin/init" -o -h "$1/bin/init" \) } # +# minimaldevnodes "mountpoint" +# tests an already mounted mountpoint to see if a very minimal +# set of devices exists or can be created in dev, and returns +# failure if not. This is required for booting to an nfsroot +# with an empty dev directory, as commonly occurs when the rootfs +# is created from a tar.gz image. This is also required for mdev. +minimaldevnodes(){ + [ -c "$1/dev/console" ] || mknod -m 600 "$1/dev/console" c 5 1 || return 1 + [ -c "$1/dev/null" ] || mknod -m 666 "$1/dev/null" c 1 3 || return 1 + return 0 +} +# # swivel "new root" "old root" # NOTE: the arguments must be paths relative to /, bad things # will happen if the arguments themselves start with / diff --git a/packages/slugos-init/files/turnup b/packages/slugos-init/files/turnup index 4aa1fba3ed..2bbc9024ef 100644 --- a/packages/slugos-init/files/turnup +++ b/packages/slugos-init/files/turnup @@ -578,7 +578,7 @@ disk() { fso="$(fsoptions "$@")" if if test -n "$uuid" then - mount "$@" UUID="$uuid" "$new" || mount "$@" -U "$uuid" "$new" + mount "$@" UUID="$uuid" "$new" else mount "$@" "$device" "$new" fi @@ -591,7 +591,7 @@ disk() { if test -n "$fst" && if test -n "$uuid" then - mount -t "$fst" -o "$fso" UUID="$uuid" "$new" || mount -t "$fst" -o "$fso" -U "$uuid" "$new" + mount -t "$fst" -o "$fso" UUID="$uuid" "$new" else mount -t "$fst" -o "$fso" "$device" "$new" fi @@ -633,7 +633,7 @@ disk() { then echo " options used: -t $fst -o $fso [error in this script]" >&2 test -n "$uuid" && - echo " uuid: $uuid (passed with UUID= or -U)" >&2 + echo " uuid: $uuid (passed with UUID=)" >&2 fi fi diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 9c50cd61f6..92ac7e30f3 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r0" +PR = "r1" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 4d1113da44ff5c1087a76eaa7613b530fee37943 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 25 Aug 2008 00:03:02 +0000 Subject: iptables 1.3.8 RRECOMMENDS+=kernel-module-ipt-masquerade --- packages/iptables/iptables.inc | 1 + packages/iptables/iptables_1.3.8.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/iptables/iptables.inc b/packages/iptables/iptables.inc index 0f4bacaf14..4868abb8ee 100644 --- a/packages/iptables/iptables.inc +++ b/packages/iptables/iptables.inc @@ -29,4 +29,5 @@ RRECOMMENDS = "\ kernel-module-ip-tables \ kernel-module-iptable-nat \ kernel-module-iptable-filter \ + kernel-module-ipt-masquerade \ " diff --git a/packages/iptables/iptables_1.3.8.bb b/packages/iptables/iptables_1.3.8.bb index 4475402df8..040be0643f 100644 --- a/packages/iptables/iptables_1.3.8.bb +++ b/packages/iptables/iptables_1.3.8.bb @@ -1,5 +1,5 @@ require iptables.inc -PR = "r3" +PR = "r4" SRC_URI += "\ file://getsockopt-failed.patch;patch=1 \ -- cgit v1.2.3 From c765bc47121d95e8cbc0a6ad71a850e2bcb8f082 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 00:59:48 +0000 Subject: meta-gpe-extras: replace the entries in RDEPENDS with something that at least exists --- packages/meta/meta-gpe-extras.bb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/meta/meta-gpe-extras.bb b/packages/meta/meta-gpe-extras.bb index b4425a682e..d966be5bf8 100644 --- a/packages/meta/meta-gpe-extras.bb +++ b/packages/meta/meta-gpe-extras.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Meta-package of extra applications for the GPE Palmtop Environment" LICENSE = "MIT" -PR="r2" +PR="r3" RDEPENDS = "\ - gpe-task-apps-extra \ - gpe-task-games \ - gpe-task-web \ - gpe-task-desktopapps" + task-gpe-apps \ + task-gpe-games \ + task-gpe-web \ + task-gpe-desktopapps" inherit meta -- cgit v1.2.3 From 5e8ea4a6f50c74eea2be4a90f7f2d21fab8e9413 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 01:38:00 +0000 Subject: nonworking: move meta-sectest-gpe and meta-gpephone to nonworking --- packages/meta/meta-gpephone.bb | 11 ----------- packages/meta/meta-sectest-gpe.bb | 13 ------------- packages/nonworking/meta/.mtn2git_empty | 0 packages/nonworking/meta/meta-gpephone.bb | 11 +++++++++++ packages/nonworking/meta/meta-sectest-gpe.bb | 13 +++++++++++++ 5 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 packages/meta/meta-gpephone.bb delete mode 100644 packages/meta/meta-sectest-gpe.bb create mode 100644 packages/nonworking/meta/.mtn2git_empty create mode 100644 packages/nonworking/meta/meta-gpephone.bb create mode 100644 packages/nonworking/meta/meta-sectest-gpe.bb diff --git a/packages/meta/meta-gpephone.bb b/packages/meta/meta-gpephone.bb deleted file mode 100644 index 9912ddbf30..0000000000 --- a/packages/meta/meta-gpephone.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" -LICENSE = "MIT" -PR = "r1" - -RDEPENDS = "\ - gpephone-task-base \ - gpephone-task-settings \ - gpephone-task-pim \ - gpephone-task-connectivity" - -inherit meta \ No newline at end of file diff --git a/packages/meta/meta-sectest-gpe.bb b/packages/meta/meta-sectest-gpe.bb deleted file mode 100644 index a73559ab1a..0000000000 --- a/packages/meta/meta-sectest-gpe.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Meta-package for GPE Security Testing Image" -LICENSE = "MIT" -PR = "r6" - -RDEPENDS = "\ - gpe-task-base \ - gpe-base-depends \ - gpe-task-base \ - gpe-task-settings \ - gpe-task-pim \ - gpe-task-sectest" - -inherit meta \ No newline at end of file diff --git a/packages/nonworking/meta/.mtn2git_empty b/packages/nonworking/meta/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/nonworking/meta/meta-gpephone.bb b/packages/nonworking/meta/meta-gpephone.bb new file mode 100644 index 0000000000..9912ddbf30 --- /dev/null +++ b/packages/nonworking/meta/meta-gpephone.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Meta-package for GPE Palmtop Environment Phone packages" +LICENSE = "MIT" +PR = "r1" + +RDEPENDS = "\ + gpephone-task-base \ + gpephone-task-settings \ + gpephone-task-pim \ + gpephone-task-connectivity" + +inherit meta \ No newline at end of file diff --git a/packages/nonworking/meta/meta-sectest-gpe.bb b/packages/nonworking/meta/meta-sectest-gpe.bb new file mode 100644 index 0000000000..a73559ab1a --- /dev/null +++ b/packages/nonworking/meta/meta-sectest-gpe.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Meta-package for GPE Security Testing Image" +LICENSE = "MIT" +PR = "r6" + +RDEPENDS = "\ + gpe-task-base \ + gpe-base-depends \ + gpe-task-base \ + gpe-task-settings \ + gpe-task-pim \ + gpe-task-sectest" + +inherit meta \ No newline at end of file -- cgit v1.2.3 From 36c64170765ecb2b2437e9b58d9ff5e262b186a8 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 25 Aug 2008 06:23:27 +0000 Subject: SlugOS 5.0 - slugos-init: update to make nfs boot work correctly; cleanup of kexec stuff (although kexec won't work with the current kernel yet). --- packages/slugos-init/files/boot/kexec | 3 --- packages/slugos-init/files/boot/network | 12 ++++++++++-- packages/slugos-init/slugos-init_5.0.bb | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/packages/slugos-init/files/boot/kexec b/packages/slugos-init/files/boot/kexec index dd757fd771..a60be03142 100644 --- a/packages/slugos-init/files/boot/kexec +++ b/packages/slugos-init/files/boot/kexec @@ -91,7 +91,6 @@ if [ -n "$1" -a -n "$2" ] ; then t=`basename "$kpath"` kexec_image="/mnt/$t" fi - umount /sys fi ;; @@ -105,7 +104,6 @@ if [ -n "$1" -a -n "$2" ] ; then t=`basename "$kpath"` kexec_image="/mnt/$t" fi - umount /sys fi ;; @@ -143,7 +141,6 @@ if [ -n "$1" -a -n "$2" ] ; then echo "Loading kexec kernel using tftp \"$kpath\"..." tftp -g -l "$kexec_image" -r "${kpath#*:}" "${kpath%%:*}" fi - umount /sys fi ;; diff --git a/packages/slugos-init/files/boot/network b/packages/slugos-init/files/boot/network index 8124f19ab2..48aa9dd7d5 100644 --- a/packages/slugos-init/files/boot/network +++ b/packages/slugos-init/files/boot/network @@ -24,8 +24,12 @@ ifconfig lo 127.0.0.1 up iface="$(config iface)" test -z "$iface" && exit 1 # -# Fire up a process in the background to load the firmware if necessary -sysf="/sys/class/firmware/firmware-$iface" +# Fire up a process in the background to load the firmware if necessary. +# If this system doesn't require the NPE-B firmware, no problem, the +# background process will simply go away in two seconds. If it requires +# some other firmware, then modification will be required. We probably +# should replace this with mdev or some other hotplug-based technique... +sysf="/sys/class/firmware/$iface" ( # Wait for the firware to be requested, if required [ -f $sysf/loading ] || sleep 1 @@ -39,5 +43,9 @@ sysf="/sys/class/firmware/firmware-$iface" # Trigger the firmware load proactively ifconfig "$iface" up # +# Unmount /sys and /proc before we leave +umount /sys +umount /proc +# ifup "$iface" # exit code is true only if the interface config has succeeded diff --git a/packages/slugos-init/slugos-init_5.0.bb b/packages/slugos-init/slugos-init_5.0.bb index 92ac7e30f3..9b7c2cd8d0 100644 --- a/packages/slugos-init/slugos-init_5.0.bb +++ b/packages/slugos-init/slugos-init_5.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" LICENSE = "GPL" DEPENDS = "base-files devio" RDEPENDS = "busybox devio" -PR = "r1" +PR = "r1.2" SRC_URI = "file://boot/flash \ file://boot/disk \ -- cgit v1.2.3 From 26e21165d3c5459d9f8b7f310c90e4c60b35f77a Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 25 Aug 2008 06:36:38 +0000 Subject: packages/perl/perl_5.8.8.bb : Change section to devel/perl to match python Bump PR --- packages/perl/perl_5.8.8.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/perl/perl_5.8.8.bb b/packages/perl/perl_5.8.8.bb index 328b4fb5df..c04485e886 100644 --- a/packages/perl/perl_5.8.8.bb +++ b/packages/perl/perl_5.8.8.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Perl is a popular scripting language." HOMEPAGE = "http://www.perl.org/" -SECTION = "devel" +SECTION = "devel/perl" LICENSE = "Artistic|GPL" PRIORITY = "optional" # We need gnugrep (for -I) DEPENDS = "virtual/db perl-native grep-native" -PR = "r25" +PR = "r26" # Major part of version PVM = "5.8" -- cgit v1.2.3 From 17ab77b858c575424a6de3feedf89a4ee7edbaa2 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Mon, 25 Aug 2008 06:37:41 +0000 Subject: packages/spandsp/spandsp.inc : Change section from voip to libs Bump PR --- packages/spandsp/spandsp.inc | 2 +- packages/spandsp/spandsp_0.0.3.bb | 2 +- packages/spandsp/spandsp_0.0.4-pre16.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/spandsp/spandsp.inc b/packages/spandsp/spandsp.inc index 9f4e5e5fbc..ed5fe3b490 100644 --- a/packages/spandsp/spandsp.inc +++ b/packages/spandsp/spandsp.inc @@ -1,6 +1,6 @@ DESCRIPTION = "A library of many DSP functions for telephony." HOMEPAGE = "http://www.soft-switch.org" -SECTION = "voip" +SECTION = "libs" LICENSE = "GPL" DEPENDS = "tiff libxml2" diff --git a/packages/spandsp/spandsp_0.0.3.bb b/packages/spandsp/spandsp_0.0.3.bb index 2dc402ffcb..cb43962def 100644 --- a/packages/spandsp/spandsp_0.0.3.bb +++ b/packages/spandsp/spandsp_0.0.3.bb @@ -1,4 +1,4 @@ -PR = "r2" +PR = "r3" SRC_URI = "http://www.soft-switch.org/downloads/spandsp/spandsp-${PV}.tgz" diff --git a/packages/spandsp/spandsp_0.0.4-pre16.bb b/packages/spandsp/spandsp_0.0.4-pre16.bb index d1e717ecd4..cacdbc6ec7 100644 --- a/packages/spandsp/spandsp_0.0.4-pre16.bb +++ b/packages/spandsp/spandsp_0.0.4-pre16.bb @@ -1,4 +1,4 @@ -PR = "r1" +PR = "r2" SRC_URI = "http://www.soft-switch.org/downloads/spandsp/${PN}-0.0.4pre16.tgz" -- cgit v1.2.3 From ccb0eb36f2d2d78c68f631812d07af4c0181130d Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 25 Aug 2008 08:56:29 +0000 Subject: icecc: include glibc into blacklist because we don't have a full cross compiler while building glibc from scratch. --- classes/icecc.bbclass | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 8c950b0281..b5a858bb1f 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -154,7 +154,7 @@ def create_cross_kernel_env(bb,d): try: os.stat(os.path.join(ice_dir, 'bin', kernel_cc)) except: # no cross compiler built yet - bb.error('no cross compiler built yet') + bb.error('no kernel cross compiler built yet') return "" VERSION = icc_determine_gcc_version( os.path.join(ice_dir,"bin",kernel_cc) ) @@ -251,23 +251,16 @@ def icc_path(bb,d): #"system" package blacklist contains a list of packages that can not distribute compile tasks #for one reason or the other - system_package_blacklist = [ "uclibc", "glibc-intermediate", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ] + system_package_blacklist = [ "uclibc", "glibc", "gcc", "qemu", "bind", "u-boot", "dhcp-forwarder", "enchant" ] + user_package_blacklist = (bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "").split() + package_blacklist = system_package_blacklist + user_package_blacklist - for black in system_package_blacklist: + for black in package_blacklist: if black in package_tmp: bb.note(package_tmp, ' found in blacklist, disable icecc') bb.data.setVar("PARALLEL_MAKE" , "", d) return "" - #user defined exclusion list - user_package_blacklist = bb.data.getVar('ICECC_USER_PACKAGE_BL', d) or "" - user_package_blacklist = user_package_blacklist.split() - - for black in user_package_blacklist: - if black in package_tmp: - bb.data.setVar("PARALLEL_MAKE" , "", d) - return "" - prefix = bb.data.expand('${HOST_PREFIX}', d) if bb.data.inherits_class("cross", d): -- cgit v1.2.3 From ad284adbc15624a03ffa9d912bcd59d7ac5c4a0a Mon Sep 17 00:00:00 2001 From: John Lee Date: Mon, 25 Aug 2008 09:05:18 +0000 Subject: mesa-full_7.0.2.bb: modified from mesa_7.0.2 but added libglut and demos. this recipe will also build glut and demos, xdemos, etc. new packages libglut and mesa-utils added. --- packages/mesa/mesa-full-7.0.2/.mtn2git_empty | 0 .../mesa/mesa-full-7.0.2/fix-host-compile.patch | 30 ++++++++++ .../mesa/mesa-full-7.0.2/fix-progs-makefile.patch | 65 ++++++++++++++++++++++ .../mesa/mesa-full-7.0.2/mklib-rpath-link.patch | 23 ++++++++ packages/mesa/mesa-full_7.0.2.bb | 20 +++++++ 5 files changed, 138 insertions(+) create mode 100644 packages/mesa/mesa-full-7.0.2/.mtn2git_empty create mode 100644 packages/mesa/mesa-full-7.0.2/fix-host-compile.patch create mode 100644 packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch create mode 100644 packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch create mode 100644 packages/mesa/mesa-full_7.0.2.bb diff --git a/packages/mesa/mesa-full-7.0.2/.mtn2git_empty b/packages/mesa/mesa-full-7.0.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mesa/mesa-full-7.0.2/fix-host-compile.patch b/packages/mesa/mesa-full-7.0.2/fix-host-compile.patch new file mode 100644 index 0000000000..d24d03d379 --- /dev/null +++ b/packages/mesa/mesa-full-7.0.2/fix-host-compile.patch @@ -0,0 +1,30 @@ +--- /src/mesa/x86/orig-Makefile 2005-07-01 04:54:38.000000000 +0300 ++++ /src/mesa/x86/Makefile 2007-06-07 21:52:31.000000000 +0300 +@@ -5,6 +5,7 @@ + + + INCLUDE_DIRS = \ ++ -I/usr/include \ + -I$(TOP)/include/GL \ + -I$(TOP)/include \ + -I.. \ +@@ -13,6 +14,10 @@ + -I../glapi \ + -I../tnl + ++OPT_FLAGS_host = -fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os ++ ++CFLAGS_host = -Wall -Wmissing-prototypes $(OPT_FLAGS_host) $(PIC_FLAGS) $(ARCH_FLAGS) \ ++ $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math + + default: gen_matypes matypes.h + +@@ -21,7 +26,7 @@ + + + gen_matypes: gen_matypes.c +- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes ++ $(CC) $(INCLUDE_DIRS) $(CFLAGS_host) gen_matypes.c -o gen_matypes + + # need some special rules here, unfortunately + matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes diff --git a/packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch b/packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch new file mode 100644 index 0000000000..727ede0eb9 --- /dev/null +++ b/packages/mesa/mesa-full-7.0.2/fix-progs-makefile.patch @@ -0,0 +1,65 @@ +Index: Mesa-7.0.2/progs/demos/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/demos/Makefile 2008-08-22 15:52:16.000000000 +0800 ++++ Mesa-7.0.2/progs/demos/Makefile 2008-08-22 15:52:33.000000000 +0800 +@@ -13,7 +13,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = \ + arbfplight \ +Index: Mesa-7.0.2/progs/glsl/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/glsl/Makefile 2008-08-22 15:56:37.000000000 +0800 ++++ Mesa-7.0.2/progs/glsl/Makefile 2008-08-22 15:56:52.000000000 +0800 +@@ -7,7 +7,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = \ + brick \ +Index: Mesa-7.0.2/progs/redbook/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/redbook/Makefile 2008-08-22 15:55:10.000000000 +0800 ++++ Mesa-7.0.2/progs/redbook/Makefile 2008-08-22 15:55:27.000000000 +0800 +@@ -7,7 +7,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = aaindex aapoly aargb accanti accpersp alpha alpha3D anti \ + bezcurve bezmesh checker clip colormat cube depthcue dof \ +Index: Mesa-7.0.2/progs/samples/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/samples/Makefile 2008-08-22 15:56:01.000000000 +0800 ++++ Mesa-7.0.2/progs/samples/Makefile 2008-08-22 15:56:13.000000000 +0800 +@@ -7,7 +7,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \ + font line logo nurb olympic overlay point prim quad select \ +Index: Mesa-7.0.2/progs/xdemos/Makefile +=================================================================== +--- Mesa-7.0.2.orig/progs/xdemos/Makefile 2008-08-22 15:57:11.000000000 +0800 ++++ Mesa-7.0.2/progs/xdemos/Makefile 2008-08-22 15:57:22.000000000 +0800 +@@ -8,7 +8,7 @@ + + LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) + +-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) ++LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS) -lstdc++ + + PROGS = glthreads \ + glxdemo \ diff --git a/packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch b/packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch new file mode 100644 index 0000000000..618f5b57ed --- /dev/null +++ b/packages/mesa/mesa-full-7.0.2/mklib-rpath-link.patch @@ -0,0 +1,23 @@ +--- /tmp/mklib 2007-12-08 11:03:23.000000000 +0100 ++++ Mesa-7.0.2/bin/mklib 2007-12-08 11:04:02.509863000 +0100 +@@ -106,6 +106,9 @@ + -L*) + DEPS="$DEPS $1" + ;; ++ -Wl*) ++ DEPS="$DEPS $1" ++ ;; + -pthread) + # this is a special case (see bugzilla 10876) + DEPS="$DEPS $1" +--- /tmp/default 2007-12-08 11:04:17.000000000 +0100 ++++ Mesa-7.0.2/configs/default 2007-12-08 11:05:06.279863000 +0100 +@@ -76,7 +76,7 @@ + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 + + # Program dependencies - specific GL/glut libraries added in Makefiles +-APP_LIB_DEPS = -lm ++APP_LIB_DEPS = $(EXTRA_LIB_PATH) -lm + + + diff --git a/packages/mesa/mesa-full_7.0.2.bb b/packages/mesa/mesa-full_7.0.2.bb new file mode 100644 index 0000000000..bac217b71d --- /dev/null +++ b/packages/mesa/mesa-full_7.0.2.bb @@ -0,0 +1,20 @@ +include mesa-mesa.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaGLUT-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 \ + file://mklib-rpath-link.patch;patch=1 \ + file://fix-host-compile.patch;patch=1 \ + file://fix-progs-makefile.patch;patch=1 \ + " + +do_install_append = "install -d ${D}${bindir}; \ + for f in glxgears glxheads glxdemo glxinfo; do \ + cp progs/xdemos/${f} ${D}${bindir}; \ + done" + +PACKAGES =+ "libglut libglut-dev mesa-utils" + +FILES_libglut = "${libdir}/libglut.so.*" +FILES_libglut-dev = "${libdir}/libglut.* ${includedir}/GL/glut*" +FILES_mesa-utils = "${bindir}/*" -- cgit v1.2.3 From 170632400a39c176bb6678cfaa63f12c2b28d9ab Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 25 Aug 2008 12:34:25 +0000 Subject: libsdl 1.2.x use pkgconfig --- packages/libsdl/libsdl-image_1.2.3.bb | 10 +++++----- packages/libsdl/libsdl-x11_1.2.11.bb | 16 +++++++++------- packages/libsdl/libsdl-x11_1.2.9.bb | 1 + packages/libsdl/libsdl.inc | 3 +-- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/packages/libsdl/libsdl-image_1.2.3.bb b/packages/libsdl/libsdl-image_1.2.3.bb index 1a911f9f62..7bf24412d2 100644 --- a/packages/libsdl/libsdl-image_1.2.3.bb +++ b/packages/libsdl/libsdl-image_1.2.3.bb @@ -3,12 +3,12 @@ SECTION = "libs" PRIORITY = "optional" DEPENDS = "zlib libpng jpeg virtual/libsdl" LICENSE = "LGPL" -PR = "r1" - -SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ - file://autotools.patch;patch=1 \ - " +PR = "r2" +SRC_URI = "\ + http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://autotools.patch;patch=1 \ +" S = "${WORKDIR}/SDL_image-${PV}" export SDL_CONFIG = "${STAGING_BINDIR_CROSS}/sdl-config" diff --git a/packages/libsdl/libsdl-x11_1.2.11.bb b/packages/libsdl/libsdl-x11_1.2.11.bb index 5a309c57a8..3f9120edb4 100644 --- a/packages/libsdl/libsdl-x11_1.2.11.bb +++ b/packages/libsdl/libsdl-x11_1.2.11.bb @@ -3,14 +3,16 @@ require libsdl.inc # extra-keys.patch is missing DEFAULT_PREFERENCE = "-1" -PR = "r1" +PR = "r6" -SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://acinclude.m4 \ - file://configure_tweak.patch;patch=1 \ - file://pagesize.patch;patch=1 \ - file://kernel-asm-page.patch;patch=1 \ - file://sdl-cdfix.patch;patch=1 " +SRC_URI = "\ + http://www.libsdl.org/release/SDL-${PV}.tar.gz \ + file://acinclude.m4 \ + file://configure_tweak.patch;patch=1 \ + file://pagesize.patch;patch=1 \ + file://kernel-asm-page.patch;patch=1 \ + file://sdl-cdfix.patch;patch=1 \ +" EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \ diff --git a/packages/libsdl/libsdl-x11_1.2.9.bb b/packages/libsdl/libsdl-x11_1.2.9.bb index 43148d4b00..637f0ae177 100644 --- a/packages/libsdl/libsdl-x11_1.2.9.bb +++ b/packages/libsdl/libsdl-x11_1.2.9.bb @@ -1,4 +1,5 @@ require libsdl.inc +PR = "r6" EXTRA_OECONF = "--disable-static --disable-debug --enable-cdrom --enable-threads --enable-timers --enable-endian \ --enable-file --enable-oss --enable-alsa --disable-esd --disable-arts \ diff --git a/packages/libsdl/libsdl.inc b/packages/libsdl/libsdl.inc index 5266c71373..5653925d68 100644 --- a/packages/libsdl/libsdl.inc +++ b/packages/libsdl/libsdl.inc @@ -5,7 +5,6 @@ DEPENDS = "alsa-lib mesa virtual/libx11 libxext" DEPENDS_avr32 = "alsa-lib virtual/libx11 libxext" PROVIDES = "virtual/libsdl" LICENSE = "LGPL" -PR = "r5" SRC_URI = "\ http://www.libsdl.org/release/SDL-${PV}.tar.gz \ @@ -15,7 +14,7 @@ SRC_URI = "\ file://acinclude.m4" S = "${WORKDIR}/SDL-${PV}" -inherit autotools binconfig +inherit autotools binconfig pkgconfig EXTRA_OECONF = "" -- cgit v1.2.3 From edec5caf27dcf1525edea1d76b1685ec64cbd570 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 25 Aug 2008 12:57:31 +0000 Subject: add tichy, a python applets manager based on SDL --- packages/openmoko-projects/tichy_svn.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/openmoko-projects/tichy_svn.bb diff --git a/packages/openmoko-projects/tichy_svn.bb b/packages/openmoko-projects/tichy_svn.bb new file mode 100644 index 0000000000..0b42fc6f70 --- /dev/null +++ b/packages/openmoko-projects/tichy_svn.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Python applets manager" +SECTION = "x11" +LICENSE = "GPL" +DEPENDS = "python-pygame" +PV = "0.1+svnr${SRCREV}" +PR = "r0" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot;module=tichy;proto=http" +S = "${WORKDIR}/tichy" + +inherit distutils + +FILES_${PN} += "${datadir}" -- cgit v1.2.3 From d90cdcf08622717e9d61bc7dd9636f61b2a32ebc Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 14:14:28 +0000 Subject: gsoap: fix PACKAGES and close 1505. --- packages/gsoap/gsoap_2.7.7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/gsoap/gsoap_2.7.7.bb b/packages/gsoap/gsoap_2.7.7.bb index 799c4a13f3..dc6ff6e320 100644 --- a/packages/gsoap/gsoap_2.7.7.bb +++ b/packages/gsoap/gsoap_2.7.7.bb @@ -3,7 +3,7 @@ for the development of SOAP Web Services and clients." SECTION = "devel" LICENSE = "GPL" DEPENDS = "gsoap-native" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/gsoap2/gsoap_${PV}.tar.gz" S = "${WORKDIR}/gsoap-2.7" @@ -22,4 +22,5 @@ do_install_append() { done } +PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale" FILES_gsoap-dev = "${bindir}/wsdl2h ${bindir}/soapcpp2 ${libdir}" -- cgit v1.2.3 From c3005ac1ad16e980158e41eb13f2438c35afd147 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 15:22:12 +0000 Subject: openembedded-essential: add help2man to DEPENDS and close 3035. --- .../distro-packages/debian/openembedded-essential-1.4/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control index 01f9f4b906..9f1e0953d4 100644 --- a/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control +++ b/contrib/distro-packages/debian/openembedded-essential-1.4/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.7.3 Package: openembedded-essential Architecture: all -Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2 +Depends: python (>= 2.3), ccache, build-essential, quilt, bison, wget, cvs, subversion, git-core, monotone, coreutils, unzip, texi2html, texinfo, libsdl1.2-dev, docbook-utils, gawk, bc, python-pysqlite2, help2man Description: Metapackage to install all needed packages to start using OpenEmbedded OpenEmbedded is a full-featured development environment allowing users to target a wide variety of devices. Supporting multiple build, release paths and -- cgit v1.2.3 From ec6aa86a7a792dcf9ec695c25a5e621e361a5e9f Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 25 Aug 2008 15:41:19 +0000 Subject: remove a couple of bluez packages --- packages/bluez/bluez-cups-backend_3.18.bb | 25 -- packages/bluez/bluez-cups-backend_3.19.bb | 25 -- packages/bluez/bluez-cups-backend_3.20.bb | 25 -- packages/bluez/bluez-cups-backend_3.22.bb | 25 -- packages/bluez/bluez-cups-backend_3.23.bb | 25 -- packages/bluez/bluez-cups-backend_3.24.bb | 27 -- packages/bluez/bluez-gnome_0.10.bb | 11 - packages/bluez/bluez-gnome_0.13.bb | 14 - packages/bluez/bluez-gnome_0.14.bb | 14 - packages/bluez/bluez-gnome_0.15.bb | 14 - packages/bluez/bluez-gnome_0.24.bb | 14 - packages/bluez/bluez-gstreamer-plugin_3.19.bb | 25 -- packages/bluez/bluez-gstreamer-plugin_3.20.bb | 25 -- packages/bluez/bluez-gstreamer-plugin_3.22.bb | 25 -- packages/bluez/bluez-gstreamer-plugin_3.23.bb | 25 -- packages/bluez/bluez-gstreamer-plugin_3.24.bb | 27 -- packages/bluez/bluez-hcidump_1.26.bb | 15 - packages/bluez/bluez-hcidump_1.29.bb | 13 - packages/bluez/bluez-hcidump_1.31.bb | 13 - packages/bluez/bluez-hcidump_1.32.bb | 13 - packages/bluez/bluez-hcidump_1.33.bb | 13 - packages/bluez/bluez-hcidump_1.37.bb | 13 - packages/bluez/bluez-hcidump_1.38.bb | 13 - packages/bluez/bluez-libs_3.10.bb | 1 - packages/bluez/bluez-libs_3.11.bb | 1 - packages/bluez/bluez-libs_3.12.bb | 1 - packages/bluez/bluez-libs_3.13.bb | 1 - packages/bluez/bluez-libs_3.14.bb | 1 - packages/bluez/bluez-libs_3.15.bb | 1 - packages/bluez/bluez-libs_3.16.bb | 1 - packages/bluez/bluez-libs_3.17.bb | 1 - packages/bluez/bluez-libs_3.18.bb | 1 - packages/bluez/bluez-libs_3.19.bb | 1 - packages/bluez/bluez-libs_3.20.bb | 1 - packages/bluez/bluez-libs_3.22.bb | 1 - packages/bluez/bluez-libs_3.23.bb | 1 - packages/bluez/bluez-libs_3.24.bb | 4 - packages/bluez/bluez-libs_3.28.bb | 4 - packages/bluez/bluez-libs_3.30.bb | 1 - packages/bluez/bluez-libs_3.4.bb | 22 - packages/bluez/bluez-libs_3.7.bb | 22 - packages/bluez/bluez-libs_3.8.bb | 22 - packages/bluez/bluez-libs_3.9.bb | 1 - packages/bluez/bluez-utils-3.14/.mtn2git_empty | 0 .../bluez/bluez-utils-3.14/hciattach-ti-bts.patch | 498 --------------------- packages/bluez/bluez-utils-3.23/.mtn2git_empty | 0 .../bluez/bluez-utils-3.23/hciattach-ti-bts.patch | 477 -------------------- packages/bluez/bluez-utils-3.24/.mtn2git_empty | 0 .../bluez/bluez-utils-3.24/hciattach-ti-bts.patch | 477 -------------------- packages/bluez/bluez-utils-3.28/.mtn2git_empty | 0 .../bluez/bluez-utils-3.28/hciattach-ti-bts.patch | 477 -------------------- packages/bluez/bluez-utils-3.30/.mtn2git_empty | 0 .../bluez/bluez-utils-3.30/hciattach-ti-bts.patch | 477 -------------------- packages/bluez/bluez-utils-3.9/.mtn2git_empty | 0 .../bluez/bluez-utils-3.9/hciattach-ti-bts.patch | 498 --------------------- packages/bluez/bluez-utils-alsa_3.18.bb | 23 - packages/bluez/bluez-utils-alsa_3.19.bb | 23 - packages/bluez/bluez-utils-alsa_3.20.bb | 23 - packages/bluez/bluez-utils-alsa_3.22.bb | 23 - packages/bluez/bluez-utils-alsa_3.23.bb | 24 - packages/bluez/bluez-utils-alsa_3.24.bb | 25 -- packages/bluez/bluez-utils_3.11.bb | 111 ----- packages/bluez/bluez-utils_3.12.bb | 114 ----- packages/bluez/bluez-utils_3.13.bb | 114 ----- packages/bluez/bluez-utils_3.14.bb | 115 ----- packages/bluez/bluez-utils_3.15.bb | 116 ----- packages/bluez/bluez-utils_3.16.bb | 116 ----- packages/bluez/bluez-utils_3.17.bb | 116 ----- packages/bluez/bluez-utils_3.18.bb | 29 -- packages/bluez/bluez-utils_3.19.bb | 29 -- packages/bluez/bluez-utils_3.20.bb | 29 -- packages/bluez/bluez-utils_3.22.bb | 29 -- packages/bluez/bluez-utils_3.23.bb | 30 -- packages/bluez/bluez-utils_3.24.bb | 30 -- packages/bluez/bluez-utils_3.28.bb | 30 -- packages/bluez/bluez-utils_3.30.bb | 55 --- packages/bluez/bluez-utils_3.4.bb | 51 --- packages/bluez/bluez-utils_3.7.bb | 54 --- packages/bluez/bluez-utils_3.8.bb | 51 --- packages/bluez/bluez-utils_3.9.bb | 13 - 80 files changed, 4805 deletions(-) delete mode 100644 packages/bluez/bluez-cups-backend_3.18.bb delete mode 100644 packages/bluez/bluez-cups-backend_3.19.bb delete mode 100644 packages/bluez/bluez-cups-backend_3.20.bb delete mode 100644 packages/bluez/bluez-cups-backend_3.22.bb delete mode 100644 packages/bluez/bluez-cups-backend_3.23.bb delete mode 100644 packages/bluez/bluez-cups-backend_3.24.bb delete mode 100644 packages/bluez/bluez-gnome_0.10.bb delete mode 100644 packages/bluez/bluez-gnome_0.13.bb delete mode 100644 packages/bluez/bluez-gnome_0.14.bb delete mode 100644 packages/bluez/bluez-gnome_0.15.bb delete mode 100644 packages/bluez/bluez-gnome_0.24.bb delete mode 100644 packages/bluez/bluez-gstreamer-plugin_3.19.bb delete mode 100644 packages/bluez/bluez-gstreamer-plugin_3.20.bb delete mode 100644 packages/bluez/bluez-gstreamer-plugin_3.22.bb delete mode 100644 packages/bluez/bluez-gstreamer-plugin_3.23.bb delete mode 100644 packages/bluez/bluez-gstreamer-plugin_3.24.bb delete mode 100644 packages/bluez/bluez-hcidump_1.26.bb delete mode 100644 packages/bluez/bluez-hcidump_1.29.bb delete mode 100644 packages/bluez/bluez-hcidump_1.31.bb delete mode 100644 packages/bluez/bluez-hcidump_1.32.bb delete mode 100644 packages/bluez/bluez-hcidump_1.33.bb delete mode 100644 packages/bluez/bluez-hcidump_1.37.bb delete mode 100644 packages/bluez/bluez-hcidump_1.38.bb delete mode 100644 packages/bluez/bluez-libs_3.10.bb delete mode 100644 packages/bluez/bluez-libs_3.11.bb delete mode 100644 packages/bluez/bluez-libs_3.12.bb delete mode 100644 packages/bluez/bluez-libs_3.13.bb delete mode 100644 packages/bluez/bluez-libs_3.14.bb delete mode 100644 packages/bluez/bluez-libs_3.15.bb delete mode 100644 packages/bluez/bluez-libs_3.16.bb delete mode 100644 packages/bluez/bluez-libs_3.17.bb delete mode 100644 packages/bluez/bluez-libs_3.18.bb delete mode 100644 packages/bluez/bluez-libs_3.19.bb delete mode 100644 packages/bluez/bluez-libs_3.20.bb delete mode 100644 packages/bluez/bluez-libs_3.22.bb delete mode 100644 packages/bluez/bluez-libs_3.23.bb delete mode 100644 packages/bluez/bluez-libs_3.24.bb delete mode 100644 packages/bluez/bluez-libs_3.28.bb delete mode 100644 packages/bluez/bluez-libs_3.30.bb delete mode 100644 packages/bluez/bluez-libs_3.4.bb delete mode 100644 packages/bluez/bluez-libs_3.7.bb delete mode 100644 packages/bluez/bluez-libs_3.8.bb delete mode 100644 packages/bluez/bluez-libs_3.9.bb delete mode 100644 packages/bluez/bluez-utils-3.14/.mtn2git_empty delete mode 100644 packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch delete mode 100644 packages/bluez/bluez-utils-3.23/.mtn2git_empty delete mode 100644 packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch delete mode 100644 packages/bluez/bluez-utils-3.24/.mtn2git_empty delete mode 100644 packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch delete mode 100644 packages/bluez/bluez-utils-3.28/.mtn2git_empty delete mode 100644 packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch delete mode 100644 packages/bluez/bluez-utils-3.30/.mtn2git_empty delete mode 100644 packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch delete mode 100644 packages/bluez/bluez-utils-3.9/.mtn2git_empty delete mode 100644 packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch delete mode 100644 packages/bluez/bluez-utils-alsa_3.18.bb delete mode 100644 packages/bluez/bluez-utils-alsa_3.19.bb delete mode 100644 packages/bluez/bluez-utils-alsa_3.20.bb delete mode 100644 packages/bluez/bluez-utils-alsa_3.22.bb delete mode 100644 packages/bluez/bluez-utils-alsa_3.23.bb delete mode 100644 packages/bluez/bluez-utils-alsa_3.24.bb delete mode 100644 packages/bluez/bluez-utils_3.11.bb delete mode 100644 packages/bluez/bluez-utils_3.12.bb delete mode 100644 packages/bluez/bluez-utils_3.13.bb delete mode 100644 packages/bluez/bluez-utils_3.14.bb delete mode 100644 packages/bluez/bluez-utils_3.15.bb delete mode 100644 packages/bluez/bluez-utils_3.16.bb delete mode 100644 packages/bluez/bluez-utils_3.17.bb delete mode 100644 packages/bluez/bluez-utils_3.18.bb delete mode 100644 packages/bluez/bluez-utils_3.19.bb delete mode 100644 packages/bluez/bluez-utils_3.20.bb delete mode 100644 packages/bluez/bluez-utils_3.22.bb delete mode 100644 packages/bluez/bluez-utils_3.23.bb delete mode 100644 packages/bluez/bluez-utils_3.24.bb delete mode 100644 packages/bluez/bluez-utils_3.28.bb delete mode 100644 packages/bluez/bluez-utils_3.30.bb delete mode 100644 packages/bluez/bluez-utils_3.4.bb delete mode 100644 packages/bluez/bluez-utils_3.7.bb delete mode 100644 packages/bluez/bluez-utils_3.8.bb delete mode 100644 packages/bluez/bluez-utils_3.9.bb diff --git a/packages/bluez/bluez-cups-backend_3.18.bb b/packages/bluez/bluez-cups-backend_3.18.bb deleted file mode 100644 index d92b53220f..0000000000 --- a/packages/bluez/bluez-cups-backend_3.18.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" \ No newline at end of file diff --git a/packages/bluez/bluez-cups-backend_3.19.bb b/packages/bluez/bluez-cups-backend_3.19.bb deleted file mode 100644 index d92b53220f..0000000000 --- a/packages/bluez/bluez-cups-backend_3.19.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" \ No newline at end of file diff --git a/packages/bluez/bluez-cups-backend_3.20.bb b/packages/bluez/bluez-cups-backend_3.20.bb deleted file mode 100644 index d92b53220f..0000000000 --- a/packages/bluez/bluez-cups-backend_3.20.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" \ No newline at end of file diff --git a/packages/bluez/bluez-cups-backend_3.22.bb b/packages/bluez/bluez-cups-backend_3.22.bb deleted file mode 100644 index d92b53220f..0000000000 --- a/packages/bluez/bluez-cups-backend_3.22.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" \ No newline at end of file diff --git a/packages/bluez/bluez-cups-backend_3.23.bb b/packages/bluez/bluez-cups-backend_3.23.bb deleted file mode 100644 index 46ca0becf0..0000000000 --- a/packages/bluez/bluez-cups-backend_3.23.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc -PR = "r1" -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" \ No newline at end of file diff --git a/packages/bluez/bluez-cups-backend_3.24.bb b/packages/bluez/bluez-cups-backend_3.24.bb deleted file mode 100644 index 40e099642a..0000000000 --- a/packages/bluez/bluez-cups-backend_3.24.bb +++ /dev/null @@ -1,27 +0,0 @@ -require bluez-utils3.inc - -PR = "r1" - -DEPENDS += "cups" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/cups/backend/bluetooth" -RDEPENDS_${PN} = "cups" diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb deleted file mode 100644 index 398e99d5c1..0000000000 --- a/packages/bluez/bluez-gnome_0.10.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Bluetooth configuration applet" -LICENSE = "GPL+LGPL" - -DEPENDS = "dbus-glib gconf libnotify gtk+" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gconf" - diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb deleted file mode 100644 index e3aaeafeb3..0000000000 --- a/packages/bluez/bluez-gnome_0.13.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Bluetooth configuration applet" -LICENSE = "GPL+LGPL" - -PR = "r1" - -DEPENDS = "dbus-glib gconf libnotify gtk+" -RRECOMMENDS = "gnome-icon-theme" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gconf" - diff --git a/packages/bluez/bluez-gnome_0.14.bb b/packages/bluez/bluez-gnome_0.14.bb deleted file mode 100644 index e3aaeafeb3..0000000000 --- a/packages/bluez/bluez-gnome_0.14.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Bluetooth configuration applet" -LICENSE = "GPL+LGPL" - -PR = "r1" - -DEPENDS = "dbus-glib gconf libnotify gtk+" -RRECOMMENDS = "gnome-icon-theme" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gconf" - diff --git a/packages/bluez/bluez-gnome_0.15.bb b/packages/bluez/bluez-gnome_0.15.bb deleted file mode 100644 index e3aaeafeb3..0000000000 --- a/packages/bluez/bluez-gnome_0.15.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Bluetooth configuration applet" -LICENSE = "GPL+LGPL" - -PR = "r1" - -DEPENDS = "dbus-glib gconf libnotify gtk+" -RRECOMMENDS = "gnome-icon-theme" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gconf" - diff --git a/packages/bluez/bluez-gnome_0.24.bb b/packages/bluez/bluez-gnome_0.24.bb deleted file mode 100644 index e3aaeafeb3..0000000000 --- a/packages/bluez/bluez-gnome_0.24.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "Bluetooth configuration applet" -LICENSE = "GPL+LGPL" - -PR = "r1" - -DEPENDS = "dbus-glib gconf libnotify gtk+" -RRECOMMENDS = "gnome-icon-theme" - -SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz" - -inherit autotools pkgconfig gconf - -FILES_${PN} += "${datadir}/gconf" - diff --git a/packages/bluez/bluez-gstreamer-plugin_3.19.bb b/packages/bluez/bluez-gstreamer-plugin_3.19.bb deleted file mode 100644 index 123259b3a7..0000000000 --- a/packages/bluez/bluez-gstreamer-plugin_3.19.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "gstreamer gst-plugins-base " - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --enable-gstreamer \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.20.bb b/packages/bluez/bluez-gstreamer-plugin_3.20.bb deleted file mode 100644 index 123259b3a7..0000000000 --- a/packages/bluez/bluez-gstreamer-plugin_3.20.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "gstreamer gst-plugins-base " - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --enable-gstreamer \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.22.bb b/packages/bluez/bluez-gstreamer-plugin_3.22.bb deleted file mode 100644 index 123259b3a7..0000000000 --- a/packages/bluez/bluez-gstreamer-plugin_3.22.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "gstreamer gst-plugins-base " - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --enable-gstreamer \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.23.bb b/packages/bluez/bluez-gstreamer-plugin_3.23.bb deleted file mode 100644 index 36e9ca3d91..0000000000 --- a/packages/bluez/bluez-gstreamer-plugin_3.23.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc -PR = "r1" -DEPENDS += "gstreamer gst-plugins-base " - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --enable-gstreamer \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-gstreamer-plugin_3.24.bb b/packages/bluez/bluez-gstreamer-plugin_3.24.bb deleted file mode 100644 index 53b7eb86f2..0000000000 --- a/packages/bluez/bluez-gstreamer-plugin_3.24.bb +++ /dev/null @@ -1,27 +0,0 @@ -require bluez-utils3.inc - -PR = "r1" - -DEPENDS += "gstreamer gst-plugins-base " - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --enable-gstreamer \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - - -FILES_${PN} = "${libdir}/gstreamer-0.10/libgstbluetooth.so" diff --git a/packages/bluez/bluez-hcidump_1.26.bb b/packages/bluez/bluez-hcidump_1.26.bb deleted file mode 100644 index 0cbc0fd6ec..0000000000 --- a/packages/bluez/bluez-hcidump_1.26.bb +++ /dev/null @@ -1,15 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools - - diff --git a/packages/bluez/bluez-hcidump_1.29.bb b/packages/bluez/bluez-hcidump_1.29.bb deleted file mode 100644 index 877c8db33c..0000000000 --- a/packages/bluez/bluez-hcidump_1.29.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/bluez/bluez-hcidump_1.31.bb b/packages/bluez/bluez-hcidump_1.31.bb deleted file mode 100644 index 877c8db33c..0000000000 --- a/packages/bluez/bluez-hcidump_1.31.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/bluez/bluez-hcidump_1.32.bb b/packages/bluez/bluez-hcidump_1.32.bb deleted file mode 100644 index 877c8db33c..0000000000 --- a/packages/bluez/bluez-hcidump_1.32.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/bluez/bluez-hcidump_1.33.bb b/packages/bluez/bluez-hcidump_1.33.bb deleted file mode 100644 index 877c8db33c..0000000000 --- a/packages/bluez/bluez-hcidump_1.33.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/bluez/bluez-hcidump_1.37.bb b/packages/bluez/bluez-hcidump_1.37.bb deleted file mode 100644 index 877c8db33c..0000000000 --- a/packages/bluez/bluez-hcidump_1.37.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/bluez/bluez-hcidump_1.38.bb b/packages/bluez/bluez-hcidump_1.38.bb deleted file mode 100644 index 877c8db33c..0000000000 --- a/packages/bluez/bluez-hcidump_1.38.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack HCI Debugger Tool." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-hcidump-${PV}.tar.gz" -S = "${WORKDIR}/bluez-hcidump-${PV}" - -EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR}" - -inherit autotools diff --git a/packages/bluez/bluez-libs_3.10.bb b/packages/bluez/bluez-libs_3.10.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.10.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.11.bb b/packages/bluez/bluez-libs_3.11.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.11.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.12.bb b/packages/bluez/bluez-libs_3.12.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.12.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.13.bb b/packages/bluez/bluez-libs_3.13.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.13.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.14.bb b/packages/bluez/bluez-libs_3.14.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.14.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.15.bb b/packages/bluez/bluez-libs_3.15.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.15.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.16.bb b/packages/bluez/bluez-libs_3.16.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.16.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.17.bb b/packages/bluez/bluez-libs_3.17.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.17.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.18.bb b/packages/bluez/bluez-libs_3.18.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.18.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.19.bb b/packages/bluez/bluez-libs_3.19.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.19.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.20.bb b/packages/bluez/bluez-libs_3.20.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.20.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.22.bb b/packages/bluez/bluez-libs_3.22.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.22.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.23.bb b/packages/bluez/bluez-libs_3.23.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.23.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.24.bb b/packages/bluez/bluez-libs_3.24.bb deleted file mode 100644 index eb515b4aba..0000000000 --- a/packages/bluez/bluez-libs_3.24.bb +++ /dev/null @@ -1,4 +0,0 @@ -require bluez-libs.inc - -PR = "r1" - diff --git a/packages/bluez/bluez-libs_3.28.bb b/packages/bluez/bluez-libs_3.28.bb deleted file mode 100644 index eb515b4aba..0000000000 --- a/packages/bluez/bluez-libs_3.28.bb +++ /dev/null @@ -1,4 +0,0 @@ -require bluez-libs.inc - -PR = "r1" - diff --git a/packages/bluez/bluez-libs_3.30.bb b/packages/bluez/bluez-libs_3.30.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.30.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-libs_3.4.bb b/packages/bluez/bluez-libs_3.4.bb deleted file mode 100644 index d740bd80a9..0000000000 --- a/packages/bluez/bluez-libs_3.4.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.bluez.org" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez/bluez-libs_3.7.bb b/packages/bluez/bluez-libs_3.7.bb deleted file mode 100644 index d740bd80a9..0000000000 --- a/packages/bluez/bluez-libs_3.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.bluez.org" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez/bluez-libs_3.8.bb b/packages/bluez/bluez-libs_3.8.bb deleted file mode 100644 index d740bd80a9..0000000000 --- a/packages/bluez/bluez-libs_3.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." -SECTION = "libs" -PRIORITY = "optional" -HOMEPAGE = "http://www.bluez.org" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" - -inherit autotools pkgconfig - -HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" - -do_stage() { - oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} - - install -d ${STAGING_INCDIR}/bluetooth/ - for f in ${HEADERS} - do - install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f - done -} diff --git a/packages/bluez/bluez-libs_3.9.bb b/packages/bluez/bluez-libs_3.9.bb deleted file mode 100644 index 6ddf62a4fb..0000000000 --- a/packages/bluez/bluez-libs_3.9.bb +++ /dev/null @@ -1 +0,0 @@ -require bluez-libs.inc diff --git a/packages/bluez/bluez-utils-3.14/.mtn2git_empty b/packages/bluez/bluez-utils-3.14/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch deleted file mode 100644 index 7936b7da3c..0000000000 --- a/packages/bluez/bluez-utils-3.14/hciattach-ti-bts.patch +++ /dev/null @@ -1,498 +0,0 @@ -Index: bluez-utils-3.9/tools/hciattach.c -=================================================================== ---- bluez-utils-3.9.orig/tools/hciattach.c 2007-01-28 21:16:48.000000000 +0100 -+++ bluez-utils-3.9/tools/hciattach.c 2007-01-29 22:51:30.000000000 +0100 -@@ -59,6 +59,8 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - -+#include "ti_bts.h" -+ - struct uart_t { - char *type; - int m_id; -@@ -68,6 +70,7 @@ - int speed; - int flags; - int (*init) (int fd, struct uart_t *u, struct termios *ti); -+ char *bts; /* bluetooth script */ - }; - - #define FLOW_CTL 0x0001 -@@ -257,6 +260,114 @@ - return 0; - } - -+static int brf6150(int fd, struct uart_t *u, struct termios *ti) -+{ -+ bts_t *bfp; -+ int i; -+ unsigned long vers; -+ unsigned char actionbuf[256]; -+ unsigned char resp[128]; /* Response */ -+ unsigned long count; -+ unsigned short atype; -+ -+ if (u->bts == NULL) /* no script, ignore */ -+ return 0; -+ -+ bfp = bts_load_script( u->bts, &vers ); -+ if (bfp == NULL) -+ return -1; -+ -+ fprintf( stderr, "Loading BTS script version %lu\n", vers ); -+ -+ while ((count = bts_next_action( bfp, actionbuf, -+ sizeof actionbuf - 1, &atype )) != 0) { -+ if (atype == ACTION_REMARKS) { -+ if (actionbuf[0] != 0) -+ fprintf( stderr, "%s\n", actionbuf ); -+ } -+ else if (atype == ACTION_SEND_COMMAND) { -+#if 0 -+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); -+ for (i=0; idata[i] ); -+ } -+ fprintf( stderr, "\n" ); -+#endif -+ usleep(wait->msec); /* seems they give usec, not msec */ -+ /* Read reply. */ -+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { -+ perror("Failed to read TI command response"); -+ return -1; -+ } -+ if (count < wait->size) { -+ fprintf( stderr, "TI command response is short."); -+ } -+ for (i=0; isize; i++) { -+ if (i == 3) continue; /* ignore */ -+ if (resp[i] != wait->data[i]) { -+ fprintf( stderr, "TI command response does not match expected result.\n" ); -+ } -+ } -+ } -+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { -+ action_serial_t *sercmd = (action_serial_t *)actionbuf; -+ -+ /* Set actual baudrate */ -+ fprintf( stderr, -+ "BTS changing baud rate to %u, flow control to %u\n", -+ sercmd->baud, sercmd->flow_control ); -+ -+ tcflush(fd, TCIOFLUSH); -+ -+ if (sercmd->flow_control) -+ ti->c_cflag |= CRTSCTS; -+ else -+ ti->c_cflag &= ~CRTSCTS; -+ if (tcsetattr(fd, TCSANOW, ti) < 0) { -+ perror("Can't set port settings"); -+ return -1; -+ } -+ -+ u->speed = sercmd->baud; -+ -+ tcflush(fd, TCIOFLUSH); -+ if (set_speed(fd, ti, sercmd->baud) < 0) { -+ perror("Can't set baud rate"); -+ return -1; -+ } -+ } -+ else if (atype == ACTION_DELAY) { -+ action_delay_t *delay = (action_delay_t *)actionbuf; -+ usleep(delay->msec); /* seems they give usec, not msec */ -+ } -+ else { -+ fprintf( stderr, "BTS action type = %d: ", (int)atype ); -+ for (i=0; i> 2) == 3) { -+ int err; -+ nanosleep(&tm, NULL); -+ -+ /* BRF6150 */ -+ if ((err=brf6150( fd, u, ti )) != 0) { -+ fprintf( stderr, "TI script failed (err=%d)\n", -+ err ); -+ return -1; -+ } -+ } -+ - nanosleep(&tm, NULL); - return 0; - } -@@ -1128,7 +1250,7 @@ - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] [speed] [flow|noflow]\n"); - printf("\thciattach -l\n"); - } - -@@ -1143,11 +1265,12 @@ - struct sigaction sa; - struct pollfd p; - char dev[PATH_MAX]; -+ char *bts = NULL; - - detach = 1; - printpid = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { - switch(opt) { - case 'b': - send_break = 1; -@@ -1169,6 +1292,10 @@ - init_speed = atoi(optarg); - break; - -+ case 'S': -+ bts = optarg; -+ break; -+ - case 'l': - for (i = 0; uart[i].type; i++) { - printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1240,6 +1367,8 @@ - if (init_speed) - u->init_speed = init_speed; - -+ u->bts = bts; -+ - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_alarm; -Index: bluez-utils-3.9/tools/Makefile.am -=================================================================== ---- bluez-utils-3.9.orig/tools/Makefile.am 2007-01-28 21:16:48.000000000 +0100 -+++ bluez-utils-3.9/tools/Makefile.am 2007-01-29 22:54:22.000000000 +0100 -@@ -37,7 +37,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - hciattach_LDADD = @BLUEZ_LIBS@ - - hciconfig_SOURCES = hciconfig.c csr.h csr.c -Index: bluez-utils-3.9/tools/ti_bts.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ bluez-utils-3.9/tools/ti_bts.h 2007-01-29 22:51:30.000000000 +0100 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+#ifndef BT_SCRIPT_H -+#define BT_SCRIPT_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * Define the interface of Bluetooth Script -+ */ -+ -+typedef void bts_t; -+ -+ -+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ -+#define ACTION_WAIT_EVENT 2 /* Wait for data */ -+#define ACTION_SERIAL_PORT_PARAMETERS 3 -+#define ACTION_DELAY 4 -+#define ACTION_RUN_SCRIPT 5 -+#define ACTION_REMARKS 6 -+ -+/* -+ * Structure for ACTION_SEND_COMMAND -+ */ -+typedef struct tagCActionCommand -+{ -+ unsigned char data[1]; /* Data to send */ -+} action_command_t; -+ -+/* -+ * Structure for ACTION_WAIT_EVENT -+ */ -+typedef struct tagCActionWaitEvent -+{ -+ unsigned long msec; /* in milliseconds */ -+ unsigned long size; -+ unsigned char data[1]; /* Data to wait for */ -+} action_wait_t; -+ -+ -+/* -+ * Structure for ACTION_SERIAL_PORT_PARAMETERS -+ */ -+typedef struct tagCActionSerialPortParameters -+{ -+ unsigned long baud; -+ unsigned long flow_control; -+} action_serial_t; -+ -+/* Flow Control Type */ -+#define FCT_NONE 0 -+#define FCT_HARDWARE 1 -+ -+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ -+ -+ -+/* -+ * Structure for ACTION_DELAY -+ */ -+typedef struct tagCActionDelay -+{ -+ unsigned long msec; /* in milliseconds */ -+} action_delay_t; -+ -+/* -+ * Structure for ACTION_RUN_SCRIPT -+ */ -+typedef struct tagCActionRunScript -+{ -+ char filename[1]; -+} action_run_t; -+ -+/* -+ * Structure for ACTION_REMARKS -+ */ -+typedef struct tagCActionRemarks -+{ -+ char m_szRemarks[1]; -+} action_remarks_t; -+ -+ -+const char *cis_create_filename(const unsigned char* cmdparms); -+bts_t * bts_load_script(const char* fname, unsigned long* version); -+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype); -+void bts_unload_script(bts_t* bts_fp); -+ -+#ifdef __cplusplus -+}; -+#endif -+ -+#endif /* BT_SCRIPT_H */ -+ -Index: bluez-utils-3.9/tools/ti_bts.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ bluez-utils-3.9/tools/ti_bts.c 2007-01-29 22:51:30.000000000 +0100 -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+ -+#include -+#include -+#include "ti_bts.h" -+ -+#ifndef MAKEWORD -+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) -+#endif -+ -+#define TI_MANUFACTURER_ID 13 -+ -+/* -+ * Common Init Script specific -+ */ -+const char * -+cis_create_filename(const unsigned char* cmdparms) -+{ -+ static char bts_file[50]; -+ -+ /* Check for TI's id */ -+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); -+ -+ if (TI_MANUFACTURER_ID == manfid) { -+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); -+ -+ unsigned short chip = (version & 0x7C00) >> 10; -+ unsigned short min_ver = (version & 0x007F); -+ unsigned short maj_ver = (version & 0x0380) >> 7; -+ -+ if (0 != (version & 0x8000)) { -+ maj_ver |= 0x0008; -+ } -+ -+ sprintf( bts_file, "TIInit_%d.%d.%d.bts", -+ (int)chip, (int)maj_ver, (int)min_ver); -+ -+ return &bts_file[0]; -+ } -+ return NULL; -+} -+ -+typedef struct tagCHeader -+{ -+ unsigned long magic; -+ unsigned long version; -+ unsigned char future[24]; -+} cheader_t; -+ -+ -+/* The value 0x42535442 stands for (in ASCII) BTSB */ -+/* which is Bluetooth Script Binary */ -+#define FILE_HEADER_MAGIC 0x42535442 -+ -+ -+bts_t * -+bts_load_script(const char* fname, unsigned long* version) -+{ -+ bts_t* bts = NULL; -+ FILE* fp = fopen(fname, "rb"); -+ -+ if (NULL != fp) { -+ /* Read header */ -+ cheader_t header; -+ -+ /* Read header */ -+ if (1 == fread(&header, sizeof(header), 1, fp)) { -+ /* Check magic number for correctness */ -+ if (header.magic == FILE_HEADER_MAGIC) { -+ /* If user wants the version number */ -+ if (NULL != version) { -+ *version = header.version; -+ } -+ bts = (bts_t*)fp; -+ } -+ } -+ /* If failed reading the file, close it */ -+ if (NULL == bts) { -+ fclose(fp); -+ } -+ } -+ return bts; -+} -+ -+unsigned long -+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype) -+{ -+ unsigned long bytes = 0; -+ FILE* fp = (FILE*)bts_fp; -+ unsigned char action_hdr[4]; -+ -+ if (bts_fp == NULL) -+ return 0; -+ -+ /* Each Action has the following: */ -+ /* UINT16 type of this action */ -+ /* UINT16 size of rest */ -+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ -+ -+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { -+ unsigned short type = *(unsigned short*)&action_hdr[0]; -+ unsigned short size = *(unsigned short*)&action_hdr[2]; -+ -+ if (size <= nMaxSize) { -+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); -+ -+ if (nread == size) { -+ *ptype = type; -+ bytes = (unsigned long)size; -+ } -+ } -+ } -+ -+ return bytes; -+} -+ -+void -+bts_unload_script(bts_t* bts_fp) -+{ -+ FILE* fp = (FILE*)bts_fp; -+ -+ if (NULL != fp) { -+ fclose(fp); -+ } -+} -+ diff --git a/packages/bluez/bluez-utils-3.23/.mtn2git_empty b/packages/bluez/bluez-utils-3.23/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch deleted file mode 100644 index 1b208f7979..0000000000 --- a/packages/bluez/bluez-utils-3.23/hciattach-ti-bts.patch +++ /dev/null @@ -1,477 +0,0 @@ ---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 -+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 -@@ -60,6 +60,8 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - -+#include "ti_bts.h" -+ - struct uart_t { - char *type; - int m_id; -@@ -70,6 +72,7 @@ - int flags; - char *bdaddr; - int (*init) (int fd, struct uart_t *u, struct termios *ti); -+ char *bts; /* bluetooth script */ - }; - - #define FLOW_CTL 0x0001 -@@ -279,6 +282,114 @@ - return 0; - } - -+static int brf6150(int fd, struct uart_t *u, struct termios *ti) -+{ -+ bts_t *bfp; -+ int i; -+ unsigned long vers; -+ unsigned char actionbuf[256]; -+ unsigned char resp[128]; /* Response */ -+ unsigned long count; -+ unsigned short atype; -+ -+ if (u->bts == NULL) /* no script, ignore */ -+ return 0; -+ -+ bfp = bts_load_script( u->bts, &vers ); -+ if (bfp == NULL) -+ return -1; -+ -+ fprintf( stderr, "Loading BTS script version %lu\n", vers ); -+ -+ while ((count = bts_next_action( bfp, actionbuf, -+ sizeof actionbuf - 1, &atype )) != 0) { -+ if (atype == ACTION_REMARKS) { -+ if (actionbuf[0] != 0) -+ fprintf( stderr, "%s\n", actionbuf ); -+ } -+ else if (atype == ACTION_SEND_COMMAND) { -+#if 0 -+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); -+ for (i=0; idata[i] ); -+ } -+ fprintf( stderr, "\n" ); -+#endif -+ usleep(wait->msec); /* seems they give usec, not msec */ -+ /* Read reply. */ -+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { -+ perror("Failed to read TI command response"); -+ return -1; -+ } -+ if (count < wait->size) { -+ fprintf( stderr, "TI command response is short."); -+ } -+ for (i=0; isize; i++) { -+ if (i == 3) continue; /* ignore */ -+ if (resp[i] != wait->data[i]) { -+ fprintf( stderr, "TI command response does not match expected result.\n" ); -+ } -+ } -+ } -+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { -+ action_serial_t *sercmd = (action_serial_t *)actionbuf; -+ -+ /* Set actual baudrate */ -+ fprintf( stderr, -+ "BTS changing baud rate to %u, flow control to %u\n", -+ sercmd->baud, sercmd->flow_control ); -+ -+ tcflush(fd, TCIOFLUSH); -+ -+ if (sercmd->flow_control) -+ ti->c_cflag |= CRTSCTS; -+ else -+ ti->c_cflag &= ~CRTSCTS; -+ if (tcsetattr(fd, TCSANOW, ti) < 0) { -+ perror("Can't set port settings"); -+ return -1; -+ } -+ -+ u->speed = sercmd->baud; -+ -+ tcflush(fd, TCIOFLUSH); -+ if (set_speed(fd, ti, sercmd->baud) < 0) { -+ perror("Can't set baud rate"); -+ return -1; -+ } -+ } -+ else if (atype == ACTION_DELAY) { -+ action_delay_t *delay = (action_delay_t *)actionbuf; -+ usleep(delay->msec); /* seems they give usec, not msec */ -+ } -+ else { -+ fprintf( stderr, "BTS action type = %d: ", (int)atype ); -+ for (i=0; i> 2) == 3) { -+ /* BRF6150 */ -+ int err; -+ -+ nanosleep(&tm, NULL); -+ if ((err = brf6150(fd, u, ti)) != 0) { -+ fprintf(stderr, "Texas module script failed (err=%d)\n", err); -+ return -1; -+ } -+ } -+ - nanosleep(&tm, NULL); - return 0; - } -@@ -1204,7 +1326,7 @@ - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] [speed] [flow|noflow] [bdaddr]\n"); - printf("\thciattach -l\n"); - } - -@@ -1219,11 +1341,12 @@ - struct sigaction sa; - struct pollfd p; - char dev[PATH_MAX]; -+ char *bts = NULL; - - detach = 1; - printpid = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { - switch(opt) { - case 'b': - send_break = 1; -@@ -1245,6 +1368,10 @@ - init_speed = atoi(optarg); - break; - -+ case 'S': -+ bts = optarg; -+ break; -+ - case 'l': - for (i = 0; uart[i].type; i++) { - printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1320,6 +1447,8 @@ - if (init_speed) - u->init_speed = init_speed; - -+ u->bts = bts; -+ - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_alarm; ---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+#ifndef BT_SCRIPT_H -+#define BT_SCRIPT_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * Define the interface of Bluetooth Script -+ */ -+ -+typedef void bts_t; -+ -+ -+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ -+#define ACTION_WAIT_EVENT 2 /* Wait for data */ -+#define ACTION_SERIAL_PORT_PARAMETERS 3 -+#define ACTION_DELAY 4 -+#define ACTION_RUN_SCRIPT 5 -+#define ACTION_REMARKS 6 -+ -+/* -+ * Structure for ACTION_SEND_COMMAND -+ */ -+typedef struct tagCActionCommand -+{ -+ unsigned char data[1]; /* Data to send */ -+} action_command_t; -+ -+/* -+ * Structure for ACTION_WAIT_EVENT -+ */ -+typedef struct tagCActionWaitEvent -+{ -+ unsigned long msec; /* in milliseconds */ -+ unsigned long size; -+ unsigned char data[1]; /* Data to wait for */ -+} action_wait_t; -+ -+ -+/* -+ * Structure for ACTION_SERIAL_PORT_PARAMETERS -+ */ -+typedef struct tagCActionSerialPortParameters -+{ -+ unsigned long baud; -+ unsigned long flow_control; -+} action_serial_t; -+ -+/* Flow Control Type */ -+#define FCT_NONE 0 -+#define FCT_HARDWARE 1 -+ -+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ -+ -+ -+/* -+ * Structure for ACTION_DELAY -+ */ -+typedef struct tagCActionDelay -+{ -+ unsigned long msec; /* in milliseconds */ -+} action_delay_t; -+ -+/* -+ * Structure for ACTION_RUN_SCRIPT -+ */ -+typedef struct tagCActionRunScript -+{ -+ char filename[1]; -+} action_run_t; -+ -+/* -+ * Structure for ACTION_REMARKS -+ */ -+typedef struct tagCActionRemarks -+{ -+ char m_szRemarks[1]; -+} action_remarks_t; -+ -+ -+const char *cis_create_filename(const unsigned char* cmdparms); -+bts_t * bts_load_script(const char* fname, unsigned long* version); -+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype); -+void bts_unload_script(bts_t* bts_fp); -+ -+#ifdef __cplusplus -+}; -+#endif -+ -+#endif /* BT_SCRIPT_H */ -+ ---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+ -+#include -+#include -+#include "ti_bts.h" -+ -+#ifndef MAKEWORD -+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) -+#endif -+ -+#define TI_MANUFACTURER_ID 13 -+ -+/* -+ * Common Init Script specific -+ */ -+const char * -+cis_create_filename(const unsigned char* cmdparms) -+{ -+ static char bts_file[50]; -+ -+ /* Check for TI's id */ -+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); -+ -+ if (TI_MANUFACTURER_ID == manfid) { -+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); -+ -+ unsigned short chip = (version & 0x7C00) >> 10; -+ unsigned short min_ver = (version & 0x007F); -+ unsigned short maj_ver = (version & 0x0380) >> 7; -+ -+ if (0 != (version & 0x8000)) { -+ maj_ver |= 0x0008; -+ } -+ -+ sprintf( bts_file, "TIInit_%d.%d.%d.bts", -+ (int)chip, (int)maj_ver, (int)min_ver); -+ -+ return &bts_file[0]; -+ } -+ return NULL; -+} -+ -+typedef struct tagCHeader -+{ -+ unsigned long magic; -+ unsigned long version; -+ unsigned char future[24]; -+} cheader_t; -+ -+ -+/* The value 0x42535442 stands for (in ASCII) BTSB */ -+/* which is Bluetooth Script Binary */ -+#define FILE_HEADER_MAGIC 0x42535442 -+ -+ -+bts_t * -+bts_load_script(const char* fname, unsigned long* version) -+{ -+ bts_t* bts = NULL; -+ FILE* fp = fopen(fname, "rb"); -+ -+ if (NULL != fp) { -+ /* Read header */ -+ cheader_t header; -+ -+ /* Read header */ -+ if (1 == fread(&header, sizeof(header), 1, fp)) { -+ /* Check magic number for correctness */ -+ if (header.magic == FILE_HEADER_MAGIC) { -+ /* If user wants the version number */ -+ if (NULL != version) { -+ *version = header.version; -+ } -+ bts = (bts_t*)fp; -+ } -+ } -+ /* If failed reading the file, close it */ -+ if (NULL == bts) { -+ fclose(fp); -+ } -+ } -+ return bts; -+} -+ -+unsigned long -+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype) -+{ -+ unsigned long bytes = 0; -+ FILE* fp = (FILE*)bts_fp; -+ unsigned char action_hdr[4]; -+ -+ if (bts_fp == NULL) -+ return 0; -+ -+ /* Each Action has the following: */ -+ /* UINT16 type of this action */ -+ /* UINT16 size of rest */ -+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ -+ -+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { -+ unsigned short type = *(unsigned short*)&action_hdr[0]; -+ unsigned short size = *(unsigned short*)&action_hdr[2]; -+ -+ if (size <= nMaxSize) { -+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); -+ -+ if (nread == size) { -+ *ptype = type; -+ bytes = (unsigned long)size; -+ } -+ } -+ } -+ -+ return bytes; -+} -+ -+void -+bts_unload_script(bts_t* bts_fp) -+{ -+ FILE* fp = (FILE*)bts_fp; -+ -+ if (NULL != fp) { -+ fclose(fp); -+ } -+} -+ ---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 -+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 -@@ -45,7 +45,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - hciattach_LDADD = @BLUEZ_LIBS@ - - hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/bluez/bluez-utils-3.24/.mtn2git_empty b/packages/bluez/bluez-utils-3.24/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch deleted file mode 100644 index 1b208f7979..0000000000 --- a/packages/bluez/bluez-utils-3.24/hciattach-ti-bts.patch +++ /dev/null @@ -1,477 +0,0 @@ ---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 -+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 -@@ -60,6 +60,8 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - -+#include "ti_bts.h" -+ - struct uart_t { - char *type; - int m_id; -@@ -70,6 +72,7 @@ - int flags; - char *bdaddr; - int (*init) (int fd, struct uart_t *u, struct termios *ti); -+ char *bts; /* bluetooth script */ - }; - - #define FLOW_CTL 0x0001 -@@ -279,6 +282,114 @@ - return 0; - } - -+static int brf6150(int fd, struct uart_t *u, struct termios *ti) -+{ -+ bts_t *bfp; -+ int i; -+ unsigned long vers; -+ unsigned char actionbuf[256]; -+ unsigned char resp[128]; /* Response */ -+ unsigned long count; -+ unsigned short atype; -+ -+ if (u->bts == NULL) /* no script, ignore */ -+ return 0; -+ -+ bfp = bts_load_script( u->bts, &vers ); -+ if (bfp == NULL) -+ return -1; -+ -+ fprintf( stderr, "Loading BTS script version %lu\n", vers ); -+ -+ while ((count = bts_next_action( bfp, actionbuf, -+ sizeof actionbuf - 1, &atype )) != 0) { -+ if (atype == ACTION_REMARKS) { -+ if (actionbuf[0] != 0) -+ fprintf( stderr, "%s\n", actionbuf ); -+ } -+ else if (atype == ACTION_SEND_COMMAND) { -+#if 0 -+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); -+ for (i=0; idata[i] ); -+ } -+ fprintf( stderr, "\n" ); -+#endif -+ usleep(wait->msec); /* seems they give usec, not msec */ -+ /* Read reply. */ -+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { -+ perror("Failed to read TI command response"); -+ return -1; -+ } -+ if (count < wait->size) { -+ fprintf( stderr, "TI command response is short."); -+ } -+ for (i=0; isize; i++) { -+ if (i == 3) continue; /* ignore */ -+ if (resp[i] != wait->data[i]) { -+ fprintf( stderr, "TI command response does not match expected result.\n" ); -+ } -+ } -+ } -+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { -+ action_serial_t *sercmd = (action_serial_t *)actionbuf; -+ -+ /* Set actual baudrate */ -+ fprintf( stderr, -+ "BTS changing baud rate to %u, flow control to %u\n", -+ sercmd->baud, sercmd->flow_control ); -+ -+ tcflush(fd, TCIOFLUSH); -+ -+ if (sercmd->flow_control) -+ ti->c_cflag |= CRTSCTS; -+ else -+ ti->c_cflag &= ~CRTSCTS; -+ if (tcsetattr(fd, TCSANOW, ti) < 0) { -+ perror("Can't set port settings"); -+ return -1; -+ } -+ -+ u->speed = sercmd->baud; -+ -+ tcflush(fd, TCIOFLUSH); -+ if (set_speed(fd, ti, sercmd->baud) < 0) { -+ perror("Can't set baud rate"); -+ return -1; -+ } -+ } -+ else if (atype == ACTION_DELAY) { -+ action_delay_t *delay = (action_delay_t *)actionbuf; -+ usleep(delay->msec); /* seems they give usec, not msec */ -+ } -+ else { -+ fprintf( stderr, "BTS action type = %d: ", (int)atype ); -+ for (i=0; i> 2) == 3) { -+ /* BRF6150 */ -+ int err; -+ -+ nanosleep(&tm, NULL); -+ if ((err = brf6150(fd, u, ti)) != 0) { -+ fprintf(stderr, "Texas module script failed (err=%d)\n", err); -+ return -1; -+ } -+ } -+ - nanosleep(&tm, NULL); - return 0; - } -@@ -1204,7 +1326,7 @@ - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] [speed] [flow|noflow] [bdaddr]\n"); - printf("\thciattach -l\n"); - } - -@@ -1219,11 +1341,12 @@ - struct sigaction sa; - struct pollfd p; - char dev[PATH_MAX]; -+ char *bts = NULL; - - detach = 1; - printpid = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { - switch(opt) { - case 'b': - send_break = 1; -@@ -1245,6 +1368,10 @@ - init_speed = atoi(optarg); - break; - -+ case 'S': -+ bts = optarg; -+ break; -+ - case 'l': - for (i = 0; uart[i].type; i++) { - printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1320,6 +1447,8 @@ - if (init_speed) - u->init_speed = init_speed; - -+ u->bts = bts; -+ - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_alarm; ---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+#ifndef BT_SCRIPT_H -+#define BT_SCRIPT_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * Define the interface of Bluetooth Script -+ */ -+ -+typedef void bts_t; -+ -+ -+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ -+#define ACTION_WAIT_EVENT 2 /* Wait for data */ -+#define ACTION_SERIAL_PORT_PARAMETERS 3 -+#define ACTION_DELAY 4 -+#define ACTION_RUN_SCRIPT 5 -+#define ACTION_REMARKS 6 -+ -+/* -+ * Structure for ACTION_SEND_COMMAND -+ */ -+typedef struct tagCActionCommand -+{ -+ unsigned char data[1]; /* Data to send */ -+} action_command_t; -+ -+/* -+ * Structure for ACTION_WAIT_EVENT -+ */ -+typedef struct tagCActionWaitEvent -+{ -+ unsigned long msec; /* in milliseconds */ -+ unsigned long size; -+ unsigned char data[1]; /* Data to wait for */ -+} action_wait_t; -+ -+ -+/* -+ * Structure for ACTION_SERIAL_PORT_PARAMETERS -+ */ -+typedef struct tagCActionSerialPortParameters -+{ -+ unsigned long baud; -+ unsigned long flow_control; -+} action_serial_t; -+ -+/* Flow Control Type */ -+#define FCT_NONE 0 -+#define FCT_HARDWARE 1 -+ -+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ -+ -+ -+/* -+ * Structure for ACTION_DELAY -+ */ -+typedef struct tagCActionDelay -+{ -+ unsigned long msec; /* in milliseconds */ -+} action_delay_t; -+ -+/* -+ * Structure for ACTION_RUN_SCRIPT -+ */ -+typedef struct tagCActionRunScript -+{ -+ char filename[1]; -+} action_run_t; -+ -+/* -+ * Structure for ACTION_REMARKS -+ */ -+typedef struct tagCActionRemarks -+{ -+ char m_szRemarks[1]; -+} action_remarks_t; -+ -+ -+const char *cis_create_filename(const unsigned char* cmdparms); -+bts_t * bts_load_script(const char* fname, unsigned long* version); -+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype); -+void bts_unload_script(bts_t* bts_fp); -+ -+#ifdef __cplusplus -+}; -+#endif -+ -+#endif /* BT_SCRIPT_H */ -+ ---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+ -+#include -+#include -+#include "ti_bts.h" -+ -+#ifndef MAKEWORD -+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) -+#endif -+ -+#define TI_MANUFACTURER_ID 13 -+ -+/* -+ * Common Init Script specific -+ */ -+const char * -+cis_create_filename(const unsigned char* cmdparms) -+{ -+ static char bts_file[50]; -+ -+ /* Check for TI's id */ -+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); -+ -+ if (TI_MANUFACTURER_ID == manfid) { -+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); -+ -+ unsigned short chip = (version & 0x7C00) >> 10; -+ unsigned short min_ver = (version & 0x007F); -+ unsigned short maj_ver = (version & 0x0380) >> 7; -+ -+ if (0 != (version & 0x8000)) { -+ maj_ver |= 0x0008; -+ } -+ -+ sprintf( bts_file, "TIInit_%d.%d.%d.bts", -+ (int)chip, (int)maj_ver, (int)min_ver); -+ -+ return &bts_file[0]; -+ } -+ return NULL; -+} -+ -+typedef struct tagCHeader -+{ -+ unsigned long magic; -+ unsigned long version; -+ unsigned char future[24]; -+} cheader_t; -+ -+ -+/* The value 0x42535442 stands for (in ASCII) BTSB */ -+/* which is Bluetooth Script Binary */ -+#define FILE_HEADER_MAGIC 0x42535442 -+ -+ -+bts_t * -+bts_load_script(const char* fname, unsigned long* version) -+{ -+ bts_t* bts = NULL; -+ FILE* fp = fopen(fname, "rb"); -+ -+ if (NULL != fp) { -+ /* Read header */ -+ cheader_t header; -+ -+ /* Read header */ -+ if (1 == fread(&header, sizeof(header), 1, fp)) { -+ /* Check magic number for correctness */ -+ if (header.magic == FILE_HEADER_MAGIC) { -+ /* If user wants the version number */ -+ if (NULL != version) { -+ *version = header.version; -+ } -+ bts = (bts_t*)fp; -+ } -+ } -+ /* If failed reading the file, close it */ -+ if (NULL == bts) { -+ fclose(fp); -+ } -+ } -+ return bts; -+} -+ -+unsigned long -+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype) -+{ -+ unsigned long bytes = 0; -+ FILE* fp = (FILE*)bts_fp; -+ unsigned char action_hdr[4]; -+ -+ if (bts_fp == NULL) -+ return 0; -+ -+ /* Each Action has the following: */ -+ /* UINT16 type of this action */ -+ /* UINT16 size of rest */ -+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ -+ -+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { -+ unsigned short type = *(unsigned short*)&action_hdr[0]; -+ unsigned short size = *(unsigned short*)&action_hdr[2]; -+ -+ if (size <= nMaxSize) { -+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); -+ -+ if (nread == size) { -+ *ptype = type; -+ bytes = (unsigned long)size; -+ } -+ } -+ } -+ -+ return bytes; -+} -+ -+void -+bts_unload_script(bts_t* bts_fp) -+{ -+ FILE* fp = (FILE*)bts_fp; -+ -+ if (NULL != fp) { -+ fclose(fp); -+ } -+} -+ ---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 -+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 -@@ -45,7 +45,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - hciattach_LDADD = @BLUEZ_LIBS@ - - hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/bluez/bluez-utils-3.28/.mtn2git_empty b/packages/bluez/bluez-utils-3.28/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch deleted file mode 100644 index 1b208f7979..0000000000 --- a/packages/bluez/bluez-utils-3.28/hciattach-ti-bts.patch +++ /dev/null @@ -1,477 +0,0 @@ ---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 -+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 -@@ -60,6 +60,8 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - -+#include "ti_bts.h" -+ - struct uart_t { - char *type; - int m_id; -@@ -70,6 +72,7 @@ - int flags; - char *bdaddr; - int (*init) (int fd, struct uart_t *u, struct termios *ti); -+ char *bts; /* bluetooth script */ - }; - - #define FLOW_CTL 0x0001 -@@ -279,6 +282,114 @@ - return 0; - } - -+static int brf6150(int fd, struct uart_t *u, struct termios *ti) -+{ -+ bts_t *bfp; -+ int i; -+ unsigned long vers; -+ unsigned char actionbuf[256]; -+ unsigned char resp[128]; /* Response */ -+ unsigned long count; -+ unsigned short atype; -+ -+ if (u->bts == NULL) /* no script, ignore */ -+ return 0; -+ -+ bfp = bts_load_script( u->bts, &vers ); -+ if (bfp == NULL) -+ return -1; -+ -+ fprintf( stderr, "Loading BTS script version %lu\n", vers ); -+ -+ while ((count = bts_next_action( bfp, actionbuf, -+ sizeof actionbuf - 1, &atype )) != 0) { -+ if (atype == ACTION_REMARKS) { -+ if (actionbuf[0] != 0) -+ fprintf( stderr, "%s\n", actionbuf ); -+ } -+ else if (atype == ACTION_SEND_COMMAND) { -+#if 0 -+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); -+ for (i=0; idata[i] ); -+ } -+ fprintf( stderr, "\n" ); -+#endif -+ usleep(wait->msec); /* seems they give usec, not msec */ -+ /* Read reply. */ -+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { -+ perror("Failed to read TI command response"); -+ return -1; -+ } -+ if (count < wait->size) { -+ fprintf( stderr, "TI command response is short."); -+ } -+ for (i=0; isize; i++) { -+ if (i == 3) continue; /* ignore */ -+ if (resp[i] != wait->data[i]) { -+ fprintf( stderr, "TI command response does not match expected result.\n" ); -+ } -+ } -+ } -+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { -+ action_serial_t *sercmd = (action_serial_t *)actionbuf; -+ -+ /* Set actual baudrate */ -+ fprintf( stderr, -+ "BTS changing baud rate to %u, flow control to %u\n", -+ sercmd->baud, sercmd->flow_control ); -+ -+ tcflush(fd, TCIOFLUSH); -+ -+ if (sercmd->flow_control) -+ ti->c_cflag |= CRTSCTS; -+ else -+ ti->c_cflag &= ~CRTSCTS; -+ if (tcsetattr(fd, TCSANOW, ti) < 0) { -+ perror("Can't set port settings"); -+ return -1; -+ } -+ -+ u->speed = sercmd->baud; -+ -+ tcflush(fd, TCIOFLUSH); -+ if (set_speed(fd, ti, sercmd->baud) < 0) { -+ perror("Can't set baud rate"); -+ return -1; -+ } -+ } -+ else if (atype == ACTION_DELAY) { -+ action_delay_t *delay = (action_delay_t *)actionbuf; -+ usleep(delay->msec); /* seems they give usec, not msec */ -+ } -+ else { -+ fprintf( stderr, "BTS action type = %d: ", (int)atype ); -+ for (i=0; i> 2) == 3) { -+ /* BRF6150 */ -+ int err; -+ -+ nanosleep(&tm, NULL); -+ if ((err = brf6150(fd, u, ti)) != 0) { -+ fprintf(stderr, "Texas module script failed (err=%d)\n", err); -+ return -1; -+ } -+ } -+ - nanosleep(&tm, NULL); - return 0; - } -@@ -1204,7 +1326,7 @@ - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] [speed] [flow|noflow] [bdaddr]\n"); - printf("\thciattach -l\n"); - } - -@@ -1219,11 +1341,12 @@ - struct sigaction sa; - struct pollfd p; - char dev[PATH_MAX]; -+ char *bts = NULL; - - detach = 1; - printpid = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { - switch(opt) { - case 'b': - send_break = 1; -@@ -1245,6 +1368,10 @@ - init_speed = atoi(optarg); - break; - -+ case 'S': -+ bts = optarg; -+ break; -+ - case 'l': - for (i = 0; uart[i].type; i++) { - printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1320,6 +1447,8 @@ - if (init_speed) - u->init_speed = init_speed; - -+ u->bts = bts; -+ - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_alarm; ---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+#ifndef BT_SCRIPT_H -+#define BT_SCRIPT_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * Define the interface of Bluetooth Script -+ */ -+ -+typedef void bts_t; -+ -+ -+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ -+#define ACTION_WAIT_EVENT 2 /* Wait for data */ -+#define ACTION_SERIAL_PORT_PARAMETERS 3 -+#define ACTION_DELAY 4 -+#define ACTION_RUN_SCRIPT 5 -+#define ACTION_REMARKS 6 -+ -+/* -+ * Structure for ACTION_SEND_COMMAND -+ */ -+typedef struct tagCActionCommand -+{ -+ unsigned char data[1]; /* Data to send */ -+} action_command_t; -+ -+/* -+ * Structure for ACTION_WAIT_EVENT -+ */ -+typedef struct tagCActionWaitEvent -+{ -+ unsigned long msec; /* in milliseconds */ -+ unsigned long size; -+ unsigned char data[1]; /* Data to wait for */ -+} action_wait_t; -+ -+ -+/* -+ * Structure for ACTION_SERIAL_PORT_PARAMETERS -+ */ -+typedef struct tagCActionSerialPortParameters -+{ -+ unsigned long baud; -+ unsigned long flow_control; -+} action_serial_t; -+ -+/* Flow Control Type */ -+#define FCT_NONE 0 -+#define FCT_HARDWARE 1 -+ -+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ -+ -+ -+/* -+ * Structure for ACTION_DELAY -+ */ -+typedef struct tagCActionDelay -+{ -+ unsigned long msec; /* in milliseconds */ -+} action_delay_t; -+ -+/* -+ * Structure for ACTION_RUN_SCRIPT -+ */ -+typedef struct tagCActionRunScript -+{ -+ char filename[1]; -+} action_run_t; -+ -+/* -+ * Structure for ACTION_REMARKS -+ */ -+typedef struct tagCActionRemarks -+{ -+ char m_szRemarks[1]; -+} action_remarks_t; -+ -+ -+const char *cis_create_filename(const unsigned char* cmdparms); -+bts_t * bts_load_script(const char* fname, unsigned long* version); -+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype); -+void bts_unload_script(bts_t* bts_fp); -+ -+#ifdef __cplusplus -+}; -+#endif -+ -+#endif /* BT_SCRIPT_H */ -+ ---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+ -+#include -+#include -+#include "ti_bts.h" -+ -+#ifndef MAKEWORD -+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) -+#endif -+ -+#define TI_MANUFACTURER_ID 13 -+ -+/* -+ * Common Init Script specific -+ */ -+const char * -+cis_create_filename(const unsigned char* cmdparms) -+{ -+ static char bts_file[50]; -+ -+ /* Check for TI's id */ -+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); -+ -+ if (TI_MANUFACTURER_ID == manfid) { -+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); -+ -+ unsigned short chip = (version & 0x7C00) >> 10; -+ unsigned short min_ver = (version & 0x007F); -+ unsigned short maj_ver = (version & 0x0380) >> 7; -+ -+ if (0 != (version & 0x8000)) { -+ maj_ver |= 0x0008; -+ } -+ -+ sprintf( bts_file, "TIInit_%d.%d.%d.bts", -+ (int)chip, (int)maj_ver, (int)min_ver); -+ -+ return &bts_file[0]; -+ } -+ return NULL; -+} -+ -+typedef struct tagCHeader -+{ -+ unsigned long magic; -+ unsigned long version; -+ unsigned char future[24]; -+} cheader_t; -+ -+ -+/* The value 0x42535442 stands for (in ASCII) BTSB */ -+/* which is Bluetooth Script Binary */ -+#define FILE_HEADER_MAGIC 0x42535442 -+ -+ -+bts_t * -+bts_load_script(const char* fname, unsigned long* version) -+{ -+ bts_t* bts = NULL; -+ FILE* fp = fopen(fname, "rb"); -+ -+ if (NULL != fp) { -+ /* Read header */ -+ cheader_t header; -+ -+ /* Read header */ -+ if (1 == fread(&header, sizeof(header), 1, fp)) { -+ /* Check magic number for correctness */ -+ if (header.magic == FILE_HEADER_MAGIC) { -+ /* If user wants the version number */ -+ if (NULL != version) { -+ *version = header.version; -+ } -+ bts = (bts_t*)fp; -+ } -+ } -+ /* If failed reading the file, close it */ -+ if (NULL == bts) { -+ fclose(fp); -+ } -+ } -+ return bts; -+} -+ -+unsigned long -+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype) -+{ -+ unsigned long bytes = 0; -+ FILE* fp = (FILE*)bts_fp; -+ unsigned char action_hdr[4]; -+ -+ if (bts_fp == NULL) -+ return 0; -+ -+ /* Each Action has the following: */ -+ /* UINT16 type of this action */ -+ /* UINT16 size of rest */ -+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ -+ -+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { -+ unsigned short type = *(unsigned short*)&action_hdr[0]; -+ unsigned short size = *(unsigned short*)&action_hdr[2]; -+ -+ if (size <= nMaxSize) { -+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); -+ -+ if (nread == size) { -+ *ptype = type; -+ bytes = (unsigned long)size; -+ } -+ } -+ } -+ -+ return bytes; -+} -+ -+void -+bts_unload_script(bts_t* bts_fp) -+{ -+ FILE* fp = (FILE*)bts_fp; -+ -+ if (NULL != fp) { -+ fclose(fp); -+ } -+} -+ ---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 -+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 -@@ -45,7 +45,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - hciattach_LDADD = @BLUEZ_LIBS@ - - hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/bluez/bluez-utils-3.30/.mtn2git_empty b/packages/bluez/bluez-utils-3.30/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch deleted file mode 100644 index 1b208f7979..0000000000 --- a/packages/bluez/bluez-utils-3.30/hciattach-ti-bts.patch +++ /dev/null @@ -1,477 +0,0 @@ ---- bluez-utils-3.1/tools/hciattach.c.orig 2006-07-23 14:02:14.000000000 +0200 -+++ bluez-utils-3.1/tools/hciattach.c 2006-07-23 14:06:29.000000000 +0200 -@@ -60,6 +60,8 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - -+#include "ti_bts.h" -+ - struct uart_t { - char *type; - int m_id; -@@ -70,6 +72,7 @@ - int flags; - char *bdaddr; - int (*init) (int fd, struct uart_t *u, struct termios *ti); -+ char *bts; /* bluetooth script */ - }; - - #define FLOW_CTL 0x0001 -@@ -279,6 +282,114 @@ - return 0; - } - -+static int brf6150(int fd, struct uart_t *u, struct termios *ti) -+{ -+ bts_t *bfp; -+ int i; -+ unsigned long vers; -+ unsigned char actionbuf[256]; -+ unsigned char resp[128]; /* Response */ -+ unsigned long count; -+ unsigned short atype; -+ -+ if (u->bts == NULL) /* no script, ignore */ -+ return 0; -+ -+ bfp = bts_load_script( u->bts, &vers ); -+ if (bfp == NULL) -+ return -1; -+ -+ fprintf( stderr, "Loading BTS script version %lu\n", vers ); -+ -+ while ((count = bts_next_action( bfp, actionbuf, -+ sizeof actionbuf - 1, &atype )) != 0) { -+ if (atype == ACTION_REMARKS) { -+ if (actionbuf[0] != 0) -+ fprintf( stderr, "%s\n", actionbuf ); -+ } -+ else if (atype == ACTION_SEND_COMMAND) { -+#if 0 -+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); -+ for (i=0; idata[i] ); -+ } -+ fprintf( stderr, "\n" ); -+#endif -+ usleep(wait->msec); /* seems they give usec, not msec */ -+ /* Read reply. */ -+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { -+ perror("Failed to read TI command response"); -+ return -1; -+ } -+ if (count < wait->size) { -+ fprintf( stderr, "TI command response is short."); -+ } -+ for (i=0; isize; i++) { -+ if (i == 3) continue; /* ignore */ -+ if (resp[i] != wait->data[i]) { -+ fprintf( stderr, "TI command response does not match expected result.\n" ); -+ } -+ } -+ } -+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { -+ action_serial_t *sercmd = (action_serial_t *)actionbuf; -+ -+ /* Set actual baudrate */ -+ fprintf( stderr, -+ "BTS changing baud rate to %u, flow control to %u\n", -+ sercmd->baud, sercmd->flow_control ); -+ -+ tcflush(fd, TCIOFLUSH); -+ -+ if (sercmd->flow_control) -+ ti->c_cflag |= CRTSCTS; -+ else -+ ti->c_cflag &= ~CRTSCTS; -+ if (tcsetattr(fd, TCSANOW, ti) < 0) { -+ perror("Can't set port settings"); -+ return -1; -+ } -+ -+ u->speed = sercmd->baud; -+ -+ tcflush(fd, TCIOFLUSH); -+ if (set_speed(fd, ti, sercmd->baud) < 0) { -+ perror("Can't set baud rate"); -+ return -1; -+ } -+ } -+ else if (atype == ACTION_DELAY) { -+ action_delay_t *delay = (action_delay_t *)actionbuf; -+ usleep(delay->msec); /* seems they give usec, not msec */ -+ } -+ else { -+ fprintf( stderr, "BTS action type = %d: ", (int)atype ); -+ for (i=0; i> 2) == 3) { -+ /* BRF6150 */ -+ int err; -+ -+ nanosleep(&tm, NULL); -+ if ((err = brf6150(fd, u, ti)) != 0) { -+ fprintf(stderr, "Texas module script failed (err=%d)\n", err); -+ return -1; -+ } -+ } -+ - nanosleep(&tm, NULL); - return 0; - } -@@ -1204,7 +1326,7 @@ - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] [speed] [flow|noflow] [bdaddr]\n"); - printf("\thciattach -l\n"); - } - -@@ -1219,11 +1341,12 @@ - struct sigaction sa; - struct pollfd p; - char dev[PATH_MAX]; -+ char *bts = NULL; - - detach = 1; - printpid = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { - switch(opt) { - case 'b': - send_break = 1; -@@ -1245,6 +1368,10 @@ - init_speed = atoi(optarg); - break; - -+ case 'S': -+ bts = optarg; -+ break; -+ - case 'l': - for (i = 0; uart[i].type; i++) { - printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1320,6 +1447,8 @@ - if (init_speed) - u->init_speed = init_speed; - -+ u->bts = bts; -+ - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_alarm; ---- bluez-utils-3.1/tools/ti_bts.h.orig 2006-07-23 14:07:26.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.h 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+#ifndef BT_SCRIPT_H -+#define BT_SCRIPT_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * Define the interface of Bluetooth Script -+ */ -+ -+typedef void bts_t; -+ -+ -+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ -+#define ACTION_WAIT_EVENT 2 /* Wait for data */ -+#define ACTION_SERIAL_PORT_PARAMETERS 3 -+#define ACTION_DELAY 4 -+#define ACTION_RUN_SCRIPT 5 -+#define ACTION_REMARKS 6 -+ -+/* -+ * Structure for ACTION_SEND_COMMAND -+ */ -+typedef struct tagCActionCommand -+{ -+ unsigned char data[1]; /* Data to send */ -+} action_command_t; -+ -+/* -+ * Structure for ACTION_WAIT_EVENT -+ */ -+typedef struct tagCActionWaitEvent -+{ -+ unsigned long msec; /* in milliseconds */ -+ unsigned long size; -+ unsigned char data[1]; /* Data to wait for */ -+} action_wait_t; -+ -+ -+/* -+ * Structure for ACTION_SERIAL_PORT_PARAMETERS -+ */ -+typedef struct tagCActionSerialPortParameters -+{ -+ unsigned long baud; -+ unsigned long flow_control; -+} action_serial_t; -+ -+/* Flow Control Type */ -+#define FCT_NONE 0 -+#define FCT_HARDWARE 1 -+ -+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ -+ -+ -+/* -+ * Structure for ACTION_DELAY -+ */ -+typedef struct tagCActionDelay -+{ -+ unsigned long msec; /* in milliseconds */ -+} action_delay_t; -+ -+/* -+ * Structure for ACTION_RUN_SCRIPT -+ */ -+typedef struct tagCActionRunScript -+{ -+ char filename[1]; -+} action_run_t; -+ -+/* -+ * Structure for ACTION_REMARKS -+ */ -+typedef struct tagCActionRemarks -+{ -+ char m_szRemarks[1]; -+} action_remarks_t; -+ -+ -+const char *cis_create_filename(const unsigned char* cmdparms); -+bts_t * bts_load_script(const char* fname, unsigned long* version); -+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype); -+void bts_unload_script(bts_t* bts_fp); -+ -+#ifdef __cplusplus -+}; -+#endif -+ -+#endif /* BT_SCRIPT_H */ -+ ---- bluez-utils-3.1/tools/ti_bts.c.orig 2006-07-23 14:07:28.000000000 +0200 -+++ bluez-utils-3.1/tools/ti_bts.c 2006-07-23 14:07:46.000000000 +0200 -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+ -+#include -+#include -+#include "ti_bts.h" -+ -+#ifndef MAKEWORD -+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) -+#endif -+ -+#define TI_MANUFACTURER_ID 13 -+ -+/* -+ * Common Init Script specific -+ */ -+const char * -+cis_create_filename(const unsigned char* cmdparms) -+{ -+ static char bts_file[50]; -+ -+ /* Check for TI's id */ -+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); -+ -+ if (TI_MANUFACTURER_ID == manfid) { -+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); -+ -+ unsigned short chip = (version & 0x7C00) >> 10; -+ unsigned short min_ver = (version & 0x007F); -+ unsigned short maj_ver = (version & 0x0380) >> 7; -+ -+ if (0 != (version & 0x8000)) { -+ maj_ver |= 0x0008; -+ } -+ -+ sprintf( bts_file, "TIInit_%d.%d.%d.bts", -+ (int)chip, (int)maj_ver, (int)min_ver); -+ -+ return &bts_file[0]; -+ } -+ return NULL; -+} -+ -+typedef struct tagCHeader -+{ -+ unsigned long magic; -+ unsigned long version; -+ unsigned char future[24]; -+} cheader_t; -+ -+ -+/* The value 0x42535442 stands for (in ASCII) BTSB */ -+/* which is Bluetooth Script Binary */ -+#define FILE_HEADER_MAGIC 0x42535442 -+ -+ -+bts_t * -+bts_load_script(const char* fname, unsigned long* version) -+{ -+ bts_t* bts = NULL; -+ FILE* fp = fopen(fname, "rb"); -+ -+ if (NULL != fp) { -+ /* Read header */ -+ cheader_t header; -+ -+ /* Read header */ -+ if (1 == fread(&header, sizeof(header), 1, fp)) { -+ /* Check magic number for correctness */ -+ if (header.magic == FILE_HEADER_MAGIC) { -+ /* If user wants the version number */ -+ if (NULL != version) { -+ *version = header.version; -+ } -+ bts = (bts_t*)fp; -+ } -+ } -+ /* If failed reading the file, close it */ -+ if (NULL == bts) { -+ fclose(fp); -+ } -+ } -+ return bts; -+} -+ -+unsigned long -+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype) -+{ -+ unsigned long bytes = 0; -+ FILE* fp = (FILE*)bts_fp; -+ unsigned char action_hdr[4]; -+ -+ if (bts_fp == NULL) -+ return 0; -+ -+ /* Each Action has the following: */ -+ /* UINT16 type of this action */ -+ /* UINT16 size of rest */ -+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ -+ -+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { -+ unsigned short type = *(unsigned short*)&action_hdr[0]; -+ unsigned short size = *(unsigned short*)&action_hdr[2]; -+ -+ if (size <= nMaxSize) { -+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); -+ -+ if (nread == size) { -+ *ptype = type; -+ bytes = (unsigned long)size; -+ } -+ } -+ } -+ -+ return bytes; -+} -+ -+void -+bts_unload_script(bts_t* bts_fp) -+{ -+ FILE* fp = (FILE*)bts_fp; -+ -+ if (NULL != fp) { -+ fclose(fp); -+ } -+} -+ ---- bluez-utils-3.1/tools/Makefile.am.orig 2006-07-23 14:06:59.000000000 +0200 -+++ bluez-utils-3.1/tools/Makefile.am 2006-07-23 14:07:18.000000000 +0200 -@@ -45,7 +45,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - hciattach_LDADD = @BLUEZ_LIBS@ - - hciconfig_SOURCES = hciconfig.c csr.h csr.c diff --git a/packages/bluez/bluez-utils-3.9/.mtn2git_empty b/packages/bluez/bluez-utils-3.9/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch b/packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch deleted file mode 100644 index 87bd19f13b..0000000000 --- a/packages/bluez/bluez-utils-3.9/hciattach-ti-bts.patch +++ /dev/null @@ -1,498 +0,0 @@ -Index: bluez-utils-3.9/tools/hciattach.c -=================================================================== ---- bluez-utils-3.9.orig/tools/hciattach.c 2007-01-28 21:16:48.000000000 +0100 -+++ bluez-utils-3.9/tools/hciattach.c 2007-01-29 22:51:30.000000000 +0100 -@@ -59,6 +59,8 @@ - #define HCI_UART_3WIRE 2 - #define HCI_UART_H4DS 3 - -+#include "ti_bts.h" -+ - struct uart_t { - char *type; - int m_id; -@@ -68,6 +70,7 @@ - int speed; - int flags; - int (*init) (int fd, struct uart_t *u, struct termios *ti); -+ char *bts; /* bluetooth script */ - }; - - #define FLOW_CTL 0x0001 -@@ -257,6 +260,114 @@ - return 0; - } - -+static int brf6150(int fd, struct uart_t *u, struct termios *ti) -+{ -+ bts_t *bfp; -+ int i; -+ unsigned long vers; -+ unsigned char actionbuf[256]; -+ unsigned char resp[128]; /* Response */ -+ unsigned long count; -+ unsigned short atype; -+ -+ if (u->bts == NULL) /* no script, ignore */ -+ return 0; -+ -+ bfp = bts_load_script( u->bts, &vers ); -+ if (bfp == NULL) -+ return -1; -+ -+ fprintf( stderr, "Loading BTS script version %lu\n", vers ); -+ -+ while ((count = bts_next_action( bfp, actionbuf, -+ sizeof actionbuf - 1, &atype )) != 0) { -+ if (atype == ACTION_REMARKS) { -+ if (actionbuf[0] != 0) -+ fprintf( stderr, "%s\n", actionbuf ); -+ } -+ else if (atype == ACTION_SEND_COMMAND) { -+#if 0 -+ fprintf( stderr, "ACTION_SEND_COMMAND: ", (int)atype ); -+ for (i=0; idata[i] ); -+ } -+ fprintf( stderr, "\n" ); -+#endif -+ usleep(wait->msec); /* seems they give usec, not msec */ -+ /* Read reply. */ -+ if ((count = read_hci_event(fd, resp, sizeof resp)) < 0) { -+ perror("Failed to read TI command response"); -+ return -1; -+ } -+ if (count < wait->size) { -+ fprintf( stderr, "TI command response is short."); -+ } -+ for (i=0; isize; i++) { -+ if (i == 3) continue; /* ignore */ -+ if (resp[i] != wait->data[i]) { -+ fprintf( stderr, "TI command response does not match expected result.\n" ); -+ } -+ } -+ } -+ else if (atype == ACTION_SERIAL_PORT_PARAMETERS) { -+ action_serial_t *sercmd = (action_serial_t *)actionbuf; -+ -+ /* Set actual baudrate */ -+ fprintf( stderr, -+ "BTS changing baud rate to %u, flow control to %u\n", -+ sercmd->baud, sercmd->flow_control ); -+ -+ tcflush(fd, TCIOFLUSH); -+ -+ if (sercmd->flow_control) -+ ti->c_cflag |= CRTSCTS; -+ else -+ ti->c_cflag &= ~CRTSCTS; -+ if (tcsetattr(fd, TCSANOW, ti) < 0) { -+ perror("Can't set port settings"); -+ return -1; -+ } -+ -+ u->speed = sercmd->baud; -+ -+ tcflush(fd, TCIOFLUSH); -+ if (set_speed(fd, ti, sercmd->baud) < 0) { -+ perror("Can't set baud rate"); -+ return -1; -+ } -+ } -+ else if (atype == ACTION_DELAY) { -+ action_delay_t *delay = (action_delay_t *)actionbuf; -+ usleep(delay->msec); /* seems they give usec, not msec */ -+ } -+ else { -+ fprintf( stderr, "BTS action type = %d: ", (int)atype ); -+ for (i=0; i> 2) == 3) { -+ int err; -+ nanosleep(&tm, NULL); -+ -+ /* BRF6150 */ -+ if ((err=brf6150( fd, u, ti )) != 0) { -+ fprintf( stderr, "TI script failed (err=%d)\n", -+ err ); -+ return -1; -+ } -+ } -+ - nanosleep(&tm, NULL); - return 0; - } -@@ -1128,7 +1250,7 @@ - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [speed] [flow|noflow]\n"); -+ printf("\thciattach [-n] [-p] [-b] [-t timeout] [-s initial_speed] [-S bts-script] [speed] [flow|noflow]\n"); - printf("\thciattach -l\n"); - } - -@@ -1143,11 +1265,12 @@ - struct sigaction sa; - struct pollfd p; - char dev[PATH_MAX]; -+ char *bts = NULL; - - detach = 1; - printpid = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:l")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:S:l")) != EOF) { - switch(opt) { - case 'b': - send_break = 1; -@@ -1169,6 +1292,10 @@ - init_speed = atoi(optarg); - break; - -+ case 'S': -+ bts = optarg; -+ break; -+ - case 'l': - for (i = 0; uart[i].type; i++) { - printf("%-10s0x%04x,0x%04x\n", uart[i].type, -@@ -1240,6 +1367,8 @@ - if (init_speed) - u->init_speed = init_speed; - -+ u->bts = bts; -+ - memset(&sa, 0, sizeof(sa)); - sa.sa_flags = SA_NOCLDSTOP; - sa.sa_handler = sig_alarm; -Index: bluez-utils-3.9/tools/Makefile.am -=================================================================== ---- bluez-utils-3.9.orig/tools/Makefile.am 2007-01-28 21:16:48.000000000 +0100 -+++ bluez-utils-3.9/tools/Makefile.am 2007-01-29 22:54:22.000000000 +0100 -@@ -37,7 +37,7 @@ - - noinst_PROGRAMS = hcisecfilter ppporc - --hciattach_SOURCES = hciattach.c hciattach_st.c -+hciattach_SOURCES = hciattach.c hciattach_st.c ti_bts.h ti_bts.c - hciattach_LDADD = @BLUEZ_LIBS@ - - hciconfig_SOURCES = hciconfig.c csr.h csr.c -Index: bluez-utils-3.9/tools/ti_bts.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ bluez-utils-3.9/tools/ti_bts.h 2007-01-29 22:51:30.000000000 +0100 -@@ -0,0 +1,116 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+#ifndef BT_SCRIPT_H -+#define BT_SCRIPT_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* -+ * Define the interface of Bluetooth Script -+ */ -+ -+typedef void bts_t; -+ -+ -+#define ACTION_SEND_COMMAND 1 /* Send out raw data (as is) */ -+#define ACTION_WAIT_EVENT 2 /* Wait for data */ -+#define ACTION_SERIAL_PORT_PARAMETERS 3 -+#define ACTION_DELAY 4 -+#define ACTION_RUN_SCRIPT 5 -+#define ACTION_REMARKS 6 -+ -+/* -+ * Structure for ACTION_SEND_COMMAND -+ */ -+typedef struct tagCActionCommand -+{ -+ unsigned char data[1]; /* Data to send */ -+} action_command_t; -+ -+/* -+ * Structure for ACTION_WAIT_EVENT -+ */ -+typedef struct tagCActionWaitEvent -+{ -+ unsigned long msec; /* in milliseconds */ -+ unsigned long size; -+ unsigned char data[1]; /* Data to wait for */ -+} action_wait_t; -+ -+ -+/* -+ * Structure for ACTION_SERIAL_PORT_PARAMETERS -+ */ -+typedef struct tagCActionSerialPortParameters -+{ -+ unsigned long baud; -+ unsigned long flow_control; -+} action_serial_t; -+ -+/* Flow Control Type */ -+#define FCT_NONE 0 -+#define FCT_HARDWARE 1 -+ -+#define DONT_CHANGE 0xFFFFFFFF /* For both baud rate and flow control */ -+ -+ -+/* -+ * Structure for ACTION_DELAY -+ */ -+typedef struct tagCActionDelay -+{ -+ unsigned long msec; /* in milliseconds */ -+} action_delay_t; -+ -+/* -+ * Structure for ACTION_RUN_SCRIPT -+ */ -+typedef struct tagCActionRunScript -+{ -+ char filename[1]; -+} action_run_t; -+ -+/* -+ * Structure for ACTION_REMARKS -+ */ -+typedef struct tagCActionRemarks -+{ -+ char m_szRemarks[1]; -+} action_remarks_t; -+ -+ -+const char *cis_create_filename(const unsigned char* cmdparms); -+bts_t * bts_load_script(const char* fname, unsigned long* version); -+unsigned long bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype); -+void bts_unload_script(bts_t* bts_fp); -+ -+#ifdef __cplusplus -+}; -+#endif -+ -+#endif /* BT_SCRIPT_H */ -+ -Index: bluez-utils-3.9/tools/ti_bts.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ bluez-utils-3.9/tools/ti_bts.c 2007-01-29 22:51:30.000000000 +0100 -@@ -0,0 +1,149 @@ -+/* -+ * Copyright (c) 2005 Texas Instruments, Inc. -+ * Ported by SDG Systems, LLC -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation; -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY -+ * CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, -+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS -+ * SOFTWARE IS DISCLAIMED. -+ * -+ */ -+ -+ -+#include -+#include -+#include "ti_bts.h" -+ -+#ifndef MAKEWORD -+#define MAKEWORD(a, b) ((unsigned short)(((unsigned char)(a)) | ((unsigned short)((unsigned char)(b))) << 8)) -+#endif -+ -+#define TI_MANUFACTURER_ID 13 -+ -+/* -+ * Common Init Script specific -+ */ -+const char * -+cis_create_filename(const unsigned char* cmdparms) -+{ -+ static char bts_file[50]; -+ -+ /* Check for TI's id */ -+ unsigned short manfid = MAKEWORD(cmdparms[8], cmdparms[9]); -+ -+ if (TI_MANUFACTURER_ID == manfid) { -+ unsigned short version = MAKEWORD(cmdparms[10], cmdparms[11]); -+ -+ unsigned short chip = (version & 0x7C00) >> 10; -+ unsigned short min_ver = (version & 0x007F); -+ unsigned short maj_ver = (version & 0x0380) >> 7; -+ -+ if (0 != (version & 0x8000)) { -+ maj_ver |= 0x0008; -+ } -+ -+ sprintf( bts_file, "TIInit_%d.%d.%d.bts", -+ (int)chip, (int)maj_ver, (int)min_ver); -+ -+ return &bts_file[0]; -+ } -+ return NULL; -+} -+ -+typedef struct tagCHeader -+{ -+ unsigned long magic; -+ unsigned long version; -+ unsigned char future[24]; -+} cheader_t; -+ -+ -+/* The value 0x42535442 stands for (in ASCII) BTSB */ -+/* which is Bluetooth Script Binary */ -+#define FILE_HEADER_MAGIC 0x42535442 -+ -+ -+bts_t * -+bts_load_script(const char* fname, unsigned long* version) -+{ -+ bts_t* bts = NULL; -+ FILE* fp = fopen(fname, "rb"); -+ -+ if (NULL != fp) { -+ /* Read header */ -+ cheader_t header; -+ -+ /* Read header */ -+ if (1 == fread(&header, sizeof(header), 1, fp)) { -+ /* Check magic number for correctness */ -+ if (header.magic == FILE_HEADER_MAGIC) { -+ /* If user wants the version number */ -+ if (NULL != version) { -+ *version = header.version; -+ } -+ bts = (bts_t*)fp; -+ } -+ } -+ /* If failed reading the file, close it */ -+ if (NULL == bts) { -+ fclose(fp); -+ } -+ } -+ return bts; -+} -+ -+unsigned long -+bts_next_action(const bts_t* bts_fp, unsigned char* action_buf, -+ unsigned long nMaxSize, unsigned short* ptype) -+{ -+ unsigned long bytes = 0; -+ FILE* fp = (FILE*)bts_fp; -+ unsigned char action_hdr[4]; -+ -+ if (bts_fp == NULL) -+ return 0; -+ -+ /* Each Action has the following: */ -+ /* UINT16 type of this action */ -+ /* UINT16 size of rest */ -+ /* BYTE[] action buffer (for HCI, includes the type byte e.g. 1 for hci command) */ -+ -+ if (1 == fread(&action_hdr[0], sizeof(action_hdr), 1, fp)) { -+ unsigned short type = *(unsigned short*)&action_hdr[0]; -+ unsigned short size = *(unsigned short*)&action_hdr[2]; -+ -+ if (size <= nMaxSize) { -+ int nread = fread(action_buf, sizeof(action_buf[0]), size, fp); -+ -+ if (nread == size) { -+ *ptype = type; -+ bytes = (unsigned long)size; -+ } -+ } -+ } -+ -+ return bytes; -+} -+ -+void -+bts_unload_script(bts_t* bts_fp) -+{ -+ FILE* fp = (FILE*)bts_fp; -+ -+ if (NULL != fp) { -+ fclose(fp); -+ } -+} -+ diff --git a/packages/bluez/bluez-utils-alsa_3.18.bb b/packages/bluez/bluez-utils-alsa_3.18.bb deleted file mode 100644 index 5c4a07e8ab..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.18.bb +++ /dev/null @@ -1,23 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils-alsa_3.19.bb b/packages/bluez/bluez-utils-alsa_3.19.bb deleted file mode 100644 index 5c4a07e8ab..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.19.bb +++ /dev/null @@ -1,23 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils-alsa_3.20.bb b/packages/bluez/bluez-utils-alsa_3.20.bb deleted file mode 100644 index 5c4a07e8ab..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.20.bb +++ /dev/null @@ -1,23 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils-alsa_3.22.bb b/packages/bluez/bluez-utils-alsa_3.22.bb deleted file mode 100644 index 5c4a07e8ab..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.22.bb +++ /dev/null @@ -1,23 +0,0 @@ -require bluez-utils3.inc - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils-alsa_3.23.bb b/packages/bluez/bluez-utils-alsa_3.23.bb deleted file mode 100644 index 0d7836fa65..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.23.bb +++ /dev/null @@ -1,24 +0,0 @@ -require bluez-utils3.inc -PR = "r1" - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils-alsa_3.24.bb b/packages/bluez/bluez-utils-alsa_3.24.bb deleted file mode 100644 index a1e3e85818..0000000000 --- a/packages/bluez/bluez-utils-alsa_3.24.bb +++ /dev/null @@ -1,25 +0,0 @@ -require bluez-utils3.inc - -PR = "r1" - -DEPENDS += "alsa-lib" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --enable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -FILES_${PN} = "${libdir}/alsa-lib/libasound*" diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb deleted file mode 100644 index 25fda9dcff..0000000000 --- a/packages/bluez/bluez-utils_3.11.bb +++ /dev/null @@ -1,111 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -#DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - " -PR = "r1" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --disable-hid2hci \ - --disable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb deleted file mode 100644 index 98a79af901..0000000000 --- a/packages/bluez/bluez-utils_3.12.bb +++ /dev/null @@ -1,114 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - " -PR = "r4" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat ${PN}-alsa" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - ${libdir}/cups/backend/.debug \ - ${libdir}/alsa-lib/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_sbindir}/hid2hci \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb deleted file mode 100644 index 0a2a062338..0000000000 --- a/packages/bluez/bluez-utils_3.13.bb +++ /dev/null @@ -1,114 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - " -PR = "r0" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat ${PN}-alsa" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - ${libdir}/cups/backend/.debug \ - ${libdir}/alsa-lib/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_sbindir}/hid2hci \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.14.bb b/packages/bluez/bluez-utils_3.14.bb deleted file mode 100644 index 5d0c3cf15b..0000000000 --- a/packages/bluez/bluez-utils_3.14.bb +++ /dev/null @@ -1,115 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://hciattach-ti-bts.patch;patch=1 \ - " -PR = "r1" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat ${PN}-alsa" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - ${libdir}/cups/backend/.debug \ - ${libdir}/alsa-lib/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_sbindir}/hid2hci \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.15.bb b/packages/bluez/bluez-utils_3.15.bb deleted file mode 100644 index a7d1dce192..0000000000 --- a/packages/bluez/bluez-utils_3.15.bb +++ /dev/null @@ -1,116 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -# ti patch doesn't apply, people using it should rediff it and send it upstream -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ -# file://hciattach-ti-bts.patch;patch=1 \ - " -PR = "r0" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat ${PN}-alsa" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - ${libdir}/cups/backend/.debug \ - ${libdir}/alsa-lib/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_sbindir}/hid2hci \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.16.bb b/packages/bluez/bluez-utils_3.16.bb deleted file mode 100644 index a7d1dce192..0000000000 --- a/packages/bluez/bluez-utils_3.16.bb +++ /dev/null @@ -1,116 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -# ti patch doesn't apply, people using it should rediff it and send it upstream -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ -# file://hciattach-ti-bts.patch;patch=1 \ - " -PR = "r0" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat ${PN}-alsa" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - ${libdir}/cups/backend/.debug \ - ${libdir}/alsa-lib/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_sbindir}/hid2hci \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.17.bb b/packages/bluez/bluez-utils_3.17.bb deleted file mode 100644 index a7d1dce192..0000000000 --- a/packages/bluez/bluez-utils_3.17.bb +++ /dev/null @@ -1,116 +0,0 @@ -require bluez-utils.inc - -DEPENDS += "glib-2.0" - -# ti patch doesn't apply, people using it should rediff it and send it upstream -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ -# file://hciattach-ti-bts.patch;patch=1 \ - " -PR = "r0" - -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --enable-alsa \ - --enable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -# The config options are explained below: - -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support, not needed for nokia770, nokia800 and om-gtao1 -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -# --enable-glib For systems that use and install GLib anyway -# --disable-sdpd The sdpd is obsolete and should no longer be used. This of course requires that hcid will be started with -s to enable the SDP server - -#Following services can be enabled so far: -# --enable-network -# --enable-serial -# --enable-input -# --enable-audio -# --enable-echo - -#There is no need to modify any init script. They will be started -#automatically or on demand. Only /etc/bluetooth/*.service files should -#be patched to change name or the autostart value. -# --enable-configfile -# --enable-initscripts - -#For even smaller -doc packages -# --disable-manpages -# --disable-pcmciarules - -#I haven't seen any embedded device with HID proxy support. So simply -#disable it: -# --disable-hid2hci - - -PACKAGES =+ "${PN}-compat ${PN}-alsa" - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/*.service \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/.debug \ - ${libdir}/cups/backend/.debug \ - ${libdir}/alsa-lib/.debug \ - " - -FILES_${PN}-compat = " \ - ${base_bindir}/sdptool \ - ${base_bindir}/dund \ - ${base_bindir}/rctest \ - ${base_bindir}/ciptool \ - ${base_bindir}/l2test \ - ${base_bindir}/rfcomm \ - ${base_bindir}/hcitool \ - ${base_bindir}/pand \ - ${base_bindir}/hidd \ - ${base_bindir}/l2ping \ - ${base_sbindir}/hciconfig \ - ${base_sbindir}/bccmd \ - ${base_sbindir}/hciemu \ - ${base_sbindir}/hid2hci \ - ${base_bindir}/passkey-agent \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -FILES_${PN}-alsa = "${libdir}/alsa-lib/libasound*" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" - - diff --git a/packages/bluez/bluez-utils_3.18.bb b/packages/bluez/bluez-utils_3.18.bb deleted file mode 100644 index 48f147aa69..0000000000 --- a/packages/bluez/bluez-utils_3.18.bb +++ /dev/null @@ -1,29 +0,0 @@ -require bluez-utils3.inc - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.19.bb b/packages/bluez/bluez-utils_3.19.bb deleted file mode 100644 index 48f147aa69..0000000000 --- a/packages/bluez/bluez-utils_3.19.bb +++ /dev/null @@ -1,29 +0,0 @@ -require bluez-utils3.inc - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.20.bb b/packages/bluez/bluez-utils_3.20.bb deleted file mode 100644 index 48f147aa69..0000000000 --- a/packages/bluez/bluez-utils_3.20.bb +++ /dev/null @@ -1,29 +0,0 @@ -require bluez-utils3.inc - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.22.bb b/packages/bluez/bluez-utils_3.22.bb deleted file mode 100644 index 48f147aa69..0000000000 --- a/packages/bluez/bluez-utils_3.22.bb +++ /dev/null @@ -1,29 +0,0 @@ -require bluez-utils3.inc - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb deleted file mode 100644 index 37365f67fc..0000000000 --- a/packages/bluez/bluez-utils_3.23.bb +++ /dev/null @@ -1,30 +0,0 @@ -require bluez-utils3.inc -PR = "r2" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.24.bb b/packages/bluez/bluez-utils_3.24.bb deleted file mode 100644 index 37365f67fc..0000000000 --- a/packages/bluez/bluez-utils_3.24.bb +++ /dev/null @@ -1,30 +0,0 @@ -require bluez-utils3.inc -PR = "r2" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.28.bb b/packages/bluez/bluez-utils_3.28.bb deleted file mode 100644 index 37365f67fc..0000000000 --- a/packages/bluez/bluez-utils_3.28.bb +++ /dev/null @@ -1,30 +0,0 @@ -require bluez-utils3.inc -PR = "r2" - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - diff --git a/packages/bluez/bluez-utils_3.30.bb b/packages/bluez/bluez-utils_3.30.bb deleted file mode 100644 index e4b5f21a84..0000000000 --- a/packages/bluez/bluez-utils_3.30.bb +++ /dev/null @@ -1,55 +0,0 @@ -require bluez-utils3.inc - -# see bluez-utils3.inc for the explanation of these option -EXTRA_OECONF = " \ - --enable-bccmd \ - --enable-hid2hci \ - --disable-alsa \ - --disable-cups \ - --enable-glib \ - --disable-sdpd \ - --enable-network \ - --enable-serial \ - --enable-input \ - --enable-audio \ - --enable-echo \ - --enable-configfile \ - --enable-initscripts \ - --enable-test \ - " - -CONFFILES_${PN} = " \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default/bluetooth \ - " - -CONFFILES_${PN}-compat = " \ - ${sysconfdir}/bluetooth/rfcomm.conf \ - " - -PACKAGES =+ "bluez-audio" - -FILES_${PN} = " \ - ${base_sbindir}/hcid \ - ${libdir}/bluetooth/plugins/*.so \ - ${sysconfdir}/init.d/bluetooth \ - ${sysconfdir}/bluetooth/hcid.conf \ - ${sysconfdir}/default \ - ${sysconfdir}/dbus-1 \ - ${base_sbindir}/hciattach \ - " - -FILES_bluez-audio = " \ - ${libdir}/bluetooth/plugins/libaudio.so \ - ${libdir}/gstreamer-0.10/*.so \ - " - -FILES_${PN}-dbg += " \ - ${libdir}/bluetooth/plugins/.debug \ - ${libdir}/gstreamer-0.10/.debug \ - " - -FILES_${PN}-dev += " \ - ${libdir}/bluetooth/plugins/*.la \ - ${libdir}/gstreamer-0.10/*.la \ - " diff --git a/packages/bluez/bluez-utils_3.4.bb b/packages/bluez/bluez-utils_3.4.bb deleted file mode 100644 index f2bbd15507..0000000000 --- a/packages/bluez/bluez-utils_3.4.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" -PROVIDES = "bluez-utils-dbus" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" -RCONFLICTS_${PN} = "bluez-utils-nodbus" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://hciattach-ti-bts.patch;patch=1" - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' until further notice... -SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} - chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" diff --git a/packages/bluez/bluez-utils_3.7.bb b/packages/bluez/bluez-utils_3.7.bb deleted file mode 100644 index 7a76cb3200..0000000000 --- a/packages/bluez/bluez-utils_3.7.bb +++ /dev/null @@ -1,54 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus cups alsa-lib openobex" -PROVIDES = "bluez-utils-dbus" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" -RCONFLICTS_${PN} = "bluez-utils-nodbus" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://hciattach-ti-bts.patch;patch=1" - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' until further notice... -SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci --enable-obex --enable-alsa --enable-cups" -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} - chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool bluez-cups-backend" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" - -FILES_bluez-cups-backend = "${libdir}/cups/backend/bluetooth" -RDEPENDS_bluez-cups-backend = "cups" diff --git a/packages/bluez/bluez-utils_3.8.bb b/packages/bluez/bluez-utils_3.8.bb deleted file mode 100644 index f2bbd15507..0000000000 --- a/packages/bluez/bluez-utils_3.8.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION = "Linux Bluetooth Stack Userland Utilities." -SECTION = "console" -PRIORITY = "optional" -DEPENDS = "bluez-libs-${PV} dbus" -PROVIDES = "bluez-utils-dbus" -RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus" -RREPLACES = "bluez-utils-dbus" -RCONFLICTS_${PN} = "bluez-utils-nodbus" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ - file://hcid.conf \ - file://hciattach-ti-bts.patch;patch=1" - -# Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol -# Let's default to that instead of 'any' until further notice... -SRC_URI += " file://default-manfid-0x0-to-bcps.patch;patch=1" - -S = "${WORKDIR}/bluez-utils-${PV}" - -EXTRA_OECONF = "--enable-initscripts --enable-bcm203x --enable-hid2hci" -# --enable-obex enable OBEX support -# --enable-alsa enable ALSA support -# --enable-cups install CUPS backend support -# --enable-bccmd install BCCMD interface utility -# --enable-avctrl install Audio/Video control utility -# --enable-hid2hci install HID mode switching utility -# --enable-dfutool install DFU firmware upgrade utility - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "bluetooth" -INITSCRIPT_PARAMS = "defaults 23 19" - -do_install_append() { - install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/ - mv ${D}${sbindir}/* ${D}${base_sbindir}/ - mv ${D}${bindir}/* ${D}${base_bindir}/ - rmdir ${D}${bindir} ${D}${sbindir} - chmod u+s ${D}${base_sbindir}/hciattach ${D}${base_sbindir}/hciconfig - install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/ -} - -CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \ - ${sysconfdir}/default/bluetooth" - -PACKAGES =+ "${PN}-ciptool" -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" diff --git a/packages/bluez/bluez-utils_3.9.bb b/packages/bluez/bluez-utils_3.9.bb deleted file mode 100644 index 29c472fbbd..0000000000 --- a/packages/bluez/bluez-utils_3.9.bb +++ /dev/null @@ -1,13 +0,0 @@ -require bluez-utils.inc - -PACKAGES =+ "${PN}-ciptool" - -SRC_URI += "file://uclibc-fix.patch;patch=1 \ - file://ppoll-uclibc-arm-r0.patch;patch=1 " - -FILES_${PN}-ciptool = "/bin/ciptool" -RREPLACES_${PN}-ciptool = "bluez-utils-dbus-ciptool" -RCONFLICTS_${PN}-ciptool = "bluez-utils-dbus-ciptool bluez-utils-nodbus" - - -PR = "r5" -- cgit v1.2.3 From 393416f90d61c3d6ebadc1a715eaeaac2f5573d1 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 16:03:07 +0000 Subject: conf/machine: replace ushbost with usbhost in a couple of config files and close 3515. --- conf/machine/d201gly2.conf | 2 +- conf/machine/epia.conf | 2 +- conf/machine/i586-generic.conf | 2 +- conf/machine/i686-generic.conf | 2 +- conf/machine/x86-32-nocona.conf | 2 +- conf/machine/x86-prescott.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/conf/machine/d201gly2.conf b/conf/machine/d201gly2.conf index d3c8780463..75a6920246 100644 --- a/conf/machine/d201gly2.conf +++ b/conf/machine/d201gly2.conf @@ -22,7 +22,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" MACHINE_TASK_PROVIDER = "task-base" diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf index b423f83f00..97d43d7a6d 100644 --- a/conf/machine/epia.conf +++ b/conf/machine/epia.conf @@ -12,6 +12,6 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86" require conf/machine/include/tune-c3.inc diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf index 6525c537b0..e715eeb83b 100644 --- a/conf/machine/i586-generic.conf +++ b/conf/machine/i586-generic.conf @@ -20,7 +20,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES ?= "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf index 15b9259b4f..685d763e6d 100644 --- a/conf/machine/i686-generic.conf +++ b/conf/machine/i686-generic.conf @@ -19,7 +19,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES ?= "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" #tune for pentium pro cpu diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf index 20b5a11770..91cf003420 100644 --- a/conf/machine/x86-32-nocona.conf +++ b/conf/machine/x86-32-nocona.conf @@ -17,7 +17,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" diff --git a/conf/machine/x86-prescott.conf b/conf/machine/x86-prescott.conf index 6a91bc39fb..5ea5079072 100644 --- a/conf/machine/x86-prescott.conf +++ b/conf/machine/x86-prescott.conf @@ -16,7 +16,7 @@ GLIBC_EXTRA_OECONF = "--with-tls" IMAGE_FSTYPES = "ext2.gz" -MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86" +MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86" MACHINE_EXTRA_RRECOMMENDS = " kernel-modules" -- cgit v1.2.3 From cf7c3e4b4071b5fd1b2a2db1d29552802419c9aa Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 25 Aug 2008 19:43:54 +0000 Subject: frameworkd git s/CHARGER/USB/ in frameworkd.conf for all machines Note: CHARGER is slightly incorrect on devices that can act as HOST and GADGET. Since you don't know whether the USB plug actually leads to the device being charged, beware of false assumptions. Better check seperatly. --- packages/freesmartphone/frameworkd/a780/frameworkd.conf | 2 +- packages/freesmartphone/frameworkd/magician/frameworkd.conf | 2 +- packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf | 2 +- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf | 2 +- packages/freesmartphone/frameworkd_git.bb | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/freesmartphone/frameworkd/a780/frameworkd.conf b/packages/freesmartphone/frameworkd/a780/frameworkd.conf index a619bf1c5a..425267d97b 100644 --- a/packages/freesmartphone/frameworkd/a780/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/a780/frameworkd.conf @@ -5,7 +5,7 @@ version = 1 # keys (copied from Openmoko, need to adjust) report1 = AUX,key,169,1 report2 = POWER,key,116,1 -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 [ogsmd] diff --git a/packages/freesmartphone/frameworkd/magician/frameworkd.conf b/packages/freesmartphone/frameworkd/magician/frameworkd.conf index b7e40c0654..c4dadee386 100644 --- a/packages/freesmartphone/frameworkd/magician/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/magician/frameworkd.conf @@ -7,7 +7,7 @@ version = 1 report1 = AUX,key,212,1 report2 = POWER,key,116,1 # magician doesn't use KEY_POWER2 for the charger, need to fix -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 [ogsmd] diff --git a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf index c25805b36f..27e624ab0a 100644 --- a/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf @@ -11,7 +11,7 @@ scenario_dir = /usr/share/openmoko/scenarios # Keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 [ogsmd] diff --git a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf index 45bb12f6a8..6af15c96e3 100644 --- a/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf +++ b/packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf @@ -17,7 +17,7 @@ ignoreinput=2,3 # keys report1 = AUX,key,169,1 report2 = POWER,key,116,1 -report3 = CHARGER,key,356,0 +report3 = USB,key,356,0 report4 = HEADSET,switch,2,0 # disable accelerometer since it uses LOADS of CPU resources diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb index fa669ced18..52bd54a4f1 100644 --- a/packages/freesmartphone/frameworkd_git.bb +++ b/packages/freesmartphone/frameworkd_git.bb @@ -5,7 +5,7 @@ SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" PV = "0.8.2+gitr${SRCREV}" -PR = "r2" +PR = "r3" inherit distutils update-rc.d @@ -42,6 +42,7 @@ RRECOMMENDS_${PN} += "\ ppp \ " +# recommend MUXer on platforms that require one RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd" RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd" -- cgit v1.2.3 From fbd816ca00ebf11edc7e8944aee9bb2d2325ce06 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 25 Aug 2008 21:02:21 +0000 Subject: linux-rt: fix scr-uri and expand efika defconfig --- packages/linux/linux-rt-2.6.25/efika/defconfig | 559 +++++++++++++++++++++---- packages/linux/linux-rt_2.6.25.bb | 6 +- 2 files changed, 470 insertions(+), 95 deletions(-) diff --git a/packages/linux/linux-rt-2.6.25/efika/defconfig b/packages/linux/linux-rt-2.6.25/efika/defconfig index 838b49a976..05b21eb4da 100644 --- a/packages/linux/linux-rt-2.6.25/efika/defconfig +++ b/packages/linux/linux-rt-2.6.25/efika/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.25.4-rt6 -# Thu Jun 12 00:22:18 2008 +# Mon Aug 25 22:09:31 2008 # # CONFIG_PPC64 is not set @@ -61,7 +61,7 @@ CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -224,7 +224,7 @@ CONFIG_BINFMT_MISC=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_HAS_WALK_MEMORY=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -# CONFIG_KEXEC is not set +CONFIG_KEXEC=y CONFIG_ARCH_FLATMEM_ENABLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y CONFIG_SELECT_MEMORY_MODEL=y @@ -242,7 +242,7 @@ CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_PROC_DEVICETREE=y CONFIG_CMDLINE_BOOL=y -CONFIG_CMDLINE="console=ttyS0,9600 console=ttyPSC0,115200" +CONFIG_CMDLINE=" debug " CONFIG_PM=y # CONFIG_PM_LEGACY is not set CONFIG_PM_DEBUG=y @@ -385,6 +385,7 @@ CONFIG_NETFILTER_ADVANCED=y # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set # CONFIG_NET_SCHED is not set +CONFIG_NET_SCH_FIFO=y # # Network testing @@ -392,22 +393,110 @@ CONFIG_NETFILTER_ADVANCED=y # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set # CONFIG_CAN is not set -# CONFIG_IRDA is not set -# CONFIG_BT is not set +CONFIG_IRDA=m + +# +# IrDA protocols +# +CONFIG_IRLAN=m +CONFIG_IRCOMM=m +CONFIG_IRDA_ULTRA=y + +# +# IrDA options +# +# CONFIG_IRDA_CACHE_LAST_LSAP is not set +# CONFIG_IRDA_FAST_RR is not set +# CONFIG_IRDA_DEBUG is not set + +# +# Infrared-port device drivers +# + +# +# SIR device drivers +# +CONFIG_IRTTY_SIR=m + +# +# Dongle support +# +# CONFIG_DONGLE is not set +CONFIG_KINGSUN_DONGLE=m +CONFIG_KSDAZZLE_DONGLE=m +CONFIG_KS959_DONGLE=m + +# +# FIR device drivers +# +CONFIG_USB_IRDA=m +# CONFIG_SIGMATEL_FIR is not set +# CONFIG_NSC_FIR is not set +# CONFIG_WINBOND_FIR is not set +# CONFIG_TOSHIBA_FIR is not set +# CONFIG_SMC_IRCC_FIR is not set +# CONFIG_ALI_FIR is not set +# CONFIG_VLSI_FIR is not set +# CONFIG_VIA_FIR is not set +# CONFIG_MCS_FIR is not set +CONFIG_BT=m +CONFIG_BT_L2CAP=m +CONFIG_BT_SCO=m +CONFIG_BT_RFCOMM=m +CONFIG_BT_RFCOMM_TTY=y +CONFIG_BT_BNEP=m +CONFIG_BT_BNEP_MC_FILTER=y +CONFIG_BT_BNEP_PROTO_FILTER=y +CONFIG_BT_HIDP=m + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUSB=m +CONFIG_BT_HCIUSB_SCO=y +# CONFIG_BT_HCIUART is not set +CONFIG_BT_HCIBCM203X=m +CONFIG_BT_HCIBPA10X=m +CONFIG_BT_HCIBFUSB=m +# CONFIG_BT_HCIVHCI is not set # CONFIG_AF_RXRPC is not set # # Wireless # -# CONFIG_CFG80211 is not set +CONFIG_CFG80211=m +CONFIG_NL80211=y CONFIG_WIRELESS_EXT=y -# CONFIG_MAC80211 is not set +CONFIG_MAC80211=m + +# +# Rate control algorithm selection +# +CONFIG_MAC80211_RC_DEFAULT_PID=y +# CONFIG_MAC80211_RC_DEFAULT_SIMPLE is not set +# CONFIG_MAC80211_RC_DEFAULT_NONE is not set + +# +# Selecting 'y' for an algorithm will +# + +# +# build the algorithm into mac80211. +# +CONFIG_MAC80211_RC_DEFAULT="pid" +CONFIG_MAC80211_RC_PID=y +# CONFIG_MAC80211_RC_SIMPLE is not set +CONFIG_MAC80211_LEDS=y +# CONFIG_MAC80211_DEBUGFS is not set +# CONFIG_MAC80211_DEBUG_PACKET_ALIGNMENT is not set +# CONFIG_MAC80211_DEBUG is not set CONFIG_IEEE80211=m # CONFIG_IEEE80211_DEBUG is not set CONFIG_IEEE80211_CRYPT_WEP=m -# CONFIG_IEEE80211_CRYPT_CCMP is not set -# CONFIG_IEEE80211_CRYPT_TKIP is not set -# CONFIG_IEEE80211_SOFTMAC is not set +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_CRYPT_TKIP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set # CONFIG_RFKILL is not set # CONFIG_NET_9P is not set @@ -660,7 +749,29 @@ CONFIG_PATA_MPC52xx=y # IEEE 1394 (FireWire) support # # CONFIG_FIREWIRE is not set -# CONFIG_IEEE1394 is not set +CONFIG_IEEE1394=m + +# +# Subsystem Options +# +# CONFIG_IEEE1394_VERBOSEDEBUG is not set + +# +# Controllers +# +CONFIG_IEEE1394_PCILYNX=m +CONFIG_IEEE1394_OHCI1394=m + +# +# Protocols +# +CONFIG_IEEE1394_VIDEO1394=m +CONFIG_IEEE1394_SBP2=m +CONFIG_IEEE1394_SBP2_PHYS_DMA=y +CONFIG_IEEE1394_ETH1394_ROM_ENTRY=y +CONFIG_IEEE1394_ETH1394=m +CONFIG_IEEE1394_DV1394=m +CONFIG_IEEE1394_RAWIO=m # CONFIG_I2O is not set # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y @@ -969,8 +1080,266 @@ CONFIG_SSB_POSSIBLE=y # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set -# CONFIG_DVB_CORE is not set +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_COMMON=m +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y +CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_CAPTURE_DRIVERS=y +# CONFIG_VIDEO_ADV_DEBUG is not set +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +CONFIG_VIDEO_TVAUDIO=m +CONFIG_VIDEO_TDA7432=m +CONFIG_VIDEO_TDA9840=m +CONFIG_VIDEO_TDA9875=m +CONFIG_VIDEO_TEA6415C=m +CONFIG_VIDEO_TEA6420=m +CONFIG_VIDEO_MSP3400=m +CONFIG_VIDEO_CS53L32A=m +CONFIG_VIDEO_M52790=m +CONFIG_VIDEO_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m +CONFIG_VIDEO_BT819=m +CONFIG_VIDEO_BT856=m +CONFIG_VIDEO_KS0127=m +CONFIG_VIDEO_OV7670=m +CONFIG_VIDEO_SAA7110=m +CONFIG_VIDEO_SAA7111=m +CONFIG_VIDEO_SAA7114=m +CONFIG_VIDEO_SAA711X=m +CONFIG_VIDEO_TVP5150=m +CONFIG_VIDEO_VPX3220=m +CONFIG_VIDEO_CX25840=m +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m +CONFIG_VIDEO_VIVI=m +CONFIG_VIDEO_BT848=m +# CONFIG_VIDEO_BT848_DVB is not set +CONFIG_VIDEO_SAA6588=m +# CONFIG_VIDEO_CPIA is not set +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_SAA5246A=m +CONFIG_VIDEO_SAA5249=m +CONFIG_TUNER_3036=m +CONFIG_VIDEO_STRADIS=m +CONFIG_VIDEO_ZORAN_ZR36060=m +CONFIG_VIDEO_ZORAN=m +CONFIG_VIDEO_ZORAN_BUZ=m +CONFIG_VIDEO_ZORAN_DC10=m +CONFIG_VIDEO_ZORAN_DC30=m +CONFIG_VIDEO_ZORAN_LML33=m +CONFIG_VIDEO_ZORAN_LML33R10=m +CONFIG_VIDEO_ZORAN_AVS6EYES=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_MXB=m +CONFIG_VIDEO_DPC=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_HEXIUM_GEMINI=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX23885=m +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_FB_IVTV=m +CONFIG_VIDEO_CAFE_CCIC=m +CONFIG_V4L_USB_DRIVERS=y +CONFIG_VIDEO_PVRUSB2=m +CONFIG_VIDEO_PVRUSB2_ONAIR_CREATOR=y +CONFIG_VIDEO_PVRUSB2_ONAIR_USB2=y +CONFIG_VIDEO_PVRUSB2_SYSFS=y +CONFIG_VIDEO_PVRUSB2_DEBUGIFC=y +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_USBVIDEO=m +CONFIG_USB_VICAM=m +CONFIG_USB_IBMCAM=m +CONFIG_USB_KONICAWC=m +CONFIG_USB_QUICKCAM_MESSENGER=m +CONFIG_USB_ET61X251=m +CONFIG_VIDEO_OVCAMCHIP=m +CONFIG_USB_W9968CF=m +CONFIG_USB_OV511=m +CONFIG_USB_SE401=m +CONFIG_USB_SN9C102=m +CONFIG_USB_STV680=m +# CONFIG_USB_ZC0301 is not set +CONFIG_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_RADIO_ADAPTERS=y +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_SI470X is not set +CONFIG_DVB_CORE=m +CONFIG_DVB_CORE_ATTACH=y +CONFIG_DVB_CAPTURE_DRIVERS=y + +# +# Supported SAA7146 based PCI Adapters +# +# CONFIG_TTPCI_EEPROM is not set +# CONFIG_DVB_AV7110 is not set +# CONFIG_DVB_BUDGET_CORE is not set + +# +# Supported USB Adapters +# +CONFIG_DVB_USB=m +# CONFIG_DVB_USB_DEBUG is not set +CONFIG_DVB_USB_A800=m +CONFIG_DVB_USB_DIBUSB_MB=m +# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set +CONFIG_DVB_USB_DIBUSB_MC=m +CONFIG_DVB_USB_DIB0700=m +CONFIG_DVB_USB_UMT_010=m +# CONFIG_DVB_USB_CXUSB is not set +CONFIG_DVB_USB_M920X=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_DIGITV=m +CONFIG_DVB_USB_VP7045=m +CONFIG_DVB_USB_VP702X=m +# CONFIG_DVB_USB_GP8PSK is not set +CONFIG_DVB_USB_NOVA_T_USB2=m +CONFIG_DVB_USB_TTUSB2=m +CONFIG_DVB_USB_DTT200U=m +CONFIG_DVB_USB_OPERA1=m +CONFIG_DVB_USB_AF9005=m +CONFIG_DVB_USB_AF9005_REMOTE=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_DVB_CINERGYT2=m +CONFIG_DVB_CINERGYT2_TUNING=y +CONFIG_DVB_CINERGYT2_STREAM_URB_COUNT=32 +CONFIG_DVB_CINERGYT2_STREAM_BUF_SIZE=512 +CONFIG_DVB_CINERGYT2_QUERY_INTERVAL=250 +CONFIG_DVB_CINERGYT2_ENABLE_RC_INPUT_DEVICE=y +CONFIG_DVB_CINERGYT2_RC_QUERY_INTERVAL=50 + +# +# Supported FlexCopII (B2C2) Adapters +# +# CONFIG_DVB_B2C2_FLEXCOP is not set + +# +# Supported BT878 Adapters +# +# CONFIG_DVB_BT8XX is not set + +# +# Supported Pluto2 Adapters +# +# CONFIG_DVB_PLUTO2 is not set + +# +# Supported DVB Frontends +# + +# +# Customise DVB Frontends +# +# CONFIG_DVB_FE_CUSTOMISE is not set + +# +# DVB-S (satellite) frontends +# +CONFIG_DVB_STV0299=m +# CONFIG_DVB_CX24110 is not set +CONFIG_DVB_CX24123=m +CONFIG_DVB_TDA8083=m +# CONFIG_DVB_MT312 is not set +# CONFIG_DVB_VES1X93 is not set +# CONFIG_DVB_S5H1420 is not set +CONFIG_DVB_TDA10086=m + +# +# DVB-T (terrestrial) frontends +# +# CONFIG_DVB_SP8870 is not set +# CONFIG_DVB_SP887X is not set +CONFIG_DVB_CX22700=m +CONFIG_DVB_CX22702=m +# CONFIG_DVB_L64781 is not set +CONFIG_DVB_TDA1004X=m +CONFIG_DVB_NXT6000=m +CONFIG_DVB_MT352=m +CONFIG_DVB_ZL10353=m +CONFIG_DVB_DIB3000MB=m +CONFIG_DVB_DIB3000MC=m +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m + +# +# DVB-C (cable) frontends +# +CONFIG_DVB_VES1820=m +# CONFIG_DVB_TDA10021 is not set +# CONFIG_DVB_TDA10023 is not set +CONFIG_DVB_STV0297=m + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +CONFIG_DVB_NXT200X=m +# CONFIG_DVB_OR51211 is not set +CONFIG_DVB_OR51132=m +# CONFIG_DVB_BCM3510 is not set +CONFIG_DVB_LGDT330X=m +CONFIG_DVB_S5H1409=m + +# +# Tuners/PLL support +# +CONFIG_DVB_PLL=m +CONFIG_DVB_TDA826X=m +CONFIG_DVB_TDA827X=m +CONFIG_DVB_TDA18271=m +CONFIG_DVB_TUNER_QT1010=m +CONFIG_DVB_TUNER_MT2060=m +CONFIG_DVB_TUNER_MT2266=m +CONFIG_DVB_TUNER_MT2131=m +CONFIG_DVB_TUNER_DIB0070=m +CONFIG_DVB_TUNER_XC5000=m + +# +# Miscellaneous devices +# +CONFIG_DVB_LNBP21=m +CONFIG_DVB_ISL6421=m +# CONFIG_DVB_TUA6100 is not set +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_VIDEO_TUNER=m +# CONFIG_VIDEO_TUNER_CUSTOMIZE is not set +CONFIG_TUNER_XC2028=m +CONFIG_TUNER_MT20XX=m +CONFIG_TUNER_TDA8290=m +CONFIG_TUNER_TEA5761=m +CONFIG_TUNER_TEA5767=m +CONFIG_TUNER_SIMPLE=m +CONFIG_TUNER_TDA9887=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_IR_I2C=m +CONFIG_VIDEO_IR=m +CONFIG_VIDEO_TVEEPROM=m # CONFIG_DAB is not set # @@ -1071,9 +1440,9 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y # # Sound @@ -1368,7 +1737,8 @@ CONFIG_USB_SERIAL_OMNINET=m # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_FTDI_ELAN is not set # CONFIG_USB_APPLEDISPLAY is not set -# CONFIG_USB_SISUSBVGA is not set +CONFIG_USB_SISUSBVGA=m +CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set # CONFIG_USB_IOWARRIOR is not set @@ -1377,7 +1747,7 @@ CONFIG_USB_SERIAL_OMNINET=m # CONFIG_MMC is not set # CONFIG_MEMSTICK is not set CONFIG_NEW_LEDS=y -# CONFIG_LEDS_CLASS is not set +CONFIG_LEDS_CLASS=m # # LED drivers @@ -1387,9 +1757,9 @@ CONFIG_NEW_LEDS=y # LED Triggers # CONFIG_LEDS_TRIGGERS=y -# CONFIG_LEDS_TRIGGER_TIMER is not set +CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y -# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +CONFIG_LEDS_TRIGGER_HEARTBEAT=m # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set CONFIG_RTC_LIB=y @@ -1500,7 +1870,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=m CONFIG_GENERIC_ACL=y # @@ -1601,43 +1971,43 @@ CONFIG_BSD_DISKLABEL=y # CONFIG_SYSV68_PARTITION is not set CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_737 is not set -# CONFIG_NLS_CODEPAGE_775 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_CODEPAGE_852 is not set -# CONFIG_NLS_CODEPAGE_855 is not set -# CONFIG_NLS_CODEPAGE_857 is not set -# CONFIG_NLS_CODEPAGE_860 is not set -# CONFIG_NLS_CODEPAGE_861 is not set -# CONFIG_NLS_CODEPAGE_862 is not set -# CONFIG_NLS_CODEPAGE_863 is not set -# CONFIG_NLS_CODEPAGE_864 is not set -# CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set -# CONFIG_NLS_CODEPAGE_869 is not set -# CONFIG_NLS_CODEPAGE_936 is not set -# CONFIG_NLS_CODEPAGE_950 is not set -# CONFIG_NLS_CODEPAGE_932 is not set -# CONFIG_NLS_CODEPAGE_949 is not set -# CONFIG_NLS_CODEPAGE_874 is not set -# CONFIG_NLS_ISO8859_8 is not set -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_1251 is not set -CONFIG_NLS_ASCII=y +CONFIG_NLS_CODEPAGE_437=m +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_ASCII=m CONFIG_NLS_ISO8859_1=m -# CONFIG_NLS_ISO8859_2 is not set -# CONFIG_NLS_ISO8859_3 is not set -# CONFIG_NLS_ISO8859_4 is not set -# CONFIG_NLS_ISO8859_5 is not set -# CONFIG_NLS_ISO8859_6 is not set -# CONFIG_NLS_ISO8859_7 is not set -# CONFIG_NLS_ISO8859_9 is not set -# CONFIG_NLS_ISO8859_13 is not set -# CONFIG_NLS_ISO8859_14 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_KOI8_U is not set +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m CONFIG_NLS_UTF8=y # CONFIG_DLM is not set @@ -1649,10 +2019,12 @@ CONFIG_CRC_CCITT=m CONFIG_CRC16=m # CONFIG_CRC_ITU_T is not set CONFIG_CRC32=y -# CONFIG_CRC7 is not set +CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y @@ -1719,50 +2091,53 @@ CONFIG_BOOTX_TEXT=y # CONFIG_SECURITY_FILE_CAPABILITIES is not set CONFIG_CRYPTO=y CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_BLKCIPHER=y -# CONFIG_CRYPTO_SEQIV is not set +CONFIG_CRYPTO_SEQIV=m +CONFIG_CRYPTO_HASH=m CONFIG_CRYPTO_MANAGER=y -# CONFIG_CRYPTO_HMAC is not set -# CONFIG_CRYPTO_XCBC is not set -# CONFIG_CRYPTO_NULL is not set -# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_HMAC=m +CONFIG_CRYPTO_XCBC=m +CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_SHA1=m -# CONFIG_CRYPTO_SHA256 is not set -# CONFIG_CRYPTO_SHA512 is not set -# CONFIG_CRYPTO_WP512 is not set -# CONFIG_CRYPTO_TGR192 is not set -# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_CBC=y -# CONFIG_CRYPTO_PCBC is not set -# CONFIG_CRYPTO_LRW is not set -# CONFIG_CRYPTO_XTS is not set -# CONFIG_CRYPTO_CTR is not set -# CONFIG_CRYPTO_GCM is not set -# CONFIG_CRYPTO_CCM is not set -# CONFIG_CRYPTO_CRYPTD is not set +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_LRW=m +CONFIG_CRYPTO_XTS=m +CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CCM=m +CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_DES=y -# CONFIG_CRYPTO_FCRYPT is not set -# CONFIG_CRYPTO_BLOWFISH is not set -# CONFIG_CRYPTO_TWOFISH is not set -# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_AES=m -# CONFIG_CRYPTO_CAST5 is not set -# CONFIG_CRYPTO_CAST6 is not set -# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_ARC4=m -# CONFIG_CRYPTO_KHAZAD is not set -# CONFIG_CRYPTO_ANUBIS is not set -# CONFIG_CRYPTO_SEED is not set -# CONFIG_CRYPTO_SALSA20 is not set +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_MICHAEL_MIC is not set +CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_CRC32C=m -# CONFIG_CRYPTO_CAMELLIA is not set -# CONFIG_CRYPTO_TEST is not set -# CONFIG_CRYPTO_AUTHENC is not set -# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_TEST=m +CONFIG_CRYPTO_AUTHENC=m +CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_HW=y # CONFIG_CRYPTO_DEV_HIFN_795X is not set CONFIG_PPC_CLOCK=y diff --git a/packages/linux/linux-rt_2.6.25.bb b/packages/linux/linux-rt_2.6.25.bb index 6ce3edf249..998fc13685 100644 --- a/packages/linux/linux-rt_2.6.25.bb +++ b/packages/linux/linux-rt_2.6.25.bb @@ -7,13 +7,13 @@ DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_mpc8315e-rdb = "1" DEFAULT_PREFERENCE_efika = "1" -PR = "r3" +PR = "r4" #KERNEL_IMAGETYPE_efika = "Image" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.25.4.bz2;patch=1;p=1 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.25.4-rt6.bz2;patch=1;p=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-2.6.25.4.bz2;patch=1 \ + ${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/older/patch-2.6.25.4-rt6.bz2;patch=1 \ file://defconfig" S = "${WORKDIR}/linux-2.6.25" -- cgit v1.2.3 From db409a7ab3c8f7f5ea00f9aa98b59de6ac55bd89 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Mon, 25 Aug 2008 22:22:49 +0000 Subject: sane-srcrevs.inc: add SRCREV for tichy --- conf/distro/include/sane-srcrevs.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a06fe7e5ed..faa6d42009 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -164,6 +164,7 @@ SRCREV_pn-serial-forward ?= "4214" SRCREV_pn-settings-daemon ?= "2006" SRCREV_pn-sjf2410-linux-native ?= "4268" SRCREV_pn-sphyrna-python ?= "45" +SRCREV_pn-tichy ?= "168" SRCREV_pn-tmut ?= "60" SRCREV_pn-u-boot-openmoko ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" -- cgit v1.2.3 From 9f039bc749f5e0c95b2a466064b1014441b22e37 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Mon, 25 Aug 2008 22:50:05 +0000 Subject: xmms-embedded: put .debug dir in $PN-dbg --- packages/xmms-embedded/xmms-embedded_20040327.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/xmms-embedded/xmms-embedded_20040327.bb b/packages/xmms-embedded/xmms-embedded_20040327.bb index 2701fa25f2..d429449435 100644 --- a/packages/xmms-embedded/xmms-embedded_20040327.bb +++ b/packages/xmms-embedded/xmms-embedded_20040327.bb @@ -2,7 +2,7 @@ DESCRIPTION = "XMMS embedded - lightweight audio player with video and codec plu SECTION = "opie/multimedia" DEPENDS = "zlib tremor libmad libid3tag libsidplay glib-2.0 libmikmod" LICENSE = "GPL" -PR = "r4" +PR = "r5" SRC_URI = "cvs://anonymous@xmms-embedded.cvs.sourceforge.net/cvsroot/xmms-embedded;module=xmms-embedded;date=${PV} \ file://bogusincdir.patch;patch=1 \ @@ -61,3 +61,5 @@ do_install() { install -m 0644 Skins/winamp_xmms/${f} ${D}${palmtopdir}/lib/xmms/skin/${f} done } + +FILES-${PN}-dbg += "${palmtopdir}/lib/xmms/Input/.debug" -- cgit v1.2.3 From 9335f6f1d853d0512ee27c4e972d65cf6af3c6f9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 26 Aug 2008 09:32:52 +0000 Subject: fso-image: remove bogus compatible machine --- packages/images/fso-image.bb | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 261caa3476..a857c5b331 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -2,7 +2,6 @@ # freesmartphone.org Image Recipe #------------------------------------------------------ -COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" IMAGE_LINGUAS = "" # getting the base system up -- cgit v1.2.3 From f8f6978b0be160111bf9478b4c48196538e788d2 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 26 Aug 2008 09:37:51 +0000 Subject: classpath: fix config.rpath, autotools and ecj -d * add ecj_java_dir.patch for issuse when ecj is not cable to to create directory-structure with parameter -d * add autotools.patch for m4 stuff * copy config.rpath always from /usr/share/gettext, so no crude hacks are needed anymore * bump PR on all recipes --- packages/classpath/classpath-0.97.2/.mtn2git_empty | 0 .../classpath/classpath-0.97.2/autotools.patch | 26 +++++++++++++++ packages/classpath/classpath-initial_0.93.bb | 6 ++-- .../classpath-minimal-0.97.2/.mtn2git_empty | 0 .../classpath-minimal-0.97.2/autotools.patch | 26 +++++++++++++++ packages/classpath/classpath-minimal_0.96.1.bb | 2 +- packages/classpath/classpath-minimal_0.97.2.bb | 4 ++- .../classpath-native-0.97.2/.mtn2git_empty | 0 .../classpath-native-0.97.2/autotools.patch | 26 +++++++++++++++ packages/classpath/classpath-native.inc | 14 ++++---- packages/classpath/classpath-native_0.96.1.bb | 2 +- packages/classpath/classpath-native_0.97.2.bb | 2 ++ packages/classpath/classpath.inc | 11 +++---- packages/classpath/classpath_0.95.bb | 2 +- packages/classpath/classpath_0.96.1.bb | 4 +-- packages/classpath/classpath_0.97.2.bb | 4 ++- packages/classpath/files/autotools.patch | 37 ++++++++++++++++++++++ packages/classpath/files/ecj_java_dir.patch | 34 ++++++++++++++++++++ 18 files changed, 177 insertions(+), 23 deletions(-) create mode 100644 packages/classpath/classpath-0.97.2/.mtn2git_empty create mode 100644 packages/classpath/classpath-0.97.2/autotools.patch create mode 100644 packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty create mode 100644 packages/classpath/classpath-minimal-0.97.2/autotools.patch create mode 100644 packages/classpath/classpath-native-0.97.2/.mtn2git_empty create mode 100644 packages/classpath/classpath-native-0.97.2/autotools.patch create mode 100644 packages/classpath/files/autotools.patch create mode 100644 packages/classpath/files/ecj_java_dir.patch diff --git a/packages/classpath/classpath-0.97.2/.mtn2git_empty b/packages/classpath/classpath-0.97.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/classpath/classpath-0.97.2/autotools.patch b/packages/classpath/classpath-0.97.2/autotools.patch new file mode 100644 index 0000000000..3df65cf892 --- /dev/null +++ b/packages/classpath/classpath-0.97.2/autotools.patch @@ -0,0 +1,26 @@ +Index: classpath-0.97.2/configure.ac +=================================================================== +--- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200 ++++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200 +@@ -41,6 +41,8 @@ + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + ++AC_CONFIG_MACRO_DIR([m4]) ++ + dnl ----------------------------------------------------------- + dnl Enable collections.jar (disabled by default) + dnl ----------------------------------------------------------- +Index: classpath-0.97.2/Makefile.am +=================================================================== +--- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 ++++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 +@@ -5,7 +5,7 @@ + DIST_SUBDIRS = lib doc external include native resource scripts tools examples + + # Allow users to pass site-specific flags to autoreconf via an env var. +-ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} ++ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} + + native: lib + diff --git a/packages/classpath/classpath-initial_0.93.bb b/packages/classpath/classpath-initial_0.93.bb index 7c1b91eb20..59a36b6cd4 100644 --- a/packages/classpath/classpath-initial_0.93.bb +++ b/packages/classpath/classpath-initial_0.93.bb @@ -5,9 +5,11 @@ require classpath-native.inc DESCRIPTION="Java1.4-compatible GNU Classpath variant that is used as bootclasspath for jikes-native." -PR = "r2" +PR = "r3" -DEPENDS = "zip-native fastjar-native jikes-native" +DEPENDS = "zip-native fastjar-native jikes-native gettext-native" + +SRC_URI += "file://autotools.patch;patch=1" EXTRA_OECONF = "\ --with-jikes=jikes \ diff --git a/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty b/packages/classpath/classpath-minimal-0.97.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/classpath/classpath-minimal-0.97.2/autotools.patch b/packages/classpath/classpath-minimal-0.97.2/autotools.patch new file mode 100644 index 0000000000..3df65cf892 --- /dev/null +++ b/packages/classpath/classpath-minimal-0.97.2/autotools.patch @@ -0,0 +1,26 @@ +Index: classpath-0.97.2/configure.ac +=================================================================== +--- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200 ++++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200 +@@ -41,6 +41,8 @@ + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + ++AC_CONFIG_MACRO_DIR([m4]) ++ + dnl ----------------------------------------------------------- + dnl Enable collections.jar (disabled by default) + dnl ----------------------------------------------------------- +Index: classpath-0.97.2/Makefile.am +=================================================================== +--- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 ++++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 +@@ -5,7 +5,7 @@ + DIST_SUBDIRS = lib doc external include native resource scripts tools examples + + # Allow users to pass site-specific flags to autoreconf via an env var. +-ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} ++ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} + + native: lib + diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb index 826c5a9479..94f8dec610 100644 --- a/packages/classpath/classpath-minimal_0.96.1.bb +++ b/packages/classpath/classpath-minimal_0.96.1.bb @@ -1,6 +1,6 @@ require classpath.inc -PR = "r6" +PR = "r7" SRC_URI += "\ file://gjar-prefix-patch.diff;patch=1;pnum=0 \ diff --git a/packages/classpath/classpath-minimal_0.97.2.bb b/packages/classpath/classpath-minimal_0.97.2.bb index e45ddf33ae..5e6d53224e 100644 --- a/packages/classpath/classpath-minimal_0.97.2.bb +++ b/packages/classpath/classpath-minimal_0.97.2.bb @@ -4,9 +4,11 @@ SRC_URI += "\ file://netif_16.patch;patch=1;pnum=0 \ file://SimpleName.diff;patch=1;pnum=0 \ file://javanet-local.patch;patch=1;pnum=0 \ + file://ecj_java_dir.patch;patch=1 \ + file://autotools.patch;patch=1 \ " -PR = "r0" +PR = "r1" PROVIDES = "${PN} classpath" diff --git a/packages/classpath/classpath-native-0.97.2/.mtn2git_empty b/packages/classpath/classpath-native-0.97.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/classpath/classpath-native-0.97.2/autotools.patch b/packages/classpath/classpath-native-0.97.2/autotools.patch new file mode 100644 index 0000000000..3df65cf892 --- /dev/null +++ b/packages/classpath/classpath-native-0.97.2/autotools.patch @@ -0,0 +1,26 @@ +Index: classpath-0.97.2/configure.ac +=================================================================== +--- classpath-0.97.2.orig/configure.ac 2008-06-06 02:58:57.000000000 +0200 ++++ classpath-0.97.2/configure.ac 2008-08-02 00:58:16.537364104 +0200 +@@ -41,6 +41,8 @@ + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + ++AC_CONFIG_MACRO_DIR([m4]) ++ + dnl ----------------------------------------------------------- + dnl Enable collections.jar (disabled by default) + dnl ----------------------------------------------------------- +Index: classpath-0.97.2/Makefile.am +=================================================================== +--- classpath-0.97.2.orig/Makefile.am 2008-06-01 20:47:05.000000000 +0200 ++++ classpath-0.97.2/Makefile.am 2008-08-02 00:58:39.004023720 +0200 +@@ -5,7 +5,7 @@ + DIST_SUBDIRS = lib doc external include native resource scripts tools examples + + # Allow users to pass site-specific flags to autoreconf via an env var. +-ACLOCAL_AMFLAGS = -I m4 ${LOCAL_AUTORECONF_FLAGS} ++ACLOCAL_AMFLAGS = -I m4 --install ${LOCAL_AUTORECONF_FLAGS} + + native: lib + diff --git a/packages/classpath/classpath-native.inc b/packages/classpath/classpath-native.inc index 3f18c5fab6..992a16ec7a 100644 --- a/packages/classpath/classpath-native.inc +++ b/packages/classpath/classpath-native.inc @@ -5,11 +5,18 @@ LICENSE = "Classpath" S = "${WORKDIR}/classpath-${PV}" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" + DEPENDS = "ecj-initial fastjar-native zip-native gettext-native" inherit autotools native + +do_configure_prepend () { + + cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S} +} + export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial" # Note: the --with-ecj options seems redundant but is @@ -29,14 +36,7 @@ EXTRA_OECONF = "\ --includedir=${STAGING_INCDIR}/classpath \ --with-vm=java \ " -# hack to get config.rpath in, it comes from gettext -do_configure_prepend () { - - ${@['','cp ${STAGING_DATADIR}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']} - -} do_stage() { oe_runmake install } - diff --git a/packages/classpath/classpath-native_0.96.1.bb b/packages/classpath/classpath-native_0.96.1.bb index a354b6b7f9..2d7ebad76f 100644 --- a/packages/classpath/classpath-native_0.96.1.bb +++ b/packages/classpath/classpath-native_0.96.1.bb @@ -1,6 +1,6 @@ require classpath-native.inc -PR = "r3" +PR = "r4" SRC_URI += "\ file://gjar-prefix-patch.diff;patch=1;pnum=0 \ diff --git a/packages/classpath/classpath-native_0.97.2.bb b/packages/classpath/classpath-native_0.97.2.bb index c25b1849ca..c9a239418b 100644 --- a/packages/classpath/classpath-native_0.97.2.bb +++ b/packages/classpath/classpath-native_0.97.2.bb @@ -10,5 +10,7 @@ SRC_URI += "\ file://SimpleName.diff;patch=1;pnum=0 \ file://javanet-local.patch;patch=1;pnum=0 \ file://sun-security-getproperty_0.96.1.patch;patch=1;pnum=0 \ + file://ecj_java_dir.patch;patch=1 \ + file://autotools.patch;patch=1 \ " diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc index cee09857e4..65bc465200 100644 --- a/packages/classpath/classpath.inc +++ b/packages/classpath/classpath.inc @@ -17,6 +17,7 @@ RPROVIDES_${PN}-common = "${PBN}-common" RPROVIDES_${PN}-gtk = "${PBN}-awt" SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz" + S = "${WORKDIR}/${PBN}-${PV}" @@ -30,21 +31,19 @@ EXTRA_OECONF = "\ inherit autotools -# hack to get config.rpath in, it comes from gettext do_configure_prepend () { - ${@['','cp ${STAGING_DATADIR_NATIVE}/automake-1.10/config.rpath ${S}'][bb.data.getVar('PREFERRED_VERSION_automake-native',d,1) == '1.10']} - + cp ${STAGING_DATADIR_NATIVE}/gettext/config.rpath ${S} } do_stage() { install -d ${STAGING_INCDIR}/classpath install -m 0644 include/jni* ${STAGING_INCDIR}/classpath - install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/ + install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath/ - install -d ${STAGING_DATADIR}/classpath - install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath + install -d ${STAGING_DATADIR}/classpath + install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/classpath } do_install() { diff --git a/packages/classpath/classpath_0.95.bb b/packages/classpath/classpath_0.95.bb index 45ce04f519..7e5ca458b0 100644 --- a/packages/classpath/classpath_0.95.bb +++ b/packages/classpath/classpath_0.95.bb @@ -6,7 +6,7 @@ SRC_URI += "\ file://javanet-local.patch;patch=1;pnum=0 \ " -PR = "r4" +PR = "r5" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb index 6952cda72f..b4dd8b53e7 100644 --- a/packages/classpath/classpath_0.96.1.bb +++ b/packages/classpath/classpath_0.96.1.bb @@ -6,7 +6,7 @@ SRC_URI += "\ file://javanet-local.patch;patch=1;pnum=0 \ " -PR = "r6" +PR = "r7" DEPENDS += "gtk+ gconf libxtst" @@ -20,5 +20,3 @@ EXTRA_OECONF += "\ --enable-local-sockets \ --with-vm=java \ " - - diff --git a/packages/classpath/classpath_0.97.2.bb b/packages/classpath/classpath_0.97.2.bb index ef43374aef..1393e2c453 100644 --- a/packages/classpath/classpath_0.97.2.bb +++ b/packages/classpath/classpath_0.97.2.bb @@ -4,9 +4,11 @@ SRC_URI += "\ file://netif_16.patch;patch=1;pnum=0 \ file://SimpleName.diff;patch=1;pnum=0 \ file://javanet-local.patch;patch=1;pnum=0 \ + file://ecj_java_dir.patch;patch=1 \ + file://autotools.patch;patch=1 \ " -PR = "r1" +PR = "r2" DEPENDS += "gtk+ gconf libxtst" diff --git a/packages/classpath/files/autotools.patch b/packages/classpath/files/autotools.patch new file mode 100644 index 0000000000..baae366d5f --- /dev/null +++ b/packages/classpath/files/autotools.patch @@ -0,0 +1,37 @@ +Index: classpath-0.93/configure.ac +=================================================================== +--- classpath-0.93.orig/configure.ac 2006-12-08 20:22:50.000000000 +0100 ++++ classpath-0.93/configure.ac 2008-08-25 22:07:40.711946598 +0200 +@@ -41,6 +41,11 @@ + AC_CONFIG_HEADERS([include/config.h]) + AC_PREFIX_DEFAULT(/usr/local/classpath) + ++AC_CONFIG_MACRO_DIR([m4]) ++ ++ ++AM_ICONV_LINK ++ + dnl ----------------------------------------------------------- + dnl Enable collections.jar (disabled by default) + dnl ----------------------------------------------------------- +@@ -312,6 +317,7 @@ + dnl AC_PROG_AWK + AC_PROG_CC + AC_PROG_CPP ++AM_PROG_CC_C_O + + # Handle -Werror default case. + if test "$ENABLE_WERROR" = default; then +Index: classpath-0.93/Makefile.am +=================================================================== +--- classpath-0.93.orig/Makefile.am 2006-02-08 08:35:30.000000000 +0100 ++++ classpath-0.93/Makefile.am 2008-08-24 21:45:42.405241264 +0200 +@@ -4,7 +4,7 @@ + SUBDIRS = lib doc external include native resource scripts tools $(EXAMPLESDIR) + DIST_SUBDIRS = lib doc external include native resource scripts tools examples + +-ACLOCAL_AMFLAGS = -I m4 ++ACLOCAL_AMFLAGS = -I m4 --install + + native: lib + diff --git a/packages/classpath/files/ecj_java_dir.patch b/packages/classpath/files/ecj_java_dir.patch new file mode 100644 index 0000000000..e310567516 --- /dev/null +++ b/packages/classpath/files/ecj_java_dir.patch @@ -0,0 +1,34 @@ +Index: classpath-0.97.2/lib/gen-classlist.sh.in +=================================================================== +--- classpath-0.97.2.orig/lib/gen-classlist.sh.in 2008-06-02 03:37:29.000000000 +0200 ++++ classpath-0.97.2/lib/gen-classlist.sh.in 2008-08-01 00:00:58.055208770 +0200 +@@ -148,4 +148,7 @@ + done + fi + ++# hack for javac that uses -d and do not make the directories ++awk -F " " '{print $1}' classes.1 | uniq | awk -F " " '{system("mkdir -p " $0)}' ++ + exit 0 +Index: classpath-0.97.2/tools/Makefile.am +=================================================================== +--- classpath-0.97.2.orig/tools/Makefile.am 2008-06-02 04:01:47.000000000 +0200 ++++ classpath-0.97.2/tools/Makefile.am 2008-08-01 00:11:18.531985989 +0200 +@@ -180,6 +180,8 @@ + mkdir classes asm + ## Compile ASM separately as it is latin-1 encoded. + find $(srcdir)/external/asm -name '*.java' -print > asm.lst ++ awk -F "/" '{OFS=FS;gsub("/"$$2"/"$$3,"",$$0);gsub("/"$$NF,"",$$0); print $$0}' asm.lst | \ ++ sort | uniq | awk -F " " '{system("mkdir -p asm/" $$0)}' + AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ + $$AC -g -d asm @asm.lst + find $(srcdir)/gnu/classpath/tools \ +@@ -189,6 +191,8 @@ + $(srcdir)/com/sun/tools/javah \ + $(srcdir)/sun/rmi/rmic \ + -name '*.java' -print > classes.lst ++ awk -F "/" '{OFS=FS;gsub("/"$$NF,"",$$0); print $$0}' classes.lst | \ ++ sort | uniq | awk -F " " '{system("mkdir -p classes/" $$0)}' + $(JCOMPILER) -g -d classes @classes.lst + cat classes.lst asm.lst > all-classes.lst + ## Copy over tools resource files. -- cgit v1.2.3 From 94a3e71cf18319169da6e529a5d6e02ee45b3efd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Tue, 26 Aug 2008 11:04:08 +0000 Subject: disapproval of revision '9cdbd45b5ff507c6e00fc91c08ec5e17929302f4' --- packages/images/fso-image.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index a857c5b331..261caa3476 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -2,6 +2,7 @@ # freesmartphone.org Image Recipe #------------------------------------------------------ +COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" IMAGE_LINGUAS = "" # getting the base system up -- cgit v1.2.3 From 6e5e69478c517beaa1c74b947c5043441d9397f5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 26 Aug 2008 13:00:20 +0000 Subject: fso-image: remove bogus compatible machine *again* --- packages/images/fso-image.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb index 261caa3476..d6eaecd9fa 100644 --- a/packages/images/fso-image.bb +++ b/packages/images/fso-image.bb @@ -2,7 +2,6 @@ # freesmartphone.org Image Recipe #------------------------------------------------------ -COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" IMAGE_LINGUAS = "" # getting the base system up @@ -17,6 +16,10 @@ BASE_INSTALL = "\ fbset-modes \ " +# Some machines don't set a *runtime* provider for X, so default to Xfbdev here +# virtual/xserver won't work, since the kdrive recipes will build multiple xserver packages +XSERVER ?= "xserver-kdrive-fbdev" + # getting an X window system up X_INSTALL = "\ e-wm \ -- cgit v1.2.3 From 3044ac769afb68a57035ce63716506cf6cdfd468 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 26 Aug 2008 14:59:45 +0000 Subject: libnl add 1.1, remove outdated ones --- packages/libnl/files/fix-helpers.patch | 49 --------------------------- packages/libnl/files/libnl-0.5.0-include.diff | 10 ------ packages/libnl/files/linux-header.patch | 24 ------------- packages/libnl/files/local-includes.patch | 11 ------ packages/libnl/libnl_0.5.0.bb | 11 ------ packages/libnl/libnl_1.0-pre6.bb | 18 ---------- packages/libnl/libnl_1.0-pre8.bb | 19 ----------- packages/libnl/libnl_1.1.bb | 17 ++++++++++ 8 files changed, 17 insertions(+), 142 deletions(-) delete mode 100644 packages/libnl/files/fix-helpers.patch delete mode 100644 packages/libnl/files/libnl-0.5.0-include.diff delete mode 100644 packages/libnl/files/linux-header.patch delete mode 100644 packages/libnl/files/local-includes.patch delete mode 100644 packages/libnl/libnl_0.5.0.bb delete mode 100644 packages/libnl/libnl_1.0-pre6.bb delete mode 100644 packages/libnl/libnl_1.0-pre8.bb create mode 100644 packages/libnl/libnl_1.1.bb diff --git a/packages/libnl/files/fix-helpers.patch b/packages/libnl/files/fix-helpers.patch deleted file mode 100644 index b6a6ff8509..0000000000 --- a/packages/libnl/files/fix-helpers.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: libnl-0.5.0/lib/helpers.c -=================================================================== ---- libnl-0.5.0.orig/lib/helpers.c -+++ libnl-0.5.0/lib/helpers.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - int nl_debug = 0; - -Index: libnl-0.5.0/lib/route/filter.c -=================================================================== ---- libnl-0.5.0.orig/lib/route/filter.c -+++ libnl-0.5.0/lib/route/filter.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - static struct rtnl_filter_ops *filter_ops; - -Index: libnl-0.5.0/lib/Makefile -=================================================================== ---- libnl-0.5.0.orig/lib/Makefile -+++ libnl-0.5.0/lib/Makefile -@@ -68,7 +68,7 @@ distclean: - - install: - mkdir -p $(DESTDIR)$(prefix)/lib/ -- install -o root -g root -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib -+ install -m 0644 $(OUT_SLIB) $(DESTDIR)$(prefix)/lib - rm -f $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) ; \ - $(LN) -s $(DESTDIR)$(prefix)/lib/$(OUT_SLIB) $(DESTDIR)$(prefix)/lib/$(LN1_SLIB) - rm -f $(DESTDIR)$(prefix)/lib/$(LN_SLIB) ; \ -Index: libnl-0.5.0/include/Makefile -=================================================================== ---- libnl-0.5.0.orig/include/Makefile -+++ libnl-0.5.0/include/Makefile -@@ -37,5 +37,5 @@ distclean: - - install: - mkdir -p $(DESTDIR)$(prefix)/include/netlink/route/ -- install -o root -g root -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/ -- install -o root -g root -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/ -+ install -m 0644 netlink/*.h $(DESTDIR)$(prefix)/include/netlink/ -+ install -m 0644 netlink/route/*.h $(DESTDIR)$(prefix)/include/netlink/route/ diff --git a/packages/libnl/files/libnl-0.5.0-include.diff b/packages/libnl/files/libnl-0.5.0-include.diff deleted file mode 100644 index f858953c8a..0000000000 --- a/packages/libnl/files/libnl-0.5.0-include.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- libnl-0.5.0.orig/include/netlink/route/tc.h 2005-09-08 19:13:15.000000000 -0300 -+++ libnl-0.5.0/include/netlink/route/tc.h 2005-09-08 19:32:33.000000000 -0300 -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #define TCA_HAS_HANDLE 0x001 - #define TCA_HAS_PARENT 0x002 diff --git a/packages/libnl/files/linux-header.patch b/packages/libnl/files/linux-header.patch deleted file mode 100644 index cecb38dc9e..0000000000 --- a/packages/libnl/files/linux-header.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: libnl-1.0-pre8/include/netlink/netlink.h -=================================================================== ---- libnl-1.0-pre8.orig/include/netlink/netlink.h 2007-11-21 18:25:39.000000000 +0100 -+++ libnl-1.0-pre8/include/netlink/netlink.h 2008-04-07 03:18:14.000000000 +0200 -@@ -24,7 +24,6 @@ - #include - #include - #include --#include - #include - #include - #include -Index: libnl-1.0-pre8/lib/route/route_obj.c -=================================================================== ---- libnl-1.0-pre8.orig/lib/route/route_obj.c 2008-04-07 03:20:25.000000000 +0200 -+++ libnl-1.0-pre8/lib/route/route_obj.c 2008-04-07 03:20:35.000000000 +0200 -@@ -33,6 +33,7 @@ - * @{ - */ - -+#include - #include - #include - #include diff --git a/packages/libnl/files/local-includes.patch b/packages/libnl/files/local-includes.patch deleted file mode 100644 index 5af463004b..0000000000 --- a/packages/libnl/files/local-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libnl-1.0-pre6/Makefile.opts.in.orig 2006-08-24 14:57:42.000000000 +0200 -+++ libnl-1.0-pre6/Makefile.opts.in 2006-08-24 14:58:20.000000000 +0200 -@@ -10,7 +10,7 @@ - # - - CC := @CC@ --CFLAGS := @CFLAGS@ -+CFLAGS := -I./include -I. -I../include @CFLAGS@ - LDFLAGS := @LDFLAGS@ - CPPFLAGS := @CPPFLAGS@ - PACKAGE_NAME := @PACKAGE_NAME@ diff --git a/packages/libnl/libnl_0.5.0.bb b/packages/libnl/libnl_0.5.0.bb deleted file mode 100644 index 5d1e8d3fc0..0000000000 --- a/packages/libnl/libnl_0.5.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Netlink library" -HOMEPAGE = "http://people.suug.ch/~tgr/libnl/" -SECTION = "libraries/network" -LICENSE = "GPLv2.1" -PR = "r0" - -SRC_URI = "http://people.suug.ch/~tgr/libnl/files/libnl-0.5.0.tar.gz \ - file://libnl-0.5.0-include.diff;patch=1 \ - file://fix-helpers.patch;patch=1" - -inherit autotools diff --git a/packages/libnl/libnl_1.0-pre6.bb b/packages/libnl/libnl_1.0-pre6.bb deleted file mode 100644 index 2509b37c4e..0000000000 --- a/packages/libnl/libnl_1.0-pre6.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://people.suug.ch/~tgr/libnl/" -PRIORITY = "optional" -PV = "0.99+1.0-pre6" - -inherit autotools pkgconfig gpe - -SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre6.tar.gz \ - file://local-includes.patch;patch=1" - -S = "${WORKDIR}/${PN}-1.0-pre6" - -do_stage () { - autotools_stage_all prefix=${prefix} -} - diff --git a/packages/libnl/libnl_1.0-pre8.bb b/packages/libnl/libnl_1.0-pre8.bb deleted file mode 100644 index e80b5aa4bd..0000000000 --- a/packages/libnl/libnl_1.0-pre8.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" -SECTION = "libs/network" -LICENSE = "LGPL" -HOMEPAGE = "http://people.suug.ch/~tgr/libnl/" -PRIORITY = "optional" -PV = "0.99+1.0-pre8" - -inherit autotools pkgconfig gpe - -SRC_URI= "http://people.suug.ch/~tgr/libnl/files/${PN}-1.0-pre8.tar.gz \ - file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \ - file://linux-header.patch;patch=1 " - -S = "${WORKDIR}/${PN}-1.0-pre8" - -do_stage () { - autotools_stage_all prefix=${prefix} -} - diff --git a/packages/libnl/libnl_1.1.bb b/packages/libnl/libnl_1.1.bb new file mode 100644 index 0000000000..51f4c4385b --- /dev/null +++ b/packages/libnl/libnl_1.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "libnl is a library for applications dealing with netlink sockets" +SECTION = "libs/network" +LICENSE = "LGPL" +HOMEPAGE = "http://people.suug.ch/~tgr/libnl" + +inherit autotools pkgconfig + +CFLAGS += '-DVLAN_FLAG_REORDER_HDR=1' + +SRC_URI = "\ + http://people.suug.ch/~tgr/libnl/files/libnl-${PV}.tar.gz \ + file://local-includes-and-avoid-wrong-ldflags.patch;patch=1 \ +" + +do_stage () { + autotools_stage_all prefix=${prefix} +} -- cgit v1.2.3 From a46613fd6a2998861272090c62e7d3d7a8b93325 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 26 Aug 2008 15:34:52 +0000 Subject: add python-connexion, a versatile (network) connectivity library --- conf/distro/include/sane-srcrevs.inc | 1 + packages/python/python-connexion_svn.bb | 26 ++++++++++++++++++++++++++ packages/tasks/task-python-everything.bb | 3 ++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 packages/python/python-connexion_svn.bb diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index faa6d42009..0a198af53c 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -155,6 +155,7 @@ SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141" SRCREV_pn-pylgrim ?= "20" SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a" +SRCREV_pn-python-connexion ?= "1283" SRCREV_pn-python-formencode = "3148" SRCREV_pn-python-gsmd = "148" SRCREV_pn-python-lightmediascanner = "68" diff --git a/packages/python/python-connexion_svn.bb b/packages/python/python-connexion_svn.bb new file mode 100644 index 0000000000..017de940e8 --- /dev/null +++ b/packages/python/python-connexion_svn.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "A versatile network connection library" +HOMEPAGE = "http://www.radlinux.org/connexion/" +SECTION = "devel/python" +LICENSE = "GPL" +BV = "0.4.6" +PV = "${BV}+svnr${SRCREV}" +PR = "ml0" + +inherit distutils + +SRC_URI = "svn://radlinux.org/radlinux/branches/${BV};module=lib" +S = "${WORKDIR}/lib" + +MODULES = "cxutil cxnet" + +do_compile() { + for i in ${MODULES}; do + cd ${S}/$i && distutils_do_compile + done +} + +do_install() { + for i in ${MODULES}; do + cd ${S}/$i && distutils_do_install + done +} diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb index 08915c033f..6c8e21ebd9 100644 --- a/packages/tasks/task-python-everything.bb +++ b/packages/tasks/task-python-everything.bb @@ -1,11 +1,12 @@ DESCRIPTION= "Everything Python" HOMEPAGE = "http://www.vanille.de/projects/python.spy" LICENSE = "MIT" -PR = "ml33" +PR = "ml34" RDEPENDS = "\ python-ao \ python-cheetah \ + python-connexion \ python-constraint \ python-dbus \ python-dialog \ -- cgit v1.2.3 From 0678b3c36030e131b96bd0f5838588e4394aa3c8 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 26 Aug 2008 18:31:18 +0000 Subject: opie-console: fix errors thrown with gcc-4.3 * serval headers used function arguments with the same name, this is no good coding style and gcc-4.3 is yelling * add double_name.patch * bump PR --- packages/opie-console/files/.mtn2git_empty | 0 packages/opie-console/files/double_name.patch | 118 ++++++++++++++++++++++++++ packages/opie-console/opie-console_1.2.3.bb | 6 +- packages/opie-console/opie-console_cvs.bb | 6 +- 4 files changed, 126 insertions(+), 4 deletions(-) create mode 100644 packages/opie-console/files/.mtn2git_empty create mode 100644 packages/opie-console/files/double_name.patch diff --git a/packages/opie-console/files/.mtn2git_empty b/packages/opie-console/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-console/files/double_name.patch b/packages/opie-console/files/double_name.patch new file mode 100644 index 0000000000..47e127e160 --- /dev/null +++ b/packages/opie-console/files/double_name.patch @@ -0,0 +1,118 @@ +Index: opie-console/profiledialogwidget.h +=================================================================== +--- opie-console.orig/profiledialogwidget.h 2002-10-21 23:43:44.000000000 +0200 ++++ opie-console/profiledialogwidget.h 2008-08-26 16:22:31.618071081 +0200 +@@ -13,7 +13,7 @@ + Terminal, + Keyboard + }; +- ProfileDialogWidget( const QString& name, QWidget* parent, const char* name = 0l); ++ ProfileDialogWidget( const QString& name, QWidget* parent, const char* na = 0l); + ~ProfileDialogWidget(); + + /* +@@ -34,7 +34,7 @@ + Q_OBJECT + public: + ProfileDialogTerminalWidget( const QString& name, QWidget* widget, +- const char* name =0l); ++ const char* na =0l); + ~ProfileDialogTerminalWidget(); + Type type()const; + }; +@@ -42,7 +42,7 @@ + Q_OBJECT + public: + ProfileDialogConnectionWidget( const QString& name, QWidget* parent, +- const char* name =0l); ++ const char* na =0l); + ~ProfileDialogConnectionWidget(); + Type type() const; + +@@ -51,7 +51,7 @@ + Q_OBJECT + public: + ProfileDialogKeyWidget( const QString &name, QWidget* parent, +- const char *name =0l); ++ const char *na =0l); + ~ProfileDialogKeyWidget(); + Type type() const; + }; +Index: opie-console/function_keyboard.h +=================================================================== +--- opie-console.orig/function_keyboard.h 2007-08-27 01:49:15.000000000 +0200 ++++ opie-console/function_keyboard.h 2008-08-26 16:22:31.618071081 +0200 +@@ -86,7 +86,7 @@ + Q_OBJECT + + public: +- FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* name = 0l ); ++ FunctionKeyboardConfig(const QString& name, QWidget *wid, const char* na = 0l ); + ~FunctionKeyboardConfig(); + + void load(const Profile&); +Index: opie-console/serialconfigwidget.h +=================================================================== +--- opie-console.orig/serialconfigwidget.h 2002-10-09 01:13:17.000000000 +0200 ++++ opie-console/serialconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 +@@ -10,7 +10,7 @@ + class SerialConfigWidget : public ProfileDialogConnectionWidget { + Q_OBJECT + public: +- SerialConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); ++ SerialConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); + ~SerialConfigWidget(); + + void load( const Profile& ); +Index: opie-console/irdaconfigwidget.h +=================================================================== +--- opie-console.orig/irdaconfigwidget.h 2002-10-09 18:33:36.000000000 +0200 ++++ opie-console/irdaconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 +@@ -12,7 +12,7 @@ + Q_OBJECT + + public: +- IrdaConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); ++ IrdaConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); + ~IrdaConfigWidget(); + + void load( const Profile& ); +Index: opie-console/btconfigwidget.h +=================================================================== +--- opie-console.orig/btconfigwidget.h 2002-10-17 16:16:03.000000000 +0200 ++++ opie-console/btconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 +@@ -14,7 +14,7 @@ + Q_OBJECT + + public: +- BTConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); ++ BTConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); + ~BTConfigWidget(); + + void load( const Profile& ); +Index: opie-console/modemconfigwidget.h +=================================================================== +--- opie-console.orig/modemconfigwidget.h 2002-10-13 23:10:15.000000000 +0200 ++++ opie-console/modemconfigwidget.h 2008-08-26 16:22:31.618071081 +0200 +@@ -15,7 +15,7 @@ + Q_OBJECT + + public: +- ModemConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); ++ ModemConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); + ~ModemConfigWidget(); + + void load( const Profile& ); +Index: opie-console/consoleconfigwidget.h +=================================================================== +--- opie-console.orig/consoleconfigwidget.h 2008-08-26 16:23:08.198065869 +0200 ++++ opie-console/consoleconfigwidget.h 2008-08-26 16:23:12.938066770 +0200 +@@ -11,7 +11,7 @@ + class ConsoleConfigWidget : public ProfileDialogConnectionWidget { + Q_OBJECT + public: +- ConsoleConfigWidget( const QString& name, QWidget* parent, const char* name = 0l ); ++ ConsoleConfigWidget( const QString& name, QWidget* parent, const char* na = 0l ); + ~ConsoleConfigWidget(); + + void load( const Profile& ); diff --git a/packages/opie-console/opie-console_1.2.3.bb b/packages/opie-console/opie-console_1.2.3.bb index 5408c0da8a..a364181d76 100644 --- a/packages/opie-console/opie-console_1.2.3.bb +++ b/packages/opie-console/opie-console_1.2.3.bb @@ -1,7 +1,9 @@ require ${PN}.inc -PR = "r0" +PR = "r1" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ - ${HANDHELDS_CVS};tag=${TAG};module=opie/apps" + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + file://double_name.patch;patch=1 \ + " diff --git a/packages/opie-console/opie-console_cvs.bb b/packages/opie-console/opie-console_cvs.bb index 4525ff88ae..00f8a284a3 100644 --- a/packages/opie-console/opie-console_cvs.bb +++ b/packages/opie-console/opie-console_cvs.bb @@ -1,8 +1,10 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/apps/${APPNAME} \ ${HANDHELDS_CVS};module=opie/pics \ - ${HANDHELDS_CVS};module=opie/apps" + ${HANDHELDS_CVS};module=opie/apps \ + file://double_name.patch;patch=1 \ + " -- cgit v1.2.3 From 38f9980e295269f51b532657067604a29e9d54b3 Mon Sep 17 00:00:00 2001 From: Stelios Koroneos Date: Tue, 26 Aug 2008 18:32:10 +0000 Subject: packages/ppp/ppp_2.4.3.bb : Add mppe support Bump PR --- .../ppp/ppp-2.4.3/ppp-2.4.3-mppe-mppc-1.1.patch | 1585 ++++++++++++++++++++ packages/ppp/ppp_2.4.3.bb | 3 +- 2 files changed, 1587 insertions(+), 1 deletion(-) create mode 100644 packages/ppp/ppp-2.4.3/ppp-2.4.3-mppe-mppc-1.1.patch diff --git a/packages/ppp/ppp-2.4.3/ppp-2.4.3-mppe-mppc-1.1.patch b/packages/ppp/ppp-2.4.3/ppp-2.4.3-mppe-mppc-1.1.patch new file mode 100644 index 0000000000..7e09f1a792 --- /dev/null +++ b/packages/ppp/ppp-2.4.3/ppp-2.4.3-mppe-mppc-1.1.patch @@ -0,0 +1,1585 @@ +diff -ruN ppp-2.4.3.orig/include/linux/ppp-comp.h ppp-2.4.3/include/linux/ppp-comp.h +--- ppp-2.4.3.orig/include/linux/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 ++++ ppp-2.4.3/include/linux/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100 +@@ -36,7 +36,7 @@ + */ + + /* +- * ==FILEVERSION 20020319== ++ * ==FILEVERSION 20020715== + * + * NOTE TO MAINTAINERS: + * If you modify this file at all, please set the above date. +@@ -86,7 +86,7 @@ + + /* Compress a packet */ + int (*compress) (void *state, unsigned char *rptr, +- unsigned char *obuf, int isize, int osize); ++ unsigned char *obuf, int isize, int osize); + + /* Return compression statistics */ + void (*comp_stat) (void *state, struct compstat *stats); +@@ -107,7 +107,7 @@ + + /* Decompress a packet. */ + int (*decompress) (void *state, unsigned char *ibuf, int isize, +- unsigned char *obuf, int osize); ++ unsigned char *obuf, int osize); + + /* Update state for an incompressible packet received */ + void (*incomp) (void *state, unsigned char *ibuf, int icnt); +@@ -288,6 +288,33 @@ + opts |= MPPE_OPT_UNKNOWN; \ + } while (/* CONSTCOND */ 0) + ++/* MPPE/MPPC definitions by J.D.*/ ++#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ ++#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */ ++#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */ ++#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */ ++#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */ ++ ++/* ++ * Definitions for Stac LZS. ++ */ ++ ++#define CI_LZS 17 /* config option for Stac LZS */ ++#define CILEN_LZS 5 /* length of config option */ ++ ++#define LZS_OVHD 4 /* max. LZS overhead */ ++#define LZS_HIST_LEN 2048 /* LZS history size */ ++#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define LZS_MODE_NONE 0 ++#define LZS_MODE_LCB 1 ++#define LZS_MODE_CRC 2 ++#define LZS_MODE_SEQ 3 ++#define LZS_MODE_EXT 4 ++ ++#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ ++#define LZS_EXT_BIT_COMP 0x20 /* bit C */ ++ + /* + * Definitions for other, as yet unsupported, compression methods. + */ +diff -ruN ppp-2.4.3.orig/include/net/ppp-comp.h ppp-2.4.3/include/net/ppp-comp.h +--- ppp-2.4.3.orig/include/net/ppp-comp.h 2002-12-06 10:49:15.000000000 +0100 ++++ ppp-2.4.3/include/net/ppp-comp.h 2004-11-21 13:54:09.000000000 +0100 +@@ -255,6 +255,33 @@ + opts |= MPPE_OPT_UNKNOWN; \ + } while (/* CONSTCOND */ 0) + ++/* MPPE/MPPC definitions by J.D.*/ ++#define MPPE_STATELESS MPPE_H_BIT /* configuration bit H */ ++#define MPPE_40BIT MPPE_L_BIT /* configuration bit L */ ++#define MPPE_56BIT MPPE_M_BIT /* configuration bit M */ ++#define MPPE_128BIT MPPE_S_BIT /* configuration bit S */ ++#define MPPE_MPPC MPPE_C_BIT /* configuration bit C */ ++ ++/* ++ * Definitions for Stac LZS. ++ */ ++ ++#define CI_LZS 17 /* config option for Stac LZS */ ++#define CILEN_LZS 5 /* length of config option */ ++ ++#define LZS_OVHD 4 /* max. LZS overhead */ ++#define LZS_HIST_LEN 2048 /* LZS history size */ ++#define LZS_MAX_CCOUNT 0x0FFF /* max. coherency counter value */ ++ ++#define LZS_MODE_NONE 0 ++#define LZS_MODE_LCB 1 ++#define LZS_MODE_CRC 2 ++#define LZS_MODE_SEQ 3 ++#define LZS_MODE_EXT 4 ++ ++#define LZS_EXT_BIT_FLUSHED 0x80 /* bit A */ ++#define LZS_EXT_BIT_COMP 0x20 /* bit C */ ++ + /* + * Definitions for other, as yet unsupported, compression methods. + */ +diff -ruN ppp-2.4.3.orig/pppd/ccp.c ppp-2.4.3/pppd/ccp.c +--- ppp-2.4.3.orig/pppd/ccp.c 2004-11-13 03:28:15.000000000 +0100 ++++ ppp-2.4.3/pppd/ccp.c 2004-11-21 13:54:09.000000000 +0100 +@@ -62,12 +62,10 @@ + static char bsd_value[8]; + static char deflate_value[8]; + +-/* +- * Option variables. +- */ + #ifdef MPPE +-bool refuse_mppe_stateful = 1; /* Allow stateful mode? */ +-#endif ++static int setmppe(char **); ++static int setnomppe(void); ++#endif /* MPPE */ + + static option_t ccp_option_list[] = { + { "noccp", o_bool, &ccp_protent.enabled_flag, +@@ -108,54 +106,36 @@ + "don't allow Predictor-1", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, + &ccp_allowoptions[0].predictor_1 }, + ++ { "lzs", o_bool, &ccp_wantoptions[0].lzs, ++ "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_PRIO }, ++ { "+lzs", o_bool, &ccp_wantoptions[0].lzs, ++ "request Stac LZS", 1, &ccp_allowoptions[0].lzs, OPT_ALIAS | OPT_PRIO }, ++ { "nolzs", o_bool, &ccp_wantoptions[0].lzs, ++ "don't allow Stac LZS", OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].lzs }, ++ { "-lzs", o_bool, &ccp_wantoptions[0].lzs, ++ "don't allow Stac LZS", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].lzs }, ++ + #ifdef MPPE +- /* MPPE options are symmetrical ... we only set wantoptions here */ +- { "require-mppe", o_bool, &ccp_wantoptions[0].mppe, +- "require MPPE encryption", +- OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 }, +- { "+mppe", o_bool, &ccp_wantoptions[0].mppe, +- "require MPPE encryption", +- OPT_ALIAS | OPT_PRIO | MPPE_OPT_40 | MPPE_OPT_128 }, +- { "nomppe", o_bool, &ccp_wantoptions[0].mppe, +- "don't allow MPPE encryption", OPT_PRIO }, +- { "-mppe", o_bool, &ccp_wantoptions[0].mppe, +- "don't allow MPPE encryption", OPT_ALIAS | OPT_PRIO }, +- +- /* We use ccp_allowoptions[0].mppe as a junk var ... it is reset later */ +- { "require-mppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40, +- &ccp_wantoptions[0].mppe }, +- { "+mppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 40-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_40, +- &ccp_wantoptions[0].mppe }, +- { "nomppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 40-bit encryption", +- OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, &ccp_wantoptions[0].mppe }, +- { "-mppe-40", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 40-bit encryption", +- OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_40, +- &ccp_wantoptions[0].mppe }, +- +- { "require-mppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 128-bit encryption", OPT_PRIO | OPT_A2OR | MPPE_OPT_128, +- &ccp_wantoptions[0].mppe }, +- { "+mppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "require MPPE 128-bit encryption", +- OPT_ALIAS | OPT_PRIO | OPT_A2OR | MPPE_OPT_128, +- &ccp_wantoptions[0].mppe }, +- { "nomppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 128-bit encryption", +- OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, &ccp_wantoptions[0].mppe }, +- { "-mppe-128", o_bool, &ccp_allowoptions[0].mppe, +- "don't allow MPPE 128-bit encryption", +- OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLRB | MPPE_OPT_128, +- &ccp_wantoptions[0].mppe }, +- +- /* strange one; we always request stateless, but will we allow stateful? */ +- { "mppe-stateful", o_bool, &refuse_mppe_stateful, +- "allow MPPE stateful mode", OPT_PRIO }, +- { "nomppe-stateful", o_bool, &refuse_mppe_stateful, +- "disallow MPPE stateful mode", OPT_PRIO | 1 }, ++ { "mppc", o_bool, &ccp_wantoptions[0].mppc, ++ "request MPPC compression", 1, &ccp_allowoptions[0].mppc }, ++ { "+mppc", o_bool, &ccp_wantoptions[0].mppc, ++ "request MPPC compression", 1, &ccp_allowoptions[0].mppc, OPT_ALIAS }, ++ { "nomppc", o_bool, &ccp_wantoptions[0].mppc, ++ "don't allow MPPC compression", OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].mppc }, ++ { "-mppc", o_bool, &ccp_wantoptions[0].mppc, ++ "don't allow MPPC compression", OPT_ALIAS | OPT_PRIOSUB | OPT_A2CLR, ++ &ccp_allowoptions[0].mppc }, ++ { "mppe", o_special, (void *)setmppe, ++ "request MPPE encryption" }, ++ { "+mppe", o_special, (void *)setmppe, ++ "request MPPE encryption" }, ++ { "nomppe", o_special_noarg, (void *)setnomppe, ++ "don't allow MPPE encryption" }, ++ { "-mppe", o_special_noarg, (void *)setnomppe, ++ "don't allow MPPE encryption" }, + #endif /* MPPE */ + + { NULL } +@@ -241,7 +221,7 @@ + */ + #define ANY_COMPRESS(opt) ((opt).deflate || (opt).bsd_compress \ + || (opt).predictor_1 || (opt).predictor_2 \ +- || (opt).mppe) ++ || (opt).lzs || (opt).mppc || (opt).mppe) + + /* + * Local state (mainly for handling reset-reqs and reset-acks). +@@ -344,6 +324,100 @@ + return 1; + } + ++#ifdef MPPE ++/* ++ * Functions called from config options ++ */ ++/* ++ MPPE suboptions: ++ required - require MPPE; disconnect if peer doesn't support it ++ stateless - use stateless mode ++ no40 - disable 40 bit keys ++ no56 - disable 56 bit keys ++ no128 - disable 128 bit keys ++*/ ++int setmppe(char **argv) ++{ ++ int i; ++ char *str, cmdbuf[16]; ++ ++ ccp_allowoptions[0].mppe = 1; ++ ccp_allowoptions[0].mppe_40 = 1; ++ ccp_allowoptions[0].mppe_56 = 1; ++ ccp_allowoptions[0].mppe_128 = 1; ++ ccp_allowoptions[0].mppe_stateless = 0; ++ ccp_wantoptions[0].mppe = 0; ++ ++ str = *argv; ++ ++ while (1) { ++ i = 0; ++ memset(cmdbuf, '\0', 16); ++ while ((i < 16) && (*str != ',') && (*str != '\0')) ++ cmdbuf[i++] = *str++; ++ cmdbuf[i] = '\0'; ++ if (!strncasecmp(cmdbuf, "no40", strlen("no40"))) { ++ ccp_allowoptions[0].mppe_40 = 0; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "no56", strlen("no56"))) { ++ ccp_allowoptions[0].mppe_56 = 0; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "no128", strlen("no128"))) { ++ ccp_allowoptions[0].mppe_128 = 0; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "stateless", strlen("stateless"))) { ++ ccp_allowoptions[0].mppe_stateless = 1; ++ goto next_param; ++ } else if (!strncasecmp(cmdbuf, "required", strlen("required"))) { ++ ccp_wantoptions[0].mppe = 1; ++ goto next_param; ++ } else { ++ option_error("invalid parameter '%s' for mppe option", cmdbuf); ++ return 0; ++ } ++ ++ next_param: ++ if (*str == ',') { ++ str++; ++ continue; ++ } ++ if (*str == '\0') { ++ if (!(ccp_allowoptions[0].mppe_40 || ccp_allowoptions[0].mppe_56 || ++ ccp_allowoptions[0].mppe_128)) { ++ if (ccp_wantoptions[0].mppe == 1) { ++ option_error("You require MPPE but you have switched off " ++ "all encryption key lengths."); ++ return 0; ++ } ++ ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0; ++ ccp_wantoptions[0].mppe_stateless = ++ ccp_allowoptions[0].mppe_stateless = 0; ++ } else { ++ ccp_allowoptions[0].mppe = 1; ++ ccp_wantoptions[0].mppe_stateless = ++ ccp_allowoptions[0].mppe_stateless; ++ if (ccp_wantoptions[0].mppe == 1) { ++ ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40; ++ ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56; ++ ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128; ++ } ++ } ++ return 1; ++ } ++ } ++} ++ ++int setnomppe(void) ++{ ++ ccp_wantoptions[0].mppe = ccp_allowoptions[0].mppe = 0; ++ ccp_wantoptions[0].mppe_40 = ccp_allowoptions[0].mppe_40 = 0; ++ ccp_wantoptions[0].mppe_56 = ccp_allowoptions[0].mppe_56 = 0; ++ ccp_wantoptions[0].mppe_128 = ccp_allowoptions[0].mppe_128 = 0; ++ ccp_wantoptions[0].mppe_stateless = ccp_allowoptions[0].mppe_stateless = 0; ++ return 1; ++} ++#endif /* MPPE */ ++ + /* + * ccp_init - initialize CCP. + */ +@@ -378,6 +452,30 @@ + ccp_allowoptions[0].bsd_bits = BSD_MAX_BITS; + + ccp_allowoptions[0].predictor_1 = 1; ++ ++ ccp_wantoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */ ++ ccp_wantoptions[0].lzs_mode = LZS_MODE_SEQ; ++ ccp_wantoptions[0].lzs_hists = 1; ++ ccp_allowoptions[0].lzs = 0; /* Stac LZS - will be enabled in the future */ ++ ccp_allowoptions[0].lzs_mode = LZS_MODE_SEQ; ++ ccp_allowoptions[0].lzs_hists = 1; ++ ++#ifdef MPPE ++ /* by default allow and request MPPC... */ ++ ccp_wantoptions[0].mppc = ccp_allowoptions[0].mppc = 1; ++ ++ /* ... and allow but don't request MPPE */ ++ ccp_allowoptions[0].mppe = 1; ++ ccp_allowoptions[0].mppe_40 = 1; ++ ccp_allowoptions[0].mppe_56 = 1; ++ ccp_allowoptions[0].mppe_128 = 1; ++ ccp_allowoptions[0].mppe_stateless = 1; ++ ccp_wantoptions[0].mppe = 0; ++ ccp_wantoptions[0].mppe_40 = 0; ++ ccp_wantoptions[0].mppe_56 = 0; ++ ccp_wantoptions[0].mppe_128 = 0; ++ ccp_wantoptions[0].mppe_stateless = 0; ++#endif /* MPPE */ + } + + /* +@@ -455,11 +553,11 @@ + if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED) { + notice("Compression disabled by peer."); + #ifdef MPPE +- if (ccp_gotoptions[unit].mppe) { ++ if (ccp_wantoptions[unit].mppe) { + error("MPPE disabled, closing LCP"); + lcp_close(unit, "MPPE disabled by peer"); + } +-#endif ++#endif /* MPPE */ + } + + /* +@@ -487,6 +585,15 @@ + break; + /* send a reset-ack, which the transmitter will see and + reset its compression state. */ ++ ++ /* In case of MPPE/MPPC or LZS we shouldn't send CCP_RESETACK, ++ but we do it in order to reset compressor; CCP_RESETACK is ++ then silently discarded. See functions ppp_send_frame and ++ ppp_ccp_peek in ppp_generic.c (Linux only !!!). All the ++ confusion is caused by the fact that CCP code is splited ++ into two parts - one part is handled by pppd, the other one ++ is handled by kernel. */ ++ + fsm_sdata(f, CCP_RESETACK, id, NULL, 0); + break; + +@@ -515,12 +622,11 @@ + fsm_lowerdown(&ccp_fsm[unit]); + + #ifdef MPPE +- if (ccp_gotoptions[unit].mppe) { ++ if (ccp_wantoptions[unit].mppe) { + error("MPPE required but peer negotiation failed"); + lcp_close(unit, "MPPE required but peer negotiation failed"); + } +-#endif +- ++#endif /* MPPE */ + } + + /* +@@ -537,7 +643,7 @@ + all_rejected[f->unit] = 0; + + #ifdef MPPE +- if (go->mppe) { ++ if (go->mppe || go->mppc) { + ccp_options *ao = &ccp_allowoptions[f->unit]; + int auth_mschap_bits = auth_done[f->unit]; + int numbits; +@@ -551,80 +657,109 @@ + * NB: If MPPE is required, all other compression opts are invalid. + * So, we return right away if we can't do it. + */ ++ if (ccp_wantoptions[f->unit].mppe) { ++ /* Leave only the mschap auth bits set */ ++ auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER | ++ CHAP_MS2_WITHPEER | CHAP_MS2_PEER); ++ /* Count the mschap auths */ ++ auth_mschap_bits >>= CHAP_MS_SHIFT; ++ numbits = 0; ++ do { ++ numbits += auth_mschap_bits & 1; ++ auth_mschap_bits >>= 1; ++ } while (auth_mschap_bits); ++ if (numbits > 1) { ++ error("MPPE required, but auth done in both directions."); ++ lcp_close(f->unit, "MPPE required but not available"); ++ return; ++ } ++ if (!numbits) { ++ error("MPPE required, but MS-CHAP[v2] auth not performed."); ++ lcp_close(f->unit, "MPPE required but not available"); ++ return; ++ } + +- /* Leave only the mschap auth bits set */ +- auth_mschap_bits &= (CHAP_MS_WITHPEER | CHAP_MS_PEER | +- CHAP_MS2_WITHPEER | CHAP_MS2_PEER); +- /* Count the mschap auths */ +- auth_mschap_bits >>= CHAP_MS_SHIFT; +- numbits = 0; +- do { +- numbits += auth_mschap_bits & 1; +- auth_mschap_bits >>= 1; +- } while (auth_mschap_bits); +- if (numbits > 1) { +- error("MPPE required, but auth done in both directions."); +- lcp_close(f->unit, "MPPE required but not available"); +- return; +- } +- if (!numbits) { +- error("MPPE required, but MS-CHAP[v2] auth not performed."); +- lcp_close(f->unit, "MPPE required but not available"); +- return; +- } +- +- /* A plugin (eg radius) may not have obtained key material. */ +- if (!mppe_keys_set) { +- error("MPPE required, but keys are not available. " +- "Possible plugin problem?"); +- lcp_close(f->unit, "MPPE required but not available"); +- return; +- } +- +- /* LM auth not supported for MPPE */ +- if (auth_done[f->unit] & (CHAP_MS_WITHPEER | CHAP_MS_PEER)) { +- /* This might be noise */ +- if (go->mppe & MPPE_OPT_40) { +- notice("Disabling 40-bit MPPE; MS-CHAP LM not supported"); +- go->mppe &= ~MPPE_OPT_40; +- ccp_wantoptions[f->unit].mppe &= ~MPPE_OPT_40; ++ /* A plugin (eg radius) may not have obtained key material. */ ++ if (!mppe_keys_set) { ++ error("MPPE required, but keys are not available. " ++ "Possible plugin problem?"); ++ lcp_close(f->unit, "MPPE required but not available"); ++ return; + } + } + +- /* Last check: can we actually negotiate something? */ +- if (!(go->mppe & (MPPE_OPT_40 | MPPE_OPT_128))) { +- /* Could be misconfig, could be 40-bit disabled above. */ +- error("MPPE required, but both 40-bit and 128-bit disabled."); +- lcp_close(f->unit, "MPPE required but not available"); +- return; ++ /* ++ * Check whether the kernel knows about the various ++ * compression methods we might request. Key material ++ * unimportant here. ++ */ ++ if (go->mppc) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = 0; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_MPPC; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 0) <= 0) ++ go->mppc = 0; ++ } ++ if (go->mppe_40) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = MPPE_STATELESS; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_40BIT; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) ++ go->mppe_40 = 0; ++ } ++ if (go->mppe_56) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = MPPE_STATELESS; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_56BIT; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) ++ go->mppe_56 = 0; ++ } ++ if (go->mppe_128) { ++ opt_buf[0] = CI_MPPE; ++ opt_buf[1] = CILEN_MPPE; ++ opt_buf[2] = MPPE_STATELESS; ++ opt_buf[3] = 0; ++ opt_buf[4] = 0; ++ opt_buf[5] = MPPE_128BIT; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) ++ go->mppe_128 = 0; ++ } ++ if (!go->mppe_40 && !go->mppe_56 && !go->mppe_128) { ++ if (ccp_wantoptions[f->unit].mppe) { ++ error("MPPE required, but kernel has no support."); ++ lcp_close(f->unit, "MPPE required but not available"); ++ } ++ go->mppe = go->mppe_stateless = 0; ++ } else { ++ /* MPPE is not compatible with other compression types */ ++ if (ccp_wantoptions[f->unit].mppe) { ++ ao->bsd_compress = go->bsd_compress = 0; ++ ao->predictor_1 = go->predictor_1 = 0; ++ ao->predictor_2 = go->predictor_2 = 0; ++ ao->deflate = go->deflate = 0; ++ ao->lzs = go->lzs = 0; ++ } + } +- +- /* sync options */ +- ao->mppe = go->mppe; +- /* MPPE is not compatible with other compression types */ +- ao->bsd_compress = go->bsd_compress = 0; +- ao->predictor_1 = go->predictor_1 = 0; +- ao->predictor_2 = go->predictor_2 = 0; +- ao->deflate = go->deflate = 0; + } + #endif /* MPPE */ +- +- /* +- * Check whether the kernel knows about the various +- * compression methods we might request. +- */ +-#ifdef MPPE +- if (go->mppe) { +- opt_buf[0] = CI_MPPE; +- opt_buf[1] = CILEN_MPPE; +- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); +- /* Key material unimportant here. */ +- if (ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0) <= 0) { +- error("MPPE required, but kernel has no support."); +- lcp_close(f->unit, "MPPE required but not available"); +- } ++ if (go->lzs) { ++ opt_buf[0] = CI_LZS; ++ opt_buf[1] = CILEN_LZS; ++ opt_buf[2] = go->lzs_hists >> 8; ++ opt_buf[3] = go->lzs_hists & 0xff; ++ opt_buf[4] = LZS_MODE_SEQ; ++ if (ccp_test(f->unit, opt_buf, CILEN_LZS, 0) <= 0) ++ go->lzs = 0; + } +-#endif + if (go->bsd_compress) { + opt_buf[0] = CI_BSD_COMPRESS; + opt_buf[1] = CILEN_BSD_COMPRESS; +@@ -679,7 +814,8 @@ + + (go->deflate? CILEN_DEFLATE: 0) + + (go->predictor_1? CILEN_PREDICTOR_1: 0) + + (go->predictor_2? CILEN_PREDICTOR_2: 0) +- + (go->mppe? CILEN_MPPE: 0); ++ + (go->lzs? CILEN_LZS: 0) ++ + ((go->mppe || go->mppc)? CILEN_MPPE: 0); + } + + /* +@@ -693,6 +829,8 @@ + { + int res; + ccp_options *go = &ccp_gotoptions[f->unit]; ++ ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + u_char *p0 = p; + + /* +@@ -701,22 +839,43 @@ + * in case it gets Acked. + */ + #ifdef MPPE +- if (go->mppe) { ++ if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) { + u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; + +- p[0] = opt_buf[0] = CI_MPPE; +- p[1] = opt_buf[1] = CILEN_MPPE; +- MPPE_OPTS_TO_CI(go->mppe, &p[2]); +- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); ++ p[0] = CI_MPPE; ++ p[1] = CILEN_MPPE; ++ p[2] = (go->mppe_stateless ? MPPE_STATELESS : 0); ++ p[3] = 0; ++ p[4] = 0; ++ p[5] = (go->mppe_40 ? MPPE_40BIT : 0) | (go->mppe_56 ? MPPE_56BIT : 0) | ++ (go->mppe_128 ? MPPE_128BIT : 0) | (go->mppc ? MPPE_MPPC : 0); ++ ++ BCOPY(p, opt_buf, CILEN_MPPE); + BCOPY(mppe_recv_key, &opt_buf[CILEN_MPPE], MPPE_MAX_KEY_LEN); + res = ccp_test(f->unit, opt_buf, CILEN_MPPE + MPPE_MAX_KEY_LEN, 0); +- if (res > 0) ++ if (res > 0) { + p += CILEN_MPPE; +- else ++ } else { + /* This shouldn't happen, we've already tested it! */ +- lcp_close(f->unit, "MPPE required but not available in kernel"); ++ go->mppe = go->mppe_40 = go->mppe_56 = go->mppe_128 = ++ go->mppe_stateless = go->mppc = 0; ++ if (ccp_wantoptions[f->unit].mppe) ++ lcp_close(f->unit, "MPPE required but not available in kernel"); ++ } ++ } ++#endif /* MPPE */ ++ if (go->lzs) { ++ p[0] = CI_LZS; ++ p[1] = CILEN_LZS; ++ p[2] = go->lzs_hists >> 8; ++ p[3] = go->lzs_hists & 0xff; ++ p[4] = LZS_MODE_SEQ; ++ res = ccp_test(f->unit, p, CILEN_LZS, 0); ++ if (res > 0) { ++ p += CILEN_LZS; ++ } else ++ go->lzs = 0; + } +-#endif + if (go->deflate) { + p[0] = go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT; + p[1] = CILEN_DEFLATE; +@@ -802,7 +961,7 @@ + + /* + * ccp_ackci - process a received configure-ack, and return +- * 1 iff the packet was OK. ++ * 1 if the packet was OK. + */ + static int + ccp_ackci(f, p, len) +@@ -811,24 +970,44 @@ + int len; + { + ccp_options *go = &ccp_gotoptions[f->unit]; ++ ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + u_char *p0 = p; + + #ifdef MPPE +- if (go->mppe) { +- u_char opt_buf[CILEN_MPPE]; +- +- opt_buf[0] = CI_MPPE; +- opt_buf[1] = CILEN_MPPE; +- MPPE_OPTS_TO_CI(go->mppe, &opt_buf[2]); +- if (len < CILEN_MPPE || memcmp(opt_buf, p, CILEN_MPPE)) ++ if (go->mppe || go->mppc || (!wo->mppe && ao->mppe)) { ++ if (len < CILEN_MPPE ++ || p[1] != CILEN_MPPE || p[0] != CI_MPPE ++ || p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) ++ || p[3] != 0 ++ || p[4] != 0 ++ || (p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0)) ++ && p[5] != ((go->mppe_56 ? MPPE_56BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0)) ++ && p[5] != ((go->mppe_128 ? MPPE_128BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0)))) + return 0; ++ if (go->mppe_40 || go->mppe_56 || go->mppe_128) ++ go->mppe = 1; + p += CILEN_MPPE; + len -= CILEN_MPPE; ++ /* Cope with first/fast ack */ ++ if (p == p0 && len == 0) ++ return 1; ++ } ++#endif /* MPPE */ ++ if (go->lzs) { ++ if (len < CILEN_LZS || p[0] != CI_LZS || p[1] != CILEN_LZS ++ || p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) ++ || p[4] != LZS_MODE_SEQ) ++ return 0; ++ p += CILEN_LZS; ++ len -= CILEN_LZS; + /* XXX Cope with first/fast ack */ +- if (len == 0) ++ if (p == p0 && len == 0) + return 1; + } +-#endif + if (go->deflate) { + if (len < CILEN_DEFLATE + || p[0] != (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) +@@ -891,7 +1070,7 @@ + + /* + * ccp_nakci - process received configure-nak. +- * Returns 1 iff the nak was OK. ++ * Returns 1 if the nak was OK. + */ + static int + ccp_nakci(f, p, len, treat_as_reject) +@@ -900,6 +1079,8 @@ + int len; + { + ccp_options *go = &ccp_gotoptions[f->unit]; ++ ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + ccp_options no; /* options we've seen already */ + ccp_options try; /* options to ask for next time */ + +@@ -907,28 +1088,100 @@ + try = *go; + + #ifdef MPPE +- if (go->mppe && len >= CILEN_MPPE +- && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { +- no.mppe = 1; +- /* +- * Peer wants us to use a different strength or other setting. +- * Fail if we aren't willing to use his suggestion. +- */ +- MPPE_CI_TO_OPTS(&p[2], try.mppe); +- if ((try.mppe & MPPE_OPT_STATEFUL) && refuse_mppe_stateful) { +- error("Refusing MPPE stateful mode offered by peer"); +- try.mppe = 0; +- } else if (((go->mppe | MPPE_OPT_STATEFUL) & try.mppe) != try.mppe) { +- /* Peer must have set options we didn't request (suggest) */ +- try.mppe = 0; +- } ++ if ((go->mppe || go->mppc || (!wo->mppe && ao->mppe)) && ++ len >= CILEN_MPPE && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { + +- if (!try.mppe) { +- error("MPPE required but peer negotiation failed"); +- lcp_close(f->unit, "MPPE required but peer negotiation failed"); ++ if (go->mppc) { ++ no.mppc = 1; ++ if (!(p[5] & MPPE_MPPC)) ++ try.mppc = 0; ++ } ++ ++ if (go->mppe) ++ no.mppe = 1; ++ if (go->mppe_40) ++ no.mppe_40 = 1; ++ if (go->mppe_56) ++ no.mppe_56 = 1; ++ if (go->mppe_128) ++ no.mppe_128 = 1; ++ if (go->mppe_stateless) ++ no.mppe_stateless = 1; ++ ++ if (ao->mppe_40) { ++ if ((p[5] & MPPE_40BIT)) ++ try.mppe_40 = 1; ++ else ++ try.mppe_40 = (p[5] == 0) ? 1 : 0; ++ } ++ if (ao->mppe_56) { ++ if ((p[5] & MPPE_56BIT)) ++ try.mppe_56 = 1; ++ else ++ try.mppe_56 = (p[5] == 0) ? 1 : 0; ++ } ++ if (ao->mppe_128) { ++ if ((p[5] & MPPE_128BIT)) ++ try.mppe_128 = 1; ++ else ++ try.mppe_128 = (p[5] == 0) ? 1 : 0; ++ } ++ ++ if (ao->mppe_stateless) { ++ if ((p[2] & MPPE_STATELESS) || wo->mppe_stateless) ++ try.mppe_stateless = 1; ++ else ++ try.mppe_stateless = 0; ++ } ++ ++ if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) { ++ try.mppe = try.mppe_stateless = 0; ++ if (wo->mppe) { ++ /* we require encryption, but peer doesn't support it ++ so we close connection */ ++ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = ++ wo->mppe_56 = wo->mppe_128 = 0; ++ lcp_close(f->unit, "MPPE required but cannot negotiate MPPE " ++ "key length"); ++ } ++ } ++ if (wo->mppe && (wo->mppe_40 != try.mppe_40) && ++ (wo->mppe_56 != try.mppe_56) && (wo->mppe_128 != try.mppe_128)) { ++ /* cannot negotiate key length */ ++ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = ++ wo->mppe_56 = wo->mppe_128 = 0; ++ lcp_close(f->unit, "Cannot negotiate MPPE key length"); + } ++ if (try.mppe_40 && try.mppe_56 && try.mppe_128) ++ try.mppe_40 = try.mppe_56 = 0; ++ else ++ if (try.mppe_56 && try.mppe_128) ++ try.mppe_56 = 0; ++ else ++ if (try.mppe_40 && try.mppe_128) ++ try.mppe_40 = 0; ++ else ++ if (try.mppe_40 && try.mppe_56) ++ try.mppe_40 = 0; ++ ++ p += CILEN_MPPE; ++ len -= CILEN_MPPE; + } + #endif /* MPPE */ ++ ++ if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) { ++ no.lzs = 1; ++ if (((p[2]<<8)|p[3]) > 1 || (p[4] != LZS_MODE_SEQ && ++ p[4] != LZS_MODE_EXT)) ++ try.lzs = 0; ++ else { ++ try.lzs_mode = p[4]; ++ try.lzs_hists = (p[2] << 8) | p[3]; ++ } ++ p += CILEN_LZS; ++ len -= CILEN_LZS; ++ } ++ + if (go->deflate && len >= CILEN_DEFLATE + && p[0] == (go->deflate_correct? CI_DEFLATE: CI_DEFLATE_DRAFT) + && p[1] == CILEN_DEFLATE) { +@@ -1001,14 +1254,50 @@ + return -1; + + #ifdef MPPE +- if (go->mppe && len >= CILEN_MPPE ++ if ((go->mppe || go->mppc) && len >= CILEN_MPPE + && p[0] == CI_MPPE && p[1] == CILEN_MPPE) { +- error("MPPE required but peer refused"); +- lcp_close(f->unit, "MPPE required but peer refused"); ++ ccp_options *wo = &ccp_wantoptions[f->unit]; ++ if (p[2] != (go->mppe_stateless ? MPPE_STATELESS : 0) || ++ p[3] != 0 || ++ p[4] != 0 || ++ p[5] != ((go->mppe_40 ? MPPE_40BIT : 0) | ++ (go->mppe_56 ? MPPE_56BIT : 0) | ++ (go->mppe_128 ? MPPE_128BIT : 0) | ++ (go->mppc ? MPPE_MPPC : 0))) ++ return 0; ++ if (go->mppc) ++ try.mppc = 0; ++ if (go->mppe) { ++ try.mppe = 0; ++ if (go->mppe_40) ++ try.mppe_40 = 0; ++ if (go->mppe_56) ++ try.mppe_56 = 0; ++ if (go->mppe_128) ++ try.mppe_128 = 0; ++ if (go->mppe_stateless) ++ try.mppe_stateless = 0; ++ if (!try.mppe_56 && !try.mppe_40 && !try.mppe_128) ++ try.mppe = try.mppe_stateless = 0; ++ if (wo->mppe) { /* we want MPPE but cannot negotiate key length */ ++ wo->mppc = wo->mppe = wo->mppe_stateless = wo->mppe_40 = ++ wo->mppe_56 = wo->mppe_128 = 0; ++ lcp_close(f->unit, "MPPE required but cannot negotiate MPPE " ++ "key length"); ++ } ++ } + p += CILEN_MPPE; + len -= CILEN_MPPE; + } +-#endif ++#endif /* MPPE */ ++ if (go->lzs && len >= CILEN_LZS && p[0] == CI_LZS && p[1] == CILEN_LZS) { ++ if (p[2] != go->lzs_hists>>8 || p[3] != (go->lzs_hists&0xff) ++ || p[4] != go->lzs_mode) ++ return 0; ++ try.lzs = 0; ++ p += CILEN_LZS; ++ len -= CILEN_LZS; ++ } + if (go->deflate_correct && len >= CILEN_DEFLATE + && p[0] == CI_DEFLATE && p[1] == CILEN_DEFLATE) { + if (p[2] != DEFLATE_MAKE_OPT(go->deflate_size) +@@ -1072,14 +1361,15 @@ + int dont_nak; + { + int ret, newret, res; +- u_char *p0, *retp; ++ u_char *p0, *retp, p2, p5; + int len, clen, type, nb; + ccp_options *ho = &ccp_hisoptions[f->unit]; + ccp_options *ao = &ccp_allowoptions[f->unit]; ++ ccp_options *wo = &ccp_wantoptions[f->unit]; + #ifdef MPPE +- bool rej_for_ci_mppe = 1; /* Are we rejecting based on a bad/missing */ +- /* CI_MPPE, or due to other options? */ +-#endif ++ u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; ++/* int mtu; */ ++#endif /* MPPE */ + + ret = CONFACK; + retp = p0 = p; +@@ -1102,103 +1392,305 @@ + switch (type) { + #ifdef MPPE + case CI_MPPE: +- if (!ao->mppe || clen != CILEN_MPPE) { ++ if ((!ao->mppc && !ao->mppe) || clen != CILEN_MPPE) { + newret = CONFREJ; + break; + } +- MPPE_CI_TO_OPTS(&p[2], ho->mppe); + +- /* Nak if anything unsupported or unknown are set. */ +- if (ho->mppe & MPPE_OPT_UNSUPPORTED) { +- newret = CONFNAK; +- ho->mppe &= ~MPPE_OPT_UNSUPPORTED; +- } +- if (ho->mppe & MPPE_OPT_UNKNOWN) { ++ p2 = p[2]; ++ p5 = p[5]; ++ /* not sure what they want, tell 'em what we got */ ++ if (((p[2] & ~MPPE_STATELESS) != 0 || p[3] != 0 || p[4] != 0 || ++ (p[5] & ~(MPPE_40BIT | MPPE_56BIT | MPPE_128BIT | ++ MPPE_MPPC)) != 0 || p[5] == 0) || ++ (p[2] == 0 && p[3] == 0 && p[4] == 0 && p[5] == 0)) { + newret = CONFNAK; +- ho->mppe &= ~MPPE_OPT_UNKNOWN; ++ p[2] = (wo->mppe_stateless ? MPPE_STATELESS : 0); ++ p[3] = 0; ++ p[4] = 0; ++ p[5] = (wo->mppe_40 ? MPPE_40BIT : 0) | ++ (wo->mppe_56 ? MPPE_56BIT : 0) | ++ (wo->mppe_128 ? MPPE_128BIT : 0) | ++ (wo->mppc ? MPPE_MPPC : 0); ++ break; + } + +- /* Check state opt */ +- if (ho->mppe & MPPE_OPT_STATEFUL) { +- /* +- * We can Nak and request stateless, but it's a +- * lot easier to just assume the peer will request +- * it if he can do it; stateful mode is bad over +- * the Internet -- which is where we expect MPPE. +- */ +- if (refuse_mppe_stateful) { +- error("Refusing MPPE stateful mode offered by peer"); ++ if ((p[5] & MPPE_MPPC)) { ++ if (ao->mppc) { ++ ho->mppc = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ opt_buf[2] = opt_buf[3] = opt_buf[4] = 0; ++ opt_buf[5] = MPPE_MPPC; ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE, 1) <= 0) { ++ ho->mppc = 0; ++ p[5] &= ~MPPE_MPPC; ++ newret = CONFNAK; ++ } ++ } else { + newret = CONFREJ; +- break; ++ if (wo->mppe || ao->mppe) { ++ p[5] &= ~MPPE_MPPC; ++ newret = CONFNAK; ++ } ++ } ++ } ++ ++ if (ao->mppe) ++ ho->mppe = 1; ++ ++ if ((p[2] & MPPE_STATELESS)) { ++ if (ao->mppe_stateless) { ++ if (wo->mppe_stateless) ++ ho->mppe_stateless = 1; ++ else { ++ newret = CONFNAK; ++ if (!dont_nak) ++ p[2] &= ~MPPE_STATELESS; ++ } ++ } else { ++ newret = CONFNAK; ++ if (!dont_nak) ++ p[2] &= ~MPPE_STATELESS; ++ } ++ } else { ++ if (wo->mppe_stateless && !dont_nak) { ++ wo->mppe_stateless = 0; ++ newret = CONFNAK; ++ p[2] |= MPPE_STATELESS; + } + } + +- /* Find out which of {S,L} are set. */ +- if ((ho->mppe & MPPE_OPT_128) +- && (ho->mppe & MPPE_OPT_40)) { +- /* Both are set, negotiate the strongest. */ ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT|MPPE_128BIT)) { + newret = CONFNAK; +- if (ao->mppe & MPPE_OPT_128) +- ho->mppe &= ~MPPE_OPT_40; +- else if (ao->mppe & MPPE_OPT_40) +- ho->mppe &= ~MPPE_OPT_128; +- else { +- newret = CONFREJ; +- break; ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ p[5] &= ~(MPPE_40BIT|MPPE_56BIT); ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] |= (MPPE_40BIT|MPPE_56BIT); ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56_40; ++ } ++ goto check_mppe; + } +- } else if (ho->mppe & MPPE_OPT_128) { +- if (!(ao->mppe & MPPE_OPT_128)) { +- newret = CONFREJ; +- break; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56_40; ++ } ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_56BIT|MPPE_128BIT)) { ++ newret = CONFNAK; ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ p[5] &= ~MPPE_56BIT; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] |= MPPE_56BIT; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56; ++ } ++ goto check_mppe; + } +- } else if (ho->mppe & MPPE_OPT_40) { +- if (!(ao->mppe & MPPE_OPT_40)) { +- newret = CONFREJ; +- break; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_56; ++ } ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_128BIT)) { ++ newret = CONFNAK; ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ p[5] &= ~MPPE_40BIT; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] |= MPPE_40BIT; ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_40; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_128BIT; ++ goto check_mppe_40; ++ } ++ if ((p[5] & ~MPPE_MPPC) == MPPE_128BIT) { ++ if (ao->mppe_128) { ++ ho->mppe_128 = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_128 = 0; ++ p[5] &= ~MPPE_128BIT; ++ newret = CONFNAK; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_128BIT; ++ newret = CONFNAK; ++ goto check_mppe; ++ } ++ check_mppe_56_40: ++ if ((p[5] & ~MPPE_MPPC) == (MPPE_40BIT|MPPE_56BIT)) { ++ newret = CONFNAK; ++ if (ao->mppe_56) { ++ ho->mppe_56 = 1; ++ p[5] &= ~MPPE_40BIT; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_56 = 0; ++ p[5] |= MPPE_40BIT; ++ p[5] &= ~MPPE_56BIT; ++ newret = CONFNAK; ++ goto check_mppe_40; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_56BIT; ++ goto check_mppe_40; ++ } ++ check_mppe_56: ++ if ((p[5] & ~MPPE_MPPC) == MPPE_56BIT) { ++ if (ao->mppe_56) { ++ ho->mppe_56 = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_56 = 0; ++ p[5] &= ~MPPE_56BIT; ++ newret = CONFNAK; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_56BIT; ++ newret = CONFNAK; ++ goto check_mppe; ++ } ++ check_mppe_40: ++ if ((p[5] & ~MPPE_MPPC) == MPPE_40BIT) { ++ if (ao->mppe_40) { ++ ho->mppe_40 = 1; ++ BCOPY(p, opt_buf, CILEN_MPPE); ++ BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], ++ MPPE_MAX_KEY_LEN); ++ if (ccp_test(f->unit, opt_buf, CILEN_MPPE + ++ MPPE_MAX_KEY_LEN, 1) <= 0) { ++ ho->mppe_40 = 0; ++ p[5] &= ~MPPE_40BIT; ++ newret = CONFNAK; ++ } ++ goto check_mppe; ++ } ++ p[5] &= ~MPPE_40BIT; ++ } ++ ++ check_mppe: ++ if (!ho->mppe_40 && !ho->mppe_56 && !ho->mppe_128) { ++ if (wo->mppe_40 || wo->mppe_56 || wo->mppe_128) { ++ newret = CONFNAK; ++ p[2] |= (wo->mppe_stateless ? MPPE_STATELESS : 0); ++ p[5] |= (wo->mppe_40 ? MPPE_40BIT : 0) | ++ (wo->mppe_56 ? MPPE_56BIT : 0) | ++ (wo->mppe_128 ? MPPE_128BIT : 0) | ++ (wo->mppc ? MPPE_MPPC : 0); ++ } else { ++ ho->mppe = ho->mppe_stateless = 0; + } + } else { +- /* Neither are set. */ ++ /* MPPE is not compatible with other compression types */ ++ if (wo->mppe) { ++ ao->bsd_compress = 0; ++ ao->predictor_1 = 0; ++ ao->predictor_2 = 0; ++ ao->deflate = 0; ++ ao->lzs = 0; ++ } ++ } ++ if ((!ho->mppc || !ao->mppc) && !ho->mppe) { ++ p[2] = p2; ++ p[5] = p5; + newret = CONFREJ; + break; + } + +- /* rebuild the opts */ +- MPPE_OPTS_TO_CI(ho->mppe, &p[2]); +- if (newret == CONFACK) { +- u_char opt_buf[CILEN_MPPE + MPPE_MAX_KEY_LEN]; +- int mtu; +- +- BCOPY(p, opt_buf, CILEN_MPPE); +- BCOPY(mppe_send_key, &opt_buf[CILEN_MPPE], +- MPPE_MAX_KEY_LEN); +- if (ccp_test(f->unit, opt_buf, +- CILEN_MPPE + MPPE_MAX_KEY_LEN, 1) <= 0) { +- /* This shouldn't happen, we've already tested it! */ +- error("MPPE required, but kernel has no support."); +- lcp_close(f->unit, "MPPE required but not available"); +- newret = CONFREJ; +- break; +- } +- /* +- * We need to decrease the interface MTU by MPPE_PAD +- * because MPPE frames **grow**. The kernel [must] +- * allocate MPPE_PAD extra bytes in xmit buffers. +- */ +- mtu = netif_get_mtu(f->unit); +- if (mtu) +- netif_set_mtu(f->unit, mtu - MPPE_PAD); +- else +- newret = CONFREJ; +- } ++ /* ++ * I have commented the code below because according to RFC1547 ++ * MTU is only information for higher level protocols about ++ * "the maximum allowable length for a packet (q.v.) transmitted ++ * over a point-to-point link without incurring network layer ++ * fragmentation." Of course a PPP implementation should be able ++ * to handle overhead added by MPPE - in our case apropriate code ++ * is located in drivers/net/ppp_generic.c in the kernel sources. ++ * ++ * According to RFC1661: ++ * - when negotiated MRU is less than 1500 octets, a PPP ++ * implementation must still be able to receive at least 1500 ++ * octets, ++ * - when PFC is negotiated, a PPP implementation is still ++ * required to receive frames with uncompressed protocol field. ++ * ++ * So why not to handle MPPE overhead without changing MTU value? ++ * I am sure that RFC3078, unfortunately silently, assumes that. ++ */ + + /* +- * We have accepted MPPE or are willing to negotiate +- * MPPE parameters. A CONFREJ is due to subsequent +- * (non-MPPE) processing. ++ * We need to decrease the interface MTU by MPPE_PAD ++ * because MPPE frames **grow**. The kernel [must] ++ * allocate MPPE_PAD extra bytes in xmit buffers. + */ +- rej_for_ci_mppe = 0; ++/* ++ mtu = netif_get_mtu(f->unit); ++ if (mtu) { ++ netif_set_mtu(f->unit, mtu - MPPE_PAD); ++ } else { ++ newret = CONFREJ; ++ if (ccp_wantoptions[f->unit].mppe) { ++ error("Cannot adjust MTU needed by MPPE."); ++ lcp_close(f->unit, "Cannot adjust MTU needed by MPPE."); ++ } ++ } ++*/ + break; + #endif /* MPPE */ ++ ++ case CI_LZS: ++ if (!ao->lzs || clen != CILEN_LZS) { ++ newret = CONFREJ; ++ break; ++ } ++ ++ ho->lzs = 1; ++ ho->lzs_hists = (p[2] << 8) | p[3]; ++ ho->lzs_mode = p[4]; ++ if ((ho->lzs_hists != ao->lzs_hists) || ++ (ho->lzs_mode != ao->lzs_mode)) { ++ newret = CONFNAK; ++ if (!dont_nak) { ++ p[2] = ao->lzs_hists >> 8; ++ p[3] = ao->lzs_hists & 0xff; ++ p[4] = ao->lzs_mode; ++ } else ++ break; ++ } ++ ++ if (p == p0 && ccp_test(f->unit, p, CILEN_LZS, 1) <= 0) { ++ newret = CONFREJ; ++ } ++ break; ++ + case CI_DEFLATE: + case CI_DEFLATE_DRAFT: + if (!ao->deflate || clen != CILEN_DEFLATE +@@ -1340,12 +1832,6 @@ + else + *lenp = retp - p0; + } +-#ifdef MPPE +- if (ret == CONFREJ && ao->mppe && rej_for_ci_mppe) { +- error("MPPE required but peer negotiation failed"); +- lcp_close(f->unit, "MPPE required but peer negotiation failed"); +- } +-#endif + return ret; + } + +@@ -1367,24 +1853,35 @@ + char *p = result; + char *q = result + sizeof(result); /* 1 past result */ + +- slprintf(p, q - p, "MPPE "); +- p += 5; +- if (opt->mppe & MPPE_OPT_128) { +- slprintf(p, q - p, "128-bit "); +- p += 8; +- } +- if (opt->mppe & MPPE_OPT_40) { +- slprintf(p, q - p, "40-bit "); +- p += 7; +- } +- if (opt->mppe & MPPE_OPT_STATEFUL) +- slprintf(p, q - p, "stateful"); +- else +- slprintf(p, q - p, "stateless"); +- ++ if (opt->mppe) { ++ if (opt->mppc) { ++ slprintf(p, q - p, "MPPC/MPPE "); ++ p += 10; ++ } else { ++ slprintf(p, q - p, "MPPE "); ++ p += 5; ++ } ++ if (opt->mppe_128) { ++ slprintf(p, q - p, "128-bit "); ++ p += 8; ++ } else if (opt->mppe_56) { ++ slprintf(p, q - p, "56-bit "); ++ p += 7; ++ } else if (opt->mppe_40) { ++ slprintf(p, q - p, "40-bit "); ++ p += 7; ++ } ++ if (opt->mppe_stateless) ++ slprintf(p, q - p, "stateless"); ++ else ++ slprintf(p, q - p, "stateful"); ++ } else if (opt->mppc) ++ slprintf(p, q - p, "MPPC"); + break; + } +-#endif ++#endif /* MPPE */ ++ case CI_LZS: ++ return "Stac LZS"; + case CI_DEFLATE: + case CI_DEFLATE_DRAFT: + if (opt2 != NULL && opt2->deflate_size != opt->deflate_size) +@@ -1440,12 +1937,12 @@ + } else if (ANY_COMPRESS(*ho)) + notice("%s transmit compression enabled", method_name(ho, NULL)); + #ifdef MPPE +- if (go->mppe) { ++ if (go->mppe || go->mppc) { + BZERO(mppe_recv_key, MPPE_MAX_KEY_LEN); + BZERO(mppe_send_key, MPPE_MAX_KEY_LEN); + continue_networks(f->unit); /* Bring up IP et al */ + } +-#endif ++#endif /* MPPE */ + } + + /* +@@ -1468,7 +1965,7 @@ + lcp_close(f->unit, "MPPE disabled"); + } + } +-#endif ++#endif /* MPPE */ + } + + /* +@@ -1528,24 +2025,28 @@ + #ifdef MPPE + case CI_MPPE: + if (optlen >= CILEN_MPPE) { +- u_char mppe_opts; +- +- MPPE_CI_TO_OPTS(&p[2], mppe_opts); +- printer(arg, "mppe %s %s %s %s %s %s%s", +- (p[2] & MPPE_H_BIT)? "+H": "-H", +- (p[5] & MPPE_M_BIT)? "+M": "-M", +- (p[5] & MPPE_S_BIT)? "+S": "-S", +- (p[5] & MPPE_L_BIT)? "+L": "-L", ++ printer(arg, "mppe %s %s %s %s %s %s", ++ (p[2] & MPPE_STATELESS)? "+H": "-H", ++ (p[5] & MPPE_56BIT)? "+M": "-M", ++ (p[5] & MPPE_128BIT)? "+S": "-S", ++ (p[5] & MPPE_40BIT)? "+L": "-L", + (p[5] & MPPE_D_BIT)? "+D": "-D", +- (p[5] & MPPE_C_BIT)? "+C": "-C", +- (mppe_opts & MPPE_OPT_UNKNOWN)? " +U": ""); +- if (mppe_opts & MPPE_OPT_UNKNOWN) ++ (p[5] & MPPE_MPPC)? "+C": "-C"); ++ if ((p[5] & ~(MPPE_56BIT | MPPE_128BIT | MPPE_40BIT | ++ MPPE_D_BIT | MPPE_MPPC)) || ++ (p[2] & ~MPPE_STATELESS)) + printer(arg, " (%.2x %.2x %.2x %.2x)", + p[2], p[3], p[4], p[5]); + p += CILEN_MPPE; + } + break; +-#endif ++#endif /* MPPE */ ++ case CI_LZS: ++ if (optlen >= CILEN_LZS) { ++ printer(arg, "lzs %.2x %.2x %.2x", p[2], p[3], p[4]); ++ p += CILEN_LZS; ++ } ++ break; + case CI_DEFLATE: + case CI_DEFLATE_DRAFT: + if (optlen >= CILEN_DEFLATE) { +@@ -1631,6 +2132,7 @@ + error("Lost compression sync: disabling compression"); + ccp_close(unit, "Lost compression sync"); + #ifdef MPPE ++ /* My module dosn't need this. J.D., 2003-07-06 */ + /* + * If we were doing MPPE, we must also take the link down. + */ +@@ -1638,9 +2140,18 @@ + error("Too many MPPE errors, closing LCP"); + lcp_close(unit, "Too many MPPE errors"); + } +-#endif ++#endif /* MPPE */ + } else { + /* ++ * When LZS or MPPE/MPPC is negotiated we just send CCP_RESETREQ ++ * and don't wait for CCP_RESETACK ++ */ ++ if ((ccp_gotoptions[f->unit].method == CI_LZS) || ++ (ccp_gotoptions[f->unit].method == CI_MPPE)) { ++ fsm_sdata(f, CCP_RESETREQ, f->reqid = ++f->id, NULL, 0); ++ return; ++ } ++ /* + * Send a reset-request to reset the peer's compressor. + * We don't do that if we are still waiting for an + * acknowledgement to a previous reset-request. +@@ -1671,4 +2182,3 @@ + } else + ccp_localstate[f->unit] &= ~RACK_PENDING; + } +- +diff -ruN ppp-2.4.3.orig/pppd/ccp.h ppp-2.4.3/pppd/ccp.h +--- ppp-2.4.3.orig/pppd/ccp.h 2004-11-04 11:02:26.000000000 +0100 ++++ ppp-2.4.3/pppd/ccp.h 2004-11-21 13:54:09.000000000 +0100 +@@ -37,9 +37,17 @@ + bool predictor_2; /* do Predictor-2? */ + bool deflate_correct; /* use correct code for deflate? */ + bool deflate_draft; /* use draft RFC code for deflate? */ ++ bool lzs; /* do Stac LZS? */ ++ bool mppc; /* do MPPC? */ + bool mppe; /* do MPPE? */ ++ bool mppe_40; /* allow 40 bit encryption? */ ++ bool mppe_56; /* allow 56 bit encryption? */ ++ bool mppe_128; /* allow 128 bit encryption? */ ++ bool mppe_stateless; /* allow stateless encryption */ + u_short bsd_bits; /* # bits/code for BSD Compress */ + u_short deflate_size; /* lg(window size) for Deflate */ ++ u_short lzs_mode; /* LZS check mode */ ++ u_short lzs_hists; /* number of LZS histories */ + short method; /* code for chosen compression method */ + } ccp_options; + +diff -ruN ppp-2.4.3.orig/pppd/chap_ms.c ppp-2.4.3/pppd/chap_ms.c +--- ppp-2.4.3.orig/pppd/chap_ms.c 2004-11-12 10:57:43.000000000 +0100 ++++ ppp-2.4.3/pppd/chap_ms.c 2004-11-21 13:54:09.000000000 +0100 +@@ -895,13 +895,17 @@ + /* + * Disable undesirable encryption types. Note that we don't ENABLE + * any encryption types, to avoid overriding manual configuration. ++ * ++ * It seems that 56 bit keys are unsupported in MS-RADIUS (see RFC 2548) + */ + switch(types) { + case MPPE_ENC_TYPES_RC4_40: +- ccp_wantoptions[0].mppe &= ~MPPE_OPT_128; /* disable 128-bit */ ++ ccp_wantoptions[0].mppe_128 = 0; /* disable 128-bit */ ++ ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */ + break; + case MPPE_ENC_TYPES_RC4_128: +- ccp_wantoptions[0].mppe &= ~MPPE_OPT_40; /* disable 40-bit */ ++ ccp_wantoptions[0].mppe_56 = 0; /* disable 56-bit */ ++ ccp_wantoptions[0].mppe_40 = 0; /* disable 40-bit */ + break; + default: + break; +diff -ruN ppp-2.4.3.orig/pppd/pppd.8 ppp-2.4.3/pppd/pppd.8 +--- ppp-2.4.3.orig/pppd/pppd.8 2004-11-13 13:22:49.000000000 +0100 ++++ ppp-2.4.3/pppd/pppd.8 2004-11-21 14:24:47.000000000 +0100 +@@ -622,9 +622,29 @@ + Enables the use of PPP multilink; this is an alias for the `multilink' + option. This option is currently only available under Linux. + .TP +-.B mppe\-stateful +-Allow MPPE to use stateful mode. Stateless mode is still attempted first. +-The default is to disallow stateful mode. ++.B mppc ++Enables MPPC (Microsoft Point to Point Compression). This is the default. ++.TP ++.B mppe \fIsubopt1[,subopt2[,subopt3[..]]] ++Modify MPPE (Microsoft Point to Point Encryption) parameters. In order ++for MPPE to successfully come up, you must have authenticated with either ++MS-CHAP or MS-CHAPv2. By default MPPE is optional, it means that pppd will ++not propose MPPE to the peer, but will negotiate MPPE if peer wants that. ++You can change this using \fIrequired\fR suboption. ++This option is presently only supported under Linux, and only if your ++kernel has been configured to include MPPE support. ++.IP ++MPPE suboptions: ++.br ++\fIrequired\fR - require MPPE; disconnect if peer doesn't support it, ++.br ++\fIstateless\fR - try to negotiate stateless mode; default is stateful, ++.br ++\fIno40\fR - disable 40 bit keys, ++.br ++\fIno56\fR - disable 56 bit keys, ++.br ++\fIno128\fR - disable 128 bit keys + .TP + .B mpshortseq + Enables the use of short (12-bit) sequence numbers in multilink +@@ -757,17 +777,11 @@ + Disables the use of PPP multilink. This option is currently only + available under Linux. + .TP +-.B nomppe +-Disables MPPE (Microsoft Point to Point Encryption). This is the default. +-.TP +-.B nomppe\-40 +-Disable 40-bit encryption with MPPE. ++.B nomppc ++Disables MPPC (Microsoft Point to Point Compression). + .TP +-.B nomppe\-128 +-Disable 128-bit encryption with MPPE. +-.TP +-.B nomppe\-stateful +-Disable MPPE stateful mode. This is the default. ++.B nomppe ++Disables MPPE (Microsoft Point to Point Encryption). + .TP + .B nompshortseq + Disables the use of short (12-bit) sequence numbers in the PPP +@@ -948,19 +962,6 @@ + Require the peer to authenticate itself using CHAP [Challenge + Handshake Authentication Protocol] authentication. + .TP +-.B require\-mppe +-Require the use of MPPE (Microsoft Point to Point Encryption). This +-option disables all other compression types. This option enables +-both 40-bit and 128-bit encryption. In order for MPPE to successfully +-come up, you must have authenticated with either MS\-CHAP or MS\-CHAPv2. +-This option is presently only supported under Linux, and only if your +-kernel has been configured to include MPPE support. +-.TP +-.B require\-mppe\-40 +-Require the use of MPPE, with 40-bit encryption. +-.TP +-.B require\-mppe\-128 +-Require the use of MPPE, with 128-bit encryption. + .TP + .B require\-mschap + Require the peer to authenticate itself using MS\-CHAP [Microsoft Challenge diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb index 71c68c2fb8..d9a3c1288c 100644 --- a/packages/ppp/ppp_2.4.3.bb +++ b/packages/ppp/ppp_2.4.3.bb @@ -3,9 +3,10 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r3" +PR = "r4" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ + file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 file://makefile.patch;patch=1 \ file://cifdefroute.patch;patch=1 \ file://pppd-resolv-varrun.patch;patch=1 \ -- cgit v1.2.3 From aa627eab2eed51be048b3585f417d89b8e982982 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Tue, 26 Aug 2008 21:42:52 +0000 Subject: tangogps: Updated to version 0.9.3. --- packages/tangogps/tangogps_0.9.2.bb | 4 ---- packages/tangogps/tangogps_0.9.3.bb | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 packages/tangogps/tangogps_0.9.2.bb create mode 100644 packages/tangogps/tangogps_0.9.3.bb diff --git a/packages/tangogps/tangogps_0.9.2.bb b/packages/tangogps/tangogps_0.9.2.bb deleted file mode 100644 index 83465c1da9..0000000000 --- a/packages/tangogps/tangogps_0.9.2.bb +++ /dev/null @@ -1,4 +0,0 @@ -require tangogps.inc - -DEPENDS += "sqlite3" -PR = "r1" diff --git a/packages/tangogps/tangogps_0.9.3.bb b/packages/tangogps/tangogps_0.9.3.bb new file mode 100644 index 0000000000..83465c1da9 --- /dev/null +++ b/packages/tangogps/tangogps_0.9.3.bb @@ -0,0 +1,4 @@ +require tangogps.inc + +DEPENDS += "sqlite3" +PR = "r1" -- cgit v1.2.3 From c4003d9ecc9f86ca5a83a7769de24e65290bc64c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 09:02:19 +0000 Subject: mozilla: fix powerpc builds --- packages/mozilla/files/powerpc/jsautocfg.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/mozilla/files/powerpc/jsautocfg.h b/packages/mozilla/files/powerpc/jsautocfg.h index 93d03744f2..408a5e4ac4 100644 --- a/packages/mozilla/files/powerpc/jsautocfg.h +++ b/packages/mozilla/files/powerpc/jsautocfg.h @@ -49,4 +49,6 @@ #define JS_STACK_GROWTH_DIRECTION (-1) +#define JS_HAVE_LONG_LONG + #endif /* js_cpucfg___ */ -- cgit v1.2.3 From cd88f994ec81f22661a154c5ee4d89e5e675709c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 09:05:49 +0000 Subject: ppp: fix parse error --- packages/ppp/ppp_2.4.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ppp/ppp_2.4.3.bb b/packages/ppp/ppp_2.4.3.bb index d9a3c1288c..f09dcaca21 100644 --- a/packages/ppp/ppp_2.4.3.bb +++ b/packages/ppp/ppp_2.4.3.bb @@ -6,7 +6,7 @@ LICENSE = "BSD GPLv2" PR = "r4" SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ - file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 + file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \ file://makefile.patch;patch=1 \ file://cifdefroute.patch;patch=1 \ file://pppd-resolv-varrun.patch;patch=1 \ -- cgit v1.2.3 From aabcc3f9d461aaf509b6c6d2f65170752697fabb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 09:44:02 +0000 Subject: angstrom feeds: add some more stuff --- contrib/angstrom/build-feeds.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 12f74a81c0..156808cb44 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -50,10 +50,10 @@ do gpe-mini-browser gpe-mini-browser2 netsurf midori minimo openmoko-browser2 webkit-gtklauncher \ samba meta-nas-server \ apache2 boa cherokee lighttpd thttpd \ - gpe-gallery gpe-scap notecase \ + gpe-gallery gpe-scap notecase task-gpe-pim \ pidgin irssi \ roadmap-gtk2 gpsdrive navit \ - xmms mplayer quasar vlc-gpe gnome-mplayer \ + xmms totem mplayer quasar vlc-gpe gnome-mplayer \ wpa-gui wifi-radar kismet aircrack-ng dsniff \ nmap iptables iperf openvpn vpnc \ gpe-login ipaq-sleep \ @@ -71,7 +71,9 @@ do xf86-input-evdev xf86-input-keyboard xf86-input-mouse \ task-opie \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ - " + rdesktop \ + gnome-games \ + " do_build done -- cgit v1.2.3 From 7bf9184bc75d4d110dd079933428661f3f1a1ba2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 09:48:12 +0000 Subject: angstrom feeds: add gta02 machine and fso apps --- contrib/angstrom/build-feeds.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 156808cb44..14b0ae2f1c 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -38,7 +38,7 @@ do_report_success() { echo "$(date -u +%s) $target $BUILD_MODE $machine" >> autobuilder-feed.log } -for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 +for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 do BUILD_MACHINE=$machine BUILD_CLEAN="libtool-cross qmake-native qmake2-native" @@ -71,7 +71,7 @@ do xf86-input-evdev xf86-input-keyboard xf86-input-mouse \ task-opie \ task-openmoko-base task-openmoko-debug task-openmoko-examples task-openmoko-feed task-openmoko-games task-openmoko-linux task-openmoko-native-sdk task-openmoko-net task-openmoko-phone task-openmoko-pim task-openmoko-ui \ - rdesktop \ + gsm0710muxd frameworkd zhone \ gnome-games \ " do_build -- cgit v1.2.3 From 164f490398ad22faacda086f35a74ac98ee6c4c4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 09:50:00 +0000 Subject: angstrom feeds: add java and more browsers --- contrib/angstrom/build-feeds.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh index 14b0ae2f1c..dab687e291 100755 --- a/contrib/angstrom/build-feeds.sh +++ b/contrib/angstrom/build-feeds.sh @@ -45,9 +45,9 @@ do BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig distcc \ usbutils pciutils mtd-utils usbview hal setserial \ task-proper-tools mc screen findutils \ - mono perl python ruby \ + mono jamvm perl python ruby \ gtk+ qt-x11-free qt4-x11-free \ - gpe-mini-browser gpe-mini-browser2 netsurf midori minimo openmoko-browser2 webkit-gtklauncher \ + gpe-mini-browser gpe-mini-browser2 netsurf midori firefox epiphany minimo openmoko-browser2 \ samba meta-nas-server \ apache2 boa cherokee lighttpd thttpd \ gpe-gallery gpe-scap notecase task-gpe-pim \ -- cgit v1.2.3 From e9bc8e10b211ae802b20049bac307c194324e738 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Wed, 27 Aug 2008 11:31:41 +0000 Subject: pidgin: Update to version 2.5.0 and set as default preference: * older versions have known security issues * ICQ works only in versions >= 2.4.3 --- packages/pidgin/pidgin/purple-OE-branding-25.patch | 16 ++++++++++++++++ packages/pidgin/pidgin_2.4.3.bb | 18 ------------------ packages/pidgin/pidgin_2.5.0.bb | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 packages/pidgin/pidgin/purple-OE-branding-25.patch delete mode 100644 packages/pidgin/pidgin_2.4.3.bb create mode 100644 packages/pidgin/pidgin_2.5.0.bb diff --git a/packages/pidgin/pidgin/purple-OE-branding-25.patch b/packages/pidgin/pidgin/purple-OE-branding-25.patch new file mode 100644 index 0000000000..293ef709d1 --- /dev/null +++ b/packages/pidgin/pidgin/purple-OE-branding-25.patch @@ -0,0 +1,16 @@ +Index: pidgin-2.5.0/libpurple/protocols/irc/irc.h +=================================================================== +--- pidgin-2.5.0.orig/libpurple/protocols/irc/irc.h 2008-08-19 01:53:38.000000000 +0000 ++++ pidgin-2.5.0/libpurple/protocols/irc/irc.h 2008-08-27 11:15:58.000000000 +0000 +@@ -36,9 +36,9 @@ + + #define IRC_DEFAULT_CHARSET "UTF-8" + #define IRC_DEFAULT_AUTODETECT FALSE +-#define IRC_DEFAULT_ALIAS "purple" ++#define IRC_DEFAULT_ALIAS "OE-user" + +-#define IRC_DEFAULT_QUIT "Leaving." ++#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" + + #define IRC_INITIAL_BUFSIZE 1024 + diff --git a/packages/pidgin/pidgin_2.4.3.bb b/packages/pidgin/pidgin_2.4.3.bb deleted file mode 100644 index 37ecbd5873..0000000000 --- a/packages/pidgin/pidgin_2.4.3.bb +++ /dev/null @@ -1,18 +0,0 @@ -require pidgin.inc - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ - file://sanitize-configure.ac.patch;patch=1 \ - file://gconf-no-errors.patch;patch=1 \ - file://pidgin.desktop-set-icon.patch;patch=1 \ - file://purple-OE-branding.patch;patch=1 \ - file://pidgin-cross-python.patch;patch=1 \ - " - -EXTRA_OECONF += " --disable-gtkspell \ - --disable-meanwhile \ - --disable-nm \ - " - -PR = "r0" diff --git a/packages/pidgin/pidgin_2.5.0.bb b/packages/pidgin/pidgin_2.5.0.bb new file mode 100644 index 0000000000..80d15f677f --- /dev/null +++ b/packages/pidgin/pidgin_2.5.0.bb @@ -0,0 +1,16 @@ +require pidgin.inc + +SRC_URI = "${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ + file://sanitize-configure.ac.patch;patch=1 \ + file://gconf-no-errors.patch;patch=1 \ + file://pidgin.desktop-set-icon.patch;patch=1 \ + file://purple-OE-branding-25.patch;patch=1 \ + file://pidgin-cross-python.patch;patch=1 \ + " + +EXTRA_OECONF += " --disable-gtkspell \ + --disable-meanwhile \ + --disable-nm \ + " + +PR = "r0" -- cgit v1.2.3 From d7a0e9f753ce162fcaf16779487d6307753106bb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 12:43:46 +0000 Subject: site common-glibc: add ac_cv_fread_reads_directories --- site/common-glibc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/site/common-glibc b/site/common-glibc index 6b7bf80c73..ce45dd250b 100644 --- a/site/common-glibc +++ b/site/common-glibc @@ -46,5 +46,7 @@ ac_cv_func_va_copy=${ac_cv_func_va_copy=yes} ac_cv_func___va_copy=${ac_cv_func___va_copy=yes} ac_cv_epoll_works=${ac_cv_epoll_works=yes} +#git +ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} # pth ac_cv_check_sjlj=ssjlj -- cgit v1.2.3 From 5294c0745148429b45065fd085ce85041cd4bb19 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 13:10:44 +0000 Subject: pixman: make 0.11.8 the default --- packages/xorg-lib/pixman_0.11.8.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/xorg-lib/pixman_0.11.8.bb b/packages/xorg-lib/pixman_0.11.8.bb index 8e4bd8cff3..a6cc53dabb 100644 --- a/packages/xorg-lib/pixman_0.11.8.bb +++ b/packages/xorg-lib/pixman_0.11.8.bb @@ -3,8 +3,6 @@ PRIORITY = "optional" DESCRIPTION = "Low-level pixel manipulation library." LICENSE = "X11" -DEFAULT_PREFERENCE = "-1" - SRC_URI = "http://cairographics.org/releases/pixman-${PV}.tar.gz \ file://pixman-arm.patch;patch=1 \ " -- cgit v1.2.3 From c19a1bde6fd7047362e5d656924887ecd4077cd6 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 13:12:36 +0000 Subject: cairo, xservers: bump PR due to pixman abi change for arm --- packages/cairo/cairo_1.6.4.bb | 2 +- packages/xorg-xserver/xserver-kdrive_1.4.2.bb | 1 + packages/xorg-xserver/xserver-xorg_1.4.2.bb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/cairo/cairo_1.6.4.bb b/packages/cairo/cairo_1.6.4.bb index bbed315452..53a71f71df 100644 --- a/packages/cairo/cairo_1.6.4.bb +++ b/packages/cairo/cairo_1.6.4.bb @@ -5,5 +5,5 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.gz \ file://configure_fix.patch;patch=1 " -PR = "r1" +PR = "r2" diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb index 5155a267b5..1583cc3c6c 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb @@ -3,6 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" PE = "1" +PR = "r1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 6e643a9138..0b0f847dff 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r1" +PR = "r2" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ -- cgit v1.2.3 From c2fc7eb12afe4faf1da04594bc81fe9e06cbc09c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 27 Aug 2008 13:18:07 +0000 Subject: gst-ffmpeg: 0.10.4 is working great, make it the default --- packages/gstreamer/gst-ffmpeg_0.10.4.bb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/gstreamer/gst-ffmpeg_0.10.4.bb b/packages/gstreamer/gst-ffmpeg_0.10.4.bb index f4f872ce01..3efccbc3af 100644 --- a/packages/gstreamer/gst-ffmpeg_0.10.4.bb +++ b/packages/gstreamer/gst-ffmpeg_0.10.4.bb @@ -6,11 +6,6 @@ HOMEPAGE = "http://www.gstreamer.net/" DEPENDS = "ffmpeg gstreamer zlib" PR = "r4" -# This uses the systems ffmpeg, which is unsupported, but we can't build the internal one with the current autotools (ab)usage -DEFAULT_PREFERENCE = "-1" -DEFAULT_PREFERENCE_armv6 = "1" -DEFAULT_PREFERENCE_armv7a = "1" - inherit autotools pkgconfig SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \ -- cgit v1.2.3