3 files changed, 20 insertions, 3 deletions
diff --git a/packages/images/initramfs-bootmenu-debug-image.bb b/packages/images/initramfs-bootmenu-debug-image.bb
new file mode 100644
index 0000000000..df5bf2b6c0
--- /dev/null
+++ b/packages/images/initramfs-bootmenu-debug-image.bb
@@ -0,0 +1,16 @@
+# initramfs image with interactive boot menu allowing to select rootfs location
+# from choices of block devices, loopback images and NFS.
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules initramfs-module-kexecboot klibc-utils-static-modprobe"
+IMAGE_INSTALL += " dropbear dropbear-backdoor"
+IMAGE_LINGUAS = ""
+
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "opkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
+
+IMAGE_FSTYPES += " cpio.gz "
+
+inherit image
diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb
index c00efcfa2f..79806c9a98 100644
--- a/packages/images/initramfs-bootmenu-image.bb
+++ b/packages/images/initramfs-bootmenu-image.bb
@@ -1,12 +1,12 @@
 # initramfs image with interactive boot menu allowing to select rootfs location
 # from choices of block devices, loopback images and NFS.
 
-IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules initramfs-module-kexecboot"
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu initramfs-module-check-modules initramfs-module-kexecboot klibc-utils-static-modprobe"
 IMAGE_LINGUAS = ""
 
 
 # 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"
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod update-rc.d uclibc"
 ROOTFS_POSTPROCESS_COMMAND += "opkg-cl ${IPKG_ARGS} -force-depends \
                                 remove ${PACKAGE_REMOVE};"
 
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
index f2d25e32ac..2bea4bbefc 100644
--- a/packages/tasks/task-devimage.bb
+++ b/packages/tasks/task-devimage.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Image for development testing"
-PR = "r4"
+PR = "r5"
 LICENSE = "MIT"
 
 inherit task
@@ -19,6 +19,7 @@ RDEPENDS = "\
     "
 
 RRECOMMENDS = "\
+    kernel \
     kernel-image \
     kernel-module-msdos \
     kernel-module-vfat \