From 6d4bfd6186d966473fbea9bc3aa0b3f503a88b33 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Mon, 3 Jan 2005 01:40:07 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/01/03 01:34:23+00:00 nexus.co.uk!pb Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into stealth.nexus.co.uk:/home/pb/oe/oe 2005/01/03 01:34:10+00:00 nexus.co.uk!pb remove bogus patch from gpe-login.bb 2005/01/03 01:18:40+00:00 rpsys.net!anon Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into tim.rpsys.net:/usr/tmp6/openembedded 2005/01/03 01:17:25+00:00 rpsys.net!anon openzaurus-2.6: fixups to let this run on shepherd. corgi now just needs cleanups in the battery management driver. 2005/01/03 01:12:04+00:00 nexus.co.uk!pb add gpsdrive, courtesy Florian Boor 2005/01/03 00:51:52+00:00 nexus.co.uk!pb tweak xmu package naming a bit 2005/01/03 00:49:36+00:00 nexus.co.uk!pb update gpe-login to 0.74 BKrev: 41d8a277OA3YdmoXw1BvD8HT9ZQKng --- packages/gpe-login/files/pre-session-ramdisk.patch | 0 .../gpe-login/files/smaller-default-icon-size.patch | 0 packages/gpe-login/files/user-own-collie-devs.patch | 0 .../gpe-login-0.73/pre-session-ramdisk.patch | 0 .../gpe-login-0.73/smaller-default-icon-size.patch | 0 .../gpe-login-0.73/user-own-collie-devs.patch | 0 packages/gpe-login/gpe-login_0.74.bb | 0 packages/gpsdrive/files/gpsdrive.desktop | 0 packages/gpsdrive/gpsdrive_2.10pre2.bb | 0 packages/linux/openzaurus_2.6.10.bb | 20 ++++++++++---------- packages/xmu/xmu_cvs.bb | 3 ++- 11 files changed, 12 insertions(+), 11 deletions(-) create mode 100644 packages/gpe-login/files/pre-session-ramdisk.patch create mode 100644 packages/gpe-login/files/smaller-default-icon-size.patch create mode 100644 packages/gpe-login/files/user-own-collie-devs.patch delete mode 100644 packages/gpe-login/gpe-login-0.73/pre-session-ramdisk.patch delete mode 100644 packages/gpe-login/gpe-login-0.73/smaller-default-icon-size.patch delete mode 100644 packages/gpe-login/gpe-login-0.73/user-own-collie-devs.patch create mode 100644 packages/gpe-login/gpe-login_0.74.bb create mode 100644 packages/gpsdrive/files/gpsdrive.desktop create mode 100644 packages/gpsdrive/gpsdrive_2.10pre2.bb diff --git a/packages/gpe-login/files/pre-session-ramdisk.patch b/packages/gpe-login/files/pre-session-ramdisk.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-login/files/smaller-default-icon-size.patch b/packages/gpe-login/files/smaller-default-icon-size.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-login/files/user-own-collie-devs.patch b/packages/gpe-login/files/user-own-collie-devs.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpe-login/gpe-login-0.73/pre-session-ramdisk.patch b/packages/gpe-login/gpe-login-0.73/pre-session-ramdisk.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-login/gpe-login-0.73/smaller-default-icon-size.patch b/packages/gpe-login/gpe-login-0.73/smaller-default-icon-size.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-login/gpe-login-0.73/user-own-collie-devs.patch b/packages/gpe-login/gpe-login-0.73/user-own-collie-devs.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/gpe-login/gpe-login_0.74.bb b/packages/gpe-login/gpe-login_0.74.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpsdrive/files/gpsdrive.desktop b/packages/gpsdrive/files/gpsdrive.desktop new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpsdrive/gpsdrive_2.10pre2.bb b/packages/gpsdrive/gpsdrive_2.10pre2.bb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/linux/openzaurus_2.6.10.bb b/packages/linux/openzaurus_2.6.10.bb index daac27f181..6e5e7cb3c7 100644 --- a/packages/linux/openzaurus_2.6.10.bb +++ b/packages/linux/openzaurus_2.6.10.bb @@ -21,18 +21,18 @@ http://www.rpsys.net/openzaurus/${KV}/jl1/sharp_mtd.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/jl1/collie_use_sharp_mtd.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_base.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/jl1/poodle_fb.patch;patch=1 \ -http://www.rpsys.net/openzaurus/${KV}/corgi_base-r5.patch;patch=1 \ +http://www.rpsys.net/openzaurus/${KV}/corgi_base-r7.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/corgi_ssp-r4.patch;patch=1 \ -http://www.rpsys.net/openzaurus/${KV}/w100-r9.patch;patch=1 \ +http://www.rpsys.net/openzaurus/${KV}/w100-r10.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl-r1.patch;patch=1 \ -http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_extra-r1.patch;patch=1 \ +http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_extra-r2.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/jffs2_longfilename-r0.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/mtd_sharpsl_map-r1.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/corgi_kbd-r4.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/corgi_backlight-r5.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/corgi_param-r1.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/corgi_ts-r2.patch;patch=1 \ -http://www.rpsys.net/openzaurus/${KV}/corgi_power-r2.patch;patch=1 \ +http://www.rpsys.net/openzaurus/${KV}/corgi_power-r3.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/corgi_power1-r0.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/fb_blank-r0.patch;patch=1 \ http://www.rpsys.net/openzaurus/${KV}/sharpsl_head_asm-r1.patch;patch=1 \ @@ -64,14 +64,14 @@ COMPATIBLE_HOST = "arm.*-linux" # # Create the kernel command line. # -CMDLINE_MTDPARTS_poodle = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)" -CMDLINE_MTDPARTS_corgi = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)" -CMDLINE_MTDPARTS_shepherd = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)" -CMDLINE_MTDPARTS_husky = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)" -CMDLINE_MTDPARTS_tosa = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2" +#CMDLINE_MTDPARTS_poodle = "mtdparts=sharpsl-nand:7168k@0k(smf),22528k@7168k(root),-(home)" +#CMDLINE_MTDPARTS_corgi = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)" +#CMDLINE_MTDPARTS_shepherd = "mtdparts=sharpsl-nand:7168k@0k(smf),25600k@7168k(root),-(home)" +#CMDLINE_MTDPARTS_husky = "mtdparts=sharpsl-nand:7168k@0k(smf),54272k@7168k(root),-(home)" +#CMDLINE_MTDPARTS_tosa = "mtdparts=sharpsl-nand:7168k@0k(smf),28672k@7168k(root),-(home) EQUIPMENT=2" CMDLINE_MEM_collie = "mem=32M" -CMDLINE_MEM_husky = "mem=64M" +#CMDLINE_MEM_husky = "mem=64M" CMDLINE_CON = "console=ttyS0,115200n8 console=tty0 noinitrd" CMDLINE_ROOT = "root=/dev/mtdblock2 rootfstype=jffs2 " diff --git a/packages/xmu/xmu_cvs.bb b/packages/xmu/xmu_cvs.bb index 4d725abdb6..2afa5fe941 100644 --- a/packages/xmu/xmu_cvs.bb +++ b/packages/xmu/xmu_cvs.bb @@ -3,11 +3,12 @@ SECTION = "x11/libs" PRIORITY = "optional" MAINTAINER = "Phil Blundell " DEPENDS = "xt xext" +PR = "r1" SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xmu" S = "${WORKDIR}/Xmu" -PACKAGES =+ "libxmuu libxmuu-dev" +PACKAGES =+ "xmuu xmuu-dev" FILES_libxmuu = "${libdir}/libXmuu.so.*" FILES_libxmuu-dev = "${libdir}/libXmuu.so" -- cgit 1.2.3-korg