From: Jose V Beneyto <sepen@crux.nu>
Date: Fri, 18 Oct 2013 10:43:11 +0000 (+0000)
Subject: Use extension .cpio.gz for initramfs file and cleanup
X-Git-Url: http://gitweb/?a=commitdiff_plain;h=1897554b5a2d34521662308e3555f8bb57d70938;p=initramfs.git

Use extension .cpio.gz for initramfs file and cleanup
---

diff --git a/Makefile b/Makefile
index bc9d2ae..2cbc2bf 100644
--- a/Makefile
+++ b/Makefile
@@ -102,7 +102,7 @@ gen_init_cpio-distclean: gen_init_cpio-clean
 $(WORK)/mnt:
 	mkdir -p $(WORK)/mnt
 
-$(WORK)/initramfs: check-root busybox dialog $(WORK)/mnt gen_init_cpio $(TOPDIR)/filesystem
+$(WORK)/initramfs.cpio.gz: check-root busybox dialog $(WORK)/mnt gen_init_cpio $(TOPDIR)/filesystem
 	install -d -m 0755 $(WORK)/mnt/{mnt,media,etc,dev,sys,proc,lib,usr,var/{log,lock,run},tmp}
 	mknod $(WORK)/mnt/dev/console c 5 1 && chmod 666 $(WORK)/mnt/dev/console
 	mknod $(WORK)/mnt/dev/null c 1 3 && chmod 666 $(WORK)/mnt/dev/null
@@ -123,18 +123,15 @@ $(WORK)/initramfs: check-root busybox dialog $(WORK)/mnt gen_init_cpio $(TOPDIR)
 	install -v -m 0400 $(TOPDIR)/filesystem/shadow $(WORK)/mnt/etc
 	install -v -m 0755 $(TOPDIR)/filesystem/rc $(WORK)/mnt/etc && \
 	install -v -m 0755 $(TOPDIR)/filesystem/{setup,setup-chroot,crux} $(WORK)/mnt/usr/bin && \
-	/sbin/ldconfig -r $(WORK)/mnt && \
-        cd $(WORK)/mnt && \
-	find . | cpio -o -H newc > $(WORK)/initramfs.cpio && \
-	cd $(WORK) && \
-	gzip -v initramfs.cpio && \
-	cp $(WORK)/initramfs{.cpio.gz,} && \
-	touch $(WORK)/initramfs
+	/sbin/ldconfig -r $(WORK)/mnt
+	cd $(WORK)/mnt && find . | cpio -o -H newc > $(WORK)/initramfs.cpio && \
+		cd $(WORK) && gzip -v initramfs.cpio
+	touch $(WORK)/initramfs.cpio.gz
 
-initramfs: $(WORK)/initramfs
+initramfs: $(WORK)/initramfs.cpio.gz
 
 initramfs-clean:
-	rm -f $(WORK)/initramfs
+	rm -rf $(WORK)/initramfs* $(WORK)/mnt
 
 initramfs-distclean: initramfs-clean