Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=setup.git;a=commitdiff;h=775b74a8e2c7a034d3ff6160e74f566d1de4dbff
commit 775b74a8e2c7a034d3ff6160e74f566d1de4dbff Author: Miklos Vajna <vmik...@frugalware.org> Date: Thu Oct 14 15:21:38 2010 +0200 support make-3.82 in this new version variables are evaluated when the target is processed, not on a line-by-line basis, so let's introduce a separate target for the usb img and partition creation diff --git a/Makefile b/Makefile index 3bb84a4..c704849 100644 --- a/Makefile +++ b/Makefile @@ -236,10 +236,14 @@ initrd: install-setup initrd_gz: clean config.mak devices initrd gzip -9 -c initrd-$(CARCH).img > initrd-$(CARCH).img.gz -usb_img: check_root -ifneq ($(CARCH),ppc) +create_usb_img: dd if=/dev/zero of=frugalware-$(FWVER)-$(CARCH)-usb.img bs=516096c count=$(CYL_COUNT) +ifneq ($(CARCH),ppc) echo -e 'n\np\n1\n\n\na\n1\nw'|/sbin/fdisk -u -C$(CYL_COUNT) -S63 -H16 frugalware-$(FWVER)-$(CARCH)-usb.img || true +endif + +usb_img: check_root create_usb_img +ifneq ($(CARCH),ppc) losetup -d /dev/loop0 || true losetup -o$(OFFSET) /dev/loop0 frugalware-$(FWVER)-$(CARCH)-usb.img /sbin/mke2fs -b1024 -F /dev/loop0 @@ -268,7 +272,6 @@ ifneq ($(CARCH),ppc) setup (hd0) \n\ quit" | grub --batch --device-map=/dev/null else - dd if=/dev/zero of=frugalware-$(FWVER)-$(CARCH)-usb.img bs=516096c count=$(CYL_COUNT) hformat frugalware-$(FWVER)-$(CARCH)-usb.img hmount frugalware-$(FWVER)-$(CARCH)-usb.img hcopy -r /usr/lib/yaboot/yaboot : _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
