VA
/
virtual-appliance
1
0
Fork 0
Code Issues Pull Requests Releases 6 Wiki Activity

Remove "archiving" options from tar commands. 

GNU Tar can (usually) handle this automagically
This commit is contained in:
Albert Hopkins 2013-10-13 15:56:20 +00:00
parent 989bacb6bd
commit 6d55ed0e69
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -125,7 +125,7 @@ sync_portage:
portage: portage-snapshot.tar.bz2 stage3 portage: portage-snapshot.tar.bz2 stage3
@./echo Unpacking portage snapshot @./echo Unpacking portage snapshot
rm -rf $(CHROOT)/usr/portage rm -rf $(CHROOT)/usr/portage
tar xjf portage-snapshot.tar.bz2 -C $(CHROOT)/usr tar xf portage-snapshot.tar.bz2 -C $(CHROOT)/usr
ifeq ($(EMERGE_RSYNC),YES) ifeq ($(EMERGE_RSYNC),YES)
@./echo Syncing portage tree @./echo Syncing portage tree
$(inroot) emerge --sync --quiet $(inroot) emerge --sync --quiet
@ -157,10 +157,10 @@ stage3: stage3-$(ARCH)-latest.tar.bz2
mkdir -p $(CHROOT) mkdir -p $(CHROOT)
ifdef stage4-exists ifdef stage4-exists
@./echo Using stage4 tarball: $(STAGE4_TARBALL) @./echo Using stage4 tarball: $(STAGE4_TARBALL)
tar xapf "$(STAGE4_TARBALL)" -C $(CHROOT) tar xpf "$(STAGE4_TARBALL)" -C $(CHROOT)
else else
@./echo Using stage3 tarball @./echo Using stage3 tarball
tar xjpf stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT) tar xpf stage3-$(ARCH)-latest.tar.bz2 -C $(CHROOT)
endif endif
touch stage3 touch stage3
@ -313,7 +313,7 @@ image: $(STAGE4_TARBALL) partitions device-map grub.shell motd.sh
@./echo Installing files to $(RAW_IMAGE) @./echo Installing files to $(RAW_IMAGE)
mkdir -p loop mkdir -p loop
mount -o noatime $(NBD_DEV)p1 loop mount -o noatime $(NBD_DEV)p1 loop
tar -aSxf $(STAGE4_TARBALL) --numeric-owner $(COPY_ARGS) -C loop tar -Sxf $(STAGE4_TARBALL) --numeric-owner $(COPY_ARGS) -C loop
./motd.sh $(EXTERNAL_KERNEL) $(VIRTIO) $(DISK_SIZE) $(SWAP_SIZE) $(UDEV) $(DASH) $(ARCH) > loop/etc/motd ./motd.sh $(EXTERNAL_KERNEL) $(VIRTIO) $(DISK_SIZE) $(SWAP_SIZE) $(UDEV) $(DASH) $(ARCH) > loop/etc/motd
ifneq ($(EXTERNAL_KERNEL),YES) ifneq ($(EXTERNAL_KERNEL),YES)
loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell loop/sbin/grub --device-map=device-map --no-floppy --batch < grub.shell