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

Makefile: Get rid of BUILD_SOFTWARE option. 

It's hardly useful anymore.
This commit is contained in:
Albert Hopkins 2015-03-01 01:31:55 +00:00
parent 07c96253dc
commit 86311ebd9f
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -30,7 +30,6 @@ ENABLE_SSHD = NO
CHANGE_PASSWORD = YES CHANGE_PASSWORD = YES
HEADLESS = NO HEADLESS = NO
EXTERNAL_KERNEL = NO EXTERNAL_KERNEL = NO
BUILD_SOFTWARE = 1
PKGLIST = 0 PKGLIST = 0
ACCEPT_KEYWORDS = amd64 ACCEPT_KEYWORDS = amd64
DASH = NO DASH = NO
@ -65,12 +64,6 @@ ifeq ($(ARCH),x86)
endif endif
stage4-exists := $(wildcard $(STAGE4_TARBALL)) stage4-exists := $(wildcard $(STAGE4_TARBALL))
software-deps := $(STAGE3)
ifneq ($(BUILD_SOFTWARE),0)
software-deps += build-software
endif
COPY_ARGS = --exclude-from=configs/rsync-excludes COPY_ARGS = --exclude-from=configs/rsync-excludes
@ -213,7 +206,8 @@ 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)
$(SOFTWARE): $(STAGE3) $(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
@ -244,8 +238,6 @@ endif
ifeq ($(DASH),YES) ifeq ($(DASH),YES)
$(inroot) $(EMERGE) -c app-shells/bash $(inroot) $(EMERGE) -c app-shells/bash
endif endif
$(SOFTWARE): $(software-deps)
ifneq ($(PKGLIST),0) ifneq ($(PKGLIST),0)
echo \# > $(LST_FILE) echo \# > $(LST_FILE)
echo \# Gentoo Virtual Appliance \"$(APPLIANCE)\" package list >> $(LST_FILE) echo \# Gentoo Virtual Appliance \"$(APPLIANCE)\" package list >> $(LST_FILE)