From 4dbe593fa51cf0286431c13f78c7a769efb10ff7 Mon Sep 17 00:00:00 2001
From: Alex Osborne <ato@meshy.org>
Date: Fri, 20 Jul 2007 13:24:07 +0000
Subject: initramfs: Add blockboot plugin and cleanup dependency handling.

---
 packages/images/devimage-image.bb  |  2 +-
 packages/images/initramfs-image.bb | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'packages/images')

diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb
index a70130180c..e8177433be 100644
--- a/packages/images/devimage-image.bb
+++ b/packages/images/devimage-image.bb
@@ -3,7 +3,7 @@
 # only shell and dropbear are loaded by default.
 # Allows to login via serial and real console or SSH
 LICENSE = "MIT"
-PR = "r2"
+PR = "r2.2"
 
 DEVIMAGE_EXTRA_RDEPENDS ?= ""
 RDEPENDS = "devimage busybox dropbear udev \
diff --git a/packages/images/initramfs-image.bb b/packages/images/initramfs-image.bb
index 7728fd80ae..95e3f84082 100644
--- a/packages/images/initramfs-image.bb
+++ b/packages/images/initramfs-image.bb
@@ -1,19 +1,17 @@
 # Sample initramfs image
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
-#RDEPENDS = "initramfs-boot busybox kernel-module-uinput uclibc libgcc1"
-RDEPENDS = "initramfs initramfs-module-nfs initramfs-module-loop \
-            busybox-static"
-
-RRECOMENDS = "kernel-module-uinput kernel-module-fat \
-              kernel-module-vfat kernel-module-loop"
+RDEPENDS = "initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 
 export IMAGE_BASENAME = "initramfs-image"
 export IMAGE_LINGUAS = ""
 
 PACKAGE_INSTALL = "${RDEPENDS}"
-# Install only ${PACKAGE_INSTALL}, not even deps
-PACKAGE_INSTALL_NO_DEPS = "1"
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
 
 inherit image
-- 
cgit v1.2.3