commit 794bd3d4ac2aaea94943276dda4b850b6972fb80
author Rick Altherr <raltherr@google.com> Fri Dec 16 13:18:15 2016 -0800
committer Patrick Williams <patrick@stwcx.xyz> Wed Jan 04 20:10:50 2017 +0000
tree 4a3f4e46ceaff72a533c3498dcea9b009b8b0415
parent 6c2e9e57126698780b083b80d7e7d23c8e74774f

No longer generate separate netboot image for obmc-phosphor-image

The netboot image consists of the initrd and rootfs packaged together
into a single U-Boot legacy ramdisk image.  The initrd is already built
as a U-Boot legacy image via INITRAMFS_IMAGE_TYPES.  Similarly, the
rootfs is already built as a U-Boot legacy image via IMAGE_TYPES.  In
getting rid of the redundancy, using built-in mechanisms is preferred
over custom code thus netboot image is being removed.

Note that removing the netboot image generation means the raw initramfs
CPIO archive is not explicitly needed so it has been removed from
INITRAMFS_IMAGE_TYPES.  It will still be generated as the U-Boot ramdisk
generation requires it as an implicit dependency.

Change-Id: I0370ccc9575000de3238af07f7f14faa283edc15
Signed-off-by: Rick Altherr <raltherr@google.com>

meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass

diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
index 8b015da..7e543de 100644
--- a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass
@@ -39,12 +39,9 @@
        ddir="${DEPLOY_DIR_IMAGE}"
        kernel="${FLASH_KERNEL_IMAGETYPE}"
        uboot="u-boot.${UBOOT_SUFFIX}"
-       initrd="${INITRD_LINK_NAME}.cpio.${INITRD_CTYPE}"
-       uinitrd="${initrd}.u-boot"
+       uinitrd="${INITRD_LINK_NAME}.cpio.${INITRD_CTYPE}.u-boot"
        rootfs="${IMAGE_LINK_NAME}.${IMAGE_BASETYPE}"
        rwfs="rwfs.${OVERLAY_BASETYPE}"
-       rofsimg=rofs.${IMAGE_BASETYPE}.cpio
-       netimg=initramfs-netboot.cpio
 
        if [ ! -f $ddir/$kernel ]; then
               bbfatal "Kernel file ${ddir}/${kernel} does not exist"
@@ -52,9 +49,6 @@
        if [ ! -f $ddir/$uboot ]; then
               bbfatal "U-boot file ${ddir}/${uboot} does not exist"
        fi
-       if [ ! -f $ddir/$initrd ]; then
-              bbfatal "initrd file ${ddir}/${initrd} does not exist"
-       fi
        if [ ! -f $ddir/$uinitrd ]; then
               bbfatal "uinitrd file ${ddir}/${uinitrd} does not exist"
        fi
@@ -89,13 +83,5 @@
 
        tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.all.tar -C ${ddir} image-bmc
        tar -h -cvf ${ddir}/${MACHINE}-${DATETIME}.tar -C ${ddir} image-u-boot image-kernel image-initramfs image-rofs image-rwfs
-
-       # Package the root image (rofs layer) with the initramfs for net booting.
-       # Uses the symlink above to get the desired name in the cpio
-       ( cd $ddir && echo image-rofs | cpio -oHnewc -L > ${rofsimg} )
-       # Prepend the rofs cpio -- being uncompressed it must be 4-byte aligned
-       cat ${ddir}/${rofsimg} ${ddir}/${initrd} > ${ddir}/${netimg}
-       oe_mkimage  "${netimg}" "${INITRD_CTYPE}"
-
 }
 do_generate_flash[vardepsexclude] = "DATETIME"

meta-phosphor/conf/machine/include/obmc-bsp-common.inc

diff --git a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
index e52d8a3..657e54f 100644
--- a/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
+++ b/meta-phosphor/conf/machine/include/obmc-bsp-common.inc
@@ -20,7 +20,7 @@
 IMAGE_CLASSES += "obmc-phosphor-image_types_uboot"
 
 INITRAMFS_CTYPE ?= "lzma"
-INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE} cpio.${INITRAMFS_CTYPE}.u-boot"
+INITRAMFS_FSTYPES += "cpio.${INITRAMFS_CTYPE}.u-boot"
 
 MACHINE_FEATURES_BACKFILL_CONSIDERED = "qemu-usermode"