[oe-commits] org.oe.dev initramfs: Add blockboot plugin and cleanup dependency handling.

[Alex commit]

initramfs: Add blockboot plugin and cleanup dependency handling.

Author: Alex
Branch: org.openembedded.dev
Revision: 02f847ad31b72be0ff17494f72b88cccdef95b0b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=02f847ad31b72be0ff17494f72b88cccdef95b0b
Files:
1
packages/initrdscripts/files/blockboot.sh
packages/initrdscripts/initramfs-module-block_0.1.bb
packages/images/devimage-image.bb
packages/images/initramfs-image.bb
packages/initrdscripts/initramfs-module-loop_0.1.bb
packages/initrdscripts/initramfs-module-nfs_0.1.bb
packages/initrdscripts/initramfs_0.1.bb
Diffs:

#
# mt diff -re7c6385784961d03ca6cd1f6be1c8cc012c3c2f1 -r02f847ad31b72be0ff17494f72b88cccdef95b0b
#
# 
# 
# add_file "packages/initrdscripts/files/blockboot.sh"
#  content [e1e0ab71a19561305b6a02ff169c7e789c5359ae]
# 
# add_file "packages/initrdscripts/initramfs-module-block_0.1.bb"
#  content [f1c3b5fb4719b0a4198a9321b3a6597b16723df6]
# 
# patch "packages/images/devimage-image.bb"
#  from [e7df38db8d9f517f454ccf08a2c09078f3fdc580]
#    to [c36b2b99ac445dcaf5b0c56269ba22ed9f01f062]
# 
# patch "packages/images/initramfs-image.bb"
#  from [15ad681b7b1290f860ece7c2f18277e57ee50cc9]
#    to [58e79ba3a3834ad8830c0866be9d5e351880e916]
# 
# patch "packages/initrdscripts/initramfs-module-loop_0.1.bb"
#  from [267ae701dc2cd445aecbf05bd0e5a86282064e0d]
#    to [4e72e934fd0cd05c39972580650a8dc4fa1db959]
# 
# patch "packages/initrdscripts/initramfs-module-nfs_0.1.bb"
#  from [62635c830fd535d4ff4b1c60539a08d5cd14ffe9]
#    to [2ac7a7ca8fdbb75b8bb837240874654e69cae292]
# 
# patch "packages/initrdscripts/initramfs_0.1.bb"
#  from [fb1fee7b80590b33bac5b3c0682c4cec9c84cd69]
#    to [c9fb5cdf0e7c885832b90ab85385224531969248]
# 
============================================================
--- packages/initrdscripts/files/blockboot.sh	e1e0ab71a19561305b6a02ff169c7e789c5359ae
+++ packages/initrdscripts/files/blockboot.sh	e1e0ab71a19561305b6a02ff169c7e789c5359ae
@@ -0,0 +1,8 @@
+#!/bin/sh
+# Allow booting from a normal block device.
+
+if [ -e "$ROOT_DEVICE" ]; then
+    echo "booting from: $ROOT_DEVICE"
+    mount "$ROOT_DEVICE" /mnt
+    BOOT_ROOT=/mnt
+fi
============================================================
--- packages/initrdscripts/initramfs-module-block_0.1.bb	f1c3b5fb4719b0a4198a9321b3a6597b16723df6
+++ packages/initrdscripts/initramfs-module-block_0.1.bb	f1c3b5fb4719b0a4198a9321b3a6597b16723df6
@@ -0,0 +1,10 @@
+SRC_URI = "file://blockboot.sh"
+PR = "r0"
+RDEPENDS = "initramfs"
+DESCRIPTION = "An initramfs module for booting off normal block devices."
+
+do_install() {
+        install -m 0755 ${WORKDIR}/blockboot.sh ${D}/initrd.d/block
+}
+
+FILES_${PN} += " /initrd.d/block "
============================================================
--- packages/images/devimage-image.bb	e7df38db8d9f517f454ccf08a2c09078f3fdc580
+++ packages/images/devimage-image.bb	c36b2b99ac445dcaf5b0c56269ba22ed9f01f062
@@ -1,9 +1,9 @@ LICENSE = "MIT"
 # Image for kernel debugging and development testing
 # It includes all useful "kernel userspace" utilities, but
 # 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 \
============================================================
--- packages/images/initramfs-image.bb	15ad681b7b1290f860ece7c2f18277e57ee50cc9
+++ packages/images/initramfs-image.bb	58e79ba3a3834ad8830c0866be9d5e351880e916
@@ -1,19 +1,17 @@ LICENSE = "MIT"
 # 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"
+RDEPENDS = "initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 
-RRECOMENDS = "kernel-module-uinput kernel-module-fat \
-              kernel-module-vfat kernel-module-loop"
-
 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
============================================================
--- packages/initrdscripts/initramfs-module-loop_0.1.bb	267ae701dc2cd445aecbf05bd0e5a86282064e0d
+++ packages/initrdscripts/initramfs-module-loop_0.1.bb	4e72e934fd0cd05c39972580650a8dc4fa1db959
@@ -1,5 +1,9 @@ SRC_URI = "file://loopboot.sh"
 SRC_URI = "file://loopboot.sh"
-PR = "r0"
+PR = "r1"
+DESCRIPTION = "An initramfs module for booting a filesystem image by loopback \
+               mounting it."
+RDEPENDS = "initramfs"
+RRECOMMENDS = "kernel-module-loop kernel-module-vfat"
 
 do_install() {
         install -m 0755 ${WORKDIR}/loopboot.sh ${D}/initrd.d/loop
============================================================
--- packages/initrdscripts/initramfs-module-nfs_0.1.bb	62635c830fd535d4ff4b1c60539a08d5cd14ffe9
+++ packages/initrdscripts/initramfs-module-nfs_0.1.bb	2ac7a7ca8fdbb75b8bb837240874654e69cae292
@@ -1,5 +1,8 @@ SRC_URI = "file://nfsboot.sh"
 SRC_URI = "file://nfsboot.sh"
-PR = "r1"
+PR = "r2"
+DESCRIPTION = "An initramfs module for booting via NFS."
+RDEPENDS = "initramfs"
+RRECOMMENDS = "kernel-module-g-ether kernel-module-nfs"
 
 do_install() {
         install -m 0755 ${WORKDIR}/nfsboot.sh ${D}/initrd.d/nfs
============================================================
--- packages/initrdscripts/initramfs_0.1.bb	fb1fee7b80590b33bac5b3c0682c4cec9c84cd69
+++ packages/initrdscripts/initramfs_0.1.bb	c9fb5cdf0e7c885832b90ab85385224531969248
@@ -1,5 +1,8 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r0"
+PR = "r1"
+DESCRIPTON = "A modular initramfs init script system."
+RDEPENDS = "busybox-static"
+RRECOMMENDS = "kernel-module-uinput"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init.sh ${D}/init