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

Makefile: Don't depend on the static dev tarball anymore. 

devtmpfs can take care of this now.  So remove the dep and the tarball.
Also move the removal udev from init in the build-software target.
This commit is contained in:
Albert Hopkins 2013-09-01 15:15:47 +00:00
parent 9b62ddde0b
commit 5dec02b5eb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -278,6 +278,12 @@ build-software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
$(gcc_config) $(gcc_config)
EDITOR=/usr/bin/nano $(inroot) etc-update EDITOR=/usr/bin/nano $(inroot) etc-update
$(MAKE) -C $(APPLIANCE) postinstall $(MAKE) -C $(APPLIANCE) postinstall
ifeq ($(UDEV),NO)
rm -f $(CHROOT)/etc/runlevels/sysinit/udev
$(inroot) $(EMERGE) -c sys-fs/udev
else
ln -sf /etc/init.d/udev $(CHROOT)/etc/runlevels/sysinit/udev
endif
ifeq ($(ENABLE_SSHD),YES) ifeq ($(ENABLE_SSHD),YES)
$(inroot) /sbin/rc-update add sshd default $(inroot) /sbin/rc-update add sshd default
endif endif
@ -302,7 +308,7 @@ endif
device-map: $(RAW_IMAGE) device-map: $(RAW_IMAGE)
echo '(hd0) ' $(RAW_IMAGE) > device-map echo '(hd0) ' $(RAW_IMAGE) > device-map
image: $(STAGE4_TARBALL) partitions device-map grub.shell dev.tar.bz2 motd.sh 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
@ -310,12 +316,6 @@ image: $(STAGE4_TARBALL) partitions device-map grub.shell dev.tar.bz2 motd.sh
./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
endif
ifeq ($(UDEV),NO)
tar jxf dev.tar.bz2 -C loop/dev
rm -f loop/etc/runlevels/sysinit/udev
else
ln -sf /etc/init.d/udev loop/etc/runlevels/sysinit/udev
endif endif
umount -l loop umount -l loop
rmdir loop rmdir loop

BIN
dev.tar.bz2
View File

Binary file not shown.