Author: Philippe Corbes <[email protected]>
Date:   Wed Sep 7 23:15:44 2011 +0200

    Add traces at image build in ptxdist menu

    Signed-off-by: Philippe Corbes <[email protected]>

diff --git a/rules/post/image_cpio.make b/rules/post/image_cpio.make
index b280e5c..53d55eb 100644
--- a/rules/post/image_cpio.make
+++ b/rules/post/image_cpio.make
@@ -11,6 +11,7 @@
 SEL_ROOTFS-$(PTXCONF_IMAGE_CPIO) += $(IMAGEDIR)/root.cpio

 $(IMAGEDIR)/root.cpio: $(STATEDIR)/image_working_dir
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from working dir..."
     @cd $(image/work_dir) && \
     ( \
@@ -18,13 +19,16 @@ $(IMAGEDIR)/root.cpio: $(STATEDIR)/image_working_dir
         echo "find . | cpio --quiet -H newc -o > '$(@)'" \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)


 SEL_ROOTFS-$(PTXCONF_IMAGE_CPIO_GZ) += $(IMAGEDIR)/root.cpio.gz

 $(IMAGEDIR)/root.cpio.gz: $(IMAGEDIR)/root.cpio
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from '$(notdir $(^))'..."
     @cat "$(^)" | gzip -n --best > "$(@)"
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_ext2.make b/rules/post/image_ext2.make
index ed7d037..0615382 100644
--- a/rules/post/image_ext2.make
+++ b/rules/post/image_ext2.make
@@ -12,6 +12,7 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_EXT2)    +=
$(IMAGEDIR)/root.ext2
 SEL_ROOTFS-$(PTXCONF_IMAGE_EXT2_GZIP)    += $(IMAGEDIR)/root.ext2.gz

 $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir
+    @$(call targetinfo)
     @echo -n "Creating root.ext2 from working dir..."
     @cd $(image/work_dir);                            \
     (awk -F: $(DOPERMISSIONS) $(image/permissions) &&        \
@@ -23,6 +24,7 @@ $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir
         echo "$@" )                        \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 ifdef PTXCONF_IMAGE_EXT2_JOURNAL
 #    # Since genext2fs cannot generate ext3 images, we use tune2fs to
create
@@ -38,9 +40,11 @@ ifdef PTXCONF_IMAGE_EXT2_JOURNAL
 endif

 $(IMAGEDIR)/root.ext2.gz: $(IMAGEDIR)/root.ext2
+    @$(call targetinfo)
     @echo -n "Creating root.ext2.gz from root.ext2...";
     @rm -f $@
     @cat $< | gzip -v9 > $@
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_hd.make b/rules/post/image_hd.make
index 4e4ab21..0d68b83 100644
--- a/rules/post/image_hd.make
+++ b/rules/post/image_hd.make
@@ -28,11 +28,13 @@ GENHDIMARGS += -p
$(PTXCONF_IMAGE_HD_PART4_START):$(PTXCONF_IMAGE_HD_PART4_END):
 endif

 $(IMAGEDIR)/hd.img:
-    @echo "Creating hdimg from root.ext2";                    \
+    @$(call targetinfo)
+    @echo "Creating hd.img from root.ext2";                    \
     PATH=$(PTXCONF_SYSROOT_HOST)/bin:$$PATH
$(PTXDIST_TOPDIR)/scripts/genhdimg    \
     -o $@ $(GENHDIMARGS)
     @$(call ptx/env) \
         ptxd_make_bootable $@ $(PTXCONF_IMAGE_HD_PART1_START)
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_iso.make b/rules/post/image_iso.make
index 8fce40a..f2d701c 100644
--- a/rules/post/image_iso.make
+++ b/rules/post/image_iso.make
@@ -14,6 +14,7 @@ image_iso/workdir := $(IMAGEDIR)/image_iso-workdir
 image_iso/isolinux_bin :=
$(PTXDIST_SYSROOT_TARGET)/usr/share/syslinux/isolinux.bin

 $(IMAGEDIR)/bootcd.iso: $(IMAGEDIR)/root.cpio.gz $(IMAGEDIR)/linuximage
$(image_iso/isolinux_bin)
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from '$(notdir $(<))'..."
     @rm -rf "$(image_iso/workdir)"
     @mkdir -p "$(image_iso/workdir)"
@@ -42,5 +43,6 @@ $(IMAGEDIR)/bootcd.iso: $(IMAGEDIR)/root.cpio.gz
$(IMAGEDIR)/linuximage $(image_
         "$(image_iso/workdir)" >/dev/null 2>&1
     @rm -rf "$(image_iso/workdir)"
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_jffs2.make b/rules/post/image_jffs2.make
index b48ac52..7ec342a 100644
--- a/rules/post/image_jffs2.make
+++ b/rules/post/image_jffs2.make
@@ -12,6 +12,7 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_JFFS2)    +=
$(IMAGEDIR)/root.jffs2
 SEL_ROOTFS-$(PTXCONF_IMAGE_JFFS2_SUM)    += $(IMAGEDIR)/root.sum.jffs2

 $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils.install.post
+    @$(call targetinfo)
     @echo -n "Creating root.jffs2 from working dir... "
     @echo -n "(--eraseblock=$(PTXCONF_IMAGE_JFFS2_BLOCKSIZE) "
     @echo "$(call remove_quotes,$(PTXCONF_IMAGE_JFFS2_EXTRA_ARGS)))"
@@ -25,8 +26,10 @@ $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils
         echo  "-o $@" ) | tee -a "$(PTX_LOGFILE)"        \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 $(IMAGEDIR)/root.sum.jffs2: $(IMAGEDIR)/root.jffs2
+    @$(call targetinfo)
     @echo -n "Creating root.sum.jffs2 with summary... "
     @echo -n "(--eraseblock=$(PTXCONF_IMAGE_JFFS2_BLOCKSIZE) "
     @echo "$(call remove_quotes,$(PTXCONF_IMAGE_JFFS2_SUM_EXTRA_ARGS)))"
@@ -39,5 +42,6 @@ $(IMAGEDIR)/root.sum.jffs2: $(IMAGEDIR)/root.jffs2
         echo "-o $@" ) | tee -a "$(PTX_LOGFILE)"        \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_kernel.make b/rules/post/image_kernel.make
index 7ffeed6..da51aa7 100644
--- a/rules/post/image_kernel.make
+++ b/rules/post/image_kernel.make
@@ -16,23 +16,29 @@ $(IMAGEDIR)/linuximage: $(STATEDIR)/image_kernel.compile
 endif

 $(STATEDIR)/image_kernel.compile: $(IMAGEDIR)/root.cpio
+    @$(call targetinfo)
     @echo -n "Creating '$(KERNEL_IMAGE)' including '$(notdir $(<))'..."
     @sed -i -e
's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"$(<)\",g' \
         $(KERNEL_DIR)/.config
     @cd $(KERNEL_DIR) && $(KERNEL_PATH) $(KERNEL_ENV) $(MAKE) \
         $(KERNEL_MAKEVARS) $(KERNEL_IMAGE)
     @echo "done."
+    @$(call touch, $@)

 $(KERNEL_IMAGE_PATH_y): $(STATEDIR)/kernel.targetinstall

 $(IMAGEDIR)/linuximage: $(KERNEL_IMAGE_PATH_y)
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from '$(notdir $(<))'..."
     @install -m 644 "$(<)" "$(@)"
     @echo "done."
+    @$(call touch, $@)

 $(IMAGEDIR)/linuximage.lzo: $(IMAGEDIR)/linuximage
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from '$(notdir $(<))'..."
     @lzop -f $(call remove_quotes,$(PTXCONF_IMAGE_KERNEL_LZOP_EXTRA_ARGS))
-o "$(@)" "$(<)"
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_squashfs.make b/rules/post/image_squashfs.make
index 5462199..f1459c5 100644
--- a/rules/post/image_squashfs.make
+++ b/rules/post/image_squashfs.make
@@ -15,6 +15,7 @@ IMAGE_SQUASHFS_EXTRA_ARGS := \
     $(PTXCONF_IMAGE_SQUASHFS_EXTRA_ARGS)

 $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-squashfs-tools.install.post
+    @$(call targetinfo)
     @echo -n "Creating root.squashfs from working dir..."
     @cd $(image/work_dir);                            \
     (awk -F: $(DOPERMISSIONS) $(image/permissions) &&        \
@@ -27,5 +28,6 @@ $(IMAGEDIR)/root.squashfs: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-squash
         echo -n $(IMAGE_SQUASHFS_EXTRA_ARGS) )    \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_tgz.make b/rules/post/image_tgz.make
index 4e996f8..9463aa0 100644
--- a/rules/post/image_tgz.make
+++ b/rules/post/image_tgz.make
@@ -11,6 +11,7 @@
 SEL_ROOTFS-$(PTXCONF_IMAGE_TGZ)        += $(IMAGEDIR)/root.tgz

 $(IMAGEDIR)/root.tgz: $(STATEDIR)/image_working_dir
+    @$(call targetinfo)
     @echo -n "Creating root.tgz from working dir..."
     @cd $(image/work_dir);                            \
     (awk -F: $(DOPERMISSIONS) $(image/permissions) &&        \
@@ -18,5 +19,6 @@ $(IMAGEDIR)/root.tgz: $(STATEDIR)/image_working_dir
         echo -n "$@ ." )                    \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_ubi.make b/rules/post/image_ubi.make
index ec5d7bb..9d6f67a 100644
--- a/rules/post/image_ubi.make
+++ b/rules/post/image_ubi.make
@@ -17,6 +17,7 @@ SEL_ROOTFS-$(PTXCONF_IMAGE_UBI_DATA)    +=
$(IMAGEDIR)/data.ubi
 # create the UBIFS image
 #
 $(IMAGEDIR)/root.ubifs: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils.install.post
+    @$(call targetinfo)
     @echo -n "Creating $(notdir $(@)) from working dir... (-m
$(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) "
     @echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c
$(PTXCONF_IMAGE_UBIFS_ROOT_MAX_LEB_COUNT)"
     @echo -n "$(PTXCONF_IMAGE_UBIFS_EXTRA_ARGS)) "
@@ -32,8 +33,10 @@ $(IMAGEDIR)/root.ubifs: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils
         echo -n "-o $@" )                        \
     ) | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 $(IMAGEDIR)/data.ubifs: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils.install.post
+    @$(call targetinfo)
     @echo -n "Creating $(notdir $(@)) from empty dir... (-m
$(PTXCONF_IMAGE_UBIFS_MINIMUM_IO_UNIT_SIZE) "
     @echo -n "-e $(PTXCONF_IMAGE_UBIFS_LEB_SIZE) -c
$(PTXCONF_IMAGE_UBIFS_DATA_MAX_LEB_COUNT)"
     @echo -n "$(PTXCONF_IMAGE_UBIFS_DATA_EXTRA_ARGS)) "
@@ -48,6 +51,7 @@ $(IMAGEDIR)/data.ubifs: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils
      -o $@                                \
     | $(FAKEROOT) --
     @echo "done."
+    @$(call touch, $@)

 #
 # create the UBI image
@@ -62,6 +66,7 @@ $(IMAGEDIR)/root.ubi: $(IMAGEDIR)/data.ubifs
 endif

 $(IMAGEDIR)/root.ubi: $(STATEDIR)/image_working_dir
$(STATEDIR)/host-mtd-utils.install.post
+    @$(call targetinfo)
     @echo -n "Creating $(notdir $(@)) from"
     @echo -n " $(notdir $(filter %.ubifs,$(^))) ... "
     @echo -n "(-s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE) "
@@ -101,8 +106,10 @@ endif
         $(PTXDIST_TEMPDIR)/ubi_root.ini;                    \

     @echo "done."
+    @$(call touch, $@)

 $(IMAGEDIR)/data.ubi: $(STATEDIR)/host-mtd-utils.install.post
$(IMAGEDIR)/data.ubifs
+    @$(call targetinfo)
     @echo -n "Creating $(notdir $(@)) from"
     @echo -n " $(notdir $(filter %.ubifs,$(^))) ... "
     @echo -n "(-s $(PTXCONF_IMAGE_UBI_SUB_PAGE_SIZE) "
@@ -125,6 +132,7 @@ $(IMAGEDIR)/data.ubi:
$(STATEDIR)/host-mtd-utils.install.post $(IMAGEDIR)/data.u
         $(PTXDIST_TEMPDIR)/ubi_data.ini;

     @echo "done."
+    @$(call touch, $@)

 # vim600:set foldmethod=marker:
 # vim600:set syntax=make:
diff --git a/rules/post/image_uramdisk.make b/rules/post/image_uramdisk.make
index 2dc70ba..6d22cca 100644
--- a/rules/post/image_uramdisk.make
+++ b/rules/post/image_uramdisk.make
@@ -25,6 +25,7 @@ endif
 # TODO
 #
 $(IMAGEDIR)/uRamdisk: $(IMAGEDIR)/root.ext2.gz
+    @$(call targetinfo)
     @echo -n "Creating U-Boot ramdisk from root.ext2.gz...";
     @$(PTXCONF_SYSROOT_HOST)/bin/mkimage \
         -A $(MKIMAGE_ARCH) \
@@ -35,5 +36,6 @@ $(IMAGEDIR)/uRamdisk: $(IMAGEDIR)/root.ext2.gz
         -d $< \
         $@
     @echo "done."
+    @$(call touch, $@)

 # vim: syntax=make
diff --git a/rules/post/image_xlblob.make b/rules/post/image_xlblob.make
index 1de9853..2e0751b 100644
--- a/rules/post/image_xlblob.make
+++ b/rules/post/image_xlblob.make
@@ -23,9 +23,11 @@ $(U_BOOT_DIR)/u-boot-xl.srec \
 $(U_BOOT_DIR)/u-boot-xl.elf: $(STATEDIR)/u-boot.xlblob

 $(IMAGEDIR)/u-boot-xl.%: $(U_BOOT_DIR)/u-boot-xl.%
$(STATEDIR)/u-boot.targetinstall
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from '$(notdir $(<))'..."
     @install -m 644 "$(<)" "$(@)"
     @echo "done."
+    @$(call touch, $@)

 endif

@@ -50,9 +52,11 @@ $(IMAGEDIR)/linuximage-xl.elf:
$(STATEDIR)/image_kernel.compile
 endif

 $(IMAGEDIR)/linuximage-xl.%: $(KERNEL_IMAGE_PATH_y)-xl.%
$(STATEDIR)/kernel.targetinstall
+    @$(call targetinfo)
     @echo -n "Creating '$(notdir $(@))' from '$(notdir $(<))'..."
     @install -m 644 "$(<)" "$(@)"
     @echo "done."
+    @$(call touch, $@)

 endif
-- 
ptxdist mailing list
[email protected]

Reply via email to