[oe-commits] org.oe.dev merge of '04d71b254a1cb165a6dab2688fc19c937e10afc5'

[pfalcon commit]

merge of '04d71b254a1cb165a6dab2688fc19c937e10afc5'
     and '3db1a7f8ffb636e2a0489fd213705447a66fd326'

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: a86b893a92c8dbd634262771afe20a8eb26f2b82
ViewMTN: http://monotone.openembedded.org/revision/info/a86b893a92c8dbd634262771afe20a8eb26f2b82
Files:
1
packages/postgresql/postgresql_8.2.4.bb
packages/postgresql/postgresql.inc
packages/postgresql/postgresql_8.1.4.bb
packages/postgresql/postgresql_8.1.8.bb
packages/initrdscripts/files/90-check-modules.sh
packages/initrdscripts/initramfs-module-check-modules_1.0.bb
packages/images/initramfs-bootmenu-image.bb
Diffs:

#
# mt diff -r04d71b254a1cb165a6dab2688fc19c937e10afc5 -ra86b893a92c8dbd634262771afe20a8eb26f2b82
#
# 
# 
# rename "packages/postgresql/postgresql_8.2.4.bb"
#     to "packages/postgresql/postgresql.inc"
# 
# add_file "packages/postgresql/postgresql_8.2.4.bb"
#  content [41ca5b2fb5d019ac39217a5c0179b31e6f22ec24]
# 
# patch "packages/postgresql/postgresql.inc"
#  from [969bc54ca34868f98644e9c9079ec2525cc08bbc]
#    to [e37431b7065b95ed185a1fa0cc6c30c0d2898034]
# 
# patch "packages/postgresql/postgresql_8.1.4.bb"
#  from [98fe892b8cf4a6013e48a0e9e68aca394fbe2e47]
#    to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
# 
# patch "packages/postgresql/postgresql_8.1.8.bb"
#  from [3457236ec656fc67c87d390af818ef6b2f5b9f75]
#    to [deb1ab6389bb118cc689529caaaf09ec341b5fa2]
# 
============================================================
--- packages/postgresql/postgresql_8.2.4.bb	41ca5b2fb5d019ac39217a5c0179b31e6f22ec24
+++ packages/postgresql/postgresql_8.2.4.bb	41ca5b2fb5d019ac39217a5c0179b31e6f22ec24
@@ -0,0 +1,7 @@
+require postgresql.inc
+
+PR = "r1"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://ftp.de.postgresql.org/mirror/postgresql/source/v${PV}/${P}.tar.bz2 \
+           file://no-ecpg-test.patch;patch=1"
============================================================
--- packages/postgresql/postgresql_8.2.4.bb	969bc54ca34868f98644e9c9079ec2525cc08bbc
+++ packages/postgresql/postgresql.inc	e37431b7065b95ed185a1fa0cc6c30c0d2898034
@@ -5,16 +5,12 @@ DEPENDS = "zlib readline"
 
 #WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
 
-SRC_URI = "ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v${PV}/${P}.tar.bz2 \
-	file://no-ecpg-test.patch;patch=1"
+SRC_URI = "ftp://ftp-archives.postgresql.org/pub/source/v${PV}/${P}.tar.bz2"
 
-
 inherit autotools pkgconfig
 
-FILES_${PN}-doc += "${prefix}/doc/"
-
 do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
+         cp /usr/sbin/zic ${S}/src/timezone/
 }
 
+FILES_${PN}-doc += "${prefix}/doc/"
-DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/postgresql/postgresql_8.1.4.bb	98fe892b8cf4a6013e48a0e9e68aca394fbe2e47
+++ packages/postgresql/postgresql_8.1.4.bb	deb1ab6389bb118cc689529caaaf09ec341b5fa2
@@ -1,20 +1,3 @@
-DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
-HOMEPAGE = "http://www.postgresql.com"
-LICENSE = "BSD"
-DEPENDS = "zlib readline"
+require postgresql.inc
 
+PR = "r1"
-#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"
-
-
-inherit autotools pkgconfig
-
-FILES_${PN}-doc += "${prefix}/doc/"
-
-do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
-}
-
-
-
============================================================
--- packages/postgresql/postgresql_8.1.8.bb	3457236ec656fc67c87d390af818ef6b2f5b9f75
+++ packages/postgresql/postgresql_8.1.8.bb	deb1ab6389bb118cc689529caaaf09ec341b5fa2
@@ -1,20 +1,3 @@
-DESCRIPTION = "PostgreSQL is a powerful, open source relational database system."
-HOMEPAGE = "http://www.postgresql.com"
-LICENSE = "BSD"
-DEPENDS = "zlib readline"
+require postgresql.inc
 
+PR = "r1"
-#WARNING: this recipe assumes you have the timezone compiler present in /usr/sbin/zic
-
-SRC_URI = "ftp://ftp.us.postgresql.org/pub/mirrors/postgresql/source/v${PV}/${P}.tar.bz2"
-
-
-inherit autotools pkgconfig
-
-FILES_${PN}-doc += "${prefix}/doc/"
-
-do_compile_append() {
-cp /usr/sbin/zic ${S}/src/timezone/
-}
-
-
-


#
# mt diff -r3db1a7f8ffb636e2a0489fd213705447a66fd326 -ra86b893a92c8dbd634262771afe20a8eb26f2b82
#
# 
# 
# add_file "packages/initrdscripts/files/90-check-modules.sh"
#  content [e60f755f3b8a6d72a799b68ff1a7291714bce727]
# 
# add_file "packages/initrdscripts/initramfs-module-check-modules_1.0.bb"
#  content [fbcef5b65fba763e3f80cb8690e058b469db5f03]
# 
# patch "packages/images/initramfs-bootmenu-image.bb"
#  from [8f1db3a032593d55326052d8031210f27d4194a9]
#    to [c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8]
# 
============================================================
--- packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
+++ packages/initrdscripts/files/90-check-modules.sh	e60f755f3b8a6d72a799b68ff1a7291714bce727
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Check that modules for the current kernel exist, error out otherwise
+
+uname=`cat /proc/version`
+ver=`expr "x$uname" : 'xLinux version \([^ ]\+\) '`
+
+if [ -n "$BOOT_ROOT" -a ! -d "$BOOT_ROOT/lib/modules/$ver" ]; then
+    echo -e "\033[1m===================="
+    echo "ERROR!"
+    echo "There are no modules for this kernel"
+    echo "version ($ver) in the root file "
+    echo "system, which will lead to boot failure or"
+    echo "broken functionally. If you performed"
+    echo "a kernel upgrade, make sure that version"
+    echo "installed in root filesystem matches"
+    echo "version used in bootloader."
+    echo -e "====================\033[0m"
+    echo
+
+    echo "System halted"
+    while true; do
+	sleep 10000
+    done
+fi
============================================================
--- packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
+++ packages/initrdscripts/initramfs-module-check-modules_1.0.bb	fbcef5b65fba763e3f80cb8690e058b469db5f03
@@ -0,0 +1,12 @@
+SRC_URI = "file://90-check-modules.sh"
+PR = "r0"
+DESCRIPTION = "An initramfs module for checking that kernel modules exist in rootfs"
+RDEPENDS = "initramfs-uniboot"
+
+do_install() {
+	install -d ${D}/initrd.d
+        install -m 0755 ${WORKDIR}/90-check-modules.sh ${D}/initrd.d/
+}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += " /initrd.d/* "
============================================================
--- packages/images/initramfs-bootmenu-image.bb	8f1db3a032593d55326052d8031210f27d4194a9
+++ packages/images/initramfs-bootmenu-image.bb	c4a6c99f3e90e1c33c4101d8d843f89b6ea05dc8
@@ -1,6 +1,6 @@
 # Sample initramfs image
 
-IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules"
 IMAGE_LINGUAS = ""
 
 # Remove any kernel-image that the kernel-module-* packages may have pulled in.