nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: drop GLUON_WLAN_MESH variable

Browse Source
This commit is contained in:
Matthias Schiffer 2019-11-05 20:49:55 +01:00
parent 02c7503f74
commit 335fae1025
8 changed files with 45 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -40,10 +40,9 @@ $(eval $(call mkabspath,GLUON_TARGETSDIR))
$(eval $(call mkabspath,GLUON_PATCHESDIR))
GLUON_MULTIDOMAIN ?= 0
GLUON_WLAN_MESH ?= 11s
GLUON_DEBUG ?= 0
export GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_WLAN_MESH GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
export GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_DEBUG GLUON_DEPRECATED GLUON_DEVICES \
GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR
show-release:

27
targets/ar71xx-generic
View File

@ -1,14 +1,24 @@
config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
config 'CONFIG_TARGET_SQUASHFS_BLOCK_SIZE=64'
local ATH10K_PACKAGES = {}
local ATH10K_PACKAGES_QCA9887 = {}
local ATH10K_PACKAGES_QCA9888 = {}
if env.GLUON_WLAN_MESH == '11s' then
ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
ATH10K_PACKAGES_QCA9887 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9887', '-ath10k-firmware-qca9887-ct'}
ATH10K_PACKAGES_QCA9888 = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca9888', '-ath10k-firmware-qca9888-ct'}
end
local ATH10K_PACKAGES = {
'kmod-ath10k',
'-kmod-ath10k-ct',
'ath10k-firmware-qca988x',
'-ath10k-firmware-qca988x-ct',
}
local ATH10K_PACKAGES_QCA9887 = {
'kmod-ath10k',
'-kmod-ath10k-ct',
'ath10k-firmware-qca9887',
'-ath10k-firmware-qca9887-ct',
}
local ATH10K_PACKAGES_QCA9888 = {
'kmod-ath10k',
'-kmod-ath10k-ct',
'ath10k-firmware-qca9888',
'-ath10k-firmware-qca9888-ct',
}
-- 8devices
@ -307,7 +317,6 @@ device('tp-link-archer-c58-v1', 'archer-c58-v1', {
device('tp-link-archer-c59-v1', 'archer-c59-v1', {
packages = ATH10K_PACKAGES_QCA9888,
broken = (env.GLUON_WLAN_MESH ~= '11s'),
})
device('tp-link-archer-c60-v1', 'archer-c60-v1', {

5
targets/ar71xx-nand
View File

@ -1,9 +1,6 @@
config 'CONFIG_GLUON_SPECIALIZE_KERNEL=y'
local ATH10K_PACKAGES = {}
if env.GLUON_WLAN_MESH == '11s' then
ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
end
local ATH10K_PACKAGES = {'kmod-ath10k', '-kmod-ath10k-ct', 'ath10k-firmware-qca988x', '-ath10k-firmware-qca988x-ct'}
defaults {

8
targets/ipq40xx-generic
View File

@ -1,13 +1,10 @@
local ATH10K_PACKAGES_IPQ40XX = {}
local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {}
if env.GLUON_WLAN_MESH == '11s' then
ATH10K_PACKAGES_IPQ40XX = {
local ATH10K_PACKAGES_IPQ40XX = {
'kmod-ath10k',
'-kmod-ath10k-ct',
'ath10k-firmware-qca4019',
'-ath10k-firmware-qca4019-ct',
}
ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
local ATH10K_PACKAGES_IPQ40XX_QCA9888 = {
'kmod-ath10k',
'-kmod-ath10k-ct',
'ath10k-firmware-qca4019',
@ -15,7 +12,6 @@ if env.GLUON_WLAN_MESH == '11s' then
'ath10k-firmware-qca9888',
'-ath10k-firmware-qca9888-ct',
}
end
defaults {

7
targets/ramips-mt7621
View File

@ -2,15 +2,12 @@
device('asus-rt-ac57u', 'asus_rt-ac57u', {
factory = false,
broken = (env.GLUON_WLAN_MESH ~= '11s'),
})
-- D-Link
device('d-link-dir-860l-b1', 'dir-860l-b1', {
broken = (env.GLUON_WLAN_MESH ~= '11s'),
})
device('d-link-dir-860l-b1', 'dir-860l-b1')
-- Netgear
@ -28,12 +25,10 @@ device('zbt-wg3526-16m', 'zbt-wg3526-16M', {
manifest_aliases = {
'zbt-wg3526',
},
broken = (env.GLUON_WLAN_MESH ~= '11s'),
})
device('zbt-wg3526-32m', 'zbt-wg3526-32M', {
factory = false,
broken = (env.GLUON_WLAN_MESH ~= '11s'),
})

2
targets/sunxi-cortexa7
View File

@ -13,5 +13,5 @@ device('lemaker-banana-pro', 'sun7i-a20-bananapro', {
})
device('lamobo-r1', 'sun7i-a20-lamobo-r1', {
broken = true, -- AP+IBSS and AP+11s not working
broken = true, -- AP+11s not working
})

16
targets/targets.mk
View File

@ -1,5 +1,3 @@
GLUON_WLAN_MESH_11s := $(filter 11s,$(GLUON_WLAN_MESH))
$(eval $(call GluonTarget,ar71xx,generic))
ifneq ($(GLUON_DEPRECATED),0)
$(eval $(call GluonTarget,ar71xx,tiny))
@ -7,25 +5,23 @@ endif
$(eval $(call GluonTarget,ar71xx,nand))
$(eval $(call GluonTarget,brcm2708,bcm2708))
$(eval $(call GluonTarget,brcm2708,bcm2709))
$(eval $(call GluonTarget,ipq40xx,generic))
$(eval $(call GluonTarget,ipq806x,generic))
$(eval $(call GluonTarget,lantiq,xway))
$(eval $(call GluonTarget,mpc85xx,generic))
$(eval $(call GluonTarget,mpc85xx,p1020))
$(eval $(call GluonTarget,ramips,mt7620))
$(eval $(call GluonTarget,ramips,mt7621))
$(eval $(call GluonTarget,ramips,mt76x8))
$(eval $(call GluonTarget,ramips,rt305x))
$(eval $(call GluonTarget,sunxi,cortexa7))
$(eval $(call GluonTarget,x86,generic))
$(eval $(call GluonTarget,x86,geode))
$(eval $(call GluonTarget,x86,64))
ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
$(eval $(call GluonTarget,ipq40xx,generic))
$(eval $(call GluonTarget,ipq806x,generic))
$(eval $(call GluonTarget,ramips,mt7620))
$(eval $(call GluonTarget,ramips,mt76x8))
$(eval $(call GluonTarget,ramips,rt305x))
endif
ifneq ($(BROKEN),)
$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
endif

10
targets/x86.inc
View File

@ -1,11 +1,6 @@
config 'CONFIG_VDI_IMAGES=y'
config 'CONFIG_VMDK_IMAGES=y'
local ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887', 'ath10k-firmware-qca988x'}
if env.GLUON_WLAN_MESH == 'ibss' then
ATH10K_PACKAGES = {'kmod-ath10k-ct', 'ath10k-firmware-qca9887-ct', 'ath10k-firmware-qca988x-ct'}
end
packages {
'kmod-3c59x',
'kmod-8139cp',
@ -37,6 +32,7 @@ packages {
'kmod-usb2',
'kmod-usb3',
'kmod-usb-serial',
'kmod-ath10k-ct',
'ath10k-firmware-qca9887',
'ath10k-firmware-qca988x',
}
packages(ATH10K_PACKAGES)