Skip to content

use new image-customization-helper #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maurerle wants to merge 1 commit into
base: v2025.1.x
Choose a base branch
from
Draft

use new image-customization-helper #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions image-customization-usb.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
pkgs_usb = {
'usbutils',
}

pkgs_hid = {
'kmod-usb-hid',
'kmod-hid-generic',
}

pkgs_usb_serial = {
'kmod-usb-serial',
'kmod-usb-serial-ftdi',
'kmod-usb-serial-pl2303',
}

pkgs_usb_storage = {
'block-mount',
'blkid',
'kmod-fs-ext4',
'kmod-fs-ntfs',
'kmod-fs-vfat',
'kmod-usb-storage',
'kmod-usb-storage-extras',-- Card Readers
'kmod-usb-storage-uas', -- USB Attached SCSI (UAS/UASP)
'kmod-nls-base',
'kmod-nls-cp1250', -- NLS Codepage 1250 (Eastern Europe)
'kmod-nls-cp437', -- NLS Codepage 437 (United States, Canada)
'kmod-nls-cp850', -- NLS Codepage 850 (Europe)
'kmod-nls-cp852', -- NLS Codepage 852 (Europe)
'kmod-nls-iso8859-1', -- NLS ISO 8859-1 (Latin 1)
'kmod-nls-iso8859-13', -- NLS ISO 8859-13 (Latin 7; Baltic)
'kmod-nls-iso8859-15', -- NLS ISO 8859-15 (Latin 9)
'kmod-nls-iso8859-2', -- NLS ISO 8859-2 (Latin 2)
'kmod-nls-utf8', -- NLS UTF-8
}

pkgs_usb_net = {
'kmod-mii',
'kmod-usb-net',
'kmod-usb-net-asix',
'kmod-usb-net-asix-ax88179',
'kmod-usb-net-cdc-eem',
'kmod-usb-net-cdc-ether',
'kmod-usb-net-cdc-subset',
'kmod-usb-net-dm9601-ether',
'kmod-usb-net-hso',
'kmod-usb-net-ipheth',
'kmod-usb-net-mcs7830',
'kmod-usb-net-pegasus',
'kmod-usb-net-rndis',
'kmod-usb-net-rtl8152',
'kmod-usb-net-smsc95xx',
}

pkgs_pci = {
'pciutils',
'kmod-bnx2', -- Broadcom NetExtreme BCM5706/5708/5709/5716
}

packages(pkgs_usb)
packages(pkgs_usb_net)
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
160 changes: 17 additions & 143 deletions image-customization.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,11 @@ packages {
'ffac-wg-registration',
'respondd-module-airtime',
'tecff-general-workaround',
'tecff-broken-wlan-workaround',
}
include('gluon-build/contrib/image-customization-helper.lua')

include_usb = false

tiny_like = device({
'tp-link-archer-c6-v2-eu-ru-jp',
'tp-link-archer-c60-v1',
'tp-link-td-w8970',
'tp-link-td-w8980',
})

if not device_class('tiny') and not tiny_like then
-- only add if not tiny and at more than 64MB RAM
if not device_class('tiny') and not atmost_64mb_ram then
features {
'tls',
'wireless-encryption-wpa3',
Expand All @@ -46,19 +38,19 @@ if not device_class('tiny') and not tiny_like then
'ff-web-ap-timer',
'ffda-gluon-usteer',
}
-- usb is only default available for non-tiny devices
include_usb = true
end

if device({
'zte-mf281',
'glinet-gl-xe300',
'glinet-gl-ap1300',
'zte-mf289f',
'zte-mf286r',
'wavlink-ws-wn572hp3-4g',
'tp-link-tl-mr6400-v5',
}) then

-- include packages only if any wifi is available
if not (no_wifi24 and no_wifi50) then
packages {
'ff-web-ap-timer',
'ffac-ssid-changer',
'tecff-broken-wlan-workaround',
}
end

if has_lte then
features {
'web-cellular',
}
Expand All @@ -67,129 +59,11 @@ if device({
}
end

pkgs_usb = {
'usbutils',
}

pkgs_hid = {
'kmod-usb-hid',
'kmod-hid-generic',
}

pkgs_usb_serial = {
'kmod-usb-serial',
'kmod-usb-serial-ftdi',
'kmod-usb-serial-pl2303',
}

pkgs_usb_storage = {
'block-mount',
'blkid',
'kmod-fs-ext4',
'kmod-fs-ntfs',
'kmod-fs-vfat',
'kmod-usb-storage',
'kmod-usb-storage-extras',-- Card Readers
'kmod-usb-storage-uas', -- USB Attached SCSI (UAS/UASP)
'kmod-nls-base',
'kmod-nls-cp1250', -- NLS Codepage 1250 (Eastern Europe)
'kmod-nls-cp437', -- NLS Codepage 437 (United States, Canada)
'kmod-nls-cp850', -- NLS Codepage 850 (Europe)
'kmod-nls-cp852', -- NLS Codepage 852 (Europe)
'kmod-nls-iso8859-1', -- NLS ISO 8859-1 (Latin 1)
'kmod-nls-iso8859-13', -- NLS ISO 8859-13 (Latin 7; Baltic)
'kmod-nls-iso8859-15', -- NLS ISO 8859-15 (Latin 9)
'kmod-nls-iso8859-2', -- NLS ISO 8859-2 (Latin 2)
'kmod-nls-utf8', -- NLS UTF-8
}

pkgs_usb_net = {
'kmod-mii',
'kmod-usb-net',
'kmod-usb-net-asix',
'kmod-usb-net-asix-ax88179',
'kmod-usb-net-cdc-eem',
'kmod-usb-net-cdc-ether',
'kmod-usb-net-cdc-subset',
'kmod-usb-net-dm9601-ether',
'kmod-usb-net-hso',
'kmod-usb-net-ipheth',
'kmod-usb-net-mcs7830',
'kmod-usb-net-pegasus',
'kmod-usb-net-rndis',
'kmod-usb-net-rtl8152',
'kmod-usb-net-smsc95xx',
}

pkgs_pci = {
'pciutils',
'kmod-bnx2', -- Broadcom NetExtreme BCM5706/5708/5709/5716
}

-- rtl838x has no USB support as of Gluon v2023.2
if target('realtek', 'rtl838x') or target('ramips', 'mt7620') then
include_usb = false
end

-- 7M usable firmware space + USB port
if target('ath79', 'generic') and not device({
'devolo-wifi-pro-1750e',
'gl.inet-gl-ar150',
'gl.inet-gl-ar300m-lite',
'gl.inet-gl-ar750',
'joy-it-jt-or750i',
'netgear-wndr3700-v2',
'tp-link-archer-a7-v5',
'tp-link-archer-c5-v1',
'tp-link-archer-c7-v2',
'tp-link-archer-c7-v5',
'tp-link-archer-c59-v1',
'tp-link-tl-wr842n-v3',
'tp-link-tl-wr1043nd-v4',
'tp-link-tl-wr1043n-v5',
}) then
include_usb = false
end

if target('ramips', 'mt76x8') and not device({
'gl-mt300n-v2',
'gl.inet-microuter-n300',
'netgear-r6120',
'ravpower-rp-wd009',
}) then
include_usb = false
end

-- 7M usable firmware space + USB port
if device({
'avm-fritz-box-7412',
'tp-link-td-w8970',
'tp-link-td-w8980',
'gl-mt300n-v2',
'gl.inet-microuter-n300',
'netgear-r6120',
'ravpower-rp-wd009'
}) then
include_usb = false
end

-- devices without usb ports
if device({
'ubiquiti-unifi-6-lr-v1',
'netgear-ex6150',
'netgear-ex3700',
'ubiquiti-edgerouter-x',
'ubiquiti-edgerouter-x-sfp',
'zyxel-nwa55axe',
}) then
include_usb = false
end
if has_usb or target('x86', '64') then
-- add usb packages
include('image-customization-usb.lua')

if include_usb then
packages(pkgs_usb)
packages(pkgs_usb_net)
packages(pkgs_usb_serial)
packages(pkgs_usb_storage)
packages {'ffka-gluon-web-usb-wan-hotplug', 'ffac-update-location-gps'}
end

Expand Down
Loading
Loading