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

fix make.conf.local

This commit is contained in:
Jörg Deckert 2021-02-08 19:12:27 +01:00
parent d8998bcf46
commit b2d2b0265f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -60,7 +60,7 @@ default_package_files := $(wildcard appliances/default/package.*)
appliance_package_files := $(wildcard appliances/$(APPLIANCE)/package.*) appliance_package_files := $(wildcard appliances/$(APPLIANCE)/package.*)
portage_default_package_files = $(patsubst appliances/default/package.%,$(CHROOT)/etc/portage/package.%/01default,$(default_package_files)) portage_default_package_files = $(patsubst appliances/default/package.%,$(CHROOT)/etc/portage/package.%/01default,$(default_package_files))
portage_package_files = $(patsubst appliances/$(APPLIANCE)/package.%,$(CHROOT)/etc/portage/package.%/02$(APPLIANCE),$(appliance_package_files)) portage_package_files = $(patsubst appliances/$(APPLIANCE)/package.%,$(CHROOT)/etc/portage/package.%/02$(APPLIANCE),$(appliance_package_files))
default_make_conf = appliances/default/make.conf default_make_conf = $(wildcard appliances/default/make.conf)
appliance_make_conf = $(wildcard appliances/$(APPLIANCE)/make.conf) appliance_make_conf = $(wildcard appliances/$(APPLIANCE)/make.conf)
portage_make_conf_local = $(CHROOT)/etc/portage/make.conf.local portage_make_conf_local = $(CHROOT)/etc/portage/make.conf.local
appliance_profile := default/linux/amd64/17.1/systemd appliance_profile := default/linux/amd64/17.1/systemd
@ -195,12 +195,12 @@ $(CHROOT)/etc/portage/package.%/02$(APPLIANCE): appliances/$(APPLIANCE)/package.
$(CHROOT)/etc/portage/make.conf: configs/make.conf.$(VA_ARCH) $(CHROOT)/etc/portage/make.conf: configs/make.conf.$(VA_ARCH)
COPY configs/make.conf.$(VA_ARCH) /etc/portage/make.conf COPY configs/make.conf.$(VA_ARCH) /etc/portage/make.conf
$(portage_make_conf_local): $(appliance_make_conf) $(portage_make_conf_local): $(default_make_conf) $(appliance_make_conf)
if test -f $(default_make_conf); \ if [ -f "$(default_make_conf)" ] ; \
then COPY $(default_make_conf) /etc/portage/make.conf.local; \ then COPY $(default_make_conf) /etc/portage/make.conf.local; \
fi fi
if test -f $(default_make_conf); \ if [ -f "$(appliance_make_conf)" ] ; \
then cat $< >> $(portage_make_conf_local); \ then cat $(appliance_make_conf) >> $(portage_make_conf_local); \
fi fi
touch $@ touch $@