diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2006-11-22 14:58:29 +0000 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2006-11-22 14:58:29 +0000 |
| commit | bbcc4e8cb63270ac75a8f918484e50de77aabc74 (patch) | |
| tree | 18240b78fe37b5f1f5aafb089087616f31b2094c /rules | |
| parent | 1cf07f19ee777f9bf8fbb756785ffc7c63e327f6 (diff) | |
| download | ptxdist-bbcc4e8cb63270ac75a8f918484e50de77aabc74.tar.gz ptxdist-bbcc4e8cb63270ac75a8f918484e50de77aabc74.tar.xz | |
create ext2 image before hd image. Use the generated image for hd images aswell instead of generating it again
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6364 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/other/Toplevel.make | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 6380e648f..2baff13ef 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -249,7 +249,7 @@ ifdef PTXCONF_IMAGE_TGZ endif ifdef PTXCONF_IMAGE_JFFS2 @imagesfrom=$(IMAGEDIR); \ - cp $(PTXDIST_TOPDIR)/generic/etc/ipkg.conf $(IMAGEDIR)/ipkg.conf; \ + cp $(PTXDIST_TOPDIR)/generic/etc/ipkg.conf $(IMAGEDIR)/ipkg.conf; \ sed -i -e "s,@SRC@,,g" $(IMAGEDIR)/ipkg.conf; \ sed -i -e "s,@ARCH@,$(PTXCONF_ARCH),g" $(IMAGEDIR)/ipkg.conf; \ echo "Creating rootfs using packages from $$imagesfrom"; \ @@ -262,28 +262,29 @@ ifdef PTXCONF_IMAGE_JFFS2 -o $(IMAGEDIR)/root.jffs2 \ -f $(IMAGEDIR)/ipkg.conf endif -ifdef PTXCONF_IMAGE_HD - $(PTXDIST_TOPDIR)/scripts/genhdimg \ - -m $(GRUB_DIR)/stage1/stage1 \ - -n $(GRUB_DIR)/stage2/stage2 \ - -r $(ROOTDIR) \ - -i images \ - -f $(PTXCONF_IMAGE_HD_CONF) -endif ifdef PTXCONF_IMAGE_EXT2 - cd $(ROOTDIR); \ - ($(AWK) -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions && \ - ( \ - echo -n "$(PTXCONF_HOST_PREFIX)/bin/genext2fs "; \ - echo -n "-b $(PTXCONF_IMAGE_EXT2_SIZE) "; \ - echo -n "$(PTXCONF_IMAGE_EXT2_EXTRA_ARGS) "; \ - echo -n "-d $(ROOTDIR) "; \ - echo "$(IMAGEDIR)/root.ext2" ) \ + cd $(ROOTDIR); \ + ($(AWK) -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions && \ + ( \ + echo -n "$(PTXCONF_HOST_PREFIX)/bin/genext2fs "; \ + echo -n "-b $(PTXCONF_IMAGE_EXT2_SIZE) "; \ + echo -n "$(PTXCONF_IMAGE_EXT2_EXTRA_ARGS) "; \ + echo -n "-d $(ROOTDIR) "; \ + echo "$(IMAGEDIR)/root.ext2" ) \ ) | $(FAKEROOT) -- endif +ifdef PTXCONF_IMAGE_HD + echo "Creating hdimg using $(IMAGEDIR)/root.ext2"; \ + PATH=$(PTXCONF_PREFIX)/bin:$$PATH $(PTXDIST_TOPDIR)/scripts/genhdimg \ + -m $(GRUB_DIR)/stage1/stage1 \ + -n $(GRUB_DIR)/stage2/stage2 \ + -o images/hd.img \ + -i images/root.ext2 \ + -p $(PTXCONF_IMAGE_EXT2_SIZE) +endif ifdef PTXCONF_IMAGE_EXT2_GZIP rm -f $(IMAGEDIR)/root.ext2.gz - gzip -v9 $(IMAGEDIR)/root.ext2 + cat $(IMAGEDIR)/root.ext2 | gzip -v9 > $(IMAGEDIR)/root.ext2.gz endif ifdef PTXCONF_IMAGE_UIMAGE $(PTXCONF_PREFIX)/bin/u-boot-mkimage \ |