freifunk/site-ffhh
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

unify setting of extra software on x86-generic and x86-64

Browse source
This commit is contained in:
Ruben Barkow 2019-12-01 19:50:36 +01:00
parent cd90115c74
commit 553ba5c01e
No known key found for this signature in database
GPG key ID: 8BCC811299DBC5DF
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
site.mk
View file

@ -22,22 +22,12 @@ GLUON_FEATURES := \
web-advanced \ web-advanced \
web-wizard web-wizard
# EXTRA_SOFTWARE_TOOLS_01 # x86 and x86-64 add extra software
EXTRA_SOFTWARE_TOOLS_01 := \ ifeq ($(GLUON_TARGET),$(filter $(GLUON_TARGET),x86-generic x86-64))
nano \ GLUON_SITE_PACKAGES += \
htop \ nano \
ethtool htop \
ethtool
# x86
ifeq ($(GLUON_TARGET),x86-generic)
GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif
# x86-64
ifeq ($(GLUON_TARGET),x86-64)
GLUON_SITE_PACKAGES += \
$(EXTRA_SOFTWARE_TOOLS_01)
endif endif
GLUON_PRIORITY ?= 7 GLUON_PRIORITY ?= 7