diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-04-14 17:43:18 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-04-14 17:43:18 +0000 |
| commit | e8cd328180f9105b8b6ebe9598ef2a80a76d9b0c (patch) | |
| tree | 43f81ad32e435998de548ec12356caa7790405c5 | |
| parent | 40cbec43e3fc03c4a61534092cce978d384039ae (diff) | |
| parent | 18e5434f25fd1d292bbc147b3b0723dd2cf23d0d (diff) | |
merge of 9b708457afab2c6fe10cebf3363b9e3047e82cdf
and aa50c5a00e165f90e9a5f70bdf46104508a46fcc
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | packages/gaim/gaim_cvs.bb | 3 | ||||
| -rw-r--r-- | packages/linux/ep93xx-kernel_2.6.16.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch | 2 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.16.bb | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index 531ad6818c..8fe6a62061 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -14,7 +14,7 @@ FEED_URIS += " \ # ${MACHINE}##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/${MACHINE} \ # updates##${ANGSTROM_URI}/releases/${DISTRO_VERSION}/feed/updates" -SRCDATE = "20060424" +SRCDATE = "20060425" # Opie diff --git a/packages/gaim/gaim_cvs.bb b/packages/gaim/gaim_cvs.bb index 921fb7c261..be9dd860b2 100644 --- a/packages/gaim/gaim_cvs.bb +++ b/packages/gaim/gaim_cvs.bb @@ -1,6 +1,7 @@ PR = "r0" #Remove the dash below when 2.0 changes in PV -PV = "2.0+cvs-${SRCDATE}" +DEFAULT_PREFERENCE = "-100000" +PV = "1.9+2.0beta3cvs-${SRCDATE}" SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/gaim;module=gaim \ file://no-superimposed-version-on-logo.patch;patch=1 \ diff --git a/packages/linux/ep93xx-kernel_2.6.16.bb b/packages/linux/ep93xx-kernel_2.6.16.bb index 1806290a67..a472e9379c 100644 --- a/packages/linux/ep93xx-kernel_2.6.16.bb +++ b/packages/linux/ep93xx-kernel_2.6.16.bb @@ -4,6 +4,8 @@ MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>" LICENSE = "GPL" PR = "r0" +COMPATIBLE_MACHINE = "ep93xx" + SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \ http://www.wantstofly.org/~buytenh/ep93xx/derevo17.diff;patch=1 \ http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1.patch;patch=1 \ diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch index c7be5b3373..3d5d197920 100644 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch @@ -17,7 +17,7 @@ Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x76dc4190, 0xcfba9599), /* Seagate 8GB microdrive */ ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */ PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb index 8d1541cb0b..6cc3253f8d 100644 --- a/packages/linux/linux-openzaurus_2.6.16.bb +++ b/packages/linux/linux-openzaurus_2.6.16.bb @@ -1,6 +1,6 @@ include linux-openzaurus.inc -PR = "r9" +PR = "r10" # Handy URLs # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \ |