diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-03-08 15:08:15 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-03-08 15:08:15 +0000 |
| commit | 8fdff86fd5be58df4bfdc669f14a39c428498ad1 (patch) | |
| tree | a5147b1a8b721383bba78aed1566644ce0278bbc | |
| parent | c3cbaccb8b2e9249655f76be8a828dcbd56c8f65 (diff) | |
| parent | 2f81f768373c2ffd26c88ea0f77b5582de975572 (diff) | |
merge of 92a452f12d8cc21518953fccb816b6da6d8cbfb6
and e5ee771a5576db06a02a6c49061082909e18705e
| -rw-r--r-- | packages/file/file-native_4.16.bb (renamed from packages/file/file-native_4.13.bb) | 0 | ||||
| -rw-r--r-- | packages/file/file_4.16.bb (renamed from packages/file/file_4.13.bb) | 1 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 2 | ||||
| -rw-r--r-- | packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb | 4 | ||||
| -rw-r--r-- | packages/xlibs/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xlibs/files/errordb-keysymdb-path-fix.patch (renamed from packages/xlibs/libx11/errordb-keysymdb-path-fix.patch) | 0 |
6 files changed, 3 insertions, 4 deletions
diff --git a/packages/file/file-native_4.13.bb b/packages/file/file-native_4.16.bb index f92ff15f78..f92ff15f78 100644 --- a/packages/file/file-native_4.13.bb +++ b/packages/file/file-native_4.16.bb diff --git a/packages/file/file_4.13.bb b/packages/file/file_4.16.bb index ac5201b739..3e579c5ef4 100644 --- a/packages/file/file_4.13.bb +++ b/packages/file/file_4.16.bb @@ -3,7 +3,6 @@ on their contents and prints a description if a match is found." SECTION = "console/utils" LICENSE = "BSD-ADV" DEPENDS = "file-native" -PR = "r2" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz" S = "${WORKDIR}/file-${PV}" diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index d6b79494be..9fb02f8211 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -7,7 +7,7 @@ PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "0.0+svn${SRCDATE}" +PV = "2.10.0+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ diff --git a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb index c3d775a063..0e8de7e9a2 100644 --- a/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb +++ b/packages/linux/ep93xx-kernel_2.6.15+2.6.16-rc5.bb @@ -3,13 +3,13 @@ SECTION = "kernel" LICENSE = "GPL" PR = "r11" -SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \ +SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.15.tar.bz2 \ http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.16-rc5.bz2;patch=1 \ http://www.wantstofly.org/~buytenh/ep93xx/derevo14.diff;patch=1 \ file://defconfig \ " -S = "${WORKDIR}/linux-${PV}" +S = "${WORKDIR}/linux-2.6.15" inherit kernel diff --git a/packages/xlibs/files/.mtn2git_empty b/packages/xlibs/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xlibs/files/.mtn2git_empty diff --git a/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch b/packages/xlibs/files/errordb-keysymdb-path-fix.patch index f43d38065e..f43d38065e 100644 --- a/packages/xlibs/libx11/errordb-keysymdb-path-fix.patch +++ b/packages/xlibs/files/errordb-keysymdb-path-fix.patch |