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

Makefile: Make the systools target inside the chroot

This commit is contained in:
Albert Hopkins 2015-02-27 22:25:56 +00:00
parent 27f7653ee7
commit d66a465456
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

@ -17,6 +17,7 @@ KERNEL = $(CHROOT)/tmp/kernel
GRUB = $(CHROOT)/tmp/grub GRUB = $(CHROOT)/tmp/grub
PREPROOT = $(CHROOT)/tmp/preproot PREPROOT = $(CHROOT)/tmp/preproot
SYSCONFIG = $(CHROOT)/tmp/sysconfig SYSCONFIG = $(CHROOT)/tmp/sysconfig
SYSTOOLS = $(CHROOT)/tmp/systools
STAGE4_TARBALL = $(CURDIR)/images/$(APPLIANCE).tar.xz STAGE4_TARBALL = $(CURDIR)/images/$(APPLIANCE).tar.xz
VIRTIO = NO VIRTIO = NO
TIMEZONE = UTC TIMEZONE = UTC
@ -199,7 +200,7 @@ ifeq ($(VIRTIO),YES)
endif endif
touch $(SYSCONFIG) touch $(SYSCONFIG)
systools: $(SYSCONFIG) $(COMPILE_OPTIONS) $(SYSTOOLS): $(SYSCONFIG) $(COMPILE_OPTIONS)
@scripts/echo Installing standard system tools @scripts/echo Installing standard system tools
-$(inroot) $(EMERGE) --unmerge sys-fs/udev -$(inroot) $(EMERGE) --unmerge sys-fs/udev
$(inroot) $(EMERGE) $(USEPKG) -n1 sys-apps/systemd $(inroot) $(EMERGE) $(USEPKG) -n1 sys-apps/systemd
@ -215,7 +216,7 @@ ifeq ($(DASH),YES)
fi fi
$(inroot) ln -sf dash /bin/sh $(inroot) ln -sf dash /bin/sh
endif endif
touch systools touch $(SYSTOOLS)
$(GRUB): $(PREPROOT) configs/grub.conf $(KERNEL) scripts/grub-headless.sed $(GRUB): $(PREPROOT) configs/grub.conf $(KERNEL) scripts/grub-headless.sed
ifneq ($(EXTERNAL_KERNEL),YES) ifneq ($(EXTERNAL_KERNEL),YES)
@ -232,7 +233,7 @@ endif
$(inroot) ln -nsf /run/systemd/resolve/resolv.conf /etc/resolv.conf $(inroot) ln -nsf /run/systemd/resolve/resolv.conf /etc/resolv.conf
touch $(GRUB) touch $(GRUB)
build-software: systools configs/eth.network configs/issue $(WORLD) build-software: $(SYSTOOLS) configs/eth.network configs/issue $(WORLD)
@scripts/echo Building $(APPLIANCE)-specific software @scripts/echo Building $(APPLIANCE)-specific software
$(MAKE) -C appliances/$(APPLIANCE) preinstall $(MAKE) -C appliances/$(APPLIANCE) preinstall
@ -336,7 +337,6 @@ eclean: $(COMPILE_OPTIONS)
clean: clean:
rm -f systools
rm -rf --one-file-system -- $(CHROOT) rm -rf --one-file-system -- $(CHROOT)
realclean: clean realclean: clean