From 564cfc801919281f3ab70f181421632b36e106f3 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 13 Mar 2015 21:26:44 +0100 Subject: [PATCH] Restructure image suffix handling to make it more flexible --- Makefile | 36 +++---- targets/ar71xx-generic/profiles.mk | 146 ++++++++++++++-------------- targets/mpc85xx-generic/profiles.mk | 2 +- targets/ramips-rt305x/profiles.mk | 4 +- targets/x86-generic/profiles.mk | 15 ++- targets/x86-kvm_guest/profiles.mk | 5 +- 6 files changed, 98 insertions(+), 110 deletions(-) diff --git a/Makefile b/Makefile index 67b85a55..a5f6b0af 100644 --- a/Makefile +++ b/Makefile @@ -63,9 +63,6 @@ endef define GluonProfileSysupgradeSuffix endef -define GluonProfileExtraSuffix -endef - define GluonModel endef @@ -136,22 +133,21 @@ define GluonProfile PROFILES += $(1) PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES)) GLUON_$(1)_DEFAULT_PACKAGES := $(2) -GLUON_$(1)_FACTORY_SUFFIX := .bin -GLUON_$(1)_SYSUPGRADE_SUFFIX := .bin -GLUON_$(1)_EXTRA_SUFFIX := +GLUON_$(1)_FACTORY_SUFFIX := -squashfs-factory +GLUON_$(1)_SYSUPGRADE_SUFFIX := -squashfs-sysupgrade +GLUON_$(1)_FACTORY_EXT := .bin +GLUON_$(1)_SYSUPGRADE_EXT := .bin GLUON_$(1)_MODELS := endef define GluonProfileFactorySuffix GLUON_$(1)_FACTORY_SUFFIX := $(2) +GLUON_$(1)_FACTORY_EXT := $(3) endef define GluonProfileSysupgradeSuffix GLUON_$(1)_SYSUPGRADE_SUFFIX := $(2) -endef - -define GluonProfileExtraSuffix -GLUON_$(1)_EXTRA_SUFFIX := $(2) +GLUON_$(1)_SYSUPGRADE_EXT := $(3) endef define GluonModel @@ -369,17 +365,13 @@ image: FORCE PROFILE="$(PROFILE)" KDIR="$(PROFILE_KDIR)" TARGET_DIR="$(TARGET_DIR)" BIN_DIR="$(BIN_DIR)" TMP_DIR="$(TMP_DIR)" $(foreach model,$(GLUON_$(PROFILE)_MODELS), \ - $(if $(GLUON_$(PROFILE)_SYSUPGRADE_SUFFIX), \ - rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_SUFFIX) && \ - cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_SUFFIX) $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_SUFFIX) && \ + $(if $(GLUON_$(PROFILE)_SYSUPGRADE_EXT), \ + rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) && \ + cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))$(GLUON_$(PROFILE)_SYSUPGRADE_SUFFIX)$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) && \ ) \ - $(if $(GLUON_$(PROFILE)_FACTORY_SUFFIX), \ - rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model)$(GLUON_$(PROFILE)_FACTORY_SUFFIX) && \ - cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))-factory$(GLUON_$(PROFILE)_FACTORY_SUFFIX) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_FACTORY_SUFFIX) && \ - ) \ - $(if $(GLUON_$(PROFILE)_EXTRA_SUFFIX), \ - rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model)$(GLUON_$(PROFILE)_EXTRA_SUFFIX) && \ - cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))$(GLUON_$(PROFILE)_EXTRA_SUFFIX) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_EXTRA_SUFFIX) && \ + $(if $(GLUON_$(PROFILE)_FACTORY_EXT), \ + rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model)$(GLUON_$(PROFILE)_FACTORY_EXT) && \ + cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))$(GLUON_$(PROFILE)_FACTORY_SUFFIX)$(GLUON_$(PROFILE)_FACTORY_EXT) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_FACTORY_EXT) && \ ) \ ) : @@ -400,10 +392,10 @@ manifest: FORCE echo && \ ($(foreach profile,$(PROFILES), \ $(foreach model,$(GLUON_$(profile)_MODELS), \ - for file in gluon-*-'$(model)-sysupgrade.bin'; do \ + for file in gluon-*-'$(model)-sysupgrade$(GLUON_$(profile)_SYSUPGRADE_EXT)'; do \ [ -e "$$file" ] && echo \ '$(model)' \ - "$$(echo "$$file" | sed -n -r -e 's/^gluon-$(call regex-escape,$(GLUON_SITE_CODE))-(.*)-$(call regex-escape,$(model))-sysupgrade\.bin$$/\1/p')" \ + "$$(echo "$$file" | sed -n -r -e 's/^gluon-$(call regex-escape,$(GLUON_SITE_CODE))-(.*)-$(call regex-escape,$(model)-sysupgrade$(GLUON_$(profile)_SYSUPGRADE_EXT))$$/\1/p')" \ "$$($(SHA512SUM) "$$file")" \ "$$file" && break; \ done; \ diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 02e8e38c..521aedf4 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -4,145 +4,145 @@ # CPE210/220/510/520 $(eval $(call GluonProfile,CPE510,rssileds)) -$(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe210-v1.0)) -$(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe220-v1.0)) -$(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe510-v1.0)) -$(eval $(call GluonModel,CPE510,cpe210-220-510-520-squashfs,tp-link-cpe520-v1.0)) +$(eval $(call GluonModel,CPE510,cpe210-220-510-520,tp-link-cpe210-v1.0)) +$(eval $(call GluonModel,CPE510,cpe210-220-510-520,tp-link-cpe220-v1.0)) +$(eval $(call GluonModel,CPE510,cpe210-220-510-520,tp-link-cpe510-v1.0)) +$(eval $(call GluonModel,CPE510,cpe210-220-510-520,tp-link-cpe520-v1.0)) # TL-WA701N/ND v1, v2 $(eval $(call GluonProfile,TLWA701)) -$(eval $(call GluonModel,TLWA701,tl-wa701n-v1-squashfs,tp-link-tl-wa701n-nd-v1)) +$(eval $(call GluonModel,TLWA701,tl-wa701n-v1,tp-link-tl-wa701n-nd-v1)) ifeq ($(BROKEN),1) -$(eval $(call GluonModel,TLWA701,tl-wa701nd-v2-squashfs,tp-link-tl-wa701n-nd-v2)) # BROKEN: untested +$(eval $(call GluonModel,TLWA701,tl-wa701nd-v2,tp-link-tl-wa701n-nd-v2)) # BROKEN: untested endif # TL-WR703N v1 $(eval $(call GluonProfile,TLWR703)) -$(eval $(call GluonModel,TLWR703,tl-wr703n-v1-squashfs,tp-link-tl-wr703n-v1)) +$(eval $(call GluonModel,TLWR703,tl-wr703n-v1,tp-link-tl-wr703n-v1)) # TL-WR710N v1 $(eval $(call GluonProfile,TLWR710)) -$(eval $(call GluonModel,TLWR710,tl-wr710n-v1-squashfs,tp-link-tl-wr710n-v1)) +$(eval $(call GluonModel,TLWR710,tl-wr710n-v1,tp-link-tl-wr710n-v1)) # TL-WR740N v1, v3, v4 $(eval $(call GluonProfile,TLWR740)) -$(eval $(call GluonModel,TLWR740,tl-wr740n-v1-squashfs,tp-link-tl-wr740n-nd-v1)) -$(eval $(call GluonModel,TLWR740,tl-wr740n-v3-squashfs,tp-link-tl-wr740n-nd-v3)) -$(eval $(call GluonModel,TLWR740,tl-wr740n-v4-squashfs,tp-link-tl-wr740n-nd-v4)) +$(eval $(call GluonModel,TLWR740,tl-wr740n-v1,tp-link-tl-wr740n-nd-v1)) +$(eval $(call GluonModel,TLWR740,tl-wr740n-v3,tp-link-tl-wr740n-nd-v3)) +$(eval $(call GluonModel,TLWR740,tl-wr740n-v4,tp-link-tl-wr740n-nd-v4)) # TL-WR741N/ND v1, v2, v4 $(eval $(call GluonProfile,TLWR741)) -$(eval $(call GluonModel,TLWR741,tl-wr741nd-v1-squashfs,tp-link-tl-wr741n-nd-v1)) -$(eval $(call GluonModel,TLWR741,tl-wr741nd-v2-squashfs,tp-link-tl-wr741n-nd-v2)) -$(eval $(call GluonModel,TLWR741,tl-wr741nd-v4-squashfs,tp-link-tl-wr741n-nd-v4)) +$(eval $(call GluonModel,TLWR741,tl-wr741nd-v1,tp-link-tl-wr741n-nd-v1)) +$(eval $(call GluonModel,TLWR741,tl-wr741nd-v2,tp-link-tl-wr741n-nd-v2)) +$(eval $(call GluonModel,TLWR741,tl-wr741nd-v4,tp-link-tl-wr741n-nd-v4)) # TL-WR743N/ND v1, v1.1, v2 $(eval $(call GluonProfile,TLWR743)) -$(eval $(call GluonModel,TLWR743,tl-wr743nd-v1-squashfs,tp-link-tl-wr743n-nd-v1)) -$(eval $(call GluonModel,TLWR743,tl-wr743nd-v2-squashfs,tp-link-tl-wr743n-nd-v2)) +$(eval $(call GluonModel,TLWR743,tl-wr743nd-v1,tp-link-tl-wr743n-nd-v1)) +$(eval $(call GluonModel,TLWR743,tl-wr743nd-v2,tp-link-tl-wr743n-nd-v2)) # TL-WR801N/ND v2 $(eval $(call GluonProfile,TLWA801)) -$(eval $(call GluonModel,TLWA801,tl-wa801nd-v2-squashfs,tp-link-tl-wa801n-nd-v2)) +$(eval $(call GluonModel,TLWA801,tl-wa801nd-v2,tp-link-tl-wa801n-nd-v2)) # TL-WR841N/ND v3, v5, v7, v8, v9 $(eval $(call GluonProfile,TLWR841)) -$(eval $(call GluonModel,TLWR841,tl-wr841nd-v3-squashfs,tp-link-tl-wr841n-nd-v3)) -$(eval $(call GluonModel,TLWR841,tl-wr841nd-v5-squashfs,tp-link-tl-wr841n-nd-v5)) -$(eval $(call GluonModel,TLWR841,tl-wr841nd-v7-squashfs,tp-link-tl-wr841n-nd-v7)) -$(eval $(call GluonModel,TLWR841,tl-wr841n-v8-squashfs,tp-link-tl-wr841n-nd-v8)) -$(eval $(call GluonModel,TLWR841,tl-wr841n-v9-squashfs,tp-link-tl-wr841n-nd-v9)) +$(eval $(call GluonModel,TLWR841,tl-wr841nd-v3,tp-link-tl-wr841n-nd-v3)) +$(eval $(call GluonModel,TLWR841,tl-wr841nd-v5,tp-link-tl-wr841n-nd-v5)) +$(eval $(call GluonModel,TLWR841,tl-wr841nd-v7,tp-link-tl-wr841n-nd-v7)) +$(eval $(call GluonModel,TLWR841,tl-wr841n-v8,tp-link-tl-wr841n-nd-v8)) +$(eval $(call GluonModel,TLWR841,tl-wr841n-v9,tp-link-tl-wr841n-nd-v9)) # TL-WR842N/ND v1, v2 $(eval $(call GluonProfile,TLWR842)) -$(eval $(call GluonModel,TLWR842,tl-wr842n-v1-squashfs,tp-link-tl-wr842n-nd-v1)) -$(eval $(call GluonModel,TLWR842,tl-wr842n-v2-squashfs,tp-link-tl-wr842n-nd-v2)) +$(eval $(call GluonModel,TLWR842,tl-wr842n-v1,tp-link-tl-wr842n-nd-v1)) +$(eval $(call GluonModel,TLWR842,tl-wr842n-v2,tp-link-tl-wr842n-nd-v2)) # TL-WR941N/ND v2, v3, v4, v5, v6 $(eval $(call GluonProfile,TLWR941)) -$(eval $(call GluonModel,TLWR941,tl-wr941nd-v2-squashfs,tp-link-tl-wr941n-nd-v2)) -$(eval $(call GluonModel,TLWR941,tl-wr941nd-v3-squashfs,tp-link-tl-wr941n-nd-v3)) -$(eval $(call GluonModel,TLWR941,tl-wr941nd-v4-squashfs,tp-link-tl-wr941n-nd-v4)) -$(eval $(call GluonModel,TLWR941,tl-wr941nd-v5-squashfs,tp-link-tl-wr941n-nd-v5)) +$(eval $(call GluonModel,TLWR941,tl-wr941nd-v2,tp-link-tl-wr941n-nd-v2)) +$(eval $(call GluonModel,TLWR941,tl-wr941nd-v3,tp-link-tl-wr941n-nd-v3)) +$(eval $(call GluonModel,TLWR941,tl-wr941nd-v4,tp-link-tl-wr941n-nd-v4)) +$(eval $(call GluonModel,TLWR941,tl-wr941nd-v5,tp-link-tl-wr941n-nd-v5)) ifeq ($(BROKEN),1) -$(eval $(call GluonModel,TLWR941,tl-wr941nd-v6-squashfs,tp-link-tl-wr941n-nd-v6)) # BROKEN: untested +$(eval $(call GluonModel,TLWR941,tl-wr941nd-v6,tp-link-tl-wr941n-nd-v6)) # BROKEN: untested endif # TL-WR1043N/ND v1, v2 $(eval $(call GluonProfile,TLWR1043)) -$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1-squashfs,tp-link-tl-wr1043n-nd-v1)) -$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2-squashfs,tp-link-tl-wr1043n-nd-v2)) +$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1,tp-link-tl-wr1043n-nd-v1)) +$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2,tp-link-tl-wr1043n-nd-v2)) # TL-WDR3500/3600/4300 v1 $(eval $(call GluonProfile,TLWDR4300)) -$(eval $(call GluonModel,TLWDR4300,tl-wdr3500-v1-squashfs,tp-link-tl-wdr3500-v1)) -$(eval $(call GluonModel,TLWDR4300,tl-wdr3600-v1-squashfs,tp-link-tl-wdr3600-v1)) -$(eval $(call GluonModel,TLWDR4300,tl-wdr4300-v1-squashfs,tp-link-tl-wdr4300-v1)) +$(eval $(call GluonModel,TLWDR4300,tl-wdr3500-v1,tp-link-tl-wdr3500-v1)) +$(eval $(call GluonModel,TLWDR4300,tl-wdr3600-v1,tp-link-tl-wdr3600-v1)) +$(eval $(call GluonModel,TLWDR4300,tl-wdr4300-v1,tp-link-tl-wdr4300-v1)) # TL-WA750RE v1 $(eval $(call GluonProfile,TLWA750)) -$(eval $(call GluonModel,TLWA750,tl-wa750re-v1-squashfs,tp-link-tl-wa750re-v1)) +$(eval $(call GluonModel,TLWA750,tl-wa750re-v1,tp-link-tl-wa750re-v1)) ifeq ($(BROKEN),1) # TL-WA830RE v2 $(eval $(call GluonProfile,TLWA830)) -$(eval $(call GluonModel,TLWA830,tl-wa830re-v2-squashfs,tp-link-tl-wa830re-v2)) +$(eval $(call GluonModel,TLWA830,tl-wa830re-v2,tp-link-tl-wa830re-v2)) endif # TL-WA850RE v1 $(eval $(call GluonProfile,TLWA850)) -$(eval $(call GluonModel,TLWA850,tl-wa850re-v1-squashfs,tp-link-tl-wa850re-v1)) +$(eval $(call GluonModel,TLWA850,tl-wa850re-v1,tp-link-tl-wa850re-v1)) # TL-WA860RE v1 $(eval $(call GluonProfile,TLWA860)) -$(eval $(call GluonModel,TLWA860,tl-wa860re-v1-squashfs,tp-link-tl-wa860re-v1)) +$(eval $(call GluonModel,TLWA860,tl-wa860re-v1,tp-link-tl-wa860re-v1)) # TL-WA901N/ND v2 $(eval $(call GluonProfile,TLWA901)) -$(eval $(call GluonModel,TLWA901,tl-wa901nd-v2-squashfs,tp-link-tl-wa901n-nd-v2)) -$(eval $(call GluonModel,TLWA901,tl-wa901nd-v3-squashfs,tp-link-tl-wa901n-nd-v3)) +$(eval $(call GluonModel,TLWA901,tl-wa901nd-v2,tp-link-tl-wa901n-nd-v2)) +$(eval $(call GluonModel,TLWA901,tl-wa901nd-v3,tp-link-tl-wa901n-nd-v3)) # TL-MR3020 v1 $(eval $(call GluonProfile,TLMR3020)) -$(eval $(call GluonModel,TLMR3020,tl-mr3020-v1-squashfs,tp-link-tl-mr3020-v1)) +$(eval $(call GluonModel,TLMR3020,tl-mr3020-v1,tp-link-tl-mr3020-v1)) # TL-MR3040 v1, v2 $(eval $(call GluonProfile,TLMR3040)) -$(eval $(call GluonModel,TLMR3040,tl-mr3040-v1-squashfs,tp-link-tl-mr3040-v1)) -$(eval $(call GluonModel,TLMR3040,tl-mr3040-v2-squashfs,tp-link-tl-mr3040-v2)) +$(eval $(call GluonModel,TLMR3040,tl-mr3040-v1,tp-link-tl-mr3040-v1)) +$(eval $(call GluonModel,TLMR3040,tl-mr3040-v2,tp-link-tl-mr3040-v2)) # TL-MR3220 v1 $(eval $(call GluonProfile,TLMR3220)) -$(eval $(call GluonModel,TLMR3220,tl-mr3220-v1-squashfs,tp-link-tl-mr3220-v1)) +$(eval $(call GluonModel,TLMR3220,tl-mr3220-v1,tp-link-tl-mr3220-v1)) # TL-MR3420 v1, v2 $(eval $(call GluonProfile,TLMR3420)) -$(eval $(call GluonModel,TLMR3420,tl-mr3420-v1-squashfs,tp-link-tl-mr3420-v1)) -$(eval $(call GluonModel,TLMR3420,tl-mr3420-v2-squashfs,tp-link-tl-mr3420-v2)) +$(eval $(call GluonModel,TLMR3420,tl-mr3420-v1,tp-link-tl-mr3420-v1)) +$(eval $(call GluonModel,TLMR3420,tl-mr3420-v2,tp-link-tl-mr3420-v2)) # TL-WR2543N/ND v1 $(eval $(call GluonProfile,TLWR2543)) -$(eval $(call GluonModel,TLWR2543,tl-wr2543-v1-squashfs,tp-link-tl-wr2543n-nd-v1)) +$(eval $(call GluonModel,TLWR2543,tl-wr2543-v1,tp-link-tl-wr2543n-nd-v1)) ifeq ($(BROKEN),1) # Archer C5 v1, C7 v2 $(eval $(call GluonProfile,ARCHERC7,kmod-ath10k)) -$(eval $(call GluonModel,ARCHERC7,archer-c5-squashfs,tp-link-archer-c5-v1)) # BROKEN: ath10k -$(eval $(call GluonModel,ARCHERC7,archer-c7-v2-squashfs,tp-link-archer-c7-v2)) # BROKEN: ath10k +$(eval $(call GluonModel,ARCHERC7,archer-c5,tp-link-archer-c5-v1)) # BROKEN: ath10k +$(eval $(call GluonModel,ARCHERC7,archer-c7-v2,tp-link-archer-c7-v2)) # BROKEN: ath10k endif ## Ubiquiti (everything) $(eval $(call GluonProfile,UBNT)) -$(eval $(call GluonModel,UBNT,ubnt-bullet-m-squashfs,ubiquiti-bullet-m)) -$(eval $(call GluonModel,UBNT,ubnt-loco-m-xw-squashfs,ubiquiti-loco-m-xw)) -$(eval $(call GluonModel,UBNT,ubnt-nano-m-squashfs,ubiquiti-nanostation-m)) -$(eval $(call GluonModel,UBNT,ubnt-nano-m-xw-squashfs,ubiquiti-nanostation-m-xw)) -$(eval $(call GluonModel,UBNT,ubnt-unifi-squashfs,ubiquiti-unifi)) -$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-squashfs,ubiquiti-unifiap-outdoor)) +$(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-bullet-m)) +$(eval $(call GluonModel,UBNT,ubnt-loco-m-xw,ubiquiti-loco-m-xw)) +$(eval $(call GluonModel,UBNT,ubnt-nano-m,ubiquiti-nanostation-m)) +$(eval $(call GluonModel,UBNT,ubnt-nano-m-xw,ubiquiti-nanostation-m-xw)) +$(eval $(call GluonModel,UBNT,ubnt-unifi,ubiquiti-unifi)) +$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor,ubiquiti-unifiap-outdoor)) ifeq ($(BROKEN),1) -$(eval $(call GluonModel,UBNT,ubnt-ls-sr71-squashfs,ubiquiti-ls-sr71)) # BROKEN: Untested -$(eval $(call GluonModel,UBNT,ubnt-uap-pro-squashfs,ubiquiti-unifi-ap-pro)) # BROKEN: not properly tested; probably issues with WLAN adapter detection -$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-plus-squashfs,ubiquiti-unifiap-outdoor+)) # BROKEN: WLAN doesn't work correctly (high packet loss) +$(eval $(call GluonModel,UBNT,ubnt-ls-sr71,ubiquiti-ls-sr71)) # BROKEN: Untested +$(eval $(call GluonModel,UBNT,ubnt-uap-pro,ubiquiti-unifi-ap-pro)) # BROKEN: not properly tested; probably issues with WLAN adapter detection +$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-plus,ubiquiti-unifiap-outdoor+)) # BROKEN: WLAN doesn't work correctly (high packet loss) endif @@ -150,54 +150,54 @@ endif # D-Link DIR-615 rev. C1 $(eval $(call GluonProfile,DIR615C1)) -$(eval $(call GluonModel,DIR615C1,dir-615-c1-squashfs,d-link-dir-615-rev-c1)) +$(eval $(call GluonModel,DIR615C1,dir-615-c1,d-link-dir-615-rev-c1)) # D-Link DIR-825 rev. B1 $(eval $(call GluonProfile,DIR825B1)) -$(eval $(call GluonModel,DIR825B1,dir-825-b1-squashfs,d-link-dir-825-rev-b1)) +$(eval $(call GluonModel,DIR825B1,dir-825-b1,d-link-dir-825-rev-b1)) ## Linksys by Cisco # WRT160NL $(eval $(call GluonProfile,WRT160NL)) -$(eval $(call GluonModel,WRT160NL,wrt160nl-squashfs,linksys-wrt160nl)) +$(eval $(call GluonModel,WRT160NL,wrt160nl,linksys-wrt160nl)) ## Buffalo # WZR-HP-G450H $(eval $(call GluonProfile,WZRHPG450H)) -$(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h-squashfs,buffalo-wzr-hp-g450h)) +$(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h,buffalo-wzr-hp-g450h)) # WZR-HP-AG300H/WZR-600DHP $(eval $(call GluonProfile,WZRHPAG300H)) -$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h-squashfs,buffalo-wzr-hp-ag300h-wzr-600dhp)) +$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h,buffalo-wzr-hp-ag300h-wzr-600dhp)) ## Netgear # WNDR3700 (v1, v2) / WNDR3800 / WNDRMAC (v1, v2) $(eval $(call GluonProfile,WNDR3700)) -$(eval $(call GluonProfileFactorySuffix,WNDR3700,.img)) -$(eval $(call GluonModel,WNDR3700,wndr3700-squashfs,netgear-wndr3700)) -$(eval $(call GluonModel,WNDR3700,wndr3700v2-squashfs,netgear-wndr3700v2)) -$(eval $(call GluonModel,WNDR3700,wndr3800-squashfs,netgear-wndr3800)) +$(eval $(call GluonProfileFactorySuffix,WNDR3700,-squashfs-factory,.img)) +$(eval $(call GluonModel,WNDR3700,wndr3700,netgear-wndr3700)) +$(eval $(call GluonModel,WNDR3700,wndr3700v2,netgear-wndr3700v2)) +$(eval $(call GluonModel,WNDR3700,wndr3800,netgear-wndr3800)) ifeq ($(BROKEN),1) -$(eval $(call GluonModel,WNDR3700,wndrmac-squashfs,netgear-wndrmac)) # BROKEN: untested -$(eval $(call GluonModel,WNDR3700,wndrmacv2-squashfs,netgear-wndrmacv2)) # BROKEN: untested +$(eval $(call GluonModel,WNDR3700,wndrmac,netgear-wndrmac)) # BROKEN: untested +$(eval $(call GluonModel,WNDR3700,wndrmacv2,netgear-wndrmacv2)) # BROKEN: untested endif ## Allnet # ALL0315N $(eval $(call GluonProfile,ALL0315N,uboot-envtools rssileds)) -$(eval $(call GluonProfileFactorySuffix,ALL0315N,)) -$(eval $(call GluonModel,ALL0315N,all0315n-squashfs,allnet-all0315n)) +$(eval $(call GluonProfileFactorySuffix,ALL0315N)) +$(eval $(call GluonModel,ALL0315N,all0315n,allnet-all0315n)) ## GL-iNet ifeq ($(BROKEN),1) # GL-iNet 1.0 $(eval $(call GluonProfile,GLINET)) -$(eval $(call GluonModel,GLINET,gl-inet-6408A-v1-squashfs,gl-inet-6408a-v1)) # BROKEN: untested -$(eval $(call GluonModel,GLINET,gl-inet-6416A-v1-squashfs,gl-inet-6416a-v1)) # BROKEN: untested +$(eval $(call GluonModel,GLINET,gl-inet-6408A-v1,gl-inet-6408a-v1)) # BROKEN: untested +$(eval $(call GluonModel,GLINET,gl-inet-6416A-v1,gl-inet-6416a-v1)) # BROKEN: untested endif diff --git a/targets/mpc85xx-generic/profiles.mk b/targets/mpc85xx-generic/profiles.mk index a98d841f..913f12b1 100644 --- a/targets/mpc85xx-generic/profiles.mk +++ b/targets/mpc85xx-generic/profiles.mk @@ -4,4 +4,4 @@ # TL-WDR4900 v1 $(eval $(call GluonProfile,TLWDR4900)) -$(eval $(call GluonModel,TLWDR4900,tl-wdr4900-v1-squashfs,tp-link-tl-wdr4900-v1)) +$(eval $(call GluonModel,TLWDR4900,tl-wdr4900-v1,tp-link-tl-wdr4900-v1)) diff --git a/targets/ramips-rt305x/profiles.mk b/targets/ramips-rt305x/profiles.mk index 364955c9..4aee5eae 100644 --- a/targets/ramips-rt305x/profiles.mk +++ b/targets/ramips-rt305x/profiles.mk @@ -2,5 +2,5 @@ # VoCore $(eval $(call GluonProfile,VOCORE)) -$(eval $(call GluonProfileFactorySuffix,VOCORE,)) -$(eval $(call GluonModel,VOCORE,vocore-squashfs,vocore)) +$(eval $(call GluonProfileFactorySuffix,VOCORE)) +$(eval $(call GluonModel,VOCORE,vocore,vocore)) diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk index 1534e8e3..5c46f58f 100644 --- a/targets/x86-generic/profiles.mk +++ b/targets/x86-generic/profiles.mk @@ -1,17 +1,14 @@ $(eval $(call GluonProfile,GENERIC,kmod-3c59x kmod-e100 kmod-e1000 kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-8139too kmod-r8169 kmod-sis900 kmod-tg3 kmod-via-rhine kmod-via-velocity)) -$(eval $(call GluonProfileFactorySuffix,GENERIC)) +$(eval $(call GluonProfileFactorySuffix,GENERIC,-ext4,.img.gz)) $(eval $(call GluonProfileSysupgradeSuffix,GENERIC)) -$(eval $(call GluonProfileExtraSuffix,GENERIC,.img.gz)) -$(eval $(call GluonModel,GENERIC,combined-ext4,x86-generic)) +$(eval $(call GluonModel,GENERIC,combined,x86-generic)) $(eval $(call GluonProfile,VDI,kmod-pcnet32 kmod-e1000)) -$(eval $(call GluonProfileFactorySuffix,VDI)) +$(eval $(call GluonProfileFactorySuffix,VDI,-ext4,.vdi)) $(eval $(call GluonProfileSysupgradeSuffix,VDI)) -$(eval $(call GluonProfileExtraSuffix,VDI,.vdi)) -$(eval $(call GluonModel,VDI,combined-ext4,x86-virtualbox)) +$(eval $(call GluonModel,VDI,combined,x86-virtualbox)) $(eval $(call GluonProfile,VMDK,kmod-pcnet32)) -$(eval $(call GluonProfileFactorySuffix,VMDK)) +$(eval $(call GluonProfileFactorySuffix,VMDK,-ext4,.vmdk)) $(eval $(call GluonProfileSysupgradeSuffix,VMDK)) -$(eval $(call GluonProfileExtraSuffix,VMDK,.vmdk)) -$(eval $(call GluonModel,VMDK,combined-ext4,x86-vmware)) +$(eval $(call GluonModel,VMDK,combined,x86-vmware)) diff --git a/targets/x86-kvm_guest/profiles.mk b/targets/x86-kvm_guest/profiles.mk index 0de8ad41..9b8042c3 100644 --- a/targets/x86-kvm_guest/profiles.mk +++ b/targets/x86-kvm_guest/profiles.mk @@ -1,5 +1,4 @@ $(eval $(call GluonProfile,KVM,kmod-virtio-balloon kmod-virtio-net kmod-virtio-random)) -$(eval $(call GluonProfileFactorySuffix,KVM)) +$(eval $(call GluonProfileFactorySuffix,KVM,-ext4,.img.gz)) $(eval $(call GluonProfileSysupgradeSuffix,KVM)) -$(eval $(call GluonProfileExtraSuffix,KVM,.img.gz)) -$(eval $(call GluonModel,KVM,combined-ext4,x86-kvm)) +$(eval $(call GluonModel,KVM,combined,x86-kvm))