[oe-commits] org.oe.angstrom-2007.12-stable applied changes from a3b18a00a09e716f4b3d5bfced86fea0439953a0

[pfalcon commit]

applied changes from a3b18a00a09e716f4b3d5bfced86fea0439953a0
             through 825754db28a782e72d84614900aff9f88d9f6349

liveramdisk-image, initramfs-jffs2: Be sure to depend on/load mtdblock. (PaulS, Koen)

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: aa3138db9ef513e31f2807db40bd42da89d33ee5
ViewMTN: http://monotone.openembedded.org/revision/info/aa3138db9ef513e31f2807db40bd42da89d33ee5
Files:
1
packages/images/liveramdisk-image.bb
packages/initrdscripts/initramfs-jffs2/jffs2boot.sh
packages/initrdscripts/initramfs-jffs2_0.1.bb
Diffs:

#
# mt diff -rc5038d7abd49fb92c300ddcd5834fd90f62c224a -raa3138db9ef513e31f2807db40bd42da89d33ee5
#
#
#
# patch "packages/images/liveramdisk-image.bb"
#  from [9ea5e86fc7f87d43b9e120e3a8ee68d9b23e1a10]
#    to [59cccb6f1f56e0a299ad91bc6e49592212af441d]
# 
# patch "packages/initrdscripts/initramfs-jffs2/jffs2boot.sh"
#  from [831f6e80cb8ffb2225c8910762bc453cdb298325]
#    to [7b1c60edba398e018cfa0af1bcb7baa3bfef5d15]
# 
# patch "packages/initrdscripts/initramfs-jffs2_0.1.bb"
#  from [5aa300aee47241c48d2ebc06f8457bbfdb4f1676]
#    to [ab4213952ad0d70587ede1fca7d2e05db0ddd1ca]
#
============================================================
--- packages/images/liveramdisk-image.bb	9ea5e86fc7f87d43b9e120e3a8ee68d9b23e1a10
+++ packages/images/liveramdisk-image.bb	59cccb6f1f56e0a299ad91bc6e49592212af441d
@@ -12,6 +12,11 @@ export IMAGE_LINGUAS = ""
 export IMAGE_LINGUAS = ""
 
 # Install only ${IMAGE_INSTALL}, not even deps
-PACKAGE_INSTALL_NO_DEPS = "1"
+#PACKAGE_INSTALL_NO_DEPS = "1"
 
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
+
 inherit image
============================================================
--- packages/initrdscripts/initramfs-jffs2/jffs2boot.sh	831f6e80cb8ffb2225c8910762bc453cdb298325
+++ packages/initrdscripts/initramfs-jffs2/jffs2boot.sh	7b1c60edba398e018cfa0af1bcb7baa3bfef5d15
@@ -4,6 +4,7 @@ mount -t proc proc /proc
 mkdir /proc
 mount -t proc proc /proc
 
+modprobe -q mtdblock
 modprobe mtdram total_size=25088 erase_size=256
 sleep 1
 
============================================================
--- packages/initrdscripts/initramfs-jffs2_0.1.bb	5aa300aee47241c48d2ebc06f8457bbfdb4f1676
+++ packages/initrdscripts/initramfs-jffs2_0.1.bb	ab4213952ad0d70587ede1fca7d2e05db0ddd1ca
@@ -1,5 +1,6 @@ SRC_URI = "file://jffs2boot.sh"
 SRC_URI = "file://jffs2boot.sh"
-PR = "r2"
+PR = "r3"
+RRECOMMENDS = "kernel-module-mtdblock kernel-module-mtdram"
 
 do_install() {
         install -m 0755 ${WORKDIR}/jffs2boot.sh ${D}/init