8 files changed, 13 insertions, 39 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index eede31952d..206d270dff 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -29,7 +29,6 @@ PREFERRED_VERSION_perl = "5.10.1"
 PREFERRED_VERSION_perl-native = "5.10.1"
 UDEV_GE_141 = "1"
 
-PREFERRED_VERSION_postgresql = "8.4.4"
 ANGSTROM_QT_VERSION ?= "4.7.1"
 PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
diff --git a/recipes/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch b/recipes/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch
index d027061d89..514a9aa7b0 100644
--- a/recipes/postgresql/postgresql-8.4.4/remove.autoconf.version.check.patch
+++ b/recipes/postgresql/postgresql-8.4.7/remove.autoconf.version.check.patch
@@ -1,10 +1,10 @@
-Index: postgresql-8.4.4/configure.in
+Index: postgresql-8.4.7/configure.in
 ===================================================================
---- postgresql-8.4.4.orig/configure.in
-+++ postgresql-8.4.4/configure.in
+--- postgresql-8.4.7.orig/configure.in
++++ postgresql-8.4.7/configure.in
 @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch un
  
- AC_INIT([PostgreSQL], [8.4.4], [pgsql-bugs@postgresql.org])
+ AC_INIT([PostgreSQL], [8.4.7], [pgsql-bugs@postgresql.org])
  
 -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
 -Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/recipes/postgresql/postgresql.inc b/recipes/postgresql/postgresql.inc
index e8cf561d98..53c38df0de 100644
--- a/recipes/postgresql/postgresql.inc
+++ b/recipes/postgresql/postgresql.inc
@@ -8,7 +8,7 @@ ARM_INSTRUCTION_SET = "arm"
 
 #WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
 
-SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
+SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
 
 LEAD_SONAME = "libpq.so"
 
diff --git a/recipes/postgresql/postgresql_8.1.4.bb b/recipes/postgresql/postgresql_8.1.4.bb
deleted file mode 100644
index 8a1db3ac2f..0000000000
--- a/recipes/postgresql/postgresql_8.1.4.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require postgresql.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "a65bdc5d833169d28bf6fbaaa8d57fcf"
-SRC_URI[sha256sum] = "ac7e7d311b07abd27b084041bcc943398df303bc86601f281891537bdf1a4e0b"
diff --git a/recipes/postgresql/postgresql_8.1.8.bb b/recipes/postgresql/postgresql_8.1.8.bb
deleted file mode 100644
index ae9ac69993..0000000000
--- a/recipes/postgresql/postgresql_8.1.8.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require postgresql.inc
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "b05e1d7f0cac9cc4e096aa21409dee55"
-SRC_URI[sha256sum] = "91f75eb29c07271fcbfa2082c8300690efe4a72f2fbf35dace98108b0c6f7ba3"
diff --git a/recipes/postgresql/postgresql_8.2.4.bb b/recipes/postgresql/postgresql_8.2.4.bb
deleted file mode 100644
index f4162ab916..0000000000
--- a/recipes/postgresql/postgresql_8.2.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require postgresql.inc
-
-PR = "${INC_PR}.0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += "file://no-ecpg-test.patch"
-
-SRC_URI[md5sum] = "af7ec100a33c41bfb8d87b5e0ec2f44a"
-SRC_URI[sha256sum] = "8ff6afab743e894c0d96e668dcf9b3d3c1044719d6def45ef7390c64b54ed268"
diff --git a/recipes/postgresql/postgresql_8.4.4.bb b/recipes/postgresql/postgresql_8.4.4.bb
deleted file mode 100644
index d9bf58e013..0000000000
--- a/recipes/postgresql/postgresql_8.4.4.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require postgresql.inc
-
-PR = "${INC_PR}.0"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI = "ftp://ftp.postgresql.org/pub/source/v${PV}/${P}.tar.bz2 \
-           file://remove.autoconf.version.check.patch"
-
-SRC_URI[md5sum] = "4bf2448ad965bca3940df648c02194df"
-SRC_URI[sha256sum] = "e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e"
diff --git a/recipes/postgresql/postgresql_8.4.7.bb b/recipes/postgresql/postgresql_8.4.7.bb
new file mode 100644
index 0000000000..696cfd9577
--- /dev/null
+++ b/recipes/postgresql/postgresql_8.4.7.bb
@@ -0,0 +1,8 @@
+require postgresql.inc
+
+PR = "${INC_PR}.0"
+
+SRC_URI += "file://remove.autoconf.version.check.patch"
+
+SRC_URI[md5sum] = "689397187bb1dfe9b5cbde99538311c3"
+SRC_URI[sha256sum] = "08032849da121e67e318f7ff4e68d3ac88f29050e242641f717c4270839b597b"