From d82fbe8a1bca3b80b8464b18bf0ed370f1f66649 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sat, 26 Jun 2021 01:36:00 +0200 Subject: [PATCH 01/11] scripts: make assemble_firmware.sh handle board specific packagelists This ports the enhancements made by @andibraeu for @weimarnetz (https://github.com/weimarnetz/firmware/issues/7#issuecomment-855293486) to our imagebuild-script. The relevant changes have been extracted with `git diff 84e11c1b7b357742df57e4c7f166dd6a51325e2e^..f2cad865b2bcfc6fd700883c3316214b61e5e543` In contrast to WeimarNetz we use a space separated list of profiles as commandline parameter. Adding device-packages to each profile will make the commandline use inpractical. So use a global list for device-packages instead, located in teh packagelists-folder. --- packagelists/profile-packages.txt | 7 +++++++ scripts/assemble_firmware.sh | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 packagelists/profile-packages.txt diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt new file mode 100644 index 0000000000..0952b88700 --- /dev/null +++ b/packagelists/profile-packages.txt @@ -0,0 +1,7 @@ +# this file lists a profile which should get special modules installed / removed +# this will usually apply only to hardware drivers +# profiles not listed here, will get the +# * default packages based on OpenWrts device-specific choice +# * the packagelist we a currently building for +# +# Format: :[-]package [package ...] diff --git a/scripts/assemble_firmware.sh b/scripts/assemble_firmware.sh index d5f8be563b..05ba763fb8 100755 --- a/scripts/assemble_firmware.sh +++ b/scripts/assemble_firmware.sh @@ -139,7 +139,12 @@ info "Extract image builder $IB_FILE" tar xf "$IB_FILE" --strip-components=1 -C "$TEMP_DIR" for profile in $PROFILES ; do - info "Building a profile for $profile" + info "Building an image for $profile" + + if [ -e "${PKGLIST_DIR}/profile-packages.txt" ] ; then + model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2)" + info "we include these extra packages: $model_packages" + fi # profiles can have a suffix. like 4mb devices get a smaller package list pro use case # UBNT:4MB -> profile "UBNT" suffix "4MB" @@ -168,6 +173,7 @@ for profile in $PROFILES ; do info "Using package list $package_list" packages=$(parse_pkg_list_file "${PKGLIST_DIR}/${package_list}.txt") + packages="${packages} ${model_packages}" if [ -z "${packages}" ] ; then info "skipping this usecase, as package list is empty" From 97bfd84829f22292eae0448361e28039cfd0fb28 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 02:30:19 +0200 Subject: [PATCH 02/11] assemble_firmware: add compatibility with weimarnetz board-package definitions * accept ":" and ";" als separator --- scripts/assemble_firmware.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/assemble_firmware.sh b/scripts/assemble_firmware.sh index 05ba763fb8..cb8c638175 100755 --- a/scripts/assemble_firmware.sh +++ b/scripts/assemble_firmware.sh @@ -143,6 +143,10 @@ for profile in $PROFILES ; do if [ -e "${PKGLIST_DIR}/profile-packages.txt" ] ; then model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2)" + # this is compatibility for WeimarNetz-stype definitons + if [ -z "${model_packages}" ]; then + model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d';' -s -f 2)" + fi info "we include these extra packages: $model_packages" fi From f9910d9a8422e4261c9e327748c101f3037f2794 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 02:38:20 +0200 Subject: [PATCH 03/11] profile-packages: import list from weimarnetz for ath10k-wave1 chips * via "curl -L https://github.com/weimarnetz/packages/raw/brauhaus-19.07/assemble/profiles/ath79_generic.profiles|grep ";" >> profile-packages.txt" * https://github.com/weimarnetz/packages/commit/8c399e6e651a1c64668de47aea293b57e7c9e5bf * See https://github.com/freifunk-berlin/firmware/issues/696, https://github.com/weimarnetz/firmware/issues/7 --- packagelists/profile-packages.txt | 38 +++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt index 0952b88700..c9d826ff9f 100644 --- a/packagelists/profile-packages.txt +++ b/packagelists/profile-packages.txt @@ -5,3 +5,41 @@ # * the packagelist we a currently building for # # Format: :[-]package [package ...] + +# ath10k Wave1 chips (AP and 802.11s in parallel with Caldera Tech drivers - Issue #696) +dlink_dir-859-a1;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +elecom_wrc-1750ghbk2-i;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +engenius_ecb1750;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +engenius_epg5000;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +engenius_ews511ap;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +glinet_gl-x750;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +iodata_wn-ac1167dgr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +iodata_wn-ac1600dgr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +iodata_wn-ac1600dgr2;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +nec_wg1200cr;-kmod-ath10k-ct -ath10k-firmware-qca9888-ct kmod-ath10k ath10k-firmware-qca9888 +nec_wg800hp;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +ocedo_koala;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +openmesh_om5p-ac-v2;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +tplink_archer-a7-v5;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +tplink_archer-c2-v3;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +tplink_archer-c25-v1;-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9887-ct ath10k-firmware-qca9887 +tplink_archer-c5-v1;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +tplink_archer-c58-v1;-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888 +tplink_archer-c6-v2;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888 +tplink_archer-c60-v1;-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888 +tplink_archer-c60-v2;-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888 +tplink_archer-c60-v3;-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888 +tplink_archer-c7-v2;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x +tplink_archer-c7-v5;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x +tplink_archer-d50-v1;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +tplink_re350k-v1;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +tplink_re450-v2;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +ubnt_nanobeam-ac;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +ubnt_nanostation-ac;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +ubnt_nanostation-ac-loco;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +ubnt_unifiac-lr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +ubnt_unifiac-lite;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +ubnt_unifiac-mesh;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x +ubnt_unifiac-mesh-pro;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +yuncore_a770;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +yuncore_a782;-kmod-ath10k-ct -ath10k-firmware-qca9888-ct kmod-ath10k ath10k-firmware-qca9888 From c99bdb576c6611d8c54e2aaefbc92a712a82beec Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 02:40:46 +0200 Subject: [PATCH 04/11] profile-packages: add definition for TPLink EAP 225 outdoor it's also an ath10k-wave1 board --- configs/ath79-generic.config | 1 + packagelists/profile-packages.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/configs/ath79-generic.config b/configs/ath79-generic.config index 2f59107e53..c7d826e67f 100644 --- a/configs/ath79-generic.config +++ b/configs/ath79-generic.config @@ -1,6 +1,7 @@ CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_generic=y CONFIG_PACKAGE_ath10k-firmware-qca988x=m +CONFIG_PACKAGE_ath10k-firmware-qca9888=m CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=m CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m CONFIG_PACKAGE_ath10k-firmware-qca9888-ct=m diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt index c9d826ff9f..7778576d1b 100644 --- a/packagelists/profile-packages.txt +++ b/packagelists/profile-packages.txt @@ -32,6 +32,7 @@ tplink_archer-c60-v3;-kmod-ath10k-ct-smallbuffers kmod-ath10k -ath10k-firmware-q tplink_archer-c7-v2;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x tplink_archer-c7-v5;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k-firmware-qca988x tplink_archer-d50-v1;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +tplink_eap225-outdoor-v1:-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca9888-ct ath10k-firmware-qca9888 tplink_re350k-v1;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x tplink_re450-v2;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x ubnt_nanobeam-ac;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x From 35aeefaf6d2a98a996eb018f557364d31f2a8c1a Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 02:48:10 +0200 Subject: [PATCH 05/11] profile-packages: add some boards of ath79-nand and ipq40xx-generic parsed from Freifunk-Gluon --- configs/ath79-generic.config | 1 + configs/ipq40xx-generic.config | 2 ++ packagelists/profile-packages.txt | 3 +++ 3 files changed, 6 insertions(+) diff --git a/configs/ath79-generic.config b/configs/ath79-generic.config index c7d826e67f..d141af22fb 100644 --- a/configs/ath79-generic.config +++ b/configs/ath79-generic.config @@ -1,6 +1,7 @@ CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_generic=y CONFIG_PACKAGE_ath10k-firmware-qca988x=m +CONFIG_PACKAGE_ath10k-firmware-qca9887=m CONFIG_PACKAGE_ath10k-firmware-qca9888=m CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=m CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m diff --git a/configs/ipq40xx-generic.config b/configs/ipq40xx-generic.config index 346e711bb1..e0d126f18a 100644 --- a/configs/ipq40xx-generic.config +++ b/configs/ipq40xx-generic.config @@ -1,2 +1,4 @@ CONFIG_TARGET_ipq40xx=y CONFIG_TARGET_ipq40xx_generic=y +CONFIG_PACKAGE_ath10k-firmware-qca9884=m +CONFIG_PACKAGE_ath10k-firmware-qca9884-ct=m diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt index 7778576d1b..0c00b80189 100644 --- a/packagelists/profile-packages.txt +++ b/packagelists/profile-packages.txt @@ -12,10 +12,13 @@ elecom_wrc-1750ghbk2-i;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k a engenius_ecb1750;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x engenius_epg5000;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x engenius_ews511ap;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +glinet_gl-ar750s-nor:-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +glinet_gl-ar750s-nor-nand:-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 glinet_gl-x750;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 iodata_wn-ac1167dgr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x iodata_wn-ac1600dgr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x iodata_wn-ac1600dgr2;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x +netgear_r7800:kmod-ath10k -kmod-ath10k-ct ath10k-firmware-qca9984 -ath10k-firmware-qca9984-ct nec_wg1200cr;-kmod-ath10k-ct -ath10k-firmware-qca9888-ct kmod-ath10k ath10k-firmware-qca9888 nec_wg800hp;-kmod-ath10k-ct-smallbuffers -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 ocedo_koala;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x From 2df39cacc92e7d3320174e9a41cae0dffe4f7db5 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 03:01:39 +0200 Subject: [PATCH 06/11] profile-packages: include pppoe packages in boards having a DSL-modem integrated This is based on Issue #838 to make the WAN-port configurable in LuCI. --- packagelists/profile-packages.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt index 0c00b80189..44d9a87067 100644 --- a/packagelists/profile-packages.txt +++ b/packagelists/profile-packages.txt @@ -47,3 +47,6 @@ ubnt_unifiac-mesh;-kmod-ath10k-ct kmod-ath10k -ath10k-firmware-qca988x-ct ath10k ubnt_unifiac-mesh-pro;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x yuncore_a770;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 yuncore_a782;-kmod-ath10k-ct -ath10k-firmware-qca9888-ct kmod-ath10k ath10k-firmware-qca9888 + +# boards with integrated DSL-port need additional hardware-support (see Issue #838) +avm_fritz7360sl:luci-proto-ipv6 luci-proto-ppp ppp ppp-mod-pppoe From 481849ba9f35c56b95d45862d1966e9b5f24c2f1 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 03:11:46 +0200 Subject: [PATCH 07/11] profile-packages: add block-mount and f2fs for the SD-slot of RB750Gr3 This allows automounting on the integrated SD-slot. --- configs/ramips-mt7621.config | 1 + packagelists/profile-packages.txt | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/configs/ramips-mt7621.config b/configs/ramips-mt7621.config index 4bb8c900ed..17dc150c33 100644 --- a/configs/ramips-mt7621.config +++ b/configs/ramips-mt7621.config @@ -2,3 +2,4 @@ CONFIG_TARGET_ramips=y CONFIG_TARGET_ramips_mt7621=y CONFIG_TARGET_ROOTFS_INITRAMFS=y # CONFIG_PACKAGE_kmod-ath9k-htc is not set +CONFIG_PACKAGE_block-mount=m diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt index 44d9a87067..f11adde9c9 100644 --- a/packagelists/profile-packages.txt +++ b/packagelists/profile-packages.txt @@ -48,5 +48,9 @@ ubnt_unifiac-mesh-pro;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k at yuncore_a770;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 yuncore_a782;-kmod-ath10k-ct -ath10k-firmware-qca9888-ct kmod-ath10k ath10k-firmware-qca9888 +# boards with mass-storage (SATA, SD-cards) will benefit from additional packages +mikrotik_routerboard-750gr3:block-mount kmod-fs-f2fs kmod-sdhci-mt7620 + # boards with integrated DSL-port need additional hardware-support (see Issue #838) avm_fritz7360sl:luci-proto-ipv6 luci-proto-ppp ppp ppp-mod-pppoe + From da82f731de076e4cfe7a9baae56f0cf251a4a1f3 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 04:01:32 +0200 Subject: [PATCH 08/11] assemble_firmware: fix parsing profile-packages for flavor-suffix * 1st remove the flavor-suffix * use the normalized profilename to lookup the profile-packagelist --- scripts/assemble_firmware.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/assemble_firmware.sh b/scripts/assemble_firmware.sh index cb8c638175..73b1696a77 100755 --- a/scripts/assemble_firmware.sh +++ b/scripts/assemble_firmware.sh @@ -141,6 +141,11 @@ tar xf "$IB_FILE" --strip-components=1 -C "$TEMP_DIR" for profile in $PROFILES ; do info "Building an image for $profile" + # profiles can have a suffix. like 4mb devices get a smaller package list pro use case + # UBNT:4MB -> profile "UBNT" suffix "4MB" + suffix="$(echo $profile | cut -d':' -f 2)" + profile="$(echo $profile | cut -d':' -f 1)" + if [ -e "${PKGLIST_DIR}/profile-packages.txt" ] ; then model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2)" # this is compatibility for WeimarNetz-stype definitons @@ -150,11 +155,6 @@ for profile in $PROFILES ; do info "we include these extra packages: $model_packages" fi - # profiles can have a suffix. like 4mb devices get a smaller package list pro use case - # UBNT:4MB -> profile "UBNT" suffix "4MB" - suffix="$(echo $profile | cut -d':' -f 2)" - profile="$(echo $profile | cut -d':' -f 1)" - for usecase in $USECASES ; do package_list="" packages="" From 512546a3e6f64bf2789a82f740a53fb0f5ab69c4 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 27 Jun 2021 21:44:01 +0200 Subject: [PATCH 09/11] assemble_firmware.sh: remove tailing newline from device-packages this causes unterminated strings inside OpenWrts Imagebuilder --- scripts/assemble_firmware.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/assemble_firmware.sh b/scripts/assemble_firmware.sh index 73b1696a77..1822b39371 100755 --- a/scripts/assemble_firmware.sh +++ b/scripts/assemble_firmware.sh @@ -147,10 +147,10 @@ for profile in $PROFILES ; do profile="$(echo $profile | cut -d':' -f 1)" if [ -e "${PKGLIST_DIR}/profile-packages.txt" ] ; then - model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2)" + model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2 | tr -t '\n' ' ')" # this is compatibility for WeimarNetz-stype definitons if [ -z "${model_packages}" ]; then - model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d';' -s -f 2)" + model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d';' -s -f 2| tr -t '\n' ' ')" fi info "we include these extra packages: $model_packages" fi From f9e230de6ebaf5cf6bd6cf486781504c79801808 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Fri, 9 Jul 2021 16:16:22 +0200 Subject: [PATCH 10/11] profile-packages: add definition for GL.iNet GL-E750, GL-AR750 --- configs/ath79-nand.config | 1 + packagelists/profile-packages.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configs/ath79-nand.config b/configs/ath79-nand.config index 103e8b1081..70c3513243 100644 --- a/configs/ath79-nand.config +++ b/configs/ath79-nand.config @@ -1,4 +1,5 @@ CONFIG_TARGET_ath79=y CONFIG_TARGET_ath79_nand=y +CONFIG_PACKAGE_ath10k-firmware-qca9887=m CONFIG_PACKAGE_ath10k-firmware-qca9887-ct=m CONFIG_PACKAGE_block-mount=m diff --git a/packagelists/profile-packages.txt b/packagelists/profile-packages.txt index f11adde9c9..9a12f8ebd3 100644 --- a/packagelists/profile-packages.txt +++ b/packagelists/profile-packages.txt @@ -12,8 +12,10 @@ elecom_wrc-1750ghbk2-i;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k a engenius_ecb1750;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x engenius_epg5000;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x engenius_ews511ap;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +glinet_gl-ar750:-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 glinet_gl-ar750s-nor:-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 glinet_gl-ar750s-nor-nand:-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 +glinet_gl-e750:-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 glinet_gl-x750;-kmod-ath10k-ct -ath10k-firmware-qca9887-ct kmod-ath10k ath10k-firmware-qca9887 iodata_wn-ac1167dgr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x iodata_wn-ac1600dgr;-kmod-ath10k-ct -ath10k-firmware-qca988x-ct kmod-ath10k ath10k-firmware-qca988x From b80e69124040ea92cb8d5d954147bf0c59406f91 Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sat, 17 Jul 2021 02:29:51 +0200 Subject: [PATCH 11/11] scripts/assemble_firmware: devicepackages: only consider boards starting at begin of line This allows to comment out lines. --- scripts/assemble_firmware.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/assemble_firmware.sh b/scripts/assemble_firmware.sh index 1822b39371..21f1da3a2d 100755 --- a/scripts/assemble_firmware.sh +++ b/scripts/assemble_firmware.sh @@ -147,10 +147,10 @@ for profile in $PROFILES ; do profile="$(echo $profile | cut -d':' -f 1)" if [ -e "${PKGLIST_DIR}/profile-packages.txt" ] ; then - model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2 | tr -t '\n' ' ')" + model_packages="$(grep ^$profile ${PKGLIST_DIR}/profile-packages.txt | cut -d':' -s -f 2 | tr -t '\n' ' ')" # this is compatibility for WeimarNetz-stype definitons if [ -z "${model_packages}" ]; then - model_packages="$(grep $profile ${PKGLIST_DIR}/profile-packages.txt | cut -d';' -s -f 2| tr -t '\n' ' ')" + model_packages="$(grep ^$profile ${PKGLIST_DIR}/profile-packages.txt | cut -d';' -s -f 2| tr -t '\n' ' ')" fi info "we include these extra packages: $model_packages" fi